Changeset 48947 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 7, 2013 9:41:00 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89644

Message:

Devices: Whitespace and svn:keyword cleanups by scm.

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevBusLogic.cpp (modified) (15 diffs)
• DrvHostFloppy.cpp (modified) (1 diff)
• DrvSCSI.cpp (modified) (2 diffs)
• DrvVD.cpp (modified) (3 diffs)
• UsbMsd.cpp (modified) (1 diff)
• VSCSI/VSCSILun.cpp (modified) (2 diffs)
• VSCSI/VSCSILunMmc.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

@@ -378 +378 @@
     bool                            fIRQEnabled;
     /** Flag whether the ISA I/O port range is disabled
-     * to prevent the BIOS to access the device. */ 
+     * to prevent the BIOS to access the device. */
     bool                            fISAEnabled;    /**< @todo unused, to be removed */
     /** Flag whether 24-bit mailboxes are in use (default is 32-bit). */
@@ -1021 +1021 @@
 static void buslogicClearInterrupt(PBUSLOGIC pBusLogic)
 {
-    LogFlowFunc(("pBusLogic=%#p, clearing %#02x (pending %#02x)\n", 
+    LogFlowFunc(("pBusLogic=%#p, clearing %#02x (pending %#02x)\n",
                  pBusLogic, pBusLogic->regInterrupt, pBusLogic->uPendingIntr));
     pBusLogic->regInterrupt = 0;
@@ -1193 +1193 @@
     {
         RTGCPHYS GCPhysAddrCCB = pTaskState->MailboxGuest.u32PhysAddrCCB;
-        LogFlowFunc(("Completing CCB %RGp hstat=%u, dstat=%u, outgoing mailbox at %RGp\n", GCPhysAddrCCB, 
+        LogFlowFunc(("Completing CCB %RGp hstat=%u, dstat=%u, outgoing mailbox at %RGp\n", GCPhysAddrCCB,
                      uHostAdapterStatus, uDeviceStatus, GCPhysAddrMailboxIncoming));
 
@@ -1349 +1349 @@
     PPDMDEVINS pDevIns = pTaskState->CTX_SUFF(pTargetDevice)->CTX_SUFF(pBusLogic)->CTX_SUFF(pDevIns);
     uint32_t   cbDataCCB;
-    uint32_t   u32PhysAddrCCB; 
-    
+    uint32_t   u32PhysAddrCCB;
+
     /* Extract the data length and physical address from the CCB. */
     if (pTaskState->fIs24Bit)
@@ -1515 +1515 @@
 #endif
 
-    LogFlowFunc(("pTaskState=%#p cbDataCCB=%u direction=%u cbSeg=%u\n", pTaskState, cbDataCCB, 
+    LogFlowFunc(("pTaskState=%#p cbDataCCB=%u direction=%u cbSeg=%u\n", pTaskState, cbDataCCB,
                  pTaskState->CommandControlBlockGuest.c.uDataDirection, pTaskState->DataSeg.cbSeg));
 
@@ -1633 +1633 @@
 
         /* With 32-bit CCBs, the (optional) sense buffer physical address is provided separately.
-         * On the other hand, with 24-bit CCBs, the sense buffer is simply located at the end of 
-         * the CCB, right after the variable-length CDB. 
+         * On the other hand, with 24-bit CCBs, the sense buffer is simply located at the end of
+         * the CCB, right after the variable-length CDB.
          */
         if (pTaskState->fIs24Bit)
-        {            
+        {
             GCPhysAddrSenseBuffer  = pTaskState->MailboxGuest.u32PhysAddrCCB;
             GCPhysAddrSenseBuffer += pTaskState->CommandControlBlockGuest.c.cbCDB + RT_OFFSETOF(CCB24, abCDB);
@@ -1844 +1844 @@
         {
             /* Some Adaptec AHA-154x drivers (e.g. OS/2) execute this command and expect
-             * it to fail. If it succeeds, the drivers refuse to load. However, some newer 
-             * Adaptec 154x models supposedly support it too?? 
+             * it to fail. If it succeeds, the drivers refuse to load. However, some newer
+             * Adaptec 154x models supposedly support it too??
              */
 
@@ -1905 +1905 @@
             /* The area for incoming mailboxes is right after the last entry of outgoing mailboxes. */
             pBusLogic->GCPhysAddrMailboxIncomingBase = pBusLogic->GCPhysAddrMailboxOutgoingBase + (pBusLogic->cMailbox * sizeof(Mailbox24));
-    
+
             Log(("GCPhysAddrMailboxOutgoingBase=%RGp\n", pBusLogic->GCPhysAddrMailboxOutgoingBase));
             Log(("GCPhysAddrMailboxIncomingBase=%RGp\n", pBusLogic->GCPhysAddrMailboxIncomingBase));
             Log(("cMailboxes=%u (24-bit mode)\n", pBusLogic->cMailbox));
             LogRel(("Initialized 24-bit mailbox, %d entries at %08x\n", pRequest->cMailbox, ADDR_TO_U32(pRequest->aMailboxBaseAddr)));
-    
+
             pBusLogic->regStatus &= ~BUSLOGIC_REGISTER_STATUS_INITIALIZATION_REQUIRED;
             pBusLogic->cbReplyParametersLeft = 0;
@@ -2297 +2297 @@
                     case BUSLOGICCOMMAND_WRITE_BUSMASTER_CHIP_FIFO:
                         pBusLogic->cbCommandParametersLeft = 3;
-                        break; 
+                        break;
                     case BUSLOGICCOMMAND_INITIALIZE_MAILBOX:
                         pBusLogic->cbCommandParametersLeft = sizeof(RequestInitMbx);
@@ -2326 +2326 @@
 #ifndef IN_RING3
                 /* This command must be executed in R3 as it rehooks the ISA I/O port. */
-                if (pBusLogic->uOperationCode == BUSLOGICCOMMAND_MODIFY_IO_ADDRESS) 
+                if (pBusLogic->uOperationCode == BUSLOGICCOMMAND_MODIFY_IO_ADDRESS)
                 {
                     rc = VINF_IOM_R3_IOPORT_WRITE;
@@ -2630 +2630 @@
     {
         /* Unregister the old range, if any. */
-        if (pBusLogic->IOISABase) 
+        if (pBusLogic->IOISABase)
             rc = PDMDevHlpIOPortDeregister(pBusLogic->CTX_SUFF(pDevIns), pBusLogic->IOISABase, 4);
 
-        if (RT_SUCCESS(rc)) 
+        if (RT_SUCCESS(rc))
         {
             pBusLogic->IOISABase = 0;   /* First mark as unregistered. */
@@ -2993 +2993 @@
 /**
  * Read a mailbox from guest memory. Convert 24-bit mailboxes to
- * 32-bit format. 
+ * 32-bit format.
  *
  * @returns Mailbox guest physical address.
@@ -3485 +3485 @@
     if (pszArgs)
         fVerbose = strstr(pszArgs, "verbose") != NULL;
-    
+
     /* Show basic information. */
     pHlp->pfnPrintf(pHlp,
@@ -3511 +3511 @@
         pHlp->pfnPrintf(pHlp, "Current command: %02X\n", pThis->uOperationCode);
 
-    if (fVerbose && (pThis->regStatus & BUSLOGIC_REGISTER_STATUS_INITIALIZATION_REQUIRED) == 0) 
+    if (fVerbose && (pThis->regStatus & BUSLOGIC_REGISTER_STATUS_INITIALIZATION_REQUIRED) == 0)
     {
         RTGCPHYS    GCMailbox;
@@ -3564 +3564 @@
             {
                 PDMDevHlpPhysRead(pThis->CTX_SUFF(pDevIns), GCMailbox, &Mbx32, sizeof(Mailbox32));
-                pHlp->pfnPrintf(pHlp, "  slot %03d: CCB at %08X completion code %02X BTSTAT %02X SDSTAT %02X", i, 
+                pHlp->pfnPrintf(pHlp, "  slot %03d: CCB at %08X completion code %02X BTSTAT %02X SDSTAT %02X", i,
                                 Mbx32.u32PhysAddrCCB, Mbx32.u.in.uCompletionCode, Mbx32.u.in.uHostAdapterStatus, Mbx32.u.in.uTargetDeviceStatus);
                 pHlp->pfnPrintf(pHlp, "%s\n", pThis->uMailboxOutgoingPositionCurrent == i ? " *" : "");

trunk/src/VBox/Devices/Storage/DrvHostFloppy.cpp

@@ -92 +92 @@
         dwLastError = GetLastError();
         rc = RTErrConvertFromWin32(dwLastError);
-        Log(("DrvHostFloppy: IOCTL_DISK_GET_DRIVE_GEOMETRY(%s) failed, LastError=%d rc=%Rrc\n", 
+        Log(("DrvHostFloppy: IOCTL_DISK_GET_DRIVE_GEOMETRY(%s) failed, LastError=%d rc=%Rrc\n",
              pThis->pszDevice, dwLastError, rc));
         return rc;

trunk/src/VBox/Devices/Storage/DrvSCSI.cpp

@@ -694 +694 @@
 
 /**
- * Called when media is unmounted 
- *  
+ * Called when media is unmounted
+ *
  * @param   pInterface      Pointer to the interface structure containing the called function pointer.
  */
@@ -961 +961 @@
     PDMBLOCKTYPE enmType = pThis->pDrvBlock->pfnGetType(pThis->pDrvBlock);
     VSCSILUNTYPE enmLunType;
-    switch (enmType) 
+    switch (enmType)
     {
     case PDMBLOCKTYPE_HARD_DISK:

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -623 +623 @@
 
 /**
- * vvl: this structure duplicate meaning of sockaddr, 
+ * vvl: this structure duplicate meaning of sockaddr,
  * perhaps it'd be better to get rid of it.
  */
@@ -681 +681 @@
     int iInetFamily = PF_INET;
     struct in_addr ip;
-#ifdef VBOX_WITH_NEW_LWIP 
+#ifdef VBOX_WITH_NEW_LWIP
     ip6_addr_t ip6;
 #endif
-    
+
     /* Check whether lwIP is set up in this VM instance. */
     if (!DevINIPConfigured())
@@ -696 +696 @@
     if (inet6_aton(pszAddress, &ip6))
         iInetFamily = PF_INET6;
-    else /* concatination with if */ 
-#endif    
+    else /* concatination with if */
+#endif
       if (!lwip_inet_aton(pszAddress, &ip))
     {

trunk/src/VBox/Devices/Storage/UsbMsd.cpp

@@ -55 +55 @@
 
 /**
- * USB MSD Command Block Wrapper or CBW. The command block 
+ * USB MSD Command Block Wrapper or CBW. The command block
  * itself (CBWCB) contains protocol-specific data (here SCSI).
  */

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp

@@ -120 +120 @@
  *
  * @returns VBox status code.
- * @param   hVScsiLun               The virtual SCSI LUN 
+ * @param   hVScsiLun               The virtual SCSI LUN
  *                                  mounting the medium.
  */
@@ -142 +142 @@
  *
  * @returns VBox status code.
- * @param   hVScsiLun               The virtual SCSI LUN 
+ * @param   hVScsiLun               The virtual SCSI LUN
  *                                  mounting the medium.
  */

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp

@@ -186 +186 @@
     unsigned        uCmd = pVScsiReq->pbCDB[0];
 
-    /* 
+    /*
      * GET CONFIGURATION, GET EVENT/STATUS NOTIFICATION, INQUIRY, and REQUEST SENSE commands
      * operate even when a unit attention condition exists for initiator; every other command
@@ -194 +194 @@
     {
         /*
-         * A note on media changes: As long as a medium is not present, the unit remains in 
-         * the 'not ready' state. Technically the unit becomes 'ready' soon after a medium 
-         * is inserted; however, we internally keep the 'not ready' state until we've had 
+         * A note on media changes: As long as a medium is not present, the unit remains in
+         * the 'not ready' state. Technically the unit becomes 'ready' soon after a medium
+         * is inserted; however, we internally keep the 'not ready' state until we've had
          * a chance to report the UNIT ATTENTION status indicating a media change.
          */
@@ -205 +205 @@
             pVScsiLunMmc->Core.fReady = true;
         }
-        else 
+        else
             rcReq = vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_NOT_READY,
                                              SCSI_ASC_MEDIUM_NOT_PRESENT, 0x00);
@@ -431 +431 @@
             cbMax  = vscsiBE2HU16(&pVScsiReq->pbCDB[7]);
             fMSF   = (pVScsiReq->pbCDB[1] >> 1) & 1;
-            switch (format) 
+            switch (format)
             {
                 case 0x00:
@@ -461 +461 @@
             vscsiDeviceReqComplete(pVScsiLun->pVScsiDevice, pVScsiReq, rcReq, false, VINF_SUCCESS);
         }
-        else if (!cSectorTransfer) 
+        else if (!cSectorTransfer)
         {
             /* A 0 transfer length is not an error. */