diff options
author | Andrew Hannam <andrewh@inmarket.com.au> | 2012-11-11 19:03:30 +1000 |
---|---|---|
committer | Andrew Hannam <andrewh@inmarket.com.au> | 2012-11-11 19:03:30 +1000 |
commit | 8b51bcf46f97d7cd752f3b3d9b52b9f39051f60f (patch) | |
tree | a1058cc5b7a3331b57e0bf57fe171d44dca5ff48 /drivers/gdisp/Win32 | |
parent | e28a4dbd0e5306f40f2e778025fd0e4888d9d0ba (diff) | |
download | uGFX-8b51bcf46f97d7cd752f3b3d9b52b9f39051f60f.tar.gz uGFX-8b51bcf46f97d7cd752f3b3d9b52b9f39051f60f.tar.bz2 uGFX-8b51bcf46f97d7cd752f3b3d9b52b9f39051f60f.zip |
Touch Fixes. Deprecate Console
Touch:
- Move defines that may be altered by the touch config file to the lld
header file.
- Move the definition of the Touch driver structure to the lld config
file.
- Changed CONVERSIONS macro to TOUCHSCREEN_CONVERSIONS
- Replaced references to GDISP_SCREEN_WIDTH with gdispGetWidth
- Renamed TOUCHSCREEN_HAS_IRQ to TOUCHSCREEN_HAS_PRESSED to match new
function name.
- Added prototypes for calibration storage functions to
touchscreen_lld.h so that either the lld driver or the application can
define the function.
Console:
-Deprecated into "old" directory. Functionality replaced by gwin.
Diffstat (limited to 'drivers/gdisp/Win32')
-rw-r--r-- | drivers/gdisp/Win32/touchscreen_lld_config.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gdisp/Win32/touchscreen_lld_config.h b/drivers/gdisp/Win32/touchscreen_lld_config.h index de200ef9..ef5d5a27 100644 --- a/drivers/gdisp/Win32/touchscreen_lld_config.h +++ b/drivers/gdisp/Win32/touchscreen_lld_config.h @@ -19,7 +19,7 @@ */
/**
- * @file drivers/touchscreen/ADS7843/touchscreen_lld_config.h
+ * @file drivers/gdisp/Win32/touchscreen_lld_config.h
* @brief Touchscreen Driver subsystem low level driver.
*
* @addtogroup TOUCHSCREEN
@@ -35,14 +35,13 @@ /* Driver hardware support. */
/*===========================================================================*/
-#define TOUCHSCREEN_HAS_IRQ TRUE
+#define TOUCHSCREEN_HAS_PRESSED TRUE
#define TOUCHSCREEN_HAS_PRESSURE FALSE
#define TOUCHSCREEN_XY_INVERTED FALSE
#define TOUCHSCREEN_STORE_CALIBRATION TRUE
+#define TOUCHSCREEN_CONVERSIONS 1
-/* Nasty stuff to fix SPI dependancy in driver structure (which doesn't exist in Win32) */
-typedef struct SPIDriver_t {} SPIDriver;
-typedef struct SPIConfig_t {} SPIConfig;
+struct TouchscreenDriver {};
#endif /* GFX_USE_TOUCHSCREEN */
|