Changeset 43458 in vbox

Timestamp:

Sep 28, 2012 6:52:23 AM (12 years ago)

Author:

vboxsync

Message:

Devices/Parallel: reverted all the extra debug logs that were added to debug the user parallel port issue. The problem has been fixed.

File:

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

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

@@ -351 +351 @@
         return 0;
     }
-
+    /* This loop is based on the fact that only one resourece is assigned to
+     * the LPT port. If multiple resources (address range) are assigned to
+     * to LPT port, it will pick and return the last one
+     */
     for (;;)
     {
@@ -383 +386 @@
         if (pBuf)
             u32ParportAddr = ((IO_DES *)pBuf)->IOD_Alloc_Base;
-        else
-            LogFlowFunc(("pBuf Not Available \n"));
         LogFlowFunc(("called GetIOResource, ret=%#x\n", u32ParportAddr));
         rdPrevResDes = 0;
@@ -421 +422 @@
     hDevInfo = SetupDiGetClassDevs(NULL, 0, 0, DIGCF_PRESENT | DIGCF_ALLCLASSES);
     if (hDevInfo == INVALID_HANDLE_VALUE)
-    {
-        LogFlowFunc(("Invalid Handle \n"));
         return VERR_INVALID_HANDLE;
-    }
 
     /* Enumerate through all devices in Set. */
@@ -443 +441 @@
                 if (pBuf)
                     RTMemFree(pBuf);
-                 /* Max size will never be more than 2048 bytes */
-                if (dwBufSize > 1024 || dwBufSize < 0)
-                    dwBufSize = 1024;
                 pBuf = (uint8_t *)RTMemAlloc(dwBufSize * 2);
             }
             else
             {
+                /* No need to bother about this error (in most cases its errno=13,
+                 * INVALID_DATA . Just break from here and proceed to next device
+                 * enumerated item
+                 */
                 LogFlow(("GetDevProp Error = %d & dwBufSz = %d\n", GetLastError(), dwBufSize));
                 break;
             }
         }
-        if(pBuf)
-            LogFlowFunc(("Got Device Entity %s\n", pBuf));
+
         if (RTStrStr((char*)pBuf, "LPT"))
         {
@@ -505 +503 @@
                 LogFlowFunc(("u32Parport Addr No Available \n"));
             if (pThis->fParportAvail)
-            {
-                LogFlow(("Parport found . Break from inner loop \n"));
                 break;
-            }
-        }
-        else
-        {
-            LogFlow(("LPT: Parallel Port not available \n"));
         }
         if (pBuf)
@@ -518 +509 @@
         if (pThis->fParportAvail)
         {
-            LogFlow(("Parport Available. Break from outer loop \n"));
             /* Parallel port address has been found. No need to iterate further. */
             break;
@@ -626 +616 @@
         rc = RTErrConvertFromErrno(errno);
 # else /* VBOX_WITH_WIN_PARPORT_SUP */
-    if (!pThis->fParportAvail)
-        LogFlowFunc(("Parport Not Available\n"));
-    //if (pThis->fParportAvail)
+    if (pThis->fParportAvail)
     {
         for (size_t i = 0; i < cbWrite; i++)
@@ -671 +659 @@
         rc = RTErrConvertFromErrno(errno);
 # else  /* VBOX_WITH_WIN_PARPORT_SUP */
-    if (!pThis->fParportAvail)
-        LogFlowFunc(("Parport Not Available\n"));
-    //if (pThis->fParportAvail)
+    if (pThis->fParportAvail)
     {
         *((uint8_t*)(pvBuf)) = 0; /* Initialize the buffer. */
@@ -703 +689 @@
     uint64_t u64Data;
     u64Data = (uint8_t)iMode;
-    if (!pThis->fParportAvail)
-        LogFlowFunc(("Parport Not available\n"));
-    //if (pThis->fParportAvail)
-    {
-        LogFlowFunc(("calling R0 to SetPortDirection, data=%#x\n", u64Data));
+    if (pThis->fParportAvail)
+    {
+        LogFlowFunc(("calling R0 to write CTRL, data=%#x\n", u64Data));
         rc = PDMDrvHlpCallR0(pThis->CTX_SUFF(pDrvIns), DRVHOSTPARALLELR0OP_SETPORTDIRECTION, u64Data);
         AssertRC(rc);
@@ -732 +716 @@
     uint64_t u64Data;
     u64Data = (uint8_t)fReg;
-    if (!pThis->fParportAvail)
-        LogFlowFunc(("Parport Not Available\n"));
-    //if (pThis->fParportAvail)
+    if (pThis->fParportAvail)
     {
         LogFlowFunc(("calling R0 to write CTRL, data=%#x\n", u64Data));
@@ -766 +748 @@
 # else /* VBOX_WITH_WIN_PARPORT_SUP */
     *pfReg = 0; /* Initialize the buffer*/
-    if (!pThis->fParportAvail)
-        LogFlowFunc(("Parport Not Available\n"));
-    //if (pThis->fParportAvail)
+    if (pThis->fParportAvail)
     {
         LogFlowFunc(("calling R0 to read control from parallel port\n"));
@@ -788 +768 @@
     int rcLnx = 0;
     uint8_t fReg = 0;
-    LogFlowFunc(("%d Status  Reg\n", *pfReg));
 # ifndef  VBOX_WITH_WIN_PARPORT_SUP
     rcLnx = ioctl(RTFileToNative(pThis->hFileDevice), PPRSTATUS, &fReg);
@@ -800 +779 @@
 # else /* VBOX_WITH_WIN_PARPORT_SUP */
     *pfReg = 0; /* Intialize the buffer. */
-    if (!pThis->fParportAvail)
-        LogFlowFunc(("fParport Not Available.. Error!!!!!!!!!! \n"));
-    //if (pThis->fParportAvail)
-    {
-        LogFlowFunc(("calling R0 to read status from parallel port. fParport should be available\n"));
+    if (pThis->fParportAvail)
+    {
+        LogFlowFunc(("calling R0 to read status from parallel port\n"));
         rc = PDMDrvHlpCallR0(pThis->CTX_SUFF(pDrvIns), DRVHOSTPARALLELR0OP_READSTATUS, 0);
         AssertRC(rc);
-        LogFlow(("value read from status = %d\n", *pfReg));
         *pfReg = pThis->u8ReadInStatus;
     }
-
 # endif /* VBOX_WITH_WIN_PARPORT_SUP */
     return rc;
@@ -1050 +1025 @@
         rc = RTFileOpen(&pThis->hWinFileDevice, (char *)pThis->szParportName,
                         RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-        LogFlowFunc(("RTFileOpen Return = %d\n", rc));
     }
 #endif