Changeset 37512 in vbox for trunk/src/VBox

Timestamp:

Jun 16, 2011 5:57:37 PM (14 years ago)

Author:

vboxsync

Message:

DevRTC: Moving the code around, adjusting it thowards our style.

File:

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

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

@@ -250 +250 @@
 }
 
+
 static void rtc_raise_irq(RTCState* pThis, uint32_t iLevel)
 {
@@ -259 +260 @@
 DECLINLINE(int) to_bcd(RTCState *pThis, int a)
 {
-    if (pThis->cmos_data[RTC_REG_B] & 0x04) {
+    if (pThis->cmos_data[RTC_REG_B] & 0x04)
         return a;
-    } else {
-        return ((a / 10) << 4) | (a % 10);
-    }
-}
+    return ((a / 10) << 4) | (a % 10);
+}
+
 
 DECLINLINE(int) from_bcd(RTCState *pThis, int a)
 {
-    if (pThis->cmos_data[RTC_REG_B] & 0x04) {
+    if (pThis->cmos_data[RTC_REG_B] & 0x04)
         return a;
-    } else {
-        return ((a >> 4) * 10) + (a & 0x0f);
-    }
-}
+    return ((a >> 4) * 10) + (a & 0x0f);
+}
+
 
 static void rtc_set_time(RTCState *pThis)
@@ -292 +291 @@
 
 
-/* -=-=-=-=-=- I/O Port -=-=-=-=-=- */
+/* -=-=-=-=-=- I/O Port Handlers -=-=-=-=-=- */
+
 
 /**
@@ -913 +913 @@
 
     int iYear = to_bcd(pThis, (Tm.tm_year / 100) + 19); /* tm_year is 1900 based */
-    rtc_set_memory(pThis, 0x32, iYear);                                     /* 32h - Century Byte (BCD value for the century */
-    rtc_set_memory(pThis, 0x37, iYear);                                     /* 37h - (IBM PS/2) Date Century Byte */
+    rtc_set_memory(pThis, 0x32, iYear);                 /* 32h - Century Byte (BCD value for the century */
+    rtc_set_memory(pThis, 0x37, iYear);                 /* 37h - (IBM PS/2) Date Century Byte */
 
     /*