diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-11-07 12:02:41 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-11-07 12:02:41 +1000 |
| commit | bd041926b43676e2bf597c98149f9a6df8f8004b (patch) | |
| tree | 22a9db91876fbac50f874539e42a0dad8b5de3fc /drivers | |
| parent | f552ba62afc6cdb72fbb1b4dcdcc96000895a1cd (diff) | |
| download | uGFX-bd041926b43676e2bf597c98149f9a6df8f8004b.tar.gz uGFX-bd041926b43676e2bf597c98149f9a6df8f8004b.tar.bz2 uGFX-bd041926b43676e2bf597c98149f9a6df8f8004b.zip | |
Allow a mouse driver to not return any results when it is polled.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c | 3 | ||||
| -rw-r--r-- | drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c | 3 | ||||
| -rw-r--r-- | drivers/multiple/Win32/gdisp_lld_Win32.c | 6 | ||||
| -rw-r--r-- | drivers/multiple/X/gdisp_lld_X.c | 5 | ||||
| -rw-r--r-- | drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c | 5 |
5 files changed, 14 insertions, 8 deletions
diff --git a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c index ac315262..5f1eb226 100644 --- a/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c +++ b/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c @@ -19,7 +19,7 @@ #define CMD_Y 0x91
#define CMD_ENABLE_IRQ 0x80
-static void MouseXYZ(GMouse* m, GMouseReading* pdr)
+static bool_t MouseXYZ(GMouse* m, GMouseReading* pdr)
{
(void)m;
@@ -42,6 +42,7 @@ static void MouseXYZ(GMouse* m, GMouseReading* pdr) release_bus(m);
}
+ return TRUE;
}
const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{
diff --git a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c index ed2e68fa..6b0bcdb2 100644 --- a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c +++ b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c @@ -56,7 +56,7 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) { return TRUE; } -static void MouseXYZ(GMouse* m, GMouseReading* pdr) +static bool_t MouseXYZ(GMouse* m, GMouseReading* pdr) { // Assume not touched. pdr->buttons = 0; @@ -80,6 +80,7 @@ static void MouseXYZ(GMouse* m, GMouseReading* pdr) } release_bus(m); + return TRUE; } const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c index ecb100f6..13c5e544 100644 --- a/drivers/multiple/Win32/gdisp_lld_Win32.c +++ b/drivers/multiple/Win32/gdisp_lld_Win32.c @@ -69,7 +69,7 @@ // Forward definitions static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance); - static void Win32MouseRead(GMouse *m, GMouseReading *prd); + static bool_t Win32MouseRead(GMouse *m, GMouseReading *prd); const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ { @@ -1169,7 +1169,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { (void) driverinstance; return TRUE; } - static void Win32MouseRead(GMouse *m, GMouseReading *pt) { + static bool_t Win32MouseRead(GMouse *m, GMouseReading *pt) { GDisplay * g; winPriv * priv; @@ -1207,6 +1207,8 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { } } #endif + + return TRUE; } #endif /* GINPUT_NEED_MOUSE */ diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c index 6e0233ba..d62f52e6 100644 --- a/drivers/multiple/X/gdisp_lld_X.c +++ b/drivers/multiple/X/gdisp_lld_X.c @@ -33,7 +33,7 @@ // Forward definitions static bool_t XMouseInit(GMouse *m, unsigned driverinstance); - static void XMouseRead(GMouse *m, GMouseReading *prd); + static bool_t XMouseRead(GMouse *m, GMouseReading *prd); const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ { @@ -364,7 +364,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) (void) driverinstance; return TRUE; } - static void XMouseRead(GMouse *m, GMouseReading *pt) { + static bool_t XMouseRead(GMouse *m, GMouseReading *pt) { xPriv * priv; priv = m->display->priv; @@ -372,6 +372,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) pt->y = priv->mousey; pt->z = (priv->buttons & GINPUT_MOUSE_BTN_LEFT) ? 1 : 0; pt->buttons = priv->buttons; + return TRUE; } #endif /* GINPUT_NEED_MOUSE */ diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c index 559b0c69..3b42bcda 100644 --- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c +++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c @@ -40,7 +40,7 @@ // Forward definitions static bool_t NMouseInit(GMouse *m, unsigned driverinstance); - static void NMouseRead(GMouse *m, GMouseReading *prd); + static bool_t NMouseRead(GMouse *m, GMouseReading *prd); const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ { @@ -710,7 +710,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { (void) driverinstance; return TRUE; } - static void NMouseRead(GMouse *m, GMouseReading *pt) { + static bool_t NMouseRead(GMouse *m, GMouseReading *pt) { GDisplay * g; netPriv * priv; @@ -721,6 +721,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { pt->y = priv->mousey; pt->z = (priv->mousebuttons & GINPUT_MOUSE_BTN_LEFT) ? 1 : 0; pt->buttons = priv->mousebuttons; + return TRUE; } #endif /* GINPUT_NEED_MOUSE */ |