PERFORCE change 57612 for review

[Scott Long]

http://perforce.freebsd.org/chv.cgi?CH=57612

Change 57612 by scottl at scottl-junior on 2004/07/18 07:25:14

	Make ntoskern.ko compile in its new location.

Affected files ...

.. //depot/projects/sonofevil/src/sys/compat/ntoskern/kern_ndis.c#2 edit
.. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_hal.c#2 edit
.. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_ndis.c#2 edit
.. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_ntoskrnl.c#2 edit
.. //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_pe.c#2 edit
.. //depot/projects/sonofevil/src/sys/modules/ntoskern/Makefile#2 edit

Differences ...

==== //depot/projects/sonofevil/src/sys/compat/ntoskern/kern_ndis.c#2 (text+ko) ====

@@ -67,12 +67,12 @@
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_ioctl.h>
 
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/ndis_var.h>
-#include <compat/ndis/hal_var.h>
-#include <compat/ndis/cfg_var.h>
+#include <compat/ntoskern/pe_var.h>
+#include <compat/ntoskern/resource_var.h>
+#include <compat/ntoskern/ntoskrnl_var.h>
+#include <compat/ntoskern/ndis_var.h>
+#include <compat/ntoskern/hal_var.h>
+#include <compat/ntoskern/cfg_var.h>
 #include <dev/if_ndis/if_ndisvar.h>
 
 #define NDIS_DUMMY_PATH "\\\\some\\bogus\\path"

==== //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_hal.c#2 (text+ko) ====

@@ -53,9 +53,9 @@
 #include <sys/bus.h>
 #include <sys/rman.h>
 
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/hal_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
+#include <compat/ntoskern/pe_var.h>
+#include <compat/ntoskern/hal_var.h>
+#include <compat/ntoskern/ntoskrnl_var.h>
 
 #define FUNC void(*)(void)
 

==== //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_ndis.c#2 (text+ko) ====

@@ -95,12 +95,12 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/hal_var.h>
-#include <compat/ndis/ndis_var.h>
-#include <compat/ndis/cfg_var.h>
+#include <compat/ntoskern/pe_var.h>
+#include <compat/ntoskern/resource_var.h>
+#include <compat/ntoskern/ntoskrnl_var.h>
+#include <compat/ntoskern/hal_var.h>
+#include <compat/ntoskern/ndis_var.h>
+#include <compat/ntoskern/cfg_var.h>
 #include <dev/if_ndis/if_ndisvar.h>
 
 #define FUNC void(*)(void)
@@ -297,7 +297,7 @@
 int
 ndis_libinit()
 {
-	strcpy(ndis_filepath, "/compat/ndis");
+	strcpy(ndis_filepath, "/compat/ntoskern");
 	return(0);
 }
 

==== //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_ntoskrnl.c#2 (text+ko) ====

@@ -59,11 +59,11 @@
 #include <sys/bus.h>
 #include <sys/rman.h>
 
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/hal_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/ndis_var.h>
+#include <compat/ntoskern/pe_var.h>
+#include <compat/ntoskern/hal_var.h>
+#include <compat/ntoskern/resource_var.h>
+#include <compat/ntoskern/ntoskrnl_var.h>
+#include <compat/ntoskern/ndis_var.h>
 
 #define __regparm __attribute__((regparm(3)))
 

==== //depot/projects/sonofevil/src/sys/compat/ntoskern/subr_pe.c#2 (text+ko) ====

@@ -60,7 +60,7 @@
 #include <string.h>
 #endif
 
-#include <compat/ndis/pe_var.h>
+#include <compat/ntoskern/pe_var.h>
 
 static vm_offset_t pe_functbl_match(image_patch_table *, char *);
 

==== //depot/projects/sonofevil/src/sys/modules/ntoskern/Makefile#2 (text+ko) ====

@@ -1,8 +1,8 @@
 # $FreeBSD: src/sys/modules/ndis/Makefile,v 1.6 2004/03/07 02:49:06 wpaul Exp $
 
-.PATH: ${.CURDIR}/../../compat/ndis
+.PATH: ${.CURDIR}/../../compat/ntoskern
 
-KMOD=	ndis
+KMOD=	ntoskern
 SRCS=	subr_pe.c subr_ndis.c subr_hal.c subr_ntoskrnl.c kern_ndis.c
 SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h vnode_if.h