Changeset 4021 in vbox for trunk

Timestamp:

Aug 3, 2007 1:17:25 PM (18 years ago)

Author:

vboxsync

Message:

Preparations for shared folders status led.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (3 diffs)
• VMMDevInterface.cpp (modified) (6 diffs)
• include/ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -219 +219 @@
     memset(mapIDELeds, 0, sizeof(mapIDELeds));
     memset(mapNetworkLeds, 0, sizeof(mapNetworkLeds));
+    memset(&mapSharedFolderLed, 0, sizeof(mapSharedFolderLed));
 
 #ifdef VBOX_WITH_UNIXY_TAP_NETWORKING
@@ -1871 +1872 @@
             /// @todo (r=dmik)
             //  USB_DEVICE_ACTIVITY
+            break;
+        }
+
+        case DeviceType_SharedFolderDevice:
+        {
+            SumLed.u32 |= readAndClearLed(mapSharedFolderLed);
             break;
         }
@@ -5644 +5651 @@
 
     /*
+     * 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->mapSharedFolderLed); RC_CHECK();
+    rc = CFGMR3InsertInteger(pCfg,  "First",    0);                                 RC_CHECK();
+    rc = CFGMR3InsertInteger(pCfg,  "Last",     0);                                 RC_CHECK();
+
+    /*
      * Audio Sniffer Device
      */

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -60 +60 @@
     /** Our VMM device connector interface. */
     PDMIVMMDEVCONNECTOR         Connector;
+
 #ifdef VBOX_HGCM
     /** Pointer to the HGCM port interface of the driver/device above us. */
@@ -65 +66 @@
     /** Our HGCM connector interface. */
     PDMIHGCMCONNECTOR           HGCMConnector;
+
+    struct
+    {
+        /** The LED. */
+        PDMLED                              Led;
+        /** The LED ports. */
+        PDMILEDPORTS                        ILeds;
+        /** Partner of ILeds. */
+        HCPTRTYPE(PPDMILEDCONNECTORS)       pLedsConnector;
+    } SharedFolders;
+
 #endif
 } DRVMAINVMMDEV, *PDRVMAINVMMDEV;
@@ -463 +475 @@
             return &pDrv->HGCMConnector;
 #endif
+        case PDMINTERFACE_LED_PORTS:
+            /* Currently only for shared folders */
+            return &pDrv->SharedFolders.ILeds;
         default:
             return NULL;
@@ -468 +483 @@
 }
 
+/**
+ * Gets the pointer to the status LED of a unit.
+ *
+ * @returns VBox status code.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @param   iLUN            The unit which status LED we desire.
+ * @param   ppLed           Where to store the LED pointer.
+ */
+static DECLCALLBACK(int) vmmdevQueryStatusLed(PPDMILEDPORTS pInterface, unsigned iLUN, PPDMLED *ppLed)
+{
+    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
+    if (iLUN == 0)
+    {
+        *ppLed = &pDrv->SharedFolders.Led;
+        return VINF_SUCCESS;
+    }
+    return VERR_PDM_LUN_NOT_FOUND;
+}
 
 /**
@@ -547 +580 @@
     pData->Connector.pfnQueryVisibleRegion            = vmmdevQueryVisibleRegion;
 
+    pData->SharedFolders.Led.u32Magic                 = PDMLED_MAGIC;
+    /* ILeds */
+    pData->SharedFolders.ILeds.pfnQueryStatusLed      = vmmdevQueryStatusLed;
+
 
 #ifdef VBOX_HGCM
@@ -592 +629 @@
     if (VBOX_SUCCESS(rc))
     {
+        PPDMIBASE pBase;
+
         LogRel(("Shared Folders service loaded.\n"));
+#if 0
+        /*
+         * Attach status driver (optional).
+         */
+        rc = PDMDrvHlpDriverAttach(pDrvIns, PDM_STATUS_LUN, &pDrvIns->IBase, &pBase, "Status Port");
+        if (VBOX_SUCCESS(rc))
+            pData->SharedFolders.pLedsConnector = (PPDMILEDCONNECTORS)
+                pBase->pfnQueryInterface(pBase, PDMINTERFACE_LED_CONNECTORS);
+        else if (rc != VERR_PDM_NO_ATTACHED_DRIVER)
+        {
+            AssertMsgFailed(("Failed to attach to status driver. rc=%Vrc\n", rc));
+            return rc;
+        }
+#endif
     }
     else

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -494 +494 @@
     PPDMLED     mapIDELeds[4];
     PPDMLED     mapNetworkLeds[8];
+    PPDMLED     mapSharedFolderLed;
 #ifdef VBOX_WITH_UNIXY_TAP_NETWORKING
     Utf8Str     maTAPDeviceName[8];