diff options
| author | Kevin E Martin <kem@kem.org> | 2004-08-16 22:48:51 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2004-08-16 22:48:51 +0000 |
| commit | 9e2172ffef436acb9a88147f276c9ddf12739a14 (patch) | |
| tree | 5a604cc6e6d7e63d2cfd535d8272096892106c5e | |
| parent | 58f47a9c32cf379fd473f01b18ddc57b90e47b0b (diff) | |
Update release and date for first RC.XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901
Fix kbd/keyboard driver for DoLoadableServer NO.
Revert change since it is better to set date in the config files.
| -rw-r--r-- | src/kbd.c | 46 |
1 files changed, 24 insertions, 22 deletions
@@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.2 2004/04/23 19:54:03 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.3 2004/08/16 20:17:52 kem Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.8 2003/11/03 05:11:47 tsi Exp $ */ /* @@ -12,7 +12,7 @@ * xf86Events.c and xf86Io.c which are * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.2 2004/04/23 19:54:03 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.3 2004/08/16 20:17:52 kem Exp $ */ #define NEED_EVENTS #include "X.h" @@ -59,6 +59,28 @@ static void InitKBD(InputInfoPtr pInfo, Bool init); static void SetXkbOption(InputInfoPtr pInfo, char *name, char **option); static void UpdateLeds(InputInfoPtr pInfo); +InputDriverRec KBD = { + 1, + "kbd", + NULL, + KbdPreInit, + NULL, + NULL, + 0 +}; + +#ifndef USE_DEPRECATED_KEYBOARD_DRIVER +InputDriverRec KEYBOARD = { + 1, + "keyboard", + NULL, + KbdPreInit, + NULL, + NULL, + 0 +}; +#endif + typedef enum { OPTION_ALWAYS_CORE, OPTION_SEND_CORE_EVENTS, @@ -709,16 +731,6 @@ PostKbdEvent(InputInfoPtr pInfo, unsigned int scanCode, Bool down) } #ifdef XFree86LOADER -InputDriverRec KBD = { - 1, - "kbd", - NULL, - KbdPreInit, - NULL, - NULL, - 0 -}; - ModuleInfoRec KbdInfo = { 1, "KBD", @@ -780,16 +792,6 @@ XF86ModuleData kbdModuleData = { #ifndef USE_DEPRECATED_KEYBOARD_DRIVER -InputDriverRec KEYBOARD = { - 1, - "keyboard", - NULL, - KbdPreInit, - NULL, - NULL, - 0 -}; - ModuleInfoRec KeyboardInfo = { 1, "KEYBOARD", |