[xserver-commit] xserver/hw/kdrive/smi Makefile.am,1.4,1.5 smi.c,1.6,1.7 smi.h,1.5,1.6 smidraw.c,1.6,1.7 smistub.c,1.4,1.5

[Keith Packard]

Committed by: keithp

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

Modified Files:
	Makefile.am smi.c smi.h smidraw.c smistub.c 
Log Message:
	merge xfixes_2_branch back to HEAD


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/smi/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	15 Oct 2003 04:59:45 -0000	1.4
+++ Makefile.am	2 Nov 2003 19:56:10 -0000	1.5
@@ -1,14 +1,8 @@
 INCLUDES = 					\
-	-I$(top_srcdir)/fb			\
-	-I$(top_srcdir)/hw/kdrive/src		\
 	-I$(top_srcdir)/hw/kdrive/fbdev		\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	-I$(top_srcdir)/mi			\
-	-I$(top_srcdir)/miext/layer		\
-	-I$(top_srcdir)/miext/shadow		\
-	-I$(top_srcdir)/randr			\
-	-I$(top_srcdir)/render			\
-	$(XSERVER_CFLAGS)
+	@KDRIVE_INCS@				\
+	@XSERVER_CFLAGS@
 
 bin_PROGRAMS = Xsmi
 
@@ -27,21 +21,5 @@
 	libsmi.a 				\
 	$(top_builddir)/hw/kdrive/fbdev/libfbdev.a \
 	$(top_builddir)/hw/kdrive/vesa/libvesa.a \
-	$(top_builddir)/dix/libdix.a		\
-	$(top_builddir)/os/libos.a		\
-	$(top_builddir)/miext/layer/liblayer.a	\
-	$(top_builddir)/hw/kdrive/src/libkdrive.a  \
-	$(top_builddir)/hw/kdrive/linux/liblinux.a  \
-	$(top_builddir)/miext/shadow/libshadow.a \
-	$(top_builddir)/randr/librandr.a	\
-	$(top_builddir)/render/librender.a	\
-	$(top_builddir)/xfixes/libxfixes.a	\
-	$(top_builddir)/fb/libfb.a		\
-	$(top_builddir)/mi/libmi.a		\
-	$(top_builddir)/Xext/libXext.a		\
-	$(top_builddir)/randr/librandr.a	\
-	$(top_builddir)/render/librender.a	\
-	$(top_builddir)/xfixes/libxfixes.a	\
-	$(top_builddir)/dix/libxpstubs.a	\
-	$(XSERVER_LIBS)				\
-	-lm -lz
+	@KDRIVE_LIBS@				\
+	@XSERVER_LIBS@

Index: smi.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/smi/smi.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- smi.c	9 Oct 2003 23:35:44 -0000	1.6
+++ smi.c	2 Nov 2003 19:56:10 -0000	1.7
@@ -27,7 +27,7 @@
 #include "smi.h"
 #include <sys/io.h>
 
-Bool
+static Bool
 smiCardInit (KdCardInfo *card)
 {
     SmiCardInfo	*smic;
@@ -51,7 +51,7 @@
     return TRUE;
 }
 
-Bool
+static Bool
 smiScreenInit (KdScreenInfo *screen)
 {
     SmiCardInfo		*smic = screen->card->driver;
@@ -80,7 +80,7 @@
     return TRUE;
 }
 
-Bool
+static Bool
 smiInitScreen (ScreenPtr pScreen)
 {
     Bool    ret;
@@ -99,13 +99,13 @@
 }
 
 #ifdef RANDR
+static Bool
 smiRandRSetConfig (ScreenPtr		pScreen,
 		   Rotation		randr,
 		   int			rate,
 		   RRScreenSizePtr	pSize)
 {
     Bool    ret;
-    KdScreenPriv(pScreen);
     
     ENTER ();
     KdCheckSync (pScreen);
@@ -115,7 +115,7 @@
     return ret;
 }
 
-Bool
+static Bool
 smiRandRInit (ScreenPtr pScreen)
 {
     rrScrPriv(pScreen);
@@ -127,7 +127,7 @@
 }
 #endif
 
-Bool
+static Bool
 smiFinishInitScreen (ScreenPtr pScreen)
 {
     Bool    ret;
@@ -141,8 +141,6 @@
 void
 smiPreserve (KdCardInfo *card)
 {
-    SmiCardInfo	*smic = card->driver;
-
     ENTER ();
     subPreserve(card);
     LEAVE();
@@ -229,6 +227,16 @@
     smiUnmapReg (card, smic);
 }
 
+static Bool
+smiDPMS (ScreenPtr pScreen, int mode)
+{
+    Bool    ret;
+    ENTER ();
+    ret = subDPMS (pScreen, mode);
+    LEAVE ();
+    return ret;
+}
+
 Bool
 smiEnable (ScreenPtr pScreen)
 {
@@ -268,27 +276,15 @@
     LEAVE ();
 }
 
-Bool
-smiDPMS (ScreenPtr pScreen, int mode)
-{
-    Bool    ret;
-    ENTER ();
-    ret = subDPMS (pScreen, mode);
-    LEAVE ();
-    return ret;
-}
-
-void
+static void
 smiRestore (KdCardInfo *card)
 {
-    SmiCardInfo	*smic = card->driver;
-    
     ENTER ();
     subRestore (card);
     LEAVE();
 }
 
-void
+static void
 smiScreenFini (KdScreenInfo *screen)
 {
     SmiScreenInfo	*smis = (SmiScreenInfo *) screen->driver;
@@ -300,7 +296,7 @@
     LEAVE ();
 }
 
-void
+static void
 smiCardFini (KdCardInfo *card)
 {
     SmiCardInfo	*smic = card->driver;
@@ -321,6 +317,8 @@
     smiCardInit,	    /* cardinit */
     smiScreenInit,	    /* scrinit */
     smiInitScreen,	    /* initScreen */
+    smiFinishInitScreen,    /* finishInitScreen */
+    subCreateResources,	    /* createRes */
     smiPreserve,	    /* preserve */
     smiEnable,		    /* enable */
     smiDPMS,		    /* dpms */
@@ -343,6 +341,4 @@
     
     subGetColors,    	    /* getColors */
     subPutColors,	    /* putColors */
-
-    smiFinishInitScreen,    /* finishInitScreen */
 };

Index: smi.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/smi/smi.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- smi.h	9 Oct 2003 23:35:44 -0000	1.5
+++ smi.h	2 Nov 2003 19:56:10 -0000	1.6
@@ -35,8 +35,9 @@
 #define subInitialize vesaInitialize
 #define subScreenInitialize vesaScreenInitialize
 #define subInitScreen vesaInitScreen
-#define subRandRSetConfig vesaRandRSetConfig
 #define subFinishInitScreen vesaFinishInitScreen
+#define subCreateResources vesaCreateResources
+#define subRandRSetConfig vesaRandRSetConfig
 #define subPreserve vesaPreserve
 #define subEnable vesaEnable
 #define subDPMS vesaDPMS
@@ -54,8 +55,9 @@
 #define subInitialize fbdevInitialize
 #define subScreenInitialize fbdevScreenInitialize
 #define subInitScreen fbdevInitScreen
-#define subRandRSetConfig fbdevRandRSetConfig
 #define subFinishInitScreen fbdevFinishInitScreen
+#define subCreateResources fbdevCreateResources
+#define subRandRSetConfig fbdevRandRSetConfig
 #define subPreserve fbdevPreserve
 #define subEnable fbdevEnable
 #define subDPMS fbdevDPMS
@@ -197,6 +199,18 @@
 smiUnmapReg (KdCardInfo *card, SmiCardInfo *smic);
 
 void
+smiOutb (CARD16 port, CARD8 val);
+
+CARD8
+smiInb (CARD16 port);
+
+CARD8
+smiGetIndex (SmiCardInfo *smic, CARD16 addr, CARD16 data, CARD8 id);
+
+void
+smiSetIndex (SmiCardInfo *smic, CARD16 addr, CARD16 data, CARD8 id, CARD8 val);
+
+void
 smiSetMMIO (KdCardInfo *card, SmiCardInfo *smic);
 
 void

Index: smidraw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/smi/smidraw.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- smidraw.c	13 Oct 2003 00:19:58 -0000	1.6
+++ smidraw.c	2 Nov 2003 19:56:10 -0000	1.7
@@ -143,18 +143,16 @@
     return TRUE;
 }
 
-Bool
-smiPrepareSolid (DrawablePtr    pDrawable,
+static Bool
+smiPrepareSolid (PixmapPtr    pPixmap,
 		 int		alu,
 		 Pixel		pm,
 		 Pixel		fg)
 {
-    KdScreenPriv(pDrawable->pScreen);
-
-    if (~pm & FbFullMask(pDrawable->depth))
+    if (~pm & FbFullMask(pPixmap->drawable.depth))
 	return FALSE;
     
-    if (!smiSetup (pDrawable->pScreen, 3))
+    if (!smiSetup (pPixmap->drawable.pScreen, 3))
 	return FALSE;
     
     accel_cmd = smiSolidRop[alu] | SMI_BITBLT | SMI_START_ENGINE;
@@ -164,7 +162,7 @@
     return TRUE;
 }
 
-void
+static void
 smiSolid (int x1, int y1, int x2, int y2)
 {
     smiWaitAvail(smic,3);
@@ -173,7 +171,7 @@
     dpr->accel_cmd = accel_cmd; 
 }
 
-void
+static void
 smiDoneSolid (void)
 {
 }
@@ -181,20 +179,18 @@
 static int copyDx;
 static int copyDy;
 
-Bool
-smiPrepareCopy (DrawablePtr	pSrcDrawable,
-		   DrawablePtr	pDstDrawable,
-		   int		dx,
-		   int		dy,
-		   int		alu,
-		   Pixel	pm)
+static Bool
+smiPrepareCopy (PixmapPtr	pSrcPixmap,
+		PixmapPtr	pDstPixmap,
+		int		dx,
+		int		dy,
+		int		alu,
+		Pixel		pm)
 {
-    KdScreenPriv(pSrcDrawable->pScreen);
-
-    if (~pm & FbFullMask(pSrcDrawable->depth))
+    if (~pm & FbFullMask(pSrcPixmap->drawable.depth))
 	return FALSE;
     
-    if (!smiSetup (pSrcDrawable->pScreen, 0))
+    if (!smiSetup (pSrcPixmap->drawable.pScreen, 0))
 	return FALSE;
     
     accel_cmd = smiBltRop[alu] | SMI_BITBLT | SMI_START_ENGINE;
@@ -206,7 +202,7 @@
     return TRUE;
 }
 
-void
+static void
 smiCopy (int srcX,
 	    int srcY,
 	    int dstX,
@@ -228,7 +224,7 @@
     dpr->accel_cmd = accel_cmd;
 }
 
-void
+static void
 smiDoneCopy (void)
 {
 }
@@ -248,7 +244,6 @@
 {
     KdScreenPriv(pScreen);
     smiCardInfo (pScreenPriv);
-    smiScreenInfo (pScreenPriv);
     
     ENTER ();
     if (pScreenPriv->screen->fb[0].depth == 4)

Index: smistub.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/smi/smistub.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- smistub.c	9 Oct 2003 06:35:11 -0000	1.4
+++ smistub.c	2 Nov 2003 19:56:10 -0000	1.5
@@ -28,6 +28,7 @@
 #include <config.h>
 #endif
 #include "smi.h"
+#include "klinux.h"
 
 void
 InitCard (char *name)