[xserver-commit] xserver/hw/kdrive/linux Makefile.am,1.6,1.7 agp.c,1.6,1.7 bus.c,1.8,1.9 keyboard.c,1.13,1.14 linux.c,1.14,1.15 mouse.c,1.11,1.12 ms.c,1.6,1.7 ps2.c,1.12,1.13

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/linux
In directory pdx:/tmp/cvs-serv23831/hw/kdrive/linux

Modified Files:
	Makefile.am agp.c bus.c keyboard.c linux.c mouse.c ms.c ps2.c 
Log Message:
	merge xfixes_2_branch back to HEAD


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	4 Oct 2003 02:56:54 -0000	1.6
+++ Makefile.am	2 Nov 2003 19:56:10 -0000	1.7
@@ -1,16 +1,18 @@
 INCLUDES = 					\
-	-I$(top_srcdir)/hw/kdrive/src		\
-	-I$(top_srcdir)/mi			\
-	-I$(top_srcdir)/fb			\
-	-I$(top_srcdir)/miext/layer		\
-	-I$(top_srcdir)/miext/shadow		\
-	-I$(top_srcdir)/randr			\
-	-I$(top_srcdir)/render			\
-	$(XSERVER_CFLAGS)
+	@KDRIVE_INCS@				\
+	@XSERVER_CFLAGS@
 
 
 noinst_LIBRARIES = liblinux.a
 
+if TSLIB
+TSLIB_C = tslib.c
+endif
+
+if H3600_TS
+TS_C = ts.c
+endif
+
 liblinux_a_SOURCES = 	\
 	agp.c		\
 	bus.c		\
@@ -18,12 +20,18 @@
 	linux.c		\
 	mouse.c		\
 	ms.c		\
-	ps2.c
+	ps2.c		\
+	$(TSLIB_C)	\
+	$(TS_C)
 
-if TSLIB
-liblinux_a_SOURCES += tslib.c
-endif
+liblinux_a_DEPENDENCIES = \
+	agp.c		\
+	bus.c		\
+	keyboard.c	\
+	linux.c		\
+	mouse.c		\
+	ms.c		\
+	ps2.c		\
+	$(TSLIB_C)	\
+	$(TS_C)
 
-if H3600_TS
-liblinux_a_SOURCES += ts.c
-endif

Index: agp.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/agp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- agp.c	11 Sep 2003 05:12:51 -0000	1.6
+++ agp.c	2 Nov 2003 19:56:10 -0000	1.7
@@ -87,7 +87,7 @@
  */
 
 static Bool
-GARTInit()
+GARTInit(void)
 {
 	static Bool initDone = FALSE;
 	struct _agp_info agpinf;

Index: bus.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/bus.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bus.c	14 Oct 2003 05:05:28 -0000	1.8
+++ bus.c	2 Nov 2003 19:56:10 -0000	1.9
@@ -35,7 +35,7 @@
 
 /* /dev/adbmouse is a busmouse */
 
-void
+static void
 BusRead (int adbPort, void *closure)
 {
     unsigned char   buf[3];
@@ -68,7 +68,7 @@
 
 int	BusInputType;
 
-int
+static int
 BusInit (void)
 {
     int	    i;
@@ -89,7 +89,7 @@
     return n;
 }
 
-void
+static void
 BusFini (void)
 {
     KdUnregisterFds (BusInputType, TRUE);

Index: keyboard.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/keyboard.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- keyboard.c	14 Oct 2003 05:05:28 -0000	1.13
+++ keyboard.c	2 Nov 2003 19:56:10 -0000	1.14
@@ -112,7 +112,7 @@
 };
 
 static void
-readKernelMapping()
+readKernelMapping(void)
 {
     KeySym	    *k;
     int		    i, j;
@@ -373,13 +373,13 @@
     kdMaxScanCode = maxKeyCode;
 }
 
-void
+static void
 LinuxKeyboardLoad (void)
 {
     readKernelMapping ();
 }
 
-void
+static void
 LinuxKeyboardRead (int fd, void *closure)
 {
     unsigned char   buf[256], *b;
@@ -400,7 +400,7 @@
 static struct termios	LinuxTermios;
 static int		LinuxKbdType;
 
-int
+static int
 LinuxKeyboardEnable (int fd, void *closure)
 {
     struct termios nTty;
@@ -429,14 +429,14 @@
     return fd;
 }
 
-void
+static void
 LinuxKeyboardDisable (int fd, void *closure)
 {
     ioctl(LinuxConsoleFd, KDSKBMODE, LinuxKbdTrans);
     tcsetattr(LinuxConsoleFd, TCSANOW, &LinuxTermios);
 }
 
-int
+static int
 LinuxKeyboardInit (void)
 {
     if (!LinuxKbdType)
@@ -450,20 +450,20 @@
     return 1;
 }
 
-void
+static void
 LinuxKeyboardFini (void)
 {
     LinuxKeyboardDisable (LinuxConsoleFd, 0);
     KdUnregisterFds (LinuxKbdType, FALSE);
 }
 
-void
+static void
 LinuxKeyboardLeds (int leds)
 {
     ioctl (LinuxConsoleFd, KDSETLED, leds & 7);
 }
 
-void
+static void
 LinuxKeyboardBell (int volume, int pitch, int duration)
 {
     if (volume && pitch)

Index: linux.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/linux.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- linux.c	28 Oct 2003 22:28:33 -0000	1.14
+++ linux.c	2 Nov 2003 19:56:10 -0000	1.15
@@ -65,7 +65,7 @@
 }
 
 static int
-LinuxInit ()
+LinuxInit (void)
 {
     int fd = -1;
     char vtname[11];

Index: mouse.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/mouse.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mouse.c	14 Oct 2003 05:05:28 -0000	1.11
+++ mouse.c	2 Nov 2003 19:56:10 -0000	1.12
@@ -46,7 +46,7 @@
     int		    used;
 } Kbufio;
 
-Bool
+static Bool
 MouseWaitForReadable (int fd, int timeout)
 {
     fd_set	    set;
@@ -69,7 +69,7 @@
     return FALSE;
 }
 
-int
+static int
 MouseReadByte (Kbufio *b, int timeout)
 {
     int	n;
@@ -89,7 +89,8 @@
     return b->buf[b->used++];
 }
 
-int
+#if NOTUSED
+static int
 MouseFlush (Kbufio *b, char *buf, int size)
 {
     CARD32  now = GetTimeInMillis ();
@@ -115,7 +116,7 @@
     return n;
 }
 
-int
+static int
 MousePeekByte (Kbufio *b, int timeout)
 {
     int	    c;
@@ -125,8 +126,9 @@
 	--b->used;
     return c;
 }
+#endif /* NOTUSED */
 
-Bool
+static Bool
 MouseWaitForWritable (int fd, int timeout)
 {
     fd_set	    set;
@@ -149,7 +151,7 @@
     return FALSE;
 }
 
-Bool
+static Bool
 MouseWriteByte (int fd, unsigned char c, int timeout)
 {
     int	ret;
@@ -171,7 +173,7 @@
     }
 }
 
-Bool
+static Bool
 MouseWriteBytes (int fd, unsigned char *c, int n, int timeout)
 {
     while (n--)
@@ -708,7 +710,7 @@
 
 #define NUM_PROT    (sizeof (kmouseProts) / sizeof (kmouseProts[0]))
 
-void
+static void
 MouseInitProtocol (Kmouse *km)
 {
     int		    ret;
@@ -736,7 +738,7 @@
     km->state = km->prot->state;
 }
 
-void
+static void
 MouseFirstProtocol (Kmouse *km, char *prot)
 {
     if (prot)
@@ -772,7 +774,7 @@
     MouseInitProtocol (km);
 }
 
-void
+static void
 MouseNextProtocol (Kmouse *km)
 {
     do
@@ -787,7 +789,7 @@
     ErrorF ("Switching to mouse protocol \"%s\"\n", km->prot->name);
 }
 
-void
+static void
 MouseRead (int mousePort, void *closure)
 {
     KdMouseInfo	    *mi = closure;
@@ -911,7 +913,7 @@
 
 #define NUM_DEFAULT_MOUSE    (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0]))
 
-Bool
+static Bool
 MouseInit (void)
 {
     int		i;
@@ -968,7 +970,7 @@
     return TRUE;
 }
 
-void
+static void
 MouseFini (void)
 {
     KdMouseInfo	*mi;

Index: ms.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/ms.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ms.c	11 Sep 2003 05:12:51 -0000	1.6
+++ ms.c	2 Nov 2003 19:56:10 -0000	1.7
@@ -35,7 +35,7 @@
 #include "scrnintstr.h"
 #include "kdrive.h"
 
-int
+static int
 MsReadBytes (int fd, char *buf, int len, int min)
 {
     int		    n, tot;
@@ -65,7 +65,7 @@
     return tot;
 }
 
-void
+static void
 MsRead (int port, void *closure)
 {
     unsigned char   buf[3 * 200];
@@ -97,7 +97,7 @@
 
 int MsInputType;
 
-int
+static int
 MsInit (void)
 {
     int port;
@@ -151,7 +151,7 @@
     return 0;
 }
 
-void
+static void
 MsFini (void)
 {
     KdUnregisterFds (MsInputType, TRUE);

Index: ps2.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/ps2.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ps2.c	14 Oct 2003 05:05:28 -0000	1.12
+++ ps2.c	2 Nov 2003 19:56:10 -0000	1.13
@@ -33,7 +33,7 @@
 #include "scrnintstr.h"
 #include "kdrive.h"
 
-int
+static int
 Ps2ReadBytes (int fd, char *buf, int len, int min)
 {
     int		    n, tot;
@@ -71,7 +71,7 @@
 
 #define NUM_PS2_NAMES	(sizeof (Ps2Names) / sizeof (Ps2Names[0]))
 
-void
+static void
 Ps2Read (int ps2Port, void *closure)
 {
     unsigned char   buf[3 * 200];
@@ -119,7 +119,7 @@
 
 int Ps2InputType;
 
-int
+static int
 Ps2Init (void)
 {
     int	    i;
@@ -141,7 +141,7 @@
     return n;
 }
 
-void
+static void
 Ps2Fini (void)
 {
     KdUnregisterFds (Ps2InputType, TRUE);