Changeset 17796 in vbox

Timestamp:

Mar 13, 2009 9:37:44 AM (16 years ago)

Author:

vboxsync

Message:

OSE: export iSCSI initiator, plus minor ifdef cleanup

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (4 diffs)
• src/VBox/Devices/Storage/DrvVD.cpp (modified) (6 diffs)
• src/VBox/Devices/Storage/ISCSIHDDCore.cpp (added)

trunk/Config.kmk

@@ -312 +312 @@
 # Enable the USB 2.0 controller
 VBOX_WITH_EHCI = 1
-# Enable the ISCSI feature.
+# Enable the ISCSI feature, with INIP support.
 VBOX_WITH_ISCSI = 1
+VBOX_WITH_INIP = 1
 # Enable the E1000 feature
 VBOX_WITH_E1000 = 1
@@ -572 +573 @@
  VBOX_WITH_DOCS=
  VBOX_WITH_ISCSI=
+ VBOX_WITH_INIP=
  VBOX_WITH_INTERNAL_NETWORKING=
  VBOX_WITH_PDM_ASYNC_COMPLETION=
@@ -645 +647 @@
  VBOX_WITH_USB=
  VBOX_WITH_EHCI=
- VBOX_WITH_ISCSI=
  VBOX_WITH_VMI=
  ifn1of ($(KBUILD_TARGET), darwin linux solaris)

trunk/src/VBox/Devices/Makefile.kmk

@@ -140 +140 @@
 ifdef VBOX_WITH_ISCSI
  VBoxDD_DEFS           += VBOX_WITH_ISCSI
+ ifdef VBOX_WITH_INIP
+  VBoxDD_DEFS          += VBOX_WITH_INIP
+ endif
 endif
 ifdef VBOX_WITH_E1000
@@ -146 +149 @@
 ifdef VBOX_WITH_BUSLOGIC
  VBoxDD_DEFS           += VBOX_WITH_BUSLOGIC
-endif
-ifndef VBOX_OSE
- VBoxDD_DEFS           += VBOX_WITH_INIP
 endif
 ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
@@ -289 +289 @@
 endif
 
-ifndef VBOX_OSE
+ifdef VBOX_WITH_INIP
 DevicesR3_INCS         += \
         Network/lwip/src/include \
@@ -362 +362 @@
 DevicesR3_SOURCES         += EFI/DevEFI.cpp
 VBoxDD_LIBS               += $(PATH_LIB)/EfiThunk$(VBOX_SUFF_LIB)
-EFI/DevEFI.cpp_INCS       += EFI/tools/include 
-EFI/DevEFI.cpp_INCS.x86   += EFI/tools/include/Ia32 
-EFI/DevEFI.cpp_INCS.amd64 += EFI/tools/include/X64 
+EFI/DevEFI.cpp_INCS       += EFI/tools/include
+EFI/DevEFI.cpp_INCS.x86   += EFI/tools/include/Ia32
+EFI/DevEFI.cpp_INCS.amd64 += EFI/tools/include/X64
 endif
 

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

@@ -35 +35 @@
 #include <iprt/tcp.h>
 
-#ifndef VBOX_OSE
+#ifdef VBOX_WITH_INIP
 /* All lwip header files are not C++ safe. So hack around this. */
 __BEGIN_DECLS
@@ -42 +42 @@
 #include <lwip/sockets.h>
 __END_DECLS
-#endif /* !VBOX_OSE */
+#endif /* VBOX_WITH_INIP */
 
 #include "Builtins.h"
 
-#ifndef VBOX_OSE
+#ifdef VBOX_WITH_INIP
 /* Small hack to get at lwIP initialized status */
 extern bool DevINIPConfigured(void);
-#endif /* !VBOX_OSE */
+#endif /* VBOX_WITH_INIP */
 
 
@@ -305 +305 @@
 
 
-#ifndef VBOX_OSE
+#ifdef VBOX_WITH_INIP
 /*******************************************************************************
 *   VD TCP network stack interface implementation - INIP case                  *
@@ -460 +460 @@
     return VINF_SUCCESS;
 }
-#endif /* !VBOX_OSE */
+#endif /* VBOX_WITH_INIP */
 
 
@@ -925 +925 @@
         else
         {
-#ifdef VBOX_OSE
+#ifndef VBOX_WITH_INIP
             rc = PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
-                                     RT_SRC_POS, N_("DrvVD: Configuration error: TCP over Internal Networking not supported in VirtualBox OSE"));
-#else /* !VBOX_OSE */
+                                     RT_SRC_POS, N_("DrvVD: Configuration error: TCP over Internal Networking not compiled in"));
+#else /* VBOX_WITH_INIP */
             pThis->VDITcpNetCallbacks.cbSize = sizeof(VDINTERFACETCPNET);
             pThis->VDITcpNetCallbacks.enmInterface = VDINTERFACETYPE_TCPNET;
@@ -937 +937 @@
             pThis->VDITcpNetCallbacks.pfnWrite = drvvdINIPWrite;
             pThis->VDITcpNetCallbacks.pfnFlush = drvvdINIPFlush;
-#endif /* !VBOX_OSE */
+#endif /* VBOX_WITH_INIP */
         }
         if (RT_SUCCESS(rc))