Changeset 32471 in vbox for trunk/src/VBox/Devices/testcase

Timestamp:

Sep 14, 2010 10:26:07 AM (14 years ago)

Author:

vboxsync

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

65845

Message:

Devices: refactoring, further PCI work

Location:

trunk/src/VBox/Devices/testcase

Files:

• Makefile.kmk (modified) (2 diffs)
• tstDeviceStructSize.cpp (modified) (1 diff)
• tstDeviceStructSizeRC.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/testcase/Makefile.kmk

@@ -70 +70 @@
   tstDeviceStructSizeRC_DEFS    += VBOX_WITH_LSILOGIC
  endif
- ifdef VBOX_WITH_HPET
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_HPET
- endif
  ifdef VBOX_WITH_HGSMI
   tstDeviceStructSizeRC_DEFS    += VBOX_WITH_HGSMI
@@ -109 +106 @@
 ifdef VBOX_WITH_LSILOGIC
  tstDeviceStructSize_DEFS   += VBOX_WITH_LSILOGIC
-endif
-ifdef VBOX_WITH_HPET
- tstDeviceStructSize_DEFS   += VBOX_WITH_HPET
-endif
-ifdef VBOX_WITH_SMC
- tstDeviceStructSize_DEFS   += VBOX_WITH_SMC
-endif
-ifdef VBOX_WITH_LPC
- tstDeviceStructSize_DEFS   += VBOX_WITH_LPC
 endif
 ifdef VBOX_WITH_HGSMI

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

@@ -53 +53 @@
 #undef LOG_GROUP
 #include "../PC/DevAPIC.cpp"
-#ifdef VBOX_WITH_HPET
-# undef LOG_GROUP
-# include "../PC/DevHPET.cpp"
-#endif
-#ifdef VBOX_WITH_LPC
-# undef LOG_GROUP
-# include "../PC/DevLPC.cpp"
-#endif
-#ifdef VBOX_WITH_SMC
-# undef LOG_GROUP
-# include "../PC/DevSMC.cpp"
-#endif
+#undef LOG_GROUP
+#include "../PC/DevHPET.cpp"
+#undef LOG_GROUP
+#include "../PC/DevLPC.cpp"
+#undef LOG_GROUP
+#include "../PC/DevSMC.cpp"
 #undef LOG_GROUP
 #include "../Storage/DevATA.cpp"

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

@@ -89 +89 @@
 # include "../Storage/DevLsiLogicSCSI.cpp"
 #endif
-#ifdef VBOX_WITH_HPET
-# undef LOG_GROUP
-# include "../PC/DevHPET.cpp"
-#endif
+#undef LOG_GROUP
+#include "../PC/DevHPET.cpp"
 
 /* we don't use iprt here because we're pretending to be in GC! */
@@ -1627 +1625 @@
 #endif /* VBOX_WITH_LSILOGIC */
 
-#ifdef VBOX_WITH_HPET
     GEN_CHECK_SIZE(HpetState);
     GEN_CHECK_OFF(HpetState, pDevInsR3);
@@ -1651 +1648 @@
     GEN_CHECK_OFF(HpetTimer, u64Period);
     GEN_CHECK_OFF(HpetTimer, u8Wrap);
-#endif
 
     return (0);