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

Timestamp:

May 1, 2018 9:49:18 PM (7 years ago)

Author:

vboxsync

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

122466

Message:

Devices/Makefile.kmk: Add VBOX_WITH_NEW_SERIAL to turn on the new serial port emulation (work in progress, disabled by default of course)

File:

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

trunk/src/VBox/Devices/Makefile.kmk

@@ -168 +168 @@
         PC/DevIoApic.cpp \
         Storage/DevFdc.cpp \
-        Serial/DevSerial.cpp \
         Parallel/DevParallel.cpp \
         \
@@ -177 +176 @@
         PC/DrvACPI.cpp \
         PC/DrvAcpiCpu.cpp \
-        Serial/DrvChar.cpp \
         Serial/DrvNamedPipe.cpp \
         Serial/DrvTCP.cpp \
@@ -195 +193 @@
  ifn1of ($(KBUILD_TARGET), darwin freebsd os2 solaris)
   VBoxDD_SOURCES += Storage/DrvHostFloppy.cpp
+ endif
+
+ if defined(VBOX_WITH_NEW_SERIAL)
+  VBoxDD_SOURCES += \
+        Serial/DevSerialNew.cpp \
+        Serial/DrvCharNew.cpp \
+        Serial/DrvHostSerialNew.cpp
+ else
+  VBoxDD_SOURCES += \
+        Serial/DevSerial.cpp \
+        Serial/DrvChar.cpp
+   ifn1of ($(KBUILD_TARGET), os2)
+   VBoxDD_SOURCES += \
+        Serial/DrvHostSerial.cpp
+   endif
  endif
 
@@ -726 +739 @@
  # --- OS specific driver hacks. ---
 
- ifeq ($(KBUILD_TARGET),darwin)
-  VBoxDD_SOURCES.darwin += Serial/DrvHostSerial.cpp
- endif # darwin
-
  ifeq ($(KBUILD_TARGET),freebsd)
-  VBoxDD_SOURCES += Serial/DrvHostSerial.cpp
   VBoxDD_SOURCES.freebsd += Network/DrvTAP.cpp
  endif # freebsd
@@ -737 +745 @@
  VBoxDD_SOURCES.linux += \
         Network/DrvTAP.cpp \
-        Parallel/DrvHostParallel.cpp \
-        Serial/DrvHostSerial.cpp
+        Parallel/DrvHostParallel.cpp
 
  ifeq ($(KBUILD_TARGET),solaris)
-  VBoxDD_SOURCES.solaris += Serial/DrvHostSerial.cpp
   ifdef VBOX_WITH_SUID_WRAPPER
    VBoxDD_DEFS += VBOX_WITH_SUID_WRAPPER
@@ -749 +755 @@
  VBoxDD_DEFS.win += VBOX_WITH_WIN_PARPORT_SUP
  VBoxDD_SOURCES.win += \
-        Serial/DrvHostSerial.cpp \
         Parallel/DrvHostParallel.cpp
 
@@ -763 +768 @@
    VBoxDD_DEFS.win += VBOX_NETFLT_ONDEMAND_BIND
   endif
- endif
-
- if defined(VBOX_WITH_NEW_DRVHOSTSERIAL)
-  VBoxDD_SOURCES.linux := \
-        $(filter-out Serial/DrvHostSerial.cpp, $(VBoxDD_SOURCES.linux)) \
-        Serial/DrvHostSerialNew.cpp
-
-  VBoxDD_SOURCES.darwin := \
-        $(filter-out Serial/DrvHostSerial.cpp, $(VBoxDD_SOURCES.darwin)) \
-        Serial/DrvHostSerialNew.cpp
-
-  VBoxDD_SOURCES.win := \
-        $(filter-out Serial/DrvHostSerial.cpp, $(VBoxDD_SOURCES.win)) \
-        Serial/DrvHostSerialNew.cpp
-
-  VBoxDD_SOURCES.freebsd := \
-        $(filter-out Serial/DrvHostSerial.cpp, $(VBoxDD_SOURCES.freebsd)) \
-        Serial/DrvHostSerialNew.cpp
-
-  VBoxDD_SOURCES.solaris := \
-        $(filter-out Serial/DrvHostSerial.cpp, $(VBoxDD_SOURCES.solaris)) \
-        Serial/DrvHostSerialNew.cpp
  endif
 
@@ -1030 +1013 @@
    VBoxDDGC_SOURCES    += \
         Storage/DevNVMe.cpp
+  endif
+
+  if defined(VBOX_WITH_NEW_SERIAL)
+   VBoxDDRC_SOURCES := \
+        $(filter-out Serial/DevSerial.cpp, $(VBoxDDRC_SOURCES)) \
+        Serial/DevSerialNew.cpp
   endif
 
@@ -1201 +1190 @@
  endif
 
+ if defined(VBOX_WITH_NEW_SERIAL)
+  VBoxDDR0_SOURCES := \
+        $(filter-out Serial/DevSerial.cpp, $(VBoxDDR0_SOURCES)) \
+        Serial/DevSerialNew.cpp
+ endif
+
  ifdef VBOX_WITH_HGSMI
   VBoxDDR0_DEFS         += VBOX_WITH_HGSMI