Changeset 5572 in vbox

Timestamp:

Oct 31, 2007 9:33:52 AM (17 years ago)

Author:

vboxsync

Message:

EHCI: Main integration

Location:

trunk/src/VBox

Files:

• Devices/Builtins.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -103 +103 @@
         return rc;
 #endif
+#ifdef VBOX_WITH_EHCI
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEHCI);
+    if (VBOX_FAILURE(rc))
+        return rc;
+#endif
 #ifdef VBOX_ACPI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceACPI);

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -67 +67 @@
 {
     LogFlowFuncEnter();
+    /** Note: hardcoded assumption about number of slots; see rom bios */
+    bool faPciDeviceNo[15] = {false};
 
 #if defined(RT_OS_WINDOWS)
@@ -345 +347 @@
         rc = CFGMR3InsertInteger(pCfg,  "IOAPIC", fIOAPIC);                         RC_CHECK();
         rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          7);                 RC_CHECK();
+        Assert(!faPciDeviceNo[7]);
+        faPciDeviceNo[7] = true;
         rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                 RC_CHECK();
 
@@ -521 +525 @@
     rc = CFGMR3InsertInteger(pInst, "Trusted",              1);     /* boolean */   RC_CHECK();
     rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          2);                     RC_CHECK();
+    Assert(!faPciDeviceNo[2]);
+    faPciDeviceNo[2] = true;
     rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                     RC_CHECK();
     rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                               RC_CHECK();
@@ -570 +576 @@
     rc = CFGMR3InsertInteger(pInst, "Trusted",              1);     /* boolean */   RC_CHECK();
     rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          1);                     RC_CHECK();
+    Assert(!faPciDeviceNo[1]);
+    faPciDeviceNo[1] = true;
     rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        1);                     RC_CHECK();
     rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                               RC_CHECK();
@@ -840 +848 @@
         /* the first network card gets the PCI ID 3, the followings starting from 8 */
         rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", !ulInstance ? 3 : ulInstance - 1 + 8); RC_CHECK();
+        Assert(!faPciDeviceNo[!ulInstance ? 3 : ulInstance - 1 + 8]);
+        faPciDeviceNo[!ulInstance ? 3 : ulInstance - 1 + 8] = true;
         rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                 RC_CHECK();
         rc = CFGMR3InsertNode(pInst, "Config", &pCfg);                              RC_CHECK();
@@ -1198 +1208 @@
     rc = CFGMR3InsertInteger(pInst, "Trusted",              1);     /* boolean */   RC_CHECK();
     rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          4);                     RC_CHECK();
+    Assert(!faPciDeviceNo[4]);
+    faPciDeviceNo[4] = true;
     rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                     RC_CHECK();
 
@@ -1247 +1259 @@
         rc = CFGMR3InsertInteger(pInst, "Trusted",              1);     /* boolean */   RC_CHECK();
         rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          5);                     RC_CHECK();
+        Assert(!faPciDeviceNo[5]);
+        faPciDeviceNo[5] = true;
         rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                     RC_CHECK();
         rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);
@@ -1317 +1331 @@
             rc = CFGMR3InsertInteger(pInst, "Trusted",              1); /* boolean */   RC_CHECK();
             rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          6);                 RC_CHECK();
+            Assert(!faPciDeviceNo[6]);
+            faPciDeviceNo[6] = true;
             rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                 RC_CHECK();
 
@@ -1332 +1348 @@
             rc = CFGMR3InsertInteger(pCfg,  "First",    0);                             RC_CHECK();
             rc = CFGMR3InsertInteger(pCfg,  "Last",     0);                             RC_CHECK();
+
+#ifdef VBOX_WITH_EHCI
+            rc = CFGMR3InsertNode(pDevices, "usb-ehci", &pDev);                         RC_CHECK();
+            rc = CFGMR3InsertNode(pDev,     "0", &pInst);                               RC_CHECK();
+            rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                           RC_CHECK();
+            rc = CFGMR3InsertInteger(pInst, "Trusted",              1); /* boolean */   RC_CHECK();
+            rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          11);                RC_CHECK();
+            Assert(!faPciDeviceNo[11]);
+            faPciDeviceNo[11] = true;
+            rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                 RC_CHECK();
+
+            rc = CFGMR3InsertNode(pInst,    "LUN#0", &pLunL0);                          RC_CHECK();
+            rc = CFGMR3InsertString(pLunL0, "Driver",               "VUSBRootHub");     RC_CHECK();
+            rc = CFGMR3InsertNode(pLunL0,   "Config", &pCfg);                           RC_CHECK();
+
+            /*
+             * Attach the status driver.
+             */
+            rc = CFGMR3InsertNode(pInst,    "LUN#999", &pLunL0);                        RC_CHECK();
+            rc = CFGMR3InsertString(pLunL0, "Driver",               "MainStatus");      RC_CHECK();
+            rc = CFGMR3InsertNode(pLunL0,   "Config", &pCfg);                           RC_CHECK();
+            rc = CFGMR3InsertInteger(pCfg,  "papLeds", (uintptr_t)&pConsole->mapUSBLed);RC_CHECK();
+            rc = CFGMR3InsertInteger(pCfg,  "First",    0);                             RC_CHECK();
+            rc = CFGMR3InsertInteger(pCfg,  "Last",     0);                             RC_CHECK();
+#endif
         }
     }