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

List:       bochs-cvs
Subject:    [Bochs-cvs] CVS: bochs/bios rombios.c, 1.167, 1.168 rombios32.c, 1.1,
From:       Volker Ruppert <vruppert () users ! sourceforge ! net>
Date:       2006-09-29 12:23:36
Message-ID: E1GTHOy-0003Xt-UP () sc8-pr-cvs3 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/bochs/bochs/bios
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13624/bios

Modified Files:
	rombios.c rombios32.c 
Log Message:
- disabled rombios32 call until the critical bugs are fixed
- more accurate delay loop using the port 0x61 refresh clock bit
- fixed capabilties reported in BIOS banner


Index: rombios.c
===================================================================
RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- rombios.c	28 Sep 2006 18:56:20 -0000	1.167
+++ rombios.c	29 Sep 2006 12:23:34 -0000	1.168
@@ -143,7 +143,7 @@
 #define BX_FLOPPY_ON_CNT 37   /* 2 seconds */
 #define BX_PCIBIOS       1
 #define BX_APM           1
-#define BX_ROMBIOS32     1
+#define BX_ROMBIOS32     0
 
 #define BX_USE_ATADRV    1
 #define BX_ELTORITO_BOOT 1
@@ -1823,16 +1823,16 @@
   printf(BX_APPNAME" BIOS - build: %s\n%s\nOptions: ",
     BIOS_BUILD_DATE, bios_cvs_version_string);
   printf(
-#ifdef BX_APM
+#if BX_APM
   "apmbios "
 #endif
-#ifdef BX_PCIBIOS
+#if BX_PCIBIOS
   "pcibios "
 #endif
-#ifdef BX_ELTORITO_BOOT
+#if BX_ELTORITO_BOOT
   "eltorito "
 #endif
-#ifdef BX_ROMBIOS32
+#if BX_ROMBIOS32
   "rombios32 "
 #endif
   "\n\n");
@@ -9211,6 +9211,7 @@
   db 0 ;; reserved
 pci_routing_table_structure_end:
 
+#if !BX_ROMBIOS32
 pci_irq_list:
   db 11, 10, 9, 5;
 
@@ -9431,6 +9432,7 @@
   pop  bp
   pop  ds
   ret
+#endif // BX_ROMBIOS32
 #endif // BX_PCIBIOS
 
 #if BX_ROMBIOS32

Index: rombios32.c
===================================================================
RCS file: /cvsroot/bochs/bochs/bios/rombios32.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rombios32.c	28 Sep 2006 18:56:20 -0000	1.1
+++ rombios32.c	29 Sep 2006 12:23:34 -0000	1.2
@@ -360,9 +360,21 @@
 /* approximative ! */
 void delay_ms(int n)
 {
-    int i, j;
+    int i, j, r1, r2;
     for(i = 0; i < n; i++) {
+#if BX_QEMU
         for(j = 0; j < 1000000; j++);
+#else
+        j = 66;
+        r1 = inb(0x61) & 0x10;
+        do {
+            r2 = inb(0x61) & 0x10;
+            if (r1 != r2) {
+                j--;
+                r1 = r2;
+            }
+        } while (j > 0);
+#endif
     }
 }
 
@@ -436,7 +448,7 @@
 
         smp_cpus = readw((void *)CPU_COUNT_ADDR);
     }
-    BX_INFO("Found %d cpus\n", smp_cpus);
+    BX_INFO("Found %d cpu(s)\n", smp_cpus);
 }
 
 /****************************************************/


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
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]