Changeset 6228 in vbox

Timestamp:

Jan 2, 2008 12:09:12 PM (17 years ago)

Author:

vboxsync

Message:

Better error reporting

File:

• trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp

@@ -131 +131 @@
 }
 
-static DECLCALLBACK(int) drvHostParallelSetMode(PPDMIHOSTPARALLELCONNECTOR pInterface, PDMPARALLELPORTMODE mode)
+static DECLCALLBACK(int) drvHostParallelSetMode(PPDMIHOSTPARALLELCONNECTOR pInterface, PDMPARALLELPORTMODE enmMode)
 {
     PDRVHOSTPARALLEL pData = PDMIHOSTPARALLELCONNECTOR_2_DRVHOSTPARALLEL(pInterface);
     int ppdev_mode;
 
-    LogFlow(("%s: mode=%d\n", __FUNCTION__, mode));
-
-    switch (mode) {
+    LogFlow(("%s: mode=%d\n", __FUNCTION__, enmMode));
+
+    switch (enmMode) {
         case PDM_PARALLEL_PORT_MODE_COMPAT:
             ppdev_mode = IEEE1284_MODE_COMPAT;
@@ -155 +155 @@
 }
 
-static DECLCALLBACK(int) drvHostParallelWriteControl(PPDMIHOSTPARALLELCONNECTOR pInterface, uint8_t val)
-{
-    PDRVHOSTPARALLEL pData = PDMIHOSTPARALLELCONNECTOR_2_DRVHOSTPARALLEL(pInterface);
-
-    LogFlow(("%s: val=%d\n", __FUNCTION__, val));
-
-    ioctl(pData->FileDevice, PPWCONTROL, &val);
-
-    return VINF_SUCCESS;
-}
-
-static DECLCALLBACK(int) drvHostParallelReadControl(PPDMIHOSTPARALLELCONNECTOR pInterface, uint8_t *pvBuf)
-{
-    PDRVHOSTPARALLEL pData = PDMIHOSTPARALLELCONNECTOR_2_DRVHOSTPARALLEL(pInterface);
-    uint8_t val;
-
-    ioctl(pData->FileDevice, PPRCONTROL, &val);
-
-    LogFlow(("%s: val=%d\n", __FUNCTION__, val));
-
-    *pvBuf = val;
-
-    return VINF_SUCCESS;
-}
-
-static DECLCALLBACK(int) drvHostParallelReadStatus(PPDMIHOSTPARALLELCONNECTOR pInterface, uint8_t *pvBuf)
-{
-    PDRVHOSTPARALLEL pData = PDMIHOSTPARALLELCONNECTOR_2_DRVHOSTPARALLEL(pInterface);
-    uint8_t val;
-
-    ioctl(pData->FileDevice, PPRSTATUS, &val);
-
-    LogFlow(("%s: val=%d\n", __FUNCTION__, val));
-
-    *pvBuf = val;
+static DECLCALLBACK(int) drvHostParallelWriteControl(PPDMIHOSTPARALLELCONNECTOR pInterface, uint8_t fReg)
+{
+    PDRVHOSTPARALLEL pData = PDMIHOSTPARALLELCONNECTOR_2_DRVHOSTPARALLEL(pInterface);
+
+    LogFlow(("%s: fReg=%d\n", __FUNCTION__, fReg));
+
+    ioctl(pData->FileDevice, PPWCONTROL, &fReg);
+
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) drvHostParallelReadControl(PPDMIHOSTPARALLELCONNECTOR pInterface, uint8_t *pfReg)
+{
+    PDRVHOSTPARALLEL pData = PDMIHOSTPARALLELCONNECTOR_2_DRVHOSTPARALLEL(pInterface);
+    uint8_t fReg;
+
+    ioctl(pData->FileDevice, PPRCONTROL, &fReg);
+
+    LogFlow(("%s: fReg=%d\n", __FUNCTION__, fReg));
+
+    *pfReg = fReg;
+
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) drvHostParallelReadStatus(PPDMIHOSTPARALLELCONNECTOR pInterface, uint8_t *pfReg)
+{
+    PDRVHOSTPARALLEL pData = PDMIHOSTPARALLELCONNECTOR_2_DRVHOSTPARALLEL(pInterface);
+    uint8_t fReg;
+
+    ioctl(pData->FileDevice, PPRSTATUS, &fReg);
+
+    LogFlow(("%s: fReg=%d\n", __FUNCTION__, fReg));
+
+    *pfReg = fReg;
 
     return VINF_SUCCESS;
@@ -272 +272 @@
 
     /*
+     * Validate the config.
+     */
+    if (!CFGMR3AreValuesValid(pCfgHandle, "DevicePath\0"))
+        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
+                                N_("Unknown host parallel configuration option, only supports DevicePath"));
+
+    /*
      * Init basic data members and interfaces.
      */
@@ -299 +306 @@
      * Open the device
      */
-    pData->FileDevice = open(pData->pszDevicePath, O_RDWR | O_NONBLOCK);
-    if (pData->FileDevice < 0) {
-
-    }
+    rc = RTFileOpen(&pData->FileDevice, pData->pszDevicePath, RTFILE_O_OPEN | RTFILE_O_READWRITE);
+    if (VBOX_FAILURE(rc))
+        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("Parallel#%d could not open '%s'"), 
+                                   pDrvIns->iInstance, pData->pszDevicePath);
 
     /*
      * Try to get exclusive access to parallel port
      */
-    if (ioctl(pData->FileDevice, PPEXCL) < 0) {
-    }
+    rc = ioctl(pData->FileDevice, PPEXCL);     
+    if (rc < 0)
+        return PDMDrvHlpVMSetError(pDrvIns, RTErrConvertFromErrno(errno), RT_SRC_POS, 
+                                   N_("Parallel#%d could not get exclusive access for parallel port '%s'"
+                                      "Be sure that no other process or driver accesses this port"), 
+                                   pDrvIns->iInstance, pData->pszDevicePath);
 
     /*
      * Claim the parallel port
      */
-    if (ioctl(pData->FileDevice, PPCLAIM) < 0) {
-    }
+    rc = ioctl(pData->FileDevice, PPCLAIM);
+    if (rc < 0)
+        return PDMDrvHlpVMSetError(pDrvIns, RTErrConvertFromErrno(errno), RT_SRC_POS, 
+                                   N_("Parallel#%d could not claim parallel port '%s'"
+                                      "Be sure that no other process or driver accesses this port"), 
+                                   pDrvIns->iInstance, pData->pszDevicePath);
 
     /*
@@ -359 +374 @@
 static DECLCALLBACK(void) drvHostParallelDestruct(PPDMDRVINS pDrvIns)
 {
-    PDRVHOSTPARALLEL     pData = PDMINS2DATA(pDrvIns, PDRVHOSTPARALLEL);
+    PDRVHOSTPARALLEL pData = PDMINS2DATA(pDrvIns, PDRVHOSTPARALLEL);
 
     LogFlow(("%s: iInstance=%d\n", __FUNCTION__, pDrvIns->iInstance));
 
     ioctl(pData->FileDevice, PPRELEASE);
-    close(pData->FileDevice);
+
+    if (pData->WakeupPipeW != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pData->WakeupPipeW);
+        AssertRC(rc);
+        pData->WakeupPipeW = NIL_RTFILE;
+    }
+    if (pData->WakeupPipeR != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pData->WakeupPipeR);
+        AssertRC(rc);
+        pData->WakeupPipeR = NIL_RTFILE;
+    }
+    if (pData->FileDevice != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pData->FileDevice);
+        AssertRC(rc);
+        pData->FileDevice = NIL_RTFILE;
+    }
 }