diff options
Diffstat (limited to 'hw/xfree86/os-support/shared/sysv_kbd.c')
| -rw-r--r-- | hw/xfree86/os-support/shared/sysv_kbd.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/hw/xfree86/os-support/shared/sysv_kbd.c b/hw/xfree86/os-support/shared/sysv_kbd.c index 2270be9f1..1bb2da386 100644 --- a/hw/xfree86/os-support/shared/sysv_kbd.c +++ b/hw/xfree86/os-support/shared/sysv_kbd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.2 1996/12/23 06:51:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.4 1999/01/14 13:05:11 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@XFree86.org> @@ -23,20 +23,18 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $Xorg: sysv_kbd.c,v 1.3 2000/08/17 19:51:30 cpqbld Exp $ */ +/* $XConsortium: sysv_kbd.c /main/3 1996/02/21 17:53:59 kaleb $ */ -#define NEED_EVENTS #include "X.h" -#include "Xproto.h" -#include "inputstr.h" -#include "scrnintstr.h" #include "compiler.h" -#include "xf86Procs.h" +#include "xf86.h" +#include "xf86Priv.h" #include "xf86_OSlib.h" -int xf86GetKbdLeds() +int +xf86GetKbdLeds() { int leds; @@ -44,12 +42,8 @@ int xf86GetKbdLeds() return(leds); } -#if NeedFunctionPrototypes -void xf86SetKbdRepeat(char rad) -#else -void xf86SetKbdRepeat(rad) -char rad; -#endif +void +xf86SetKbdRepeat(char rad) { #ifdef KDSETRAD ioctl(xf86Info.consoleFd, KDSETRAD, rad); @@ -60,14 +54,15 @@ static int kbdtrans; static struct termio kbdtty; static char *kbdemap = NULL; -void xf86KbdInit() +void +xf86KbdInit() { #ifdef KDGKBMODE ioctl (xf86Info.consoleFd, KDGKBMODE, &kbdtrans); #endif ioctl (xf86Info.consoleFd, TCGETA, &kbdtty); #if defined(E_TABSZ) && !defined(SCO325) - kbdemap = (char *)xalloc(E_TABSZ); + kbdemap = xalloc(E_TABSZ); if (ioctl(xf86Info.consoleFd, LDGMAP, kbdemap) < 0) { xfree(kbdemap); @@ -76,7 +71,8 @@ void xf86KbdInit() #endif } -int xf86KbdOn() +int +xf86KbdOn() { struct termio nTty; @@ -93,7 +89,8 @@ int xf86KbdOn() return(xf86Info.consoleFd); } -int xf86KbdOff() +int +xf86KbdOff() { if (kbdemap) { |