Changeset 25987 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 24, 2010 1:50:26 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56852

Message:

HPET work

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (1 diff)
• vbox.dsl (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -2399 +2399 @@
     s->uPmIoPortBase = PM_PORT_BASE;
 
+    /* 
+     * FDC and SMC try to use the same non-shareable interrupt (6), 
+     * enable only one device.
+     */
+    if (s->fUseSmc)
+        s->fUseFdc = false;
+
     /* */
     uint32_t rsdp_addr = find_rsdp_space();

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -935 +935 @@
 
                 // High Precision Event Timer
-                Device(HPET) {
-                Name (_HID,  EISAID("PNP0103"))
-                Name (_CID, EISAID("PNP0C01"))
-                Name(_UID, 0)
-                Method (_STA, 0, NotSerialized) {
-                    Return(UHPT)
-                }
-                Name(CRS, ResourceTemplate() {
-                 IRQNoFlags ()
+                Device(HPET) 
+                {
+                  Name (_HID,  EISAID("PNP0103"))
+                  Name (_CID, EISAID("PNP0C01"))
+                  Name(_UID, 0)
+
+                  Method (_STA, 0, NotSerialized) 
+                  {
+                       Return(UHPT)
+                  }
+
+                  Name(CRS, ResourceTemplate() 
+                  {
+                      IRQNoFlags ()
                             {0}
-                 IRQNoFlags ()
+                      IRQNoFlags ()
                             {8}
-                 Memory32Fixed (ReadWrite,
+                      Memory32Fixed (ReadOnly,
                             0xFED00000,         // Address Base
                             0x00000400         // Address Length
@@ -953 +958 @@
                   })
                 
-                }
-                Method (_CRS, 0, NotSerialized)
-                {
+                  Method (_CRS, 0, NotSerialized)
+                  {
                      Return (CRS)
-                }
-
+                  }
+                }
 
                 // System Management Controller