Changeset 46035 in vbox for trunk/src/VBox/Devices

Timestamp:

May 13, 2013 4:47:40 PM (12 years ago)

Author:

vboxsync

Message:

Remove L4 support from main tree.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (7 diffs)
• Network/DrvTAP.cpp (modified) (1 diff)
• Storage/DrvHostDVD.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -97 +97 @@
         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Newdev.lib
  endif
- ifeq ($(KBUILD_TARGET),l4)
-  VBoxDDU_LIBS           += \
-        $(L4_LIBDIR)/libl4sys.p.a
- endif
  VBoxDDU_LDFLAGS.darwin   = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDDU.dylib
  ifdef VBOX_WITH_USB
@@ -109 +105 @@
 
  VBoxDDU_LDFLAGS.linux    = -Wl,--no-undefined
- VBoxDDU_LDFLAGS.l4       = -Wl,--no-undefined
-
- #
- # VBoxDDULnxHostR3 (Only needed for l4, currently for executing vditool on L4Linux.)
- #
- ifeq ($(KBUILD_TARGET),l4)
-  LIBRARIES                += VBoxDDULnxHostR3
-  VBoxDDULnxHostR3_TEMPLATE = VBOXLNXHOSTR3LIB
-  VBoxDDULnxHostR3_DEFS     = IN_VBOXDDU
-  VBoxDDULnxHostR3_SOURCES  = $(VBoxDDU_SOURCES)
- endif
 
  #
@@ -212 +197 @@
         -framework DiskArbitration
  VBoxDD_LDFLAGS.linux    = -Wl,--no-undefined
- VBoxDD_LDFLAGS.l4       = -Wl,--no-undefined
 
  # --- Tracing bits. ---
@@ -287 +271 @@
         $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)
   VBoxDD_SOURCES.linux  += \
-        USB/USBProxyDevice.cpp \
-        USB/linux/USBProxyDevice-linux.cpp
-
-  VBoxDD_DEFS.l4        += VUSB_HAVE_USBPROXY_DEVICE
-  VBoxDD_SOURCES.l4     += \
         USB/USBProxyDevice.cpp \
         USB/linux/USBProxyDevice-linux.cpp
@@ -599 +578 @@
  endif # freebsd
 
- ifeq ($(KBUILD_TARGET),l4)
-  $(error L4 is busted. Fix when needed.)
-  #VBoxDD_SOURCES      = filter needed
-  VBoxDD_SOURCES.l4    += \
-        Audio/ossaudio.c
- endif # l4
-
  VBoxDD_SOURCES.linux  += \
         Network/DrvTAP.cpp \
@@ -659 +631 @@
         $(VBoxDDU_1_STAGE_TARGET) \
         $(VBoxDD2_1_STAGE_TARGET)
- endif
- ifeq ($(KBUILD_TARGET),l4)
-  VBoxDD_LIBS           += \
-        $(L4_LIBDIR)/libl4sys.p.a
  endif
 
@@ -883 +851 @@
         $(LIB_VMM) \
         $(LIB_RUNTIME)
- ifeq ($(KBUILD_TARGET),l4)
- VBoxDD2_LIBS           += \
-        $(L4_LIBDIR)/libl4sys.p.a
- endif
  VBoxDD2_LIBS.darwin    += $(LIB_REM)
  VBoxDD2_LDFLAGS.darwin  = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDD2.dylib
  VBoxDD2_LDFLAGS.linux   = -Wl,--no-undefined
- VBoxDD2_LDFLAGS.l4      = -Wl,--no-undefined
 
  ifdef VBOX_WITH_PXE_ROM

trunk/src/VBox/Devices/Network/DrvTAP.cpp

@@ -63 +63 @@
 #include <errno.h>
 #include <unistd.h>
-
-#ifdef RT_OS_L4
-# include <l4/vboxserver/file.h>
-#endif
 
 #include "VBoxDD.h"

trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp

@@ -34 +34 @@
 # include <mach/mach_error.h>
 # define USE_MEDIA_POLLING
-
-#elif defined(RT_OS_L4)
-/* nothing (yet). */
 
 #elif defined RT_OS_LINUX
@@ -438 +435 @@
         rc = VERR_DEV_IO_ERROR;
 
-#elif defined(RT_OS_L4)
-    /* Not really ported to L4 yet. */
-    rc = VERR_INTERNAL_ERROR;
-
 #elif defined(RT_OS_LINUX)
     int direction;
@@ -778 +771 @@
 #endif
 
-#ifndef RT_OS_L4 /* Passthrough is not supported on L4 yet */
             bool fPassthrough;
             rc = CFGMR3QueryBool(pCfg, "Passthrough", &fPassthrough);
@@ -786 +778 @@
                 /* Passthrough requires opening the device in R/W mode. */
                 pThis->fReadOnlyConfig = false;
-# ifdef VBOX_WITH_SUID_WRAPPER  /* Solaris setuid for Passthrough mode. */
+#ifdef VBOX_WITH_SUID_WRAPPER  /* Solaris setuid for Passthrough mode. */
                 rc = solarisCheckUserAuth();
                 if (RT_FAILURE(rc))
@@ -793 +785 @@
                     return rc;
                 }
-# endif /* VBOX_WITH_SUID_WRAPPER */
+#endif /* VBOX_WITH_SUID_WRAPPER */
             }
-#endif /* !RT_OS_L4 */
 
             pThis->IMount.pfnUnmount = drvHostDvdUnmount;