From 7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 3 Nov 2018 10:51:23 +1000 Subject: For all source files update integer types to the new gI8 etc type names --- src/ginput/ginput_driver_keyboard.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/ginput/ginput_driver_keyboard.h') diff --git a/src/ginput/ginput_driver_keyboard.h b/src/ginput/ginput_driver_keyboard.h index 0d107274..84c73b9b 100644 --- a/src/ginput/ginput_driver_keyboard.h +++ b/src/ginput/ginput_driver_keyboard.h @@ -24,15 +24,15 @@ typedef struct GKeyboard { GDriver d; // The driver overheads and vmt - uint16_t cntc; // The byte count in c - uint16_t cntsc; // The byte count in sc + gU16 cntc; // The byte count in c + gU16 cntsc; // The byte count in sc char c[8]; // The utf8 code for the current key char sc[8]; // The scancode for the current key - uint32_t keystate; // The keyboard state. - uint16_t flags; + gU32 keystate; // The keyboard state. + gU16 flags; #define GKEYBOARD_FLG_NEEDREAD 0x0001 - uint16_t laystate; // The layout state. - const uint8_t * pLayout; // The current keyboard layout + gU16 laystate; // The layout state. + const gU8 * pLayout; // The current keyboard layout // Other driver specific fields may follow. } GKeyboard; @@ -40,10 +40,10 @@ typedef struct GKeyboardVMT { GDriverVMT d; // Device flags are part of the general vmt #define GKEYBOARD_VFLG_NOPOLL 0x0001 // Do not poll this device - it is purely interrupt driven #define GKEYBOARD_VFLG_DYNAMICONLY 0x8000 // This keyboard driver should not be statically initialized eg Win32 - const uint8_t * defLayout; // The default keyboard layout + const gU8 * defLayout; // The default keyboard layout gBool (*init)(GKeyboard *m, unsigned driverinstance); // Required void (*deinit)(GKeyboard *m); // Optional - int (*getdata)(GKeyboard *k, uint8_t *pch, int sz); // Required. Get zero or more scancode bytes. Returns the number of scancode bytes returns + int (*getdata)(GKeyboard *k, gU8 *pch, int sz); // Required. Get zero or more scancode bytes. Returns the number of scancode bytes returns void (*putdata)(GKeyboard *k, char ch); // Optional. Send a single byte to the keyboard. } GKeyboardVMT; -- cgit v1.2.3