uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Another attempt to get CMSIS semaphores correct.

ugfx_release_2.6
inmarket 2015-10-26 23:04:51 +10:00
parent bc32c99d1a
commit 267178254d
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gos/gos_cmsis.c
View File

@ -43,9 +43,9 @@ void gfxSemInit(gfxSem* psem, semcount_t val, semcount_t limit)
osSemaphoreDef_t def; osSemaphoreDef_t def;
def.semaphore = psem->semaphore; def.semaphore = psem->semaphore;
psem->id = osSemaphoreCreate(&def, limit); if (val > limit) val = limit;
while(val--) psem->available = limit - val;
osSemaphoreRelease(psem->id); psem->id = osSemaphoreCreate(&def, val);
} }
void gfxSemDestroy(gfxSem* psem) void gfxSemDestroy(gfxSem* psem)
@ -55,22 +55,29 @@ void gfxSemDestroy(gfxSem* psem)
bool_t gfxSemWait(gfxSem* psem, delaytime_t ms) bool_t gfxSemWait(gfxSem* psem, delaytime_t ms)
{ {
return osSemaphoreWait(psem->id, ms) > 0; if (osSemaphoreWait(psem->id, ms) == osOK) {
psem->available++;
return TRUE;
}
return FALSE;
} }
bool_t gfxSemWaitI(gfxSem* psem) bool_t gfxSemWaitI(gfxSem* psem)
{ {
return osSemaphoreWait(psem->id, 0) > 0; return gfxSemWait(psem, 0);
} }
void gfxSemSignal(gfxSem* psem) void gfxSemSignal(gfxSem* psem)
{ {
osSemaphoreRelease(psem->id); gfxSemSignalI(psem);
} }
void gfxSemSignalI(gfxSem* psem) void gfxSemSignalI(gfxSem* psem)
{ {
osSemaphoreRelease(psem->id); if (psem->available) {
psem->available--;
osSemaphoreRelease(psem->id);
}
} }
gfxThreadHandle gfxThreadCreate(void* stackarea, size_t stacksz, threadpriority_t prio, DECLARE_THREAD_FUNCTION((*fn),p), void* param) gfxThreadHandle gfxThreadCreate(void* stackarea, size_t stacksz, threadpriority_t prio, DECLARE_THREAD_FUNCTION((*fn),p), void* param)

5
src/gos/gos_cmsis.h
View File

@ -42,8 +42,9 @@ typedef osPriority threadpriority_t;
#define HIGH_PRIORITY osPriorityHigh #define HIGH_PRIORITY osPriorityHigh
typedef struct gfxSem { typedef struct gfxSem {
uint32_t semaphore[2]; uint32_t semaphore[2];
osSemaphoreId id; osSemaphoreId id;
semcount_t available;
} gfxSem; } gfxSem;
typedef struct gfxMutex { typedef struct gfxMutex {