Changeset 48435 in vbox for trunk/src/VBox/Devices/Makefile.kmk

Timestamp:

Sep 11, 2013 3:18:22 PM (11 years ago)

Author:

vboxsync

Message:

SMC reimplementation (disabled). Works but needs save state, more keys and more testing.

File:

• trunk/src/VBox/Devices/Makefile.kmk (modified) (11 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -119 +119 @@
         $(if $(VBOX_BIOS_DMI_FALLBACK),VBOX_BIOS_DMI_FALLBACK,) \
         VBOX_WITH_DMI_CHASSIS \
-        VBOX_WITH_DMI_OEMSTRINGS
+        VBOX_WITH_DMI_OEMSTRINGS \
+        $(if $(VBOX_WITH_SMC_NEW),VBOX_WITH_SMC_NEW,)
  VBoxDD_DEFS.win         = _WIN32_WINNT=0x0510
  ifeq ($(KBUILD_TARGET_ARCH),x86)
@@ -136 +137 @@
         Bus/MsiCommon.cpp \
         Bus/MsixCommon.cpp \
+        $(if $(VBOX_WITH_SMC_NEW),EFI/DevSmc.cpp,) \
         Graphics/DevVGA.cpp \
         Storage/DevATA.cpp \
@@ -156 +158 @@
         PC/DevDMA.cpp \
         PC/DevHPET.cpp \
-        PC/DevSMC.cpp \
-        PC/DevLPC.cpp \
         Storage/DevFdc.cpp \
         Serial/DevSerial.cpp \
@@ -762 +762 @@
         Bus/MsiCommon.cpp \
         Bus/MsixCommon.cpp \
+        $(if $(VBOX_WITH_SMC_NEW),EFI/DevSmc.cpp,) \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \
@@ -863 +864 @@
  #
  VBoxDD2_TEMPLATE        = VBoxR3DllWarnNoPic
- VBoxDD2_DEFS            = IN_VBOXDD2
+ VBoxDD2_DEFS            = IN_VBOXDD2 $(if $(VBOX_WITH_SMC_NEW),VBOX_WITH_SMC_NEW,)
  VBoxDD2_INCS           := \
         build \
@@ -871 +872 @@
         PC/DevAPIC.cpp \
         PC/DevIoApic.cpp \
-        PC/DevSMC.cpp  \
+        $(if $(VBOX_WITH_SMC_NEW),,PC/DevSMC.cpp) \
         PC/DevLPC.cpp
  VBoxDD2_LIBS            = \
@@ -904 +905 @@
         Bus/MsiCommon.cpp \
         Bus/MsixCommon.cpp \
+        $(if $(VBOX_WITH_SMC_NEW),EFI/DevSmc.cpp,) \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \
@@ -1023 +1025 @@
   #
   VBoxDD2GC_TEMPLATE       = VBoxRc
-  VBoxDD2GC_DEFS           =
+  VBoxDD2GC_DEFS           = $(if $(VBOX_WITH_SMC_NEW),VBOX_WITH_SMC_NEW,)
   VBoxDD2GC_INCS           = build
   VBoxDD2GC_SOURCES        = \
         PC/DevAPIC.cpp \
         PC/DevIoApic.cpp \
-        PC/DevSMC.cpp
+        $(if $(VBOX_WITH_SMC_NEW),,PC/DevSMC.cpp)
   if1of ($(VBOX_LDR_FMT32), pe lx)
    VBoxDD2GC_LIBS          = \
@@ -1041 +1043 @@
  #
  VBoxDD2R0_TEMPLATE       = VBoxR0
- VBoxDD2R0_DEFS           = IN_RT_R0
+ VBoxDD2R0_DEFS           = IN_RT_R0 $(if $(VBOX_WITH_SMC_NEW),VBOX_WITH_SMC_NEW,)
  VBoxDD2R0_INCS           = build
  VBoxDD2R0_SOURCES        = \
@@ -1047 +1049 @@
         PC/DevAPIC.cpp \
         PC/DevIoApic.cpp \
-        PC/DevSMC.cpp
+        $(if $(VBOX_WITH_SMC_NEW),,PC/DevSMC.cpp)
 
  if1of ($(VBOX_LDR_FMT), pe lx)
@@ -1115 +1117 @@
  endif
 
+ #
+ # Apple SMC Utility.
+ #
+ ifdef VBOX_WITH_TESTCASES
+  PROGRAMS.darwin += VBoxSmcUtil-darwin
+  VBoxSmcUtil-darwin_TEMPLATE = VBOXR3TSTEXE
+  VBoxSmcUtil-darwin_SOURCES = EFI/VBoxSmcUtil-darwin.cpp
+  VBoxSmcUtil-darwin_LDFLAGS = -framework IOKit
+ endif
+
 endif # !VBOX_ONLY_EXTPACKS