Changeset 1931 in vbox for trunk/src/VBox

Timestamp:

Apr 4, 2007 2:04:15 PM (18 years ago)

Author:

vboxsync

Message:

apic.c => DevAPIC.cpp

Location:

trunk/src/VBox/Devices

Files:

• Makefile (modified) (3 diffs)
• PC/DevAPIC.cpp (moved) (moved from trunk/src/VBox/Devices/PC/apic.c ) (10 diffs)
• testcase/tstDeviceStructSize.cpp (modified) (1 diff)
• testcase/tstDeviceStructSizeGC.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Makefile

@@ -141 +141 @@
 VBoxDD2_SOURCES         = \
         Builtins2.cpp \
-        PC/apic.c
+        PC/DevAPIC.cpp
 VBoxDD2_LIBS            = \
         $(PATH_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
@@ -289 +289 @@
         $(PATH_CURRENT)
 VBoxDD2GC_SOURCES        = \
-        PC/apic.c
+        PC/DevAPIC.cpp
 ifeq ($(VBOX_LDR_FMT32),pe)
 VBoxDD2GC_LDFLAGS        = -Entry:apicMMIOWrite
@@ -309 +309 @@
         $(PATH_CURRENT)
 VBoxDD2R0_SOURCES        = \
-        PC/apic.c
+        PC/DevAPIC.cpp
 ifeq ($(VBOX_LDR_FMT),pe)
 VBoxDD2R0_LDFLAGS        = -Entry:apicMMIOWrite

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

@@ -732 +732 @@
     }
     reset_bit(s->irr, intno);
-    if (s->tpr && intno <= s->tpr) {
+    if (s->tpr && (uint32_t)intno <= s->tpr) {
         Log(("apic_get_interrupt: returns %d (sp)\n", s->spurious_vec & 0xff));
         return s->spurious_vec & 0xff;
@@ -1080 +1080 @@
 static void apic_save(QEMUFile *f, void *opaque)
 {
-    APICState *s = opaque;
+    APICState *s = (APICState*)opaque;
     int i;
 
@@ -1114 +1114 @@
 static int apic_load(QEMUFile *f, void *opaque, int version_id)
 {
-    APICState *s = opaque;
+    APICState *s = (APICState*)opaque;
     int i;
 
@@ -1153 +1153 @@
 static void apic_reset(void *opaque)
 {
-    APICState *s = opaque;
+    APICState *s = (APICState*)opaque;
 #ifdef VBOX
     TMTimerStop(s->CTXSUFF(pTimer));
@@ -1277 +1277 @@
 void ioapic_set_irq(void *opaque, int vector, int level)
 {
-    IOAPICState *s = opaque;
+    IOAPICState *s = (IOAPICState*)opaque;
 
     if (vector >= 0 && vector < IOAPIC_NUM_PINS) {
@@ -1303 +1303 @@
 static uint32_t ioapic_mem_readl(void *opaque, target_phys_addr_t addr)
 {
-    IOAPICState *s = opaque;
+    IOAPICState *s = (IOAPICState*)opaque;
     int index;
     uint32_t val = 0;
@@ -1339 +1339 @@
 static void ioapic_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
 {
-    IOAPICState *s = opaque;
+    IOAPICState *s = (IOAPICState*)opaque;
     int index;
 
@@ -1377 +1377 @@
 static void ioapic_save(QEMUFile *f, void *opaque)
 {
-    IOAPICState *s = opaque;
+    IOAPICState *s = (IOAPICState*)opaque;
     int i;
 
@@ -1389 +1389 @@
 static int ioapic_load(QEMUFile *f, void *opaque, int version_id)
 {
-    IOAPICState *s = opaque;
+    IOAPICState *s = (IOAPICState*)opaque;
     int i;
 
@@ -1405 +1405 @@
 static void ioapic_reset(void *opaque)
 {
-    IOAPICState *s = opaque;
+    IOAPICState *s = (IOAPICState*)opaque;
 #ifdef VBOX
     PPDMDEVINSHC        pDevIns    = s->pDevInsHC;

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -48 +48 @@
 #include "PC/DevRTC.cpp"
 #undef LOG_GROUP
-#include "PC/apic.c"
+#include "PC/DevAPIC.cpp"
 #undef LOG_GROUP
 #include "Storage/DevATA.cpp"

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -58 +58 @@
 #include "PC/DevRTC.cpp"
 #undef LOG_GROUP
-#include "PC/apic.c"
+#include "PC/DevAPIC.cpp"
 #undef LOG_GROUP
 #include "Storage/DevATA.cpp"