aboutsummaryrefslogtreecommitdiffstats
path: root/src/ginput/ginput_keyboard.c
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@embedded.pro>2017-08-27 13:43:53 +0200
committerJoel Bodenmann <joel@embedded.pro>2017-08-27 13:43:53 +0200
commit285c6528e65c3fa9a898e03b261fcaf8121308cd (patch)
tree0895be81ed272a7e32bb1ed4df273a488ccce8ed /src/ginput/ginput_keyboard.c
parentf9494c44a2406b4b7dd753076f1dfc8380e19500 (diff)
parentdb7971734fc940851b6d91a77a60906622f6c491 (diff)
downloaduGFX-285c6528e65c3fa9a898e03b261fcaf8121308cd.tar.gz
uGFX-285c6528e65c3fa9a898e03b261fcaf8121308cd.tar.bz2
uGFX-285c6528e65c3fa9a898e03b261fcaf8121308cd.zip
Merge branch 'master' of git.ugfx.io:uGFX/uGFX
Diffstat (limited to 'src/ginput/ginput_keyboard.c')
-rw-r--r--src/ginput/ginput_keyboard.c26
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) {