diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c index e75f8d55b..7ba99b45c 100644 --- a/hw/kdrive/linux/linux.c +++ b/hw/kdrive/linux/linux.c @@ -469,6 +469,18 @@ LinuxFini (void) return; } +void +KdOsAddInputDrivers () +{ + KdAddPointerDriver(&LinuxMouseDriver); + KdAddPointerDriver(&MsMouseDriver); + KdAddPointerDriver(&Ps2MouseDriver); +#ifdef TSLIB + KdAddPointerDriver(&TsDriver); +#endif + KdAddKeyboardDriver(&LinuxKeyboardDriver); +} + KdOsFuncs LinuxFuncs = { LinuxInit, LinuxEnable, diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index 7e8712c5e..7f752e933 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -739,6 +739,9 @@ KdProcessArgument (int argc, char **argv, int i); void KdOsInit (KdOsFuncs *pOsFuncs); +void +KdOsAddInputDrivers (void); + Bool KdAllocatePrivates (ScreenPtr pScreen); diff --git a/hw/kdrive/vxworks/vxworks.c b/hw/kdrive/vxworks/vxworks.c index ce214ff84..aa460010c 100644 --- a/hw/kdrive/vxworks/vxworks.c +++ b/hw/kdrive/vxworks/vxworks.c @@ -33,12 +33,6 @@ VxWorksSpecialKey (KeySym sym) case XK_Break: download(1, "launcher", 0); return TRUE; - case XK_Delete: - dispatchException |= DE_REBOOT; - return TRUE; - case XK_BackSpace: - dispatchException |= DE_RESET; - return TRUE; } return FALSE; } @@ -53,6 +47,13 @@ VxWorksFini (void) { } +void +KdOsAddInputDrivers (void) +{ + KdAddPointerDriver(&VxWorksMouseDriver); + KdAddPointerDriver(&VxWorksKeyboardDriver); +} + KdOsFuncs VxWorksFuncs = { VxWorksInit, VxWorksEnable,