Changeset 52506 in vbox for trunk/src

Timestamp:

Aug 27, 2014 2:11:36 PM (11 years ago)

Author:

vboxsync

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

95737

Message:

Deleted PC/DevSMC.cpp, removed the associated define.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (10 diffs)
• PC/DevSMC.cpp (deleted)
• build/VBoxDD.cpp (modified) (1 diff)
• build/VBoxDD2.cpp (modified) (1 diff)
• build/VBoxDD2.h (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -18 +18 @@
 SUB_DEPTH = ../../..
 include $(KBUILD_PATH)/subheader.kmk
-
-# Enable the new SMC code.
-VBOX_WITH_SMC_NEW = 1
 
 # Make sure our Config.kmk is included.
@@ -125 +122 @@
         $(if $(VBOX_BIOS_DMI_FALLBACK),VBOX_BIOS_DMI_FALLBACK,) \
         VBOX_WITH_DMI_CHASSIS \
-        VBOX_WITH_DMI_OEMSTRINGS \
-        $(if $(VBOX_WITH_SMC_NEW),VBOX_WITH_SMC_NEW,)
+        VBOX_WITH_DMI_OEMSTRINGS
  VBoxDD_DEFS.win         = _WIN32_WINNT=0x0510
  ifeq ($(KBUILD_TARGET_ARCH),x86)
@@ -143 +139 @@
         Bus/MsiCommon.cpp \
         Bus/MsixCommon.cpp \
-        $(if $(VBOX_WITH_SMC_NEW),EFI/DevSmc.cpp,) \
+        EFI/DevSmc.cpp \
         Graphics/DevVGA.cpp \
         Storage/DevATA.cpp \
@@ -883 +879 @@
         Bus/MsiCommon.cpp \
         Bus/MsixCommon.cpp \
-        $(if $(VBOX_WITH_SMC_NEW),EFI/DevSmc.cpp,) \
+        EFI/DevSmc.cpp \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \
@@ -998 +994 @@
  #
  VBoxDD2_TEMPLATE        = VBoxR3DllWarnNoPic
- VBoxDD2_DEFS            = IN_VBOXDD2 $(if $(VBOX_WITH_SMC_NEW),VBOX_WITH_SMC_NEW,)
+ VBoxDD2_DEFS            = IN_VBOXDD2
  VBoxDD2_INCS           := \
         build \
@@ -1006 +1002 @@
         PC/DevAPIC.cpp \
         PC/DevIoApic.cpp \
-        $(if $(VBOX_WITH_SMC_NEW),,PC/DevSMC.cpp) \
         PC/DevLPC.cpp
  VBoxDD2_LIBS            = \
@@ -1042 +1037 @@
         Bus/MsiCommon.cpp \
         Bus/MsixCommon.cpp \
-        $(if $(VBOX_WITH_SMC_NEW),EFI/DevSmc.cpp,) \
+        EFI/DevSmc.cpp \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \
@@ -1176 +1171 @@
   #
   VBoxDD2GC_TEMPLATE       = VBoxRc
-  VBoxDD2GC_DEFS           = $(if $(VBOX_WITH_SMC_NEW),VBOX_WITH_SMC_NEW,)
   VBoxDD2GC_INCS           = build
   VBoxDD2GC_SOURCES        = \
         PC/DevAPIC.cpp \
-        PC/DevIoApic.cpp \
-        $(if $(VBOX_WITH_SMC_NEW),,PC/DevSMC.cpp)
+        PC/DevIoApic.cpp
   if1of ($(VBOX_LDR_FMT32), pe lx)
    VBoxDD2GC_LIBS          = \
@@ -1194 +1187 @@
  #
  VBoxDD2R0_TEMPLATE       = VBoxR0
- VBoxDD2R0_DEFS           = IN_RT_R0 $(if $(VBOX_WITH_SMC_NEW),VBOX_WITH_SMC_NEW,)
+ VBoxDD2R0_DEFS           = IN_RT_R0
  VBoxDD2R0_INCS           = build
  VBoxDD2R0_SOURCES        = \
@@ -1200 +1193 @@
         PC/DevAPIC.cpp \
         PC/DevIoApic.cpp \
-        $(if $(VBOX_WITH_SMC_NEW),,PC/DevSMC.cpp)
 
  if1of ($(VBOX_LDR_FMT), pe lx)

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -81 +81 @@
     if (RT_FAILURE(rc))
         return rc;
-#ifdef VBOX_WITH_SMC_NEW
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceSmc);
     if (RT_FAILURE(rc))
         return rc;
-#endif
 #ifdef VBOX_WITH_EFI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEFI);

trunk/src/VBox/Devices/build/VBoxDD2.cpp

@@ -65 +65 @@
     if (RT_FAILURE(rc))
         return rc;
-#ifndef VBOX_WITH_SMC_NEW
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceSMC);
-    if (RT_FAILURE(rc))
-        return rc;
-#endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLPC);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/build/VBoxDD2.h

@@ -46 +46 @@
 extern const PDMDEVREG g_DeviceAPIC;
 extern const PDMDEVREG g_DeviceIOAPIC;
-#ifndef VBOX_WITH_SMC_NEW
-extern const PDMDEVREG g_DeviceSMC;
-#endif
 extern const PDMDEVREG g_DeviceLPC;