Changeset 41667 in vbox

Timestamp:

Jun 12, 2012 12:00:37 PM (13 years ago)

Author:

vboxsync

Message:

Compacted CMOS debug info output.

File:

• trunk/src/VBox/Devices/PC/DevRTC.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevRTC.cpp

@@ -288 +288 @@
 {
     RTCState *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
-    const char *PChCMOSBank = "CMOS Bank Info 0x0E - 0x7F";
     uint16_t u16ByteCount = 0;
-    uint8_t   u8CMOSByte;
-    pHlp->pfnPrintf(pHlp, "%s\n" ,PChCMOSBank);
-    for (u16ByteCount = CMOS_BANK_LOWER_LIMIT; u16ByteCount < CMOS_BANK_UPPER_LIMIT; u16ByteCount++)
-    {
-        u8CMOSByte  =  pThis->cmos_data[u16ByteCount];
-        pHlp->pfnPrintf(pHlp, "Off: 0x%02x Val: 0x%02x\n",u16ByteCount, u8CMOSByte);
-    }
+
+    pHlp->pfnPrintf(pHlp, "First CMOS bank, offsets 0x0E - 0x7F");
+    pHlp->pfnPrintf(pHlp, "\nOffset %02x : --- use 'info rtc' to show CMOS clock ---", 0);
+    for (u16ByteCount = CMOS_BANK_LOWER_LIMIT; u16ByteCount <= CMOS_BANK_UPPER_LIMIT; u16ByteCount++)
+    {
+        if ((u16ByteCount & 15) == 0) {
+            pHlp->pfnPrintf(pHlp, "\nOffset %02x : ", u16ByteCount);
+        } else if ((u16ByteCount & 15) == 8) {
+            pHlp->pfnPrintf(pHlp, "-");
+        } else {
+            pHlp->pfnPrintf(pHlp, " ");
+        }
+        pHlp->pfnPrintf(pHlp, "%02x", pThis->cmos_data[u16ByteCount]);
+    }
+    pHlp->pfnPrintf(pHlp, "\n");
 }
 
@@ -306 +313 @@
 {
     RTCState *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
-    const char *PChCMOSBank = "CMOS Bank2 Info 0x80 - 0xFF";
     uint16_t u16ByteCount = 0;
-    uint8_t   u8CMOSByte;
-    pHlp->pfnPrintf(pHlp, "%s\n" ,PChCMOSBank);
-    for (u16ByteCount = CMOS_BANK2_LOWER_LIMIT; u16ByteCount < CMOS_BANK2_UPPER_LIMIT; u16ByteCount++)
-    {
-        u8CMOSByte  =  pThis->cmos_data[u16ByteCount];
-        pHlp->pfnPrintf(pHlp, "Off: 0x%02x Val: 0x%02x\n",u16ByteCount, u8CMOSByte);
-    }
+
+    pHlp->pfnPrintf(pHlp, "Second CMOS bank, offsets 0x80 - 0xFF");
+    for (u16ByteCount = CMOS_BANK2_LOWER_LIMIT; u16ByteCount <= CMOS_BANK2_UPPER_LIMIT; u16ByteCount++)
+    {
+        if ((u16ByteCount & 15) == 0) {
+            pHlp->pfnPrintf(pHlp, "\nOffset %02x : ", u16ByteCount);
+        } else if ((u16ByteCount & 15) == 8) {
+            pHlp->pfnPrintf(pHlp, "-");
+        } else {
+            pHlp->pfnPrintf(pHlp, " ");
+        }
+        pHlp->pfnPrintf(pHlp, "%02x", pThis->cmos_data[u16ByteCount]);
+    }
+    pHlp->pfnPrintf(pHlp, "\n");
 }