Changeset 28125 in vbox for trunk/src/VBox/Devices/Serial/DrvChar.cpp

Timestamp:

Apr 9, 2010 8:15:38 AM (15 years ago)

Author:

vboxsync

Message:

DrvChar.cpp: cosmetics

File:

• trunk/src/VBox/Devices/Serial/DrvChar.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Serial/DrvChar.cpp

@@ -22 +22 @@
  * additional information or have any questions.
  */
-
 
 
@@ -114 +113 @@
 {
     PDRVCHAR pThis = PDMICHAR_2_DRVCHAR(pInterface);
-    const char *pBuffer = (const char *)pvBuf;
+    const char *pbBuffer = (const char *)pvBuf;
 
     LogFlow(("%s: pvBuf=%#p cbWrite=%d\n", __FUNCTION__, pvBuf, cbWrite));
 
-    for (uint32_t i=0; i<cbWrite; i++)
+    for (uint32_t i = 0; i < cbWrite; i++)
     {
         uint32_t iOld = pThis->iSendQueueHead;
         uint32_t iNew = (iOld + 1) & CHAR_MAX_SEND_QUEUE_MASK;
 
-        pThis->aSendQueue[iOld] = pBuffer[i];
+        pThis->aSendQueue[iOld] = pbBuffer[i];
 
         STAM_COUNTER_INC(&pThis->StatBytesWritten);
@@ -129 +128 @@
         ASMAtomicIncU32(&pThis->cEntries);
         if (pThis->cEntries > CHAR_MAX_SEND_QUEUE_MASK / 2)
-            pThis->pDrvCharPort->pfnNotifyBufferFull(pThis->pDrvCharPort, true);
+            pThis->pDrvCharPort->pfnNotifyBufferFull(pThis->pDrvCharPort, true /*fFull*/);
     }
     RTSemEventSignal(pThis->SendSem);
@@ -177 +176 @@
 
             rc = pThis->pDrvStream->pfnWrite(pThis->pDrvStream, &pThis->aSendQueue[pThis->iSendQueueTail], &cbProcessed);
-            pThis->pDrvCharPort->pfnNotifyBufferFull(pThis->pDrvCharPort, false);
+            pThis->pDrvCharPort->pfnNotifyBufferFull(pThis->pDrvCharPort, false /*fFull*/);
             if (RT_SUCCESS(rc))
             {
@@ -213 +212 @@
 static DECLCALLBACK(int) drvCharReceiveLoop(RTTHREAD ThreadSelf, void *pvUser)
 {
-    PDRVCHAR pThis = (PDRVCHAR)pvUser;
-    char aBuffer[256], *pBuffer;
-    size_t cbRemaining, cbProcessed;
-    int rc;
-
-    cbRemaining = 0;
-    pBuffer = aBuffer;
+    PDRVCHAR    pThis = (PDRVCHAR)pvUser;
+    char        abBuffer[256];
+    char       *pbRemaining = abBuffer;
+    size_t      cbRemaining = 0;
+    int         rc;
+
     while (!pThis->fShutdown)
     {
@@ -227 +225 @@
             if (pThis->pDrvStream)
             {
-                cbRemaining = sizeof(aBuffer);
-                rc = pThis->pDrvStream->pfnRead(pThis->pDrvStream, aBuffer, &cbRemaining);
+                pbRemaining = abBuffer;
+                cbRemaining = sizeof(abBuffer);
+                rc = pThis->pDrvStream->pfnRead(pThis->pDrvStream, abBuffer, &cbRemaining);
                 if (RT_FAILURE(rc))
                 {
@@ -236 +235 @@
             }
             else
-            {
-                cbRemaining = 0;
                 RTThreadSleep(100);
-            }
-            pBuffer = aBuffer;
         }
         else
         {
             /* Send data to guest. */
-            cbProcessed = cbRemaining;
-            rc = pThis->pDrvCharPort->pfnNotifyRead(pThis->pDrvCharPort, pBuffer, &cbProcessed);
+            size_t cbProcessed = cbRemaining;
+            rc = pThis->pDrvCharPort->pfnNotifyRead(pThis->pDrvCharPort, pbRemaining, &cbProcessed);
             if (RT_SUCCESS(rc))
             {
                 Assert(cbProcessed);
-                pBuffer += cbProcessed;
+                pbRemaining += cbProcessed;
                 cbRemaining -= cbProcessed;
                 STAM_COUNTER_ADD(&pThis->StatBytesRead, cbProcessed);