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.

5 files changed, 18 insertions, 8 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);