diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-05-25 01:26:52 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-05-25 01:26:52 +1000 |
| commit | 7fbfde42aabbcd30cffba2fba35158236c0a6c6c (patch) | |
| tree | e85c90a4f21974b706315d64209021e0b2bde764 /drivers/multiple | |
| parent | 42006a67b5ccfd86f30d8a91cc474681c437eaf6 (diff) | |
| download | uGFX-7fbfde42aabbcd30cffba2fba35158236c0a6c6c.tar.gz uGFX-7fbfde42aabbcd30cffba2fba35158236c0a6c6c.tar.bz2 uGFX-7fbfde42aabbcd30cffba2fba35158236c0a6c6c.zip | |
GOS module, for operating system independance
GMISC fast floating point trig
GMISC fast fixed point trig
Diffstat (limited to 'drivers/multiple')
| -rw-r--r-- | drivers/multiple/Win32/gdisp_lld.c | 4 | ||||
| -rw-r--r-- | drivers/multiple/X/gdisp_lld.c | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/drivers/multiple/Win32/gdisp_lld.c b/drivers/multiple/Win32/gdisp_lld.c index e8b55e45..221442ef 100644 --- a/drivers/multiple/Win32/gdisp_lld.c +++ b/drivers/multiple/Win32/gdisp_lld.c @@ -13,8 +13,6 @@ * @{ */ -#include "ch.h" -#include "hal.h" #include "gfx.h" #if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/ @@ -173,7 +171,7 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) mousex = (coord_t)LOWORD(lParam); mousey = (coord_t)HIWORD(lParam); #if GINPUT_MOUSE_POLL_PERIOD == TIME_INFINITE - ginputMouseWakeup(); + ginputMouseWakeupI(); #endif break; #endif diff --git a/drivers/multiple/X/gdisp_lld.c b/drivers/multiple/X/gdisp_lld.c index 139cc420..c431c30c 100644 --- a/drivers/multiple/X/gdisp_lld.c +++ b/drivers/multiple/X/gdisp_lld.c @@ -10,8 +10,6 @@ * @brief GDISP Graphics Driver subsystem low level driver source for X. */ -#include "ch.h" -#include "hal.h" #include "gfx.h" #if GFX_USE_GDISP @@ -119,12 +117,12 @@ static void ProcessEvent(void) { /* this is the X11 thread which keeps track of all events */ #if GDISP_THREAD_CHIBIOS - static WORKING_AREA(waXThread, 1024); - static msg_t ThreadX(void *arg) { + static DECLARESTACK(waXThread, 1024); + static threadreturn_t ThreadX(void *arg) { (void)arg; while(1) { - chThdSleepMilliseconds(100); + gfxSleepMilliseconds(100); while(XPending(dis)) { XNextEvent(dis, &evt); ProcessEvent(); @@ -230,7 +228,7 @@ bool_t gdisp_lld_init(void) ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask); #if GDISP_THREAD_CHIBIOS - if (!chThdCreateStatic(waXThread, sizeof(waXThread), HIGHPRIO, ThreadX, 0)) { + if (!gfxCreateThread(waXThread, sizeof(waXThread), HIGH_PRIORITY, ThreadX, 0)) { #else if (pthread_attr_init(&thattr) || pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED) |