diff options
author | inmarket <inmarket@ugfx.org> | 2017-08-26 00:48:57 +0200 |
---|---|---|
committer | Gogs <gogs@fake.local> | 2017-08-26 00:48:57 +0200 |
commit | 642f04380d1574ef919417d9ca1aa25374ac5b84 (patch) | |
tree | 9ba4b96002ebc011d107ded2b4c75d7cf6e9bc86 /src | |
parent | c18bc690b08cc64bed234272a6ce5ebe0233d033 (diff) | |
parent | 00935510791c7f09eac2b8ecda4c0baefab5ae73 (diff) | |
download | uGFX-642f04380d1574ef919417d9ca1aa25374ac5b84.tar.gz uGFX-642f04380d1574ef919417d9ca1aa25374ac5b84.tar.bz2 uGFX-642f04380d1574ef919417d9ca1aa25374ac5b84.zip |
Merge branch 'tabsForIndenting' of raboof/ugfx into master
Diffstat (limited to 'src')
-rw-r--r-- | src/ginput/ginput_keyboard.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/ginput/ginput_keyboard.c b/src/ginput/ginput_keyboard.c index 0018dafb..141bdd2b 100644 --- a/src/ginput/ginput_keyboard.c +++ b/src/ginput/ginput_keyboard.c @@ -471,7 +471,7 @@ void _gkeyboardInit(void) { static const GKeyboardVMT * const dclist[] = {GINPUT_KEYBOARD_DRIVER_LIST}; for(i = 0; i < sizeof(dclist)/sizeof(dclist[0]); i++) { - if (!(dclist[i]->d.flags & GKEYBOARD_VFLG_DYNAMICONLY)) + if (!(dclist[i]->d.flags & GKEYBOARD_VFLG_DYNAMICONLY)) gdriverRegister(&dclist[i]->d, 0); } } @@ -481,8 +481,8 @@ void _gkeyboardInit(void) { { extern const GKeyboardVMT const GKEYBOARDVMT_OnlyOne[1]; - if (!(GKEYBOARDVMT_OnlyOne->d.flags & GKEYBOARD_VFLG_DYNAMICONLY)) - gdriverRegister(&GKEYBOARDVMT_OnlyOne->d, 0); + if (!(GKEYBOARDVMT_OnlyOne->d.flags & GKEYBOARD_VFLG_DYNAMICONLY)) + gdriverRegister(&GKEYBOARDVMT_OnlyOne->d, 0); } #endif @@ -493,43 +493,43 @@ void _gkeyboardDeinit(void) { } bool_t _gkeyboardInitDriver(GDriver *g, void *param, unsigned driverinstance, unsigned systeminstance) { - #define k ((GKeyboard *)g) + #define k ((GKeyboard *)g) (void) param; - (void) systeminstance; + (void) systeminstance; // The initial keyboard layout comes from the VMT k->pLayout = gkvmt(k)->defLayout; // Init the mouse - if (!gkvmt(k)->init((GKeyboard *)g, driverinstance)) - return FALSE; + if (!gkvmt(k)->init((GKeyboard *)g, driverinstance)) + return FALSE; // Ensure the Poll timer is started if (!gtimerIsActive(&KeyboardTimer)) gtimerStart(&KeyboardTimer, KeyboardPoll, 0, TRUE, GINPUT_KEYBOARD_POLL_PERIOD); - return TRUE; + return TRUE; - #undef k + #undef k } void _gkeyboardPostInitDriver(GDriver *g) { - #define k ((GKeyboard *)g) + #define k ((GKeyboard *)g) // Run the init sequence from the layout microcode. microengine(k, 0, FLAG_INIT); - #undef k + #undef k } void _gkeyboardDeInitDriver(GDriver *g) { - (void) g; + (void) g; } GSourceHandle ginputGetKeyboard(unsigned instance) { if (instance == GKEYBOARD_ALL_INSTANCES) return (GSourceHandle)&KeyboardTimer; - return (GSourceHandle)gdriverGetInstance(GDRIVER_TYPE_KEYBOARD, instance); + return (GSourceHandle)gdriverGetInstance(GDRIVER_TYPE_KEYBOARD, instance); } bool_t ginputGetKeyboardStatus(unsigned instance, GEventKeyboard *pe) { |