Changeset 62563 in vbox for trunk/src

Timestamp:

Jul 26, 2016 2:12:44 PM (8 years ago)

Author:

vboxsync

Message:

Devices: Rename I/O APIC files.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (6 diffs)
• PC/DevIoApic.cpp (moved) (moved from trunk/src/VBox/Devices/PC/DevIOAPIC_New.cpp )
• PC/DevIoApic_Old.cpp (copied) (copied from trunk/src/VBox/Devices/PC/DevIoApic.cpp )
• testcase/tstDeviceStructSize.cpp (modified) (1 diff)
• testcase/tstDeviceStructSizeRC.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -156 +156 @@
         PC/DevDMA.cpp \
         PC/DevHPET.cpp \
-        $(if $(VBOX_WITH_NEW_IOAPIC),PC/DevIOAPIC_New.cpp,) \
+        $(if $(VBOX_WITH_NEW_IOAPIC),PC/DevIoApic.cpp,) \
         Storage/DevFdc.cpp \
         Serial/DevSerial.cpp \
@@ -894 +894 @@
         Input/PS2M.cpp \
         PC/DevACPI.cpp \
-        $(if $(VBOX_WITH_NEW_IOAPIC),PC/DevIOAPIC_New.cpp,) \
+        $(if $(VBOX_WITH_NEW_IOAPIC),PC/DevIoApic.cpp,) \
         PC/DevPit-i8254.cpp \
         PC/DevPIC.cpp \
@@ -1028 +1028 @@
         PC/DevLPC.cpp \
         $(if $(VBOX_WITH_NEW_APIC),,PC/DevAPIC.cpp) \
-        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic.cpp)
+        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp)
  VBoxDD2_LIBS            = \
         $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
@@ -1064 +1064 @@
         Input/PS2M.cpp \
         PC/DevACPI.cpp \
-        $(if $(VBOX_WITH_NEW_IOAPIC),PC/DevIOAPIC_New.cpp,) \
+        $(if $(VBOX_WITH_NEW_IOAPIC),PC/DevIoApic.cpp,) \
         PC/DevPit-i8254.cpp \
         PC/DevPIC.cpp \
@@ -1193 +1193 @@
   VBoxDD2RC_INCS           = build
   VBoxDD2RC_SOURCES        = \
-        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic.cpp) \
+        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp) \
         $(if $(VBOX_WITH_NEW_APIC),,PC/DevAPIC.cpp) \
         build/VBoxDD2R0.cpp # Dummy to prevent linking errors.
@@ -1213 +1213 @@
  VBoxDD2R0_SOURCES        = \
         build/VBoxDD2R0.cpp \
-        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic.cpp) \
+        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp) \
         $(if $(VBOX_WITH_NEW_APIC),,PC/DevAPIC.cpp)
  if1of ($(VBOX_LDR_FMT), pe lx)

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

@@ -66 +66 @@
 #undef LOG_GROUP
 #ifdef VBOX_WITH_NEW_IOAPIC
-# include "../PC/DevIOAPIC_New.cpp"
+# include "../PC/DevIoApic.cpp"
 #else
-# include "../PC/DevIoApic.cpp"
+# include "../PC/DevIoApic_Old.cpp"
 #endif
 #undef LOG_GROUP

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

@@ -68 +68 @@
 #undef LOG_GROUP
 #ifdef VBOX_WITH_NEW_IOAPIC
-# include "../PC/DevIOAPIC_New.cpp"
+# include "../PC/DevIoApic.cpp"
 #else
-# include "../PC/DevIoApic.cpp"
+# include "../PC/DevIoApic_Old.cpp"
 #endif
 #undef LOG_GROUP
@@ -878 +878 @@
 
 #ifdef VBOX_WITH_NEW_IOAPIC
-    /* PC/DevIOAPIC_New.cpp */
+    /* PC/DevIoApic.cpp */
     GEN_CHECK_SIZE(IOAPIC);
     GEN_CHECK_OFF(IOAPIC, pDevInsR3);
@@ -902 +902 @@
 # endif
 #else
-    /* PC/DevIoApic.cpp */
+    /* PC/DevIoApic_Old.cpp */
     GEN_CHECK_SIZE(IOAPIC);
     GEN_CHECK_OFF(IOAPIC, id);