diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-11-03 12:29:30 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-11-03 12:29:30 +1000 |
| commit | 8a9ed5195b3345635533b6150b9303abbaf5adf3 (patch) | |
| tree | b57c4580a50b261e75a19e53124acb3670d47b6f /drivers | |
| parent | 7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d (diff) | |
| download | uGFX-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 'drivers')
| -rw-r--r-- | drivers/multiple/X/gdisp_lld_X.c | 4 | ||||
| -rw-r--r-- | drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c | 6 | ||||
| -rw-r--r-- | drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c index ace906a7..0d6a4abc 100644 --- a/drivers/multiple/X/gdisp_lld_X.c +++ b/drivers/multiple/X/gdisp_lld_X.c @@ -270,8 +270,8 @@ static void ProcessEvent(GDisplay *g, xPriv *priv) { } /* this is the X11 thread which keeps track of all events */ -static DECLARE_THREAD_STACK(waXThread, 1024); -static DECLARE_THREAD_FUNCTION(ThreadX, arg) { +static GFX_THREAD_STACK(waXThread, 1024); +static GFX_THREAD_FUNCTION(ThreadX, arg) { GDisplay *g; (void)arg; diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c index a5bfbd97..2664502a 100644 --- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c +++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c @@ -168,7 +168,7 @@ typedef struct netPriv { static gThread hThread; #if GDISP_GFXNET_UNSAFE_SOCKETS - static gfxMutex uGFXnetMutex; + static gMutex uGFXnetMutex; #define MUTEX_INIT gfxMutexInit(&uGFXnetMutex) #define MUTEX_ENTER gfxMutexEnter(&uGFXnetMutex) #define MUTEX_EXIT gfxMutexExit(&uGFXnetMutex) @@ -318,8 +318,8 @@ static gBool rxdata(SOCKET_TYPE fd) { return gTrue; } -static DECLARE_THREAD_STACK(waNetThread, 512); -static DECLARE_THREAD_FUNCTION(NetThread, param) { +static GFX_THREAD_STACK(waNetThread, 512); +static GFX_THREAD_FUNCTION(NetThread, param) { SOCKET_TYPE listenfd, fdmax, i, clientfd; socklen_t len; fd_set master, read_fds; diff --git a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp index 0e5381e5..de532a96 100644 --- a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp +++ b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp @@ -126,7 +126,7 @@ typedef struct netPriv { } netPriv; #if GDISP_GFXNET_UNSAFE_SOCKETS - static gfxMutex uGFXnetMutex; + static gMutex uGFXnetMutex; #define MUTEX_INIT gfxMutexInit(&uGFXnetMutex) #define MUTEX_ENTER gfxMutexEnter(&uGFXnetMutex) #define MUTEX_EXIT gfxMutexExit(&uGFXnetMutex) |