Changeset 44004 in vbox for trunk

Timestamp:

Nov 30, 2012 3:52:31 PM (12 years ago)

Author:

vboxsync

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

82396

Message:

APIC: spaces, nits.

Location:

trunk

Files:

• include/VBox/apic.h (modified) (3 diffs)
• src/VBox/Devices/PC/DevApic.h (modified) (1 diff)

trunk/include/VBox/apic.h

@@ -32 +32 @@
 
 #define APIC_REG_VERSION                        0x0030
-#define   APIC_REG_VERSION_GET_VER(u32)         (u32 & 0xff)
-#define   APIC_REG_VERSION_GET_MAX_LVT(u32)     ((u32 & 0xff0000) >> 16)
+#define APIC_REG_VERSION_GET_VER(u32)           (u32 & 0xff)
+#define APIC_REG_VERSION_GET_MAX_LVT(u32)       ((u32 & 0xff0000) >> 16)
 
-/* defines according to Figure 10-8 of the Intel Software Developers Manual Vol 3A */
+/* Defines according to Figure 10-8 of the Intel Software Developers Manual Vol 3A */
 #define APIC_REG_LVT_LINT0                      0x0350
 #define APIC_REG_LVT_LINT1                      0x0360
@@ -41 +41 @@
 #define APIC_REG_LVT_PC                         0x0340
 #define APIC_REG_LVT_THMR                       0x0330
-#define   APIC_REG_LVT_MODE_MASK                (RT_BIT(8)|RT_BIT(9)|RT_BIT(10))
-#define   APIC_REG_LVT_MODE_FIXED               0
-#define   APIC_REG_LVT_MODE_NMI                 (RT_BIT(10))
-#define   APIC_REG_LVT_MODE_EXTINT              (RT_BIT(8)|RT_BIT(9)|RT_BIT(10))
-#define   APIC_REG_LVT_PIN_POLARIY              RT_BIT(13)
-#define   APIC_REG_LVT_REMOTE_IRR               RT_BIT(14)
-#define   APIC_REG_LVT_LEVEL_TRIGGER            RT_BIT(15)
-#define   APIC_REG_LVT_MASKED                   RT_BIT(16)
+#define APIC_REG_LVT_MODE_MASK                  (RT_BIT(8) | RT_BIT(9) | RT_BIT(10))
+#define APIC_REG_LVT_MODE_FIXED                 0
+#define APIC_REG_LVT_MODE_NMI                   RT_BIT(10)
+#define APIC_REG_LVT_MODE_EXTINT                (RT_BIT(8) | RT_BIT(9) | RT_BIT(10))
+#define APIC_REG_LVT_PIN_POLARIY                RT_BIT(13)
+#define APIC_REG_LVT_REMOTE_IRR                 RT_BIT(14)
+#define APIC_REG_LVT_LEVEL_TRIGGER              RT_BIT(15)
+#define APIC_REG_LVT_MASKED                     RT_BIT(16)
 
 DECLINLINE(uint32_t) ApicRegRead(void *pvBase, uint32_t offReg)
@@ -55 +55 @@
 }
 
-#endif
+#endif /* ___VBox_apic_h */
 

trunk/src/VBox/Devices/PC/DevApic.h

@@ -67 +67 @@
 #define APIC_TRIGGER_LEVEL 1
 
-#define APIC_LVT_TIMER_PERIODIC         (1<<17)
-#define APIC_LVT_MASKED                 (1<<16)
-#define APIC_LVT_LEVEL_TRIGGER          (1<<15)
-#define APIC_LVT_REMOTE_IRR             (1<<14)
-#define APIC_INPUT_POLARITY             (1<<13)
-#define APIC_SEND_PENDING               (1<<12)
+#define APIC_LVT_TIMER_PERIODIC         (1 << 17)
+#define APIC_LVT_MASKED                 (1 << 16)
+#define APIC_LVT_LEVEL_TRIGGER          (1 << 15)
+#define APIC_LVT_REMOTE_IRR             (1 << 14)
+#define APIC_INPUT_POLARITY             (1 << 13)
+#define APIC_SEND_PENDING               (1 << 12)
 
-#endif
+#endif /* ___PC_DevApic_h */