- Move LAN headers out of main include directory.

- Add few missing functions to ndis.h.

svn path=/trunk/; revision=15573

reactos/drivers/net/lan/include/net_lan.h

@@ -1,6 +1,6 @@
 #ifndef _NET_LAN_H
 
-#include "net/wh.h"
+#include "net_wh.h"
 
 #define FSCTL_LAN_BASE FILE_DEVICE_NETWORK
 #define _LAN_CONTROL_CODE(Function, Method) \

reactos/drivers/net/lan/include/precomp.h

@@ -8,7 +8,7 @@
 #include <roscfg.h>
 #include <debug.h>
 #include <pseh.h>
-#include "net/lan.h"
+#include "net_lan.h"
 #include "lan.h"
 
 #endif/*_LAN_PRECOMP_H*/

reactos/drivers/net/lan/lan/lan.c

@@ -1208,7 +1208,6 @@ LanDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
 {
     PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
     NTSTATUS Status = STATUS_SUCCESS;
-    PFILE_OBJECT FileObject = IrpSp->FileObject;
 
     LA_DbgPrint(MID_TRACE,("LanDispatch: %d\n", IrpSp->MajorFunction));
     if( IrpSp->MajorFunction != IRP_MJ_CREATE) {

reactos/drivers/net/lan/makefile

@@ -13,6 +13,7 @@ TARGET_PCH = include/precomp.h
 # -DMEMTRACK
 TARGET_CFLAGS = \
 	-D__USE_W32API \
+	-D_SEH_NO_NATIVE_NLG \
 	-DNDIS40 \
 	-DMEMTRACK \
 	-Wall -Werror \
@@ -20,8 +21,10 @@ TARGET_CFLAGS = \
 	-I$(PATH_TO_TOP)/w32api/include \
 	-I$(PATH_TO_TOP)/include
 
-TARGET_DDKLIBS = ndis.a \
-	$(PATH_TO_TOP)/dk/w32/lib/pseh.a
+TARGET_DDKLIBS = ndis.a
+
+TARGET_LIBS = \
+	$(PATH_TO_TOP)/dk/w32/lib/libpseh.a
 
 TARGET_CLEAN = \
 	lan/*.o

reactos/w32api/include/ddk/ndis.h

@@ -3065,6 +3065,11 @@ NdisGetCurrentSystemTime(
 
 #endif
 
+NDISAPI
+CCHAR
+DDKAPI
+NdisSystemProcessorCount(VOID);
+
 NDISAPI
 VOID
 DDKAPI
@@ -5169,6 +5174,35 @@ NdisMUnmapIoSpace(
 
 
 
+/* Event functions */
+
+NDISAPI
+VOID
+DDKAPI
+NdisInitializeEvent(
+  IN PNDIS_EVENT  Event);
+
+NDISAPI
+VOID
+DDKAPI
+NdisSetEvent(
+  IN PNDIS_EVENT  Event);
+
+NDISAPI
+VOID
+DDKAPI
+NdisResetEvent(
+  IN PNDIS_EVENT  Event);
+
+NDISAPI
+BOOLEAN
+DDKAPI
+NdisWaitEvent(
+  IN PNDIS_EVENT  Event,
+  IN UINT  Timeout);
+
+
+
 /* NDIS intermediate miniport structures */
 
 typedef VOID (DDKAPI *W_MINIPORT_CALLBACK)(