xserver/hw/kdrive/neomagic backend.c,1.2,1.3 neomagic.c,1.4,1.5

[Franco Catrin L.]

Committed by: fcatrin

Update of /cvs/xserver/xserver/hw/kdrive/neomagic
In directory pdx:/tmp/cvs-serv20894

Modified Files:
	backend.c neomagic.c 
Log Message:
small fixes, but still can't get this driver woking again

Index: backend.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/neomagic/backend.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/backend.c	5 Apr 2004 02:52:35 -0000	1.2
+++ b/backend.c	5 Apr 2004 18:19:34 -0000	1.3
@@ -19,24 +19,6 @@
 {
     Bool success = FALSE;
 
-#ifdef KDRIVEFBDEV
-    if (!success && fbdevInitialize(card, &backend->priv.fbdev)) {
-        success = TRUE;
-        backend->type = FBDEV;
-        backend->cardfini = fbdevCardFini;
-        backend->scrfini = fbdevScreenFini;
-        backend->initScreen = fbdevInitScreen;
-        backend->finishInitScreen = fbdevFinishInitScreen;
-        backend->createRes = fbdevCreateResources;
-        backend->preserve = fbdevPreserve;
-        backend->restore = fbdevRestore;
-        backend->dpms = fbdevDPMS;
-        backend->enable = fbdevEnable;
-        backend->disable = fbdevDisable;
-        backend->getColors = fbdevGetColors;
-        backend->putColors = fbdevPutColors;
-    }
-#endif
 #ifdef KDRIVEVESA
     if (!success && vesaInitialize(card, &backend->priv.vesa)) {
         success = TRUE;
@@ -55,6 +37,24 @@
         backend->putColors = vesaPutColors;
     }
 #endif
+#ifdef KDRIVEFBDEV
+    if (!success && fbdevInitialize(card, &backend->priv.fbdev)) {
+        success = TRUE;
+        backend->type = FBDEV;
+        backend->cardfini = fbdevCardFini;
+        backend->scrfini = fbdevScreenFini;
+        backend->initScreen = fbdevInitScreen;
+        backend->finishInitScreen = fbdevFinishInitScreen;
+        backend->createRes = fbdevCreateResources;
+        backend->preserve = fbdevPreserve;
+        backend->restore = fbdevRestore;
+        backend->dpms = fbdevDPMS;
+        backend->enable = fbdevEnable;
+        backend->disable = fbdevDisable;
+        backend->getColors = fbdevGetColors;
+        backend->putColors = fbdevPutColors;
+    }
+#endif
     return success;
 }
 
@@ -75,6 +75,7 @@
 #endif
 #ifdef KDRIVEVESA
     if (backendCard->type == VESA) {
+		screen->card->driver = &backendCard->priv.vesa;
         if (screen->fb[0].depth == 0) {
             screen->fb[0].depth = 16;
         }

Index: neomagic.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/neomagic/neomagic.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/neomagic.c	5 Apr 2004 02:52:35 -0000	1.4
+++ b/neomagic.c	5 Apr 2004 18:19:34 -0000	1.5
@@ -98,7 +98,8 @@
         return FALSE;
     }
 
-    screen->driver = neos;
+	memset (neos, '\0', sizeof (NeoScreenInfo));
+
 
     if(!backendScreenInitialize(screen, &neos->backendScreen, &neoc->backendCard)) {
         xfree(neos);
@@ -136,6 +137,8 @@
         neos->off_screen_size = 0;
     }
 
+    screen->driver = neos;
+
     LEAVE();
     return TRUE;
 }