Make more extensions optional in build (for kdrive). Fix kdrive build for

    actual hardware. Fix kdrive pointer signed/unsigned types. Add
    kdrive-required YX rotation functions. Replace rgb text file loading
    with static rgb color table.

26 files changed, 49 insertions, 26 deletions

diff --git a/hw/kdrive/ati/ChangeLog b/hw/kdrive/ati/ChangeLog
index d842f19b2..a76712897 100644
--- a/hw/kdrive/ati/ChangeLog
+++ b/hw/kdrive/ati/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-15  Keith Packard  <keithp@keithp.com>
+
+	* Makefile.am:
+	* ati.c: (ATIMapReg):
+	* ati.h:
+	* ati_cursor.c: (ATIMoveCursor), (ClassicSetCursorColors),
+	(ClassicLoadCursor), (RadeonLoadCursor), (ATIUnloadCursor):
+	Fix kdrive pointer signed/unsigned types.
+
 2006-02-14  Eric Anholt  <anholt@FreeBSD.org>
 
 	* ati_draw.c: (ATIDrawDisable):
diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am
index 186978887..22f763b80 100644
--- a/hw/kdrive/ati/Makefile.am
+++ b/hw/kdrive/ati/Makefile.am
@@ -65,7 +65,8 @@ ATI_LIBS =				\
 Xati_LDADD = \
 	$(ATI_LIBS)			\
 	@KDRIVE_LIBS@			\
+	@XSERVER_LIBS@			\
 	$(TSLIB_FLAG)
 
 
-Xati_DEPENDENCIES = $(ATI_LIBS) @KDRIVE_LIBS@
+Xati_DEPENDENCIES = $(ATI_LIBS)
diff --git a/hw/kdrive/ati/ati.c b/hw/kdrive/ati/ati.c
index 4db069a8b..5b4e80ff2 100644
--- a/hw/kdrive/ati/ati.c
+++ b/hw/kdrive/ati/ati.c
@@ -532,7 +532,7 @@ ATIScreenFini(KdScreenInfo *screen)
 Bool
 ATIMapReg(KdCardInfo *card, ATICardInfo *atic)
 {
-	atic->reg_base = (CARD8 *)KdMapDevice(ATI_REG_BASE(card),
+	atic->reg_base = (char *)KdMapDevice(ATI_REG_BASE(card),
 	    ATI_REG_SIZE(card));
 
 	if (atic->reg_base == NULL)
diff --git a/hw/kdrive/ati/ati.h b/hw/kdrive/ati/ati.h
index 3b5fee380..5ffd227ca 100644
--- a/hw/kdrive/ati/ati.h
+++ b/hw/kdrive/ati/ati.h
@@ -139,7 +139,7 @@ typedef struct _ATICardInfo {
 	struct backend_funcs backend_funcs;
 
 	struct pci_id_entry *pci_id;
-	CARD8 *reg_base;
+	char *reg_base;
 	Bool is_radeon;
 	Bool is_r100;
 	Bool is_r200;
diff --git a/hw/kdrive/ati/ati_cursor.c b/hw/kdrive/ati/ati_cursor.c
index a14fc6c97..e8c711707 100644
--- a/hw/kdrive/ati/ati_cursor.c
+++ b/hw/kdrive/ati/ati_cursor.c
@@ -37,7 +37,7 @@ ATIMoveCursor(ScreenPtr pScreen, int x, int y)
 	ATIScreenInfo(pScreenPriv);
 	ATICursor *pCurPriv = &atis->cursor;
 	CARD16 xoff, yoff;
-	CARD8 *mmio = atic->reg_base;
+	char *mmio = atic->reg_base;
 	int stride = atic->is_radeon ? 256 : 16;
 
 	if (!pCurPriv->has_cursor)
@@ -99,7 +99,7 @@ ClassicSetCursorColors(ScreenPtr pScreen)
 	ATICardInfo(pScreenPriv);
 	ATIScreenInfo(pScreenPriv);
 	ATICursor *pCurPriv = &atis->cursor;
-	CARD8 *mmio = atic->reg_base;
+	char *mmio = atic->reg_base;
 
 	MMIO_OUT32(mmio, ATI_REG_CUR_CLR0, pCurPriv->mask);
 	MMIO_OUT32(mmio, ATI_REG_CUR_CLR1, pCurPriv->source);
@@ -154,7 +154,7 @@ ClassicLoadCursor(ScreenPtr pScreen)
 	int i;
 	int lwsrc;
 	CARD32 tmp;
-	CARD8 *mmio = atic->reg_base;
+	char *mmio = atic->reg_base;
 
 	ClassicAllocCursorColors(pScreen);
 
@@ -243,7 +243,7 @@ RadeonLoadCursor(ScreenPtr pScreen)
 	CARD32 *ram, *msk, *mskLine, *src, *srcLine;
 	int lwsrc;
 	CARD32 tmp;
-	CARD8 *mmio = atic->reg_base;
+	char *mmio = atic->reg_base;
 
 	pCurPriv->pCursor = pCursor;
 	pCurPriv->xhot = pCursor->bits->xhot;
@@ -351,7 +351,7 @@ ATIUnloadCursor(ScreenPtr pScreen)
 {
 	KdScreenPriv(pScreen);
 	ATICardInfo(pScreenPriv);
-	CARD8 *mmio = atic->reg_base;
+	char *mmio = atic->reg_base;
 	CARD32 tmp;
 
 	tmp = MMIO_IN32(mmio, ATI_REG_GEN_CNTL);
diff --git a/hw/kdrive/chips/Makefile.am b/hw/kdrive/chips/Makefile.am
index 210005594..e3080774b 100644
--- a/hw/kdrive/chips/Makefile.am
+++ b/hw/kdrive/chips/Makefile.am
@@ -27,6 +27,7 @@ CHIPS_LIBS =					\
 Xchips_LDADD = \
 	$(CHIPS_LIBS)				\
 	@KDRIVE_LIBS@                          \
+	@XSERVER_LIBS@				\
 	$(TSLIB_FLAG)
 
 Xchips_DEPENDENCIES = $(CHIPS_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/epson/Makefile.am b/hw/kdrive/epson/Makefile.am
index 1a2554994..0538f4c39 100644
--- a/hw/kdrive/epson/Makefile.am
+++ b/hw/kdrive/epson/Makefile.am
@@ -27,6 +27,7 @@ EPSON_LIBS =					\
 Xepson_LDADD = \
 	$(EPSON_LIBS)				\
 	@KDRIVE_LIBS@                          \
+	@XSERVER_LIBS@				\
 	$(TSLIB_FLAG)
 
 Xepson_DEPENDENCIES = $(EPSON_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
index 046836a44..fce6df9f4 100644
--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@@ -20,7 +20,7 @@ Xfbdev_SOURCES = \
 Xfbdev_LDADD = 						\
 	libfbdev.a					\
 	@KDRIVE_LIBS@					\
-	@KDRIVE_LIBS@					\
+	@XSERVER_LIBS@					\
 	$(TSLIB_FLAG)
 
 Xfbdev_DEPENDENCIES =					\
diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
index e8338136a..86384f0a4 100644
--- a/hw/kdrive/fbdev/fbdev.c
+++ b/hw/kdrive/fbdev/fbdev.c
@@ -58,11 +58,11 @@ fbdevInitialize (KdCardInfo *card, FbdevPriv *priv)
 	return FALSE;
     }
 
-    priv->fb_base = (unsigned char *) mmap ((caddr_t) NULL,
-					    priv->fix.smem_len,
-					    PROT_READ|PROT_WRITE,
-					    MAP_SHARED,
-					    priv->fd, 0);
+    priv->fb_base = (char *) mmap ((caddr_t) NULL,
+				   priv->fix.smem_len,
+				   PROT_READ|PROT_WRITE,
+				   MAP_SHARED,
+				   priv->fd, 0);
     
     if (priv->fb_base == (char *)-1) 
     {
diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am
index 15913e11a..d676a6902 100644
--- a/hw/kdrive/i810/Makefile.am
+++ b/hw/kdrive/i810/Makefile.am
@@ -29,6 +29,7 @@ I810_LIBS =						\
 Xi810_LDADD = \
 	$(I810_LIBS)					\
 	@KDRIVE_LIBS@                                  \
+	@XSERVER_LIBS@					\
 	$(TSLIB_FLAG)
 
 Xi810_DEPENDENCIES = $(I810_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/linux/mouse.c b/hw/kdrive/linux/mouse.c
index 16c0e7ba3..5fe997864 100644
--- a/hw/kdrive/linux/mouse.c
+++ b/hw/kdrive/linux/mouse.c
@@ -491,7 +491,7 @@ ps2Init (KdMouseInfo *mi)
     int		    ninit;
     
     /* Send Intellimouse initialization sequence */
-    MouseWriteBytes (km->iob.fd, intelli_init, strlen (intelli_init), 100);
+    MouseWriteBytes (km->iob.fd, intelli_init, strlen ((char *) intelli_init), 100);
     /*
      * Send ID command
      */
@@ -518,7 +518,7 @@ ps2Init (KdMouseInfo *mi)
 	break;
     }
     if (init)
-	MouseWriteBytes (km->iob.fd, init, strlen (init), 100);
+	MouseWriteBytes (km->iob.fd, init, strlen ((char *) init), 100);
     /*
      * Flush out the available data to eliminate responses to the
      * initialization string.  Make sure any partial event is
diff --git a/hw/kdrive/linux/ms.c b/hw/kdrive/linux/ms.c
index 6c8e6dc38..7f046bdc3 100644
--- a/hw/kdrive/linux/ms.c
+++ b/hw/kdrive/linux/ms.c
@@ -74,7 +74,7 @@ MsRead (int port, void *closure)
     int		    dx, dy;
     unsigned long   flags;
 
-    while ((n = MsReadBytes (port, buf, sizeof (buf), 3)) > 0)
+    while ((n = MsReadBytes (port, (char *) buf, sizeof (buf), 3)) > 0)
     {
 	b = buf;
 	while (n >= 3)
diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c
index 29b6a46a2..b59dbfac7 100644
--- a/hw/kdrive/linux/ps2.c
+++ b/hw/kdrive/linux/ps2.c
@@ -90,7 +90,7 @@ Ps2Read (int ps2Port, void *closure)
 	right_button = KD_BUTTON_1;
     }
 #endif
-    while ((n = Ps2ReadBytes (ps2Port, buf, sizeof (buf), 3)) > 0)
+    while ((n = Ps2ReadBytes (ps2Port, (char *) buf, sizeof (buf), 3)) > 0)
     {
 	b = buf;
 	while (n >= 3)
diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am
index efe0f74ec..299565fdb 100644
--- a/hw/kdrive/mach64/Makefile.am
+++ b/hw/kdrive/mach64/Makefile.am
@@ -30,7 +30,7 @@ MACH64_LIBS =						\
 Xmach64_LDADD = 					\
 	$(MACH64_LIBS)					\
 	@KDRIVE_LIBS@					\
-	@KDRIVE_LIBS@                                  \
+	@XSERVER_LIBS@					\
 	$(TSLIB_FLAG)
 
 
diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am
index d084d8824..64d260ede 100644
--- a/hw/kdrive/mga/Makefile.am
+++ b/hw/kdrive/mga/Makefile.am
@@ -29,6 +29,7 @@ MGA_LIBS =						\
 Xmga_LDADD = \
 	$(MGA_LIBS)					\
 	@KDRIVE_LIBS@                                  \
+	@XSERVER_LIBS@					\
 	$(TSLIB_FLAG)
 
 Xmga_DEPENDENCIES = $(MGA_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/neomagic/ChangeLog b/hw/kdrive/neomagic/ChangeLog
index 20724d66c..4e0788e5a 100644
--- a/hw/kdrive/neomagic/ChangeLog
+++ b/hw/kdrive/neomagic/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-15  Keith Packard  <keithp@keithp.com>
+
+	* Makefile.am:
+	Add XSERVER_LIBS to build in xorg tree
+
 2005-08-07  Keith Packard  <keithp@keithp.com>
 
 	* neo_draw.c:
diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am
index 2bc4e9d87..b37bfc303 100644
--- a/hw/kdrive/neomagic/Makefile.am
+++ b/hw/kdrive/neomagic/Makefile.am
@@ -41,7 +41,7 @@ NEOMAGIC_LIBS =                 \
 Xneomagic_LDADD = \
 	$(NEOMAGIC_LIBS)            \
 	@KDRIVE_LIBS@               \
-	@KDRIVE_LIBS@              \
+	@XSERVER_LIBS@					\
 	$(TSLIB_FLAG)
 
 Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am
index c2e0fcf7a..48551a3a6 100644
--- a/hw/kdrive/nvidia/Makefile.am
+++ b/hw/kdrive/nvidia/Makefile.am
@@ -30,7 +30,7 @@ NVIDIA_LIBS =					\
 Xnvidia_LDADD = \
 	$(NVIDIA_LIBS)				\
 	@KDRIVE_LIBS@				\
-	@KDRIVE_LIBS@				\
+	@XSERVER_LIBS@					\
 	$(TSLIB_FLAG)
 
 Xnvidia_DEPENDENCIES = $(NVIDIA_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/pm2/Makefile.am b/hw/kdrive/pm2/Makefile.am
index 9a03b678b..1a712072a 100644
--- a/hw/kdrive/pm2/Makefile.am
+++ b/hw/kdrive/pm2/Makefile.am
@@ -28,6 +28,7 @@ PM2_LIBS =					\
 Xpm2_LDADD = \
 	$(PM2_LIBS)				\
 	@KDRIVE_LIBS@                          \
+	@XSERVER_LIBS@					\
 	$(TSLIB_FLAG)
 
 Xpm2_DEPENDENCIES = $(PM2_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am
index d0596125a..b33e138e1 100644
--- a/hw/kdrive/r128/Makefile.am
+++ b/hw/kdrive/r128/Makefile.am
@@ -27,6 +27,7 @@ R128_LIBS =					\
 Xr128_LDADD = \
 	$(R128_LIBS)				\
 	@KDRIVE_LIBS@                          \
+	@XSERVER_LIBS@					\
 	$(TSLIB_FLAG)
 
 Xr128_DEPENDENCIES = $(R128_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am
index b884af042..ba6ed4d4a 100644
--- a/hw/kdrive/sdl/Makefile.am
+++ b/hw/kdrive/sdl/Makefile.am
@@ -13,6 +13,7 @@ Xsdl_SOURCES = sdl.c
 
 Xsdl_LDADD = @KDRIVE_PURE_LIBS@				\
 	@KDRIVE_LIBS@                                  \
+	@XSERVER_LIBS@					\
 	$(TSLIB_FLAG)					\
 	@XSDL_LIBS@
 
diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am
index 4790e438e..a214e762e 100644
--- a/hw/kdrive/smi/Makefile.am
+++ b/hw/kdrive/smi/Makefile.am
@@ -32,6 +32,7 @@ SMI_LIBS =					\
 Xsmi_LDADD = \
 	$(SMI_LIBS)				\
 	@KDRIVE_LIBS@                          \
+	@XSERVER_LIBS@					\
 	$(TSLIB_FLAG)
 
 Xsmi_DEPENDENCIES = $(SMI_LIBS) @KDRIVE_LIBS@
diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c
index 178544ce0..6c07f2dee 100644
--- a/hw/kdrive/src/kaa.c
+++ b/hw/kdrive/src/kaa.c
@@ -192,7 +192,7 @@ kaaMoveInPixmap (PixmapPtr pPixmap)
 
     if (pKaaScr->info->UploadToScreen)
     {
-	if (pKaaScr->info->UploadToScreen(pPixmap, src, src_pitch))
+	if (pKaaScr->info->UploadToScreen(pPixmap, (char *) src, src_pitch))
 	    return;
     }
 
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index cfe89f13a..7f1c07f9a 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -39,7 +39,6 @@
 #include <stdio.h>
 
 #ifdef XKB
-#define XKB_IN_SERVER
 #include <X11/extensions/XKBsrv.h>
 #endif
 
@@ -457,7 +456,7 @@ KdKeybdProc(DeviceIntPtr pDevice, int onoff)
 	    names.keymap = XkbInitialMap;
 
 	XkbSetRulesDflts ("base", "pc101", "us", NULL, NULL);
-	ret = XkbInitKeyboardDeviceStruct (pDev,
+	ret = XkbInitKeyboardDeviceStruct ((DeviceIntPtr) pDev,
 					   &names,
 					   &kdKeySyms,
 					   kdModMap,
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
index c82b02cf8..01bc0a3e1 100644
--- a/hw/kdrive/vesa/Makefile.am
+++ b/hw/kdrive/vesa/Makefile.am
@@ -28,7 +28,8 @@ Xvesa_LDADD = \
 	libvesa.a 				\
 	@KDRIVE_LIBS@				\
 	@KDRIVE_LIBS@                          \
-	$(TSLIB_FLAG)
+	$(TSLIB_FLAG)				\
+	@XSERVER_LIBS@
 
 Xvesa_DEPENDENCIES = \
 	libvesa.a    \
diff --git a/hw/kdrive/via/Makefile.am b/hw/kdrive/via/Makefile.am
index 3c2f45f9d..4d52df9b1 100644
--- a/hw/kdrive/via/Makefile.am
+++ b/hw/kdrive/via/Makefile.am
@@ -28,7 +28,7 @@ VIA_LIBS =	\
 Xvia_LDADD =						\
 	$(VIA_LIBS)					\
 	@KDRIVE_LIBS@					\
-	@KDRIVE_LIBS@                                  \
+	@XSERVER_LIBS@					\
 	$(TSLIB_FLAG)					
 
 Xvia_DEPENDENCIES = $(VIA_LIBS) @KDRIVE_LIBS@