Indent src/ginput/ginput_keyboard.c with tabs
src/ginput/ginput_keyboard.c was already mostly indented with tabs, but some lines that were indented with spaces made it in there. This causes trouble with GCC 6 which can warn (or error) on misleading indentations.
This commit is contained in:
parent
97511a9fc7
commit
0093551079
@ -471,7 +471,7 @@ void _gkeyboardInit(void) {
|
|||||||
static const GKeyboardVMT * const dclist[] = {GINPUT_KEYBOARD_DRIVER_LIST};
|
static const GKeyboardVMT * const dclist[] = {GINPUT_KEYBOARD_DRIVER_LIST};
|
||||||
|
|
||||||
for(i = 0; i < sizeof(dclist)/sizeof(dclist[0]); i++) {
|
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);
|
gdriverRegister(&dclist[i]->d, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -481,8 +481,8 @@ void _gkeyboardInit(void) {
|
|||||||
{
|
{
|
||||||
extern const GKeyboardVMT const GKEYBOARDVMT_OnlyOne[1];
|
extern const GKeyboardVMT const GKEYBOARDVMT_OnlyOne[1];
|
||||||
|
|
||||||
if (!(GKEYBOARDVMT_OnlyOne->d.flags & GKEYBOARD_VFLG_DYNAMICONLY))
|
if (!(GKEYBOARDVMT_OnlyOne->d.flags & GKEYBOARD_VFLG_DYNAMICONLY))
|
||||||
gdriverRegister(&GKEYBOARDVMT_OnlyOne->d, 0);
|
gdriverRegister(&GKEYBOARDVMT_OnlyOne->d, 0);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -493,43 +493,43 @@ void _gkeyboardDeinit(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool_t _gkeyboardInitDriver(GDriver *g, void *param, unsigned driverinstance, unsigned systeminstance) {
|
bool_t _gkeyboardInitDriver(GDriver *g, void *param, unsigned driverinstance, unsigned systeminstance) {
|
||||||
#define k ((GKeyboard *)g)
|
#define k ((GKeyboard *)g)
|
||||||
(void) param;
|
(void) param;
|
||||||
(void) systeminstance;
|
(void) systeminstance;
|
||||||
|
|
||||||
// The initial keyboard layout comes from the VMT
|
// The initial keyboard layout comes from the VMT
|
||||||
k->pLayout = gkvmt(k)->defLayout;
|
k->pLayout = gkvmt(k)->defLayout;
|
||||||
|
|
||||||
// Init the mouse
|
// Init the mouse
|
||||||
if (!gkvmt(k)->init((GKeyboard *)g, driverinstance))
|
if (!gkvmt(k)->init((GKeyboard *)g, driverinstance))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
// Ensure the Poll timer is started
|
// Ensure the Poll timer is started
|
||||||
if (!gtimerIsActive(&KeyboardTimer))
|
if (!gtimerIsActive(&KeyboardTimer))
|
||||||
gtimerStart(&KeyboardTimer, KeyboardPoll, 0, TRUE, GINPUT_KEYBOARD_POLL_PERIOD);
|
gtimerStart(&KeyboardTimer, KeyboardPoll, 0, TRUE, GINPUT_KEYBOARD_POLL_PERIOD);
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
#undef k
|
#undef k
|
||||||
}
|
}
|
||||||
|
|
||||||
void _gkeyboardPostInitDriver(GDriver *g) {
|
void _gkeyboardPostInitDriver(GDriver *g) {
|
||||||
#define k ((GKeyboard *)g)
|
#define k ((GKeyboard *)g)
|
||||||
|
|
||||||
// Run the init sequence from the layout microcode.
|
// Run the init sequence from the layout microcode.
|
||||||
microengine(k, 0, FLAG_INIT);
|
microengine(k, 0, FLAG_INIT);
|
||||||
|
|
||||||
#undef k
|
#undef k
|
||||||
}
|
}
|
||||||
|
|
||||||
void _gkeyboardDeInitDriver(GDriver *g) {
|
void _gkeyboardDeInitDriver(GDriver *g) {
|
||||||
(void) g;
|
(void) g;
|
||||||
}
|
}
|
||||||
|
|
||||||
GSourceHandle ginputGetKeyboard(unsigned instance) {
|
GSourceHandle ginputGetKeyboard(unsigned instance) {
|
||||||
if (instance == GKEYBOARD_ALL_INSTANCES)
|
if (instance == GKEYBOARD_ALL_INSTANCES)
|
||||||
return (GSourceHandle)&KeyboardTimer;
|
return (GSourceHandle)&KeyboardTimer;
|
||||||
return (GSourceHandle)gdriverGetInstance(GDRIVER_TYPE_KEYBOARD, instance);
|
return (GSourceHandle)gdriverGetInstance(GDRIVER_TYPE_KEYBOARD, instance);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool_t ginputGetKeyboardStatus(unsigned instance, GEventKeyboard *pe) {
|
bool_t ginputGetKeyboardStatus(unsigned instance, GEventKeyboard *pe) {
|
||||||
|
Loading…
Reference in New Issue
Block a user