Changeset 34458 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Nov 29, 2010 12:29:23 PM (14 years ago)

Author:

vboxsync

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

68232

Message:

BIOS: removed generic vars mechanism

Location:

trunk/src/VBox/Devices/PC

Files:

• BIOS/rombios.c (modified) (2 diffs)
• DevPcBios.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/PC/BIOS/rombios.c

@@ -4645 +4645 @@
 }
 
-Bit32u readBiosVar(varNum)
-    Bit16u varNum;
-{
-    int i, iPort = 0x402;
-    Bit32u result = 0;
-    Bit8u bits[4];
-
-    outw(iPort, varNum);
-
-    for (i=0; i<4; i++)
-        bits[i] = inb(iPort);
-
-    result = (((Bit32u)bits[3]) << 24) | (((Bit32u)bits[2]) <<  16) |
-             (((Bit32u)bits[1]) <<  8) | (((Bit32u)bits[0]) <<  0);
-
-    return result;
-}
-
   void
 int15_function32(regs, ES, DS, FLAGS)
@@ -4766 +4748 @@
 #endif /* !VBOX */
 
-                mcfgStart = readBiosVar(1);
-                mcfgSize  = readBiosVar(2);
+                mcfgStart = 0;
+                mcfgSize  = 0;
 
                 switch(regs.u.r16.bx)

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

@@ -180 +180 @@
     uint32_t        u32McfgBase;
     uint32_t        cbMcfgLength;
-    uint16_t        iVarNum;
-    uint16_t        iVarPos;
 } DEVPCBIOS, *PDEVPCBIOS;
 
@@ -638 +636 @@
 }
 
-static uint8_t pcbiosReadVar(PDEVPCBIOS pThis)
-{
-    uint32_t u32Val = 0, u32Size = 4;
-    switch (pThis->iVarNum)
-    {
-        case 1:
-            u32Val = pThis->u32McfgBase;
-            u32Size = 4;
-            break;
-        case 2:
-            u32Val = pThis->cbMcfgLength;
-            u32Size = 4;
-            break;
-        default:
-            AssertMsgFailed(("Unknown variable: %d\n", pThis->iVarNum));
-    }
-    uint32_t iPos = pThis->iVarPos++;
-    if (pThis->iVarPos >= u32Size)
-            pThis->iVarPos = 0;
-
-    Log(("Read pos %d of var %d: %x\n",
-         iPos, pThis->iVarNum, (u32Val >> (iPos*8)) & 0xff));
-
-    return (u32Val >> (iPos*8)) & 0xff;
-}
-
 /**
  * Port I/O Handler for IN operations.
@@ -677 +649 @@
 static DECLCALLBACK(int) pcbiosIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
-    if (cb == 1 && Port == 0x402)
-    {
-        PDEVPCBIOS pThis = PDMINS_2_DATA(pDevIns, PDEVPCBIOS);
-        uint8_t u8Val = pcbiosReadVar(pThis);
-        *(uint8_t*)pu32 = u8Val;
-        return VINF_SUCCESS;
-    }
-
     return VERR_IOM_IOPORT_UNUSED;
 }
@@ -750 +714 @@
             pThis->szMsg[++pThis->iMsg] = '\0';
         }
-        return VINF_SUCCESS;
-    }
-
-    if (cb == 2 && Port == 0x402)
-    {
-        PDEVPCBIOS pThis = PDMINS_2_DATA(pDevIns, PDEVPCBIOS);
-        pThis->iVarNum = u32;
-        pThis->iVarPos = 0;
         return VINF_SUCCESS;
     }