Changeset 56263 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Jun 5, 2015 3:22:11 PM (10 years ago)

Author:

vboxsync

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

100838

Message:

NetAdp: Properly moved VBoxNetAdp6 driver to VBoxNetAdp/win (#7849)

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• Makefile.kmk (modified) (3 diffs)
• win/drv/VBoxNetLwf-win.cpp (copied) (copied from trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.cpp ) (1 diff)
• win/drv/VBoxNetLwf-win.h (copied) (copied from trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.h )
• win/drv/VBoxNetLwf.inf (copied) (copied from trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf.inf )
• win/ndis6 (deleted)

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

@@ -157 +157 @@
  VBoxNetLwf_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK)INCS
  VBoxNetLwf_SOURCES.win = \
-        win/ndis6/VBoxNetLwf-win.cpp
-#       win/drv/VBoxNetLwfRt-win.cpp \
-#       win/drv/VBoxNetLwf-win.rc
+        win/drv/VBoxNetLwf-win.cpp
  # with WINDDKWLH the WIN9X_COMPAT_SPINLOCK is needed to avoid inline declaration of KeInitializeSpinLock
  # otherwise the linker would complain about dumplicate _KeInitializeSpinLock@4 definition
@@ -192 +190 @@
  VBoxNetLwf-inf_BLDDIRS = $(PATH_TARGET)/VBoxNetLwfCat.dir
 
-$(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.inf: $(PATH_SUB_CURRENT)/win/ndis6/VBoxNetLwf.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+$(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.inf: $(PATH_SUB_CURRENT)/win/drv/VBoxNetLwf.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_GENERATE,VBoxNetLwf-inf,$@,$<)
         $(call VBOX_EDIT_INF_FN,$<,$@)
@@ -445 +443 @@
                 $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.sys \
                 $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.inf
-        $(call MSG_TOOL,Inf2Cat,VBoxNetFlt-inf,$@,$<)
-        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
-
- endif #  ifdef VBOX_SIGNING_MODE
-
- #
- # VBoxNetAdp6.sys - The VirtualBox Adapter miniport driver.
- #
- SYSMODS.win += VBoxNetAdp6
- VBoxNetAdp6_TEMPLATE = VBOXR0DRV
- #VBoxNetAdp6_INST = $(INST_VBOXNETADP)
- if defined(VBOX_SIGNING_MODE)
-  VBoxNetAdp6_INSTTYPE.win = none
-  VBoxNetAdp6_DEBUG_INSTTYPE.win = both
- endif
- VBoxNetAdp6_DEFS = IN_RT_R0 IN_SUP_STATIC
- VBoxNetAdp6_INCS := $(PATH_SUB_CURRENT)
- VBoxNetAdp6_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK)INCS
- VBoxNetAdp6_SOURCES = \
-        win/ndis6/VBoxNetAdp-win.cpp \
-        win/ndis6/VBoxNetAdp-win.rc
- VBoxNetAdp6_DEFS += NDIS_MINIPORT_DRIVER NDIS_WDM=1 BINARY_COMPATIBLE=0
- VBoxNetAdp6_DEFS += NDIS60_MINIPORT=1 NDIS60=1
- VBoxNetAdp6_LDFLAGS.win.x86 = -Entry:DriverEntry@8
- VBoxNetAdp6_LDFLAGS.win.amd64 = -Entry:DriverEntry
- VBoxNetAdp6_LIBS.win = \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ntoskrnl.lib \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/hal.lib \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ndis.lib \
-        $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
- VBoxNetAdp6_LIBS = \
-        $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
-
-
- INSTALLS.win += VBoxNetAdp6-inf
- VBoxNetAdp6-inf_INST = $(INST_BIN)
- VBoxNetAdp6-inf_MODE = a+r,u+w
- VBoxNetAdp6-inf_SOURCES = \
-        $(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.inf
- VBoxNetAdp6-inf_CLEAN = $(VBoxNetAdp6-inf_SOURCES)
- VBoxNetAdp6-inf_BLDDIRS = $(PATH_TARGET)/VBoxNetAdp6Cat.dir
-
-$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.inf: $(PATH_SUB_CURRENT)/win/ndis6/VBoxNetAdp6.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
-        $(call MSG_GENERATE,VBoxNetAdp6-inf,$@,$<)
-        $(call VBOX_EDIT_INF_FN,$<,$@)
-
- ifdef VBOX_SIGNING_MODE
-VBoxNetAdp6-inf_SOURCES += \
-        $(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.sys \
-        $(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.cat
-
-$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.sys: $$(VBoxNetAdp6_1_TARGET) | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.cat: \
-                $(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.sys \
-                $(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.inf
         $(call MSG_TOOL,Inf2Cat,VBoxNetFlt-inf,$@,$<)
         $(call VBOX_MAKE_CAT_FN, $(@D),$@)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp

@@ -88 +88 @@
 
 #include "VBoxNetLwf-win.h"
-#include "VBoxNetCmn-win.h"
+#include "VBox/VBoxNetCmn-win.h"
 
 /* Forward declarations */