Changeset 16960 in vbox

Timestamp:

Feb 19, 2009 10:13:33 PM (16 years ago)

Author:

vboxsync

Message:

#2957: VBoxNetAdp: generic and darwin parts. Not operational yet.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (2 diffs)
• src/VBox/HostDrivers/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk (modified) (2 diffs)
• src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c (added)
• src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h (added)
• src/VBox/HostDrivers/VBoxNetAdp/darwin (added)
• src/VBox/HostDrivers/VBoxNetAdp/darwin/Info.plist (added)
• src/VBox/HostDrivers/VBoxNetAdp/darwin/Makefile.kup (added)
• src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp (added)
• src/VBox/HostDrivers/VBoxNetAdp/darwin/loadnetadp.sh (added)
• src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetAdapter-darwin.cpp (deleted)
• src/VBox/Main/ConsoleImpl2.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -74 +74 @@
  INST_VBOXDRV_TIGER   = $(INST_DIST)VBoxDrvTiger.kext/
  INST_VBOXNETFLT      = $(INST_DIST)VBoxNetFlt.kext/
- INST_VBOXNETTAP      = $(INST_DIST)VBoxNetTap.kext/
+ INST_VBOXNETADP      = $(INST_DIST)VBoxNetAdp.kext/
  INST_VBOXUSB         = $(INST_DIST)VBoxUSB.kext/
  INST_VBOXUSB_TIGER   = $(INST_DIST)VBoxUSBTiger.kext/

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -353 +353 @@
                  "                            [-floppy disabled|empty|<uuid>|\n"
                  "                                     <filename>|host:<drive>]\n"
-#ifdef RT_OS_LINUX
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
                  "                            [-nic<1-N> none|null|nat|hostif|intnet|hostonly]\n"
-#else /* !RT_OS_LINUX */
+#else /* !RT_OS_LINUX && !RT_OS_DARWIN */
                  "                            [-nic<1-N> none|null|nat|hostif|intnet]\n"
-#endif /* !RT_OS_LINUX */
+#endif /* !RT_OS_LINUX && !RT_OS_DARWIN  */
                  "                            [-nictype<1-N> Am79C970A|Am79C973"
 #ifdef VBOX_WITH_E1000

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -1389 +1389 @@
                     CHECK_ERROR_RET(nic, AttachToInternalNetwork(), 1);
                 }
-#ifdef RT_OS_LINUX
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
                 else if (strcmp(nics[n], "hostonly") == 0)
                 {
@@ -1395 +1395 @@
                     CHECK_ERROR_RET(nic, AttachToHostOnlyNetwork(), 1);
                 }
-#endif /* RT_OS_LINUX */
+#endif /* defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) */
                 else
                 {

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -38 +38 @@
   endif
  endif
-
- if1of ($(KBUILD_TARGET),solaris)
+ if1of ($(KBUILD_TARGET), darwin solaris)
   ifdef VBOX_WITH_NETADP
    include $(PATH_SUB_CURRENT)/VBoxNetAdp/Makefile.kmk

trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk

@@ -23 +23 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-if1of ($(KBUILD_TARGET), solaris)
+
+if1of ($(KBUILD_TARGET), solaris darwin)
 #
 # vboxnetadp(.o) - The lower case driver.
@@ -31 +32 @@
 SYSMODS += vboxnetadp
 vboxnetadp_TEMPLATE         = VBOXR0DRV
+vboxnetadp_INST = $(INST_VBOXNETADP)$(if $(eq $(KBUILD_TARGET),darwin),Contents/MacOS/)
 vboxnetadp_NAME.solaris     = vboxnet
-vboxnetadp_DEFS             = IN_RT_R0
-vboxnetadp_DEFS.solaris    += VBOX_SVN_REV=$(VBOX_SVN_REV)
+vboxnetadp_DEFS             = IN_RT_R0 VBOX_SVN_REV=$(VBOX_SVN_REV) IN_SUP_STATIC
 vboxnetadp_DEPS.solaris    += $(VBOX_SVN_REV_KMK)
 vboxnetadp_LDFLAGS.solaris += -N misc/gld
-vboxnetflt_INCS            := \
+vboxnetadp_LDFLAGS.darwin   = -v -Wl,-whyload -Wl,-v -Wl,-whatsloaded
+vboxnetadp_INCS            := \
         $(PATH_SUB_CURRENT)
 vboxnetadp_LIBS            += \
+        $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
+vboxnetadp_LIBS.solaris    += \
         $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
 vboxnetadp_SOURCES.solaris = solaris/VBoxNetAdp-solaris.c
+vboxnetadp_SOURCES.darwin  = darwin/VBoxNetAdp-darwin.cpp
+vboxnetadp_SOURCES         = VBoxNetAdp.c
  endif
 endif
+
+# Darwin extras.
+ifeq ($(KBUILD_TARGET),darwin)
+INSTALLS += VBoxNetAdp.kext
+VBoxNetAdp.kext_INST     = $(INST_VBOXNETADP)Contents/
+VBoxNetAdp.kext_SOURCES  = \
+        $(PATH_VBoxNetAdp.kext)/Info.plist
+VBoxNetAdp.kext_CLEAN    = \
+        $(PATH_VBoxNetAdp.kext)/Info.plist
+
+$$(PATH_VBoxNetAdp.kext)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
+        $(call MSG_GENERATE,VBoxNetAdp,$@,$<)
+        $(xQUIET)$(RM) -f $@
+        $(xQUIET)$(SED) \
+                -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
+                -e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
+                -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
+                -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
+                --output $@ \
+                $<
+
+INSTALLS.darwin += Scripts-darwin-adp
+Scripts-darwin-adp_INST = $(INST_DIST)
+Scripts-darwin-adp_SOURCES = \
+        darwin/loadnetadp.sh
+endif # darwin
 
 include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1639 +1639 @@
                 rc = CFGMR3InsertString(pCfg, "Trunk", "vboxnet0");             RC_CHECK();
                 rc = CFGMR3InsertString(pCfg, "Network", "HostInterfaceNetworking-vboxnet0"); RC_CHECK();
-#ifdef RT_OS_WINDOWS
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_DARWIN)
                 /* TODO: set the proper Trunk and Network values, currently the driver uses the first adapter instance */
                 rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp); RC_CHECK();