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

Timestamp:

Feb 2, 2017 2:10:51 PM (8 years ago)

Author:

vboxsync

Message:

vbox.dsl: re-enable MEM4 and do CreateQwordField only if we really need it

File:

• trunk/src/VBox/Devices/PC/vbox.dsl (modified) (1 diff)

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

@@ -1591 +1591 @@
                 CreateDwordField (CRS, \_SB.PCI0.MEM3._MIN, RAMT)
                 CreateDwordField (CRS, \_SB.PCI0.MEM3._LEN, RAMR)
-//                CreateQwordField (TOM, \_SB.PCI0.MEM4._MIN, TM4N)
-//                CreateQwordField (TOM, \_SB.PCI0.MEM4._MAX, TM4X)
-//                CreateQwordField (TOM, \_SB.PCI0.MEM4._LEN, TM4L)
 
                 Store (MEML, RAMT)
                 Subtract (0xffe00000, RAMT, RAMR)
 
-//                if (LNotEqual (PMEM, 0x00000000))
-//                {
-//                    Store (0x10000000, Local1)           // 16TB in units of 64KB
-//                    Multiply (PMEM, 0x10000, TM4N)       // PMEM in units of 64KB
-//                    Multiply (Local1, 0x10000, TM4L)
-//                    Subtract (Add (TM4N, TM4L), 1, TM4X) // MAX = MIN + LEN - 1
-//
-//                    ConcatenateResTemplate (CRS, TOM, Local2)
-//
-//                    Return (Local2)
-//                }
+                if (LNotEqual (PMEM, 0x00000000))
+                {
+                    CreateQwordField (TOM, \_SB.PCI0.MEM4._MIN, TM4N)
+                    CreateQwordField (TOM, \_SB.PCI0.MEM4._MAX, TM4X)
+                    CreateQwordField (TOM, \_SB.PCI0.MEM4._LEN, TM4L)
+
+                    Store (0x10000000, Local1)           // 16TB in units of 64KB
+                    Multiply (PMEM, 0x10000, TM4N)       // PMEM in units of 64KB
+                    Multiply (Local1, 0x10000, TM4L)
+                    Subtract (Add (TM4N, TM4L), 1, TM4X) // MAX = MIN + LEN - 1
+
+                    ConcatenateResTemplate (CRS, TOM, Local2)
+
+                    Return (Local2)
+                }
 
                 Return (CRS)