[xserver-commit] xserver/hw/kdrive/mga Makefile.am,1.4,1.5 mga.c,1.3,1.4 mgadraw.c,1.7,1.8

[Keith Packard]

Committed by: keithp

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

Modified Files:
	Makefile.am mga.c mgadraw.c 
Log Message:
	merge xfixes_2_branch back to HEAD


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/mga/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,15 +1,7 @@
 INCLUDES = 					\
-	-I$(top_srcdir)/fb			\
-	-I$(top_srcdir)/hw/kdrive/src		\
+	@KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	-I$(top_srcdir)/hw/kdrive/linux		\
-	-I$(top_srcdir)/include			\
-	-I$(top_srcdir)/mi			\
-	-I$(top_srcdir)/miext/layer		\
-	-I$(top_srcdir)/miext/shadow		\
-	-I$(top_srcdir)/randr			\
-	-I$(top_srcdir)/render			\
-	$(XSERVER_CFLAGS)
+	@XSERVER_CFLAGS@
 
 bin_PROGRAMS = Xmga
 
@@ -24,23 +16,7 @@
 	mgastub.c
 
 Xmga_LDADD = \
-	libmga.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
+	libmga.a 					\
+	$(top_builddir)/hw/kdrive/vesa/libvesa.a 	\
+	@KDRIVE_LIBS@					\
+	@XSERVER_LIBS@

Index: mga.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/mga/mga.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mga.c	15 Oct 2003 05:34:54 -0000	1.3
+++ mga.c	2 Nov 2003 19:56:10 -0000	1.4
@@ -27,7 +27,7 @@
 #endif
 #include "mga.h"
 
-Bool
+static Bool
 mgaCardInit (KdCardInfo *card)
 {
     MgaCardInfo *mgac;
@@ -51,11 +51,10 @@
     return TRUE;
 }
 
-Bool
+static Bool
 mgaScreenInit (KdScreenInfo *screen)
 {
     MgaScreenInfo *mgas;
-    int screen_size, memory;
 
     mgas = (MgaScreenInfo *) xalloc (sizeof (MgaScreenInfo));
     if (!mgas)
@@ -75,33 +74,17 @@
 
     fprintf (stderr, "vesa mapping is %d\n", mgas->vesa.mapping);
 #endif
-    screen->memory_base = mgas->vesa.fb;
-
-    memory = mgas->vesa.fb_size;
-    screen_size = screen->fb[0].byteStride * screen->height;
-
-    memory -= screen_size;
-    if (memory > screen->fb[0].byteStride)
-    {
-	screen->off_screen_base = screen_size;
-	screen->off_screen_size = memory;
-    }
-    else
-    {
-	screen->off_screen_base = 0;
-	screen->off_screen_size = 0;
-    }
     screen->driver = mgas;
     return TRUE;
 }
 
-Bool
+static Bool
 mgaInitScreen (ScreenPtr pScreen)
 {
     return vesaInitScreen (pScreen);
 }
 
-Bool
+static Bool
 mgaFinishInitScreen (ScreenPtr pScreen)
 {
     Bool ret;
@@ -111,7 +94,13 @@
     return ret;
 }
 
-void
+static Bool
+mgaCreateResources (ScreenPtr pScreen)
+{
+    return vesaCreateResources (pScreen);
+}
+
+static void
 mgaPreserve (KdCardInfo *card)
 {
     vesaPreserve (card);
@@ -162,14 +151,14 @@
     mgaUnmapReg (card, mgac);
 }
 
-Bool
+static Bool
 mgaDPMS (ScreenPtr pScreen, int mode)
 {
     /* XXX */
     return TRUE;
 }
 
-Bool
+static Bool
 mgaEnable (ScreenPtr pScreen)
 {
     KdScreenPriv (pScreen);
@@ -184,7 +173,7 @@
     return TRUE;
 }
 
-void
+static void
 mgaDisable (ScreenPtr pScreen)
 {
     KdScreenPriv (pScreen);
@@ -195,7 +184,7 @@
     vesaDisable (pScreen);
 }
 
-void
+static void
 mgaRestore (KdCardInfo *card)
 {
     MgaCardInfo *mgac = card->driver;
@@ -204,7 +193,7 @@
     vesaRestore (card);
 }
 
-void
+static void
 mgaScreenFini (KdScreenInfo *screen)
 {
     MgaScreenInfo *mgas = (MgaScreenInfo *) screen->driver;
@@ -214,7 +203,7 @@
     screen->driver = 0;
 }
 
-void
+static void
 mgaCardFini (KdCardInfo *card)
 {
     MgaCardInfo *mgac = (MgaCardInfo *)card->driver;
@@ -227,6 +216,8 @@
     mgaCardInit,	/* cardinit */
     mgaScreenInit,	/* scrinit */
     mgaInitScreen,	/* initScreen */
+    mgaFinishInitScreen, /* finishInitScreen */
+    mgaCreateResources,	/* createRes */
     mgaPreserve,	/* preserve */
     mgaEnable,		/* enable */
     mgaDPMS,		/* dpms */
@@ -249,7 +240,5 @@
     
     vesaGetColors,    	 /* getColors */
     vesaPutColors,	 /* putColors */
-
-    mgaFinishInitScreen, /* finishInitScreen */
 };
 

Index: mgadraw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/mga/mgadraw.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mgadraw.c	15 Oct 2003 05:34:54 -0000	1.7
+++ mgadraw.c	2 Nov 2003 19:56:10 -0000	1.8
@@ -51,7 +51,7 @@
 int pitch, src_pitch;
 int dir;
 
-void
+static void
 mgaWaitAvail (int n)
 {
     if (fifo_size < n) {
@@ -62,7 +62,7 @@
     fifo_size -= n;
 }
 
-void
+static void
 mgaWaitIdle (void)
 {
     while (MGA_IN32 (mmio, MGA_REG_STATUS) & 0x10000);
@@ -91,11 +91,10 @@
   return TRUE;
 }
 
-Bool
+static Bool
 mgaPrepareSolid (PixmapPtr pPixmap, int alu, Pixel pm, Pixel fg)
 {
     KdScreenPriv(pPixmap->drawable.pScreen);
-    mgaScreenInfo (pScreenPriv);
     int cmd;
     int dst_org;
 
@@ -115,7 +114,7 @@
     return TRUE;
 }
 
-void
+static void
 mgaSolid (int x1, int y1, int x2, int y2)
 {
     mgaWaitAvail (2);
@@ -124,7 +123,7 @@
     MGA_OUT32 (mmio, MGA_REG_YDSTLEN | MGA_REG_EXEC, (y1 << 16) | (y2 - y1));
 }
 
-void
+static void
 mgaDoneSolid (void)
 {
 }
@@ -132,12 +131,11 @@
 #define BLIT_LEFT	1
 #define BLIT_UP		4
 
-Bool
+static Bool
 mgaPrepareCopy (PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap,
 		int dx, int dy, int alu, Pixel pm)
 {
     KdScreenPriv(pSrcPixmap->drawable.pScreen);
-    mgaScreenInfo (pScreenPriv);
 
     int cmd;
 
@@ -165,7 +163,7 @@
     return TRUE;
 }
 
-void
+static void
 mgaCopy (int srcX, int srcY, int dstX, int dstY, int w, int h)
 {
     int start, end;
@@ -191,7 +189,7 @@
     MGA_OUT32 (mmio, MGA_REG_YDSTLEN | MGA_REG_EXEC, (dstY << 16) | h);
 }
 
-void
+static void
 mgaDoneCopy (void)
 {
 }