aboutsummaryrefslogtreecommitdiffstats
path: root/src/gos/gos_cmsis2.c
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2018-11-03 12:29:30 +1000
committerinmarket <andrewh@inmarket.com.au>2018-11-03 12:29:30 +1000
commit8a9ed5195b3345635533b6150b9303abbaf5adf3 (patch)
treeb57c4580a50b261e75a19e53124acb3670d47b6f /src/gos/gos_cmsis2.c
parent7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d (diff)
downloaduGFX-8a9ed5195b3345635533b6150b9303abbaf5adf3.tar.gz
uGFX-8a9ed5195b3345635533b6150b9303abbaf5adf3.tar.bz2
uGFX-8a9ed5195b3345635533b6150b9303abbaf5adf3.zip
Tidy u gfxSem, gfxMutex and various Macros by converting to new types gSem, gMutex etc
Diffstat (limited to 'src/gos/gos_cmsis2.c')
-rw-r--r--src/gos/gos_cmsis2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gos/gos_cmsis2.c b/src/gos/gos_cmsis2.c
index 9bc5e112..e7df341f 100644
--- a/src/gos/gos_cmsis2.c
+++ b/src/gos/gos_cmsis2.c
@@ -31,7 +31,7 @@ void _gosInit(void)
}
#if !GFX_OS_NO_INIT && GFX_OS_CALL_UGFXMAIN
- static DECLARE_THREAD_FUNCTION(startUGFX_CMSIS2, p) {
+ static GFX_THREAD_FUNCTION(startUGFX_CMSIS2, p) {
(void) p;
uGFXMain();
}
@@ -59,24 +59,24 @@ void _gosDeinit(void)
{
}
-void gfxMutexInit(gfxMutex* pmutex)
+void gfxMutexInit(gMutex* pmutex)
{
*pmutex = osMutexNew(NULL);
}
-void gfxSemInit(gfxSem* psem, gSemcount val, gSemcount limit)
+void gfxSemInit(gSem* psem, gSemcount val, gSemcount limit)
{
*psem = osSemaphoreNew(limit, val, NULL);
}
-gBool gfxSemWait(gfxSem* psem, gDelay ms)
+gBool gfxSemWait(gSem* psem, gDelay ms)
{
if (osSemaphoreAcquire(*psem, gfxMillisecondsToTicks(ms)) == osOK)
return gTrue;
return gFalse;
}
-gThread gfxThreadCreate(void* stackarea, gMemSize stacksz, gThreadpriority prio, DECLARE_THREAD_FUNCTION((*fn),p), void* param)
+gThread gfxThreadCreate(void* stackarea, gMemSize stacksz, gThreadpriority prio, GFX_THREAD_FUNCTION((*fn),p), void* param)
{
osThreadAttr_t def;