[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bochs-cvs
Subject:    [Bochs-cvs] [13516] trunk/bochs/iodev/display
From:       vruppert--- via Bochs-cvs <bochs-cvs () lists ! sourceforge ! net>
Date:       2018-05-21 18:03:14
Message-ID: 1526925795.27385.8128 () sfp-scm-6 ! v30 ! lw ! sourceforge ! com
[Download RAW message or body]

Revision: 13516
Author:   vruppert
Date:     2018-05-21 18:01:49 +0000 (Mon, 21 May 2018)
Log Message:
-----------
Some small additions for the Voodoo3 model.

Modified Paths:
--------------
    trunk/bochs/iodev/display/banshee.cc
    trunk/bochs/iodev/display/voodoo_data.h

Modified: trunk/bochs/iodev/display/banshee.cc
===================================================================
--- trunk/bochs/iodev/display/banshee.cc	2018-05-21 16:11:46 UTC (rev 13515)
+++ trunk/bochs/iodev/display/banshee.cc	2018-05-21 18:01:49 UTC (rev 13516)
@@ -211,7 +211,11 @@
     pci_conf[0x55] = 0x60;
     pci_conf[0x56] = 0x10;
     pci_conf[0x57] = 0x00;
-    pci_conf[0x58] = 0x21;
+    if (s.model == VOODOO_3) {
+      pci_conf[0x58] = 0x23;
+    } else {
+      pci_conf[0x58] = 0x21;
+    }
     pci_conf[0x59] = 0x02;
     pci_conf[0x5b] = 0x07;
     v->banshee.io[io_strapInfo] |= 0x0000000c;
@@ -926,6 +930,9 @@
     case cmdHoleCnt1:
       result = v->fbi.cmdfifo[fifo_idx].holes;
       break;
+    case cmdStatus0:
+    case cmdStatus1:
+      BX_ERROR(("cmdStatus%d not implemented yet", fifo_idx));
     default:
       result = v->banshee.agp[reg];
   }
@@ -963,6 +970,9 @@
         v->fbi.cmdfifo[1].end = v->fbi.cmdfifo[1].base + (((value & 0xff) + 1) << 12);
       }
       v->fbi.cmdfifo[fifo_idx].count_holes = (((value >> 10) & 1) == 0);
+      if ((value >> 9) & 1) {
+        BX_ERROR(("CMDFIFO in AGP memory not supported yet"));
+      }
       if (v->fbi.cmdfifo[fifo_idx].enabled != ((value >> 8) & 1)) {
         v->fbi.cmdfifo[fifo_idx].enabled = ((value >> 8) & 1);
         BX_INFO(("CMDFIFO #%d now %sabled", fifo_idx,

Modified: trunk/bochs/iodev/display/voodoo_data.h
===================================================================
--- trunk/bochs/iodev/display/voodoo_data.h	2018-05-21 16:11:46 UTC (rev 13515)
+++ trunk/bochs/iodev/display/voodoo_data.h	2018-05-21 18:01:49 UTC (rev 13516)
@@ -933,15 +933,17 @@
 #define cmdAMax0        (0x03c/4) /*  */
 
 /* 0x040 */
+#define cmdStatus0        (0x040/4) /*  */
 #define cmdFifoDepth0     (0x044/4) /*  */
 #define cmdHoleCnt0       (0x048/4) /*  */
 #define cmdBaseAddr1      (0x050/4) /*  */
 #define cmdBaseSize1      (0x054/4) /*  */
-#define cmdBump1        (0x058/4) /*  */
+#define cmdBump1          (0x058/4) /*  */
 #define cmdRdPtrL1        (0x05c/4) /*  */
 #define cmdRdPtrH1        (0x060/4) /*  */
-#define cmdAMin1        (0x064/4) /*  */
-#define cmdAMax1        (0x06c/4) /*  */
+#define cmdAMin1          (0x064/4) /*  */
+#define cmdAMax1          (0x06c/4) /*  */
+#define cmdStatus1        (0x070/4) /*  */
 #define cmdFifoDepth1     (0x074/4) /*  */
 #define cmdHoleCnt1       (0x078/4) /*  */
 


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]