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

Timestamp:

Sep 10, 2013 8:36:43 AM (11 years ago)

Author:

vboxsync

Message:

DevAHCI.cpp: Logging nits.

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (9 diffs)

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

@@ -2585 +2585 @@
 }
 
-#ifdef DEBUG
+#ifdef LOG_ENABLED
 
 /**
@@ -2700 +2700 @@
     ahciLog(("%s: *** End command header info dump. ***\n", __FUNCTION__));
 }
-#endif /* DEBUG */
+
+#endif /* LOG_ENABLED */
 
 /**
@@ -4237 +4238 @@
                     break;
                 }
-                else if (!pAhciPort->pDrvMount->pfnIsMounted(pAhciPort->pDrvMount))
+                if (!pAhciPort->pDrvMount->pfnIsMounted(pAhciPort->pDrvMount))
                 {
                     atapiCmdErrorSimple(pAhciPort, pAhciReq, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
@@ -4258 +4259 @@
                      * valid area this often generates too many release log
                      * entries otherwise. */
-                    static uint64_t uLastLogTS = 0;
-                    if (RTTimeMilliTS() >= uLastLogTS + 1000)
+                    static uint64_t s_uLastLogTS = 0;
+                    if (RTTimeMilliTS() >= s_uLastLogTS + 1000)
                     {
                         LogRel(("AHCI ATAPI: LUN#%d: CD-ROM block number %Ld invalid (READ)\n", pAhciPort->iLUN, (uint64_t)iATAPILBA + cSectors));
-                        uLastLogTS = RTTimeMilliTS();
+                        s_uLastLogTS = RTTimeMilliTS();
                     }
                     atapiCmdErrorSimple(pAhciPort, pAhciReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_LOGICAL_BLOCK_OOR);
@@ -4299 +4300 @@
                      * valid area this often generates too many release log
                      * entries otherwise. */
-                    static uint64_t uLastLogTS = 0;
-                    if (RTTimeMilliTS() >= uLastLogTS + 1000)
+                    static uint64_t s_uLastLogTS = 0;
+                    if (RTTimeMilliTS() >= s_uLastLogTS + 1000)
                     {
                         LogRel(("AHCI ATA: LUN#%d: CD-ROM block number %Ld invalid (READ CD)\n", pAhciPort->iLUN, (uint64_t)iATAPILBA + cSectors));
-                        uLastLogTS = RTTimeMilliTS();
+                        s_uLastLogTS = RTTimeMilliTS();
                     }
                     atapiCmdErrorSimple(pAhciPort, pAhciReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_LOGICAL_BLOCK_OOR);
@@ -4352 +4353 @@
                      * valid area this often generates too many release log
                      * entries otherwise. */
-                    static uint64_t uLastLogTS = 0;
-                    if (RTTimeMilliTS() >= uLastLogTS + 1000)
+                    static uint64_t s_uLastLogTS = 0;
+                    if (RTTimeMilliTS() >= s_uLastLogTS + 1000)
                     {
                         LogRel(("AHCI ATAPI: LUN#%d: CD-ROM block number %Ld invalid (SEEK)\n", pAhciPort->iLUN, (uint64_t)iATAPILBA));
-                        uLastLogTS = RTTimeMilliTS();
+                        s_uLastLogTS = RTTimeMilliTS();
                     }
                     atapiCmdErrorSimple(pAhciPort, pAhciReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_LOGICAL_BLOCK_OOR);
@@ -4823 +4824 @@
 
     pbPacket = pAhciReq->aATAPICmd;
-#ifdef DEBUG
     Log(("%s: LUN#%d CMD=%#04x \"%s\"\n", __FUNCTION__, pAhciPort->iLUN, pbPacket[0], SCSICmdText(pbPacket[0])));
-#else /* !DEBUG */
-    Log(("%s: LUN#%d CMD=%#04x\n", __FUNCTION__, pAhciPort->iLUN, pbPacket[0]));
-#endif /* !DEBUG */
     Log2(("%s: limit=%#x packet: %.*Rhxs\n", __FUNCTION__, pAhciReq->cmdFis[AHCI_CMDFIS_CYLL] | (pAhciReq->cmdFis[AHCI_CMDFIS_CYLH] << 8), ATAPI_PACKET_SIZE, pbPacket));
 
@@ -6170 +6167 @@
     PDMDevHlpPhysRead(pAhciPort->CTX_SUFF(pDevIns), pAhciReq->GCPhysCmdHdrAddr, &pAhciReq->cmdHdr, sizeof(CmdHdr));
 
-#ifdef DEBUG
+#ifdef LOG_ENABLED
     /* Print some infos about the command header. */
     ahciDumpCmdHdrInfo(pAhciPort, &pAhciReq->cmdHdr);
@@ -6208 +6205 @@
     pAhciReq->cPrdtlEntries = AHCI_CMDHDR_PRDTL_ENTRIES(pAhciReq->cmdHdr.u32DescInf);
 
-#ifdef DEBUG
+#ifdef LOG_ENABLED
     /* Print some infos about the FIS. */
     ahciDumpFisInfo(pAhciPort, &pAhciReq->cmdFis[0]);