Changeset 4032 in vbox

Timestamp:

Aug 4, 2007 11:21:11 AM (17 years ago)

Author:

vboxsync

Message:

Implemented shared folder status light

Location:

trunk

Files:

• include/VBox/shflsvc.h (modified) (2 diffs)
• src/VBox/Devices/VMMDev/VBoxDev.cpp (modified) (4 diffs)
• src/VBox/Devices/VMMDev/VMMDevState.h (modified) (1 diff)
• src/VBox/HostServices/SharedFolders/service.cpp (modified) (5 diffs)
• src/VBox/HostServices/SharedFolders/shfl.h (modified) (1 diff)
• src/VBox/HostServices/SharedFolders/shflsvc.h (deleted)
• src/VBox/Main/VMMDevInterface.cpp (modified) (2 diffs)

trunk/include/VBox/shflsvc.h

@@ -103 +103 @@
 /** Remove shared folder mapping. */
 #define SHFL_FN_REMOVE_MAPPING      (2)
+/** Set the led status light address */
+#define SHFL_FN_SET_STATUS_LED      (3)
 
 /** @} */
@@ -959 +961 @@
 #define SHFL_CPARMS_REMOVE_MAPPING (1)
 
+
+/**
+ * SHFL_FN_SET_STATUS_LED
+ */
+
+/** Parameters structure. */
+typedef struct _VBoxSFSetStatusLed
+{
+    VBoxGuestHGCMCallInfo callInfo;
+
+    /** pointer, in: LED address
+     * Points to PPDMLED buffer.
+     */
+    HGCMFunctionParameter led;
+
+} VBoxSFSetStatusLed;
+
+#define SHFL_CPARMS_SET_STATUS_LED (1)
+
 /** @} */
 

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -1461 +1461 @@
             return &pData->HGCMPort;
 #endif
+        case PDMINTERFACE_LED_PORTS:
+            /* Currently only for shared folders */
+            return &pData->SharedFolders.ILeds;
         default:
             return NULL;
@@ -1661 +1664 @@
 
     return;
+}
+
+/**
+ * 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)
+{
+    VMMDevState *pData = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+    if (iLUN == 0) /* LUN 0 is shared folders */
+    {
+        *ppLed = &pData->SharedFolders.Led;
+        return VINF_SUCCESS;
+    }
+    return VERR_PDM_LUN_NOT_FOUND;
 }
 
@@ -1896 +1918 @@
     pData->Port.pfnRequestSeamlessChange  = vmmdevRequestSeamlessChange;
 
+    /* Shared folder LED */
+    pData->SharedFolders.Led.u32Magic                 = PDMLED_MAGIC;
+    pData->SharedFolders.ILeds.pfnQueryStatusLed      = vmmdevQueryStatusLed;
 
 #ifdef VBOX_HGCM
@@ -1927 +1952 @@
     else
         AssertMsgFailedReturn(("Failed to attach LUN #0! rc=%Vrc\n", rc), rc);
+
+    /*
+     * Attach status driver for shared folders (optional).
+     */
+    PPDMIBASE pBase;
+    rc = PDMDevHlpDriverAttach(pDevIns, PDM_STATUS_LUN, &pData->Base, &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;
+    }
 
     /* 

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -159 +159 @@
 #endif /* VBOX_HGCM */
 
+    /* Shared folders LED */
+    struct
+    {
+        /** The LED. */
+        PDMLED                              Led;
+        /** The LED ports. */
+        PDMILEDPORTS                        ILeds;
+        /** Partner of ILeds. */
+        HCPTRTYPE(PPDMILEDCONNECTORS)       pLedsConnector;
+    } SharedFolders;
+
 } VMMDevState;
 

trunk/src/VBox/HostServices/SharedFolders/service.cpp

@@ -30 +30 @@
 #include <iprt/assert.h>
 #include <VBox/ssm.h>
+#include <VBox/pdm.h>
 
 #define SHFL_SSM_VERSION        2
@@ -73 +74 @@
 
 PVBOXHGCMSVCHELPERS g_pHelpers;
-
+static PPDMLED      pStatusLed = NULL;
 
 static DECLCALLBACK(int) svcUnload (void)
@@ -536 +537 @@
                 {
                     /* Execute the function. */
+                    if (pStatusLed)
+                    {
+                        Assert(pStatusLed->u32Magic == PDMLED_MAGIC);
+                        pStatusLed->Asserted.s.fReading = pStatusLed->Actual.s.fReading = 1;
+                    }
 
                     rc = vbsfRead (pClient, root, Handle, offset, &count, pBuffer);
+                    if (pStatusLed)
+                        pStatusLed->Actual.s.fReading = 0;
 
                     if (VBOX_SUCCESS(rc))
@@ -593 +601 @@
                 {
                     /* Execute the function. */
-
+                    if (pStatusLed)
+                    {
+                        Assert(pStatusLed->u32Magic == PDMLED_MAGIC);
+                        pStatusLed->Asserted.s.fWriting = pStatusLed->Actual.s.fWriting = 1;
+                    }
+                    
                     rc = vbsfWrite (pClient, root, Handle, offset, &count, pBuffer);
+                    if (pStatusLed)
+                        pStatusLed->Actual.s.fWriting = 0;
 
                     if (VBOX_SUCCESS(rc))
@@ -1153 +1168 @@
         break;
     }
+
+    case SHFL_FN_SET_STATUS_LED:
+    {
+        Log(("svcCall: SHFL_FN_SET_STATUS_LED\n"));
+
+        /* Verify parameter count and types. */
+        if (cParms != SHFL_CPARMS_SET_STATUS_LED)
+        {
+            rc = VERR_INVALID_PARAMETER;
+        }
+        else if (   paParms[0].type != VBOX_HGCM_SVC_PARM_PTR     /* folder name */
+                )
+        {
+            rc = VERR_INVALID_PARAMETER;
+        }
+        else
+        {
+            /* Fetch parameters. */
+            PPDMLED  pLed     = (PPDMLED)paParms[0].u.pointer.addr;
+            uint32_t cbLed    = paParms[0].u.pointer.size;
+
+            /* Verify parameters values. */
+            if (   (cbLed != sizeof (PDMLED))
+               )
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                /* Execute the function. */
+                pStatusLed = pLed;
+                rc = VINF_SUCCESS;
+            }
+        }
+        break;
+    }
+
     default:
         rc = VERR_NOT_IMPLEMENTED;

trunk/src/VBox/HostServices/SharedFolders/shfl.h

@@ -57 +57 @@
 
 
-
 #endif /* __SHFL__H */

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -30 +30 @@
 #include <VBox/VBoxDev.h>
 #include <VBox/VBoxGuest.h>
+#include <VBox/shflsvc.h>
 #include <iprt/asm.h>
 
@@ -591 +592 @@
     if (VBOX_SUCCESS(rc))
     {
+        PPDMLED       pLed;
+        PPDMILEDPORTS pLedPort;
+
         LogRel(("Shared Folders service loaded.\n"));
+        pLedPort = (PPDMILEDPORTS)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_LED_PORTS);
+        if (!pLedPort)
+        {
+            AssertMsgFailed(("Configuration error: No LED port interface above!\n"));
+            return VERR_PDM_MISSING_INTERFACE_ABOVE;
+        }
+        rc = pLedPort->pfnQueryStatusLed(pLedPort, 0, &pLed);
+        if (VBOX_SUCCESS(rc) && pLed)
+        {
+            VBOXHGCMSVCPARM  parm;
+
+            parm.type = VBOX_HGCM_SVC_PARM_PTR;
+            parm.u.pointer.addr = pLed;
+            parm.u.pointer.size = sizeof(*pLed);
+
+            rc = HGCMHostCall("VBoxSharedFolders", SHFL_FN_SET_STATUS_LED, 1, &parm);
+        }
+        else
+            AssertMsgFailed(("pfnQueryStatusLed failed with %Vrc (pLed=%x)\n", rc, pLed));
     }
     else