Changeset 43393 in vbox for trunk/src/VBox/Devices/Parallel

Timestamp:

Sep 21, 2012 10:54:07 AM (12 years ago)

Author:

vboxsync

Message:

Devices/Parallel: Reverted the changes related to extra debug statement for debugging (r 80854).

Location:

trunk/src/VBox/Devices/Parallel

Files:

• DevParallel.cpp (modified) (1 diff)
• DrvHostParallel.cpp (modified) (11 diffs)

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

@@ -475 +475 @@
                     rc = VINF_IOM_R3_IOPORT_READ;
 #else
-                    LogFlow(("Read Status \n"));
                     if (RT_LIKELY(pThis->pDrvHostParallelConnector))
                     {
-                        LogFlow(("Call to Read Status \n"));
                         rc = pThis->pDrvHostParallelConnector->pfnReadStatus(pThis->pDrvHostParallelConnector, &pThis->regStatus);
                         AssertRC(rc);
                     }
                     *pu32 = pThis->regStatus;
-
-                    LogFlow(("Call to parallel IRQ . Status=%d\n", *pu32));
                     parallelIrqClear(pThis);
 #endif

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

@@ -403 +403 @@
     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. */
@@ -427 +424 @@
         }
         if(!pBuf)
-        {
-            LogFlowFunc(("No Memory to save ParportString\n"));
             return VERR_NO_MEMORY;
-        }
-        LogFlowFunc(("%s\n", (char*)pBuf));
+
         if (RTStrStr((char*)pBuf, "LPT"))
         {
@@ -478 +472 @@
                 pThis->u32LptAddrStatus  = pThis->u32LptAddr + STATUS_REG_OFFSET;
             }
-            else
-                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)
             RTMemFree(pBuf);
         if (pThis->fParportAvail)
         {
-            LogFlow(("Parport Available. Break from outer loop \n"));
             /* Parallel port address has been found. No need to iterate further. */
             break;
@@ -600 +586 @@
         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++)
@@ -645 +629 @@
         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. */
@@ -677 +659 @@
     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));
+    LogFlowFunc(("calling R0 to write CTRL, data=%#x\n", u64Data));
+    if (pThis->fParportAvail)
+    {
         rc = PDMDrvHlpCallR0(pThis->CTX_SUFF(pDrvIns), DRVHOSTPARALLELR0OP_SETPORTDIRECTION, u64Data);
         AssertRC(rc);
@@ -706 +686 @@
     uint64_t u64Data;
     u64Data = (uint8_t)fReg;
-    if (!pThis->fParportAvail)
-        LogFlowFunc(("Parport Not Available\n"));
-    //if (pThis->fParportAvail)
-    {
-        LogFlowFunc(("calling R0 to write CTRL, data=%#x\n", u64Data));
+    LogFlowFunc(("calling R0 to write CTRL, data=%#x\n", u64Data));
+    if (pThis->fParportAvail)
+    {
         rc = PDMDrvHlpCallR0(pThis->CTX_SUFF(pDrvIns), DRVHOSTPARALLELR0OP_WRITECONTROL, u64Data);
         AssertRC(rc);
@@ -740 +718 @@
 # 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"));
@@ -762 +738 @@
     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);
@@ -774 +749 @@
 # 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;
@@ -1024 +995 @@
         rc = RTFileOpen(&pThis->hWinFileDevice, (char *)pThis->szParportName,
                         RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-        LogFlowFunc(("RTFileOpen Return = %d\n", rc));
     }
 #endif