From 827234d64e6f11cc8cd557638679441cc96095fa Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 28 May 2005 11:09:34 +0000
Subject: [PATCH] Use W32API.

svn path=/trunk/; revision=15569
---
 reactos/drivers/net/dd/ne2000/Makefile         |  2 +-
 reactos/drivers/net/dd/ne2000/include/ne2000.h | 11 +----------
 reactos/drivers/net/dd/ne2000/ne2000/main.c    |  4 ++--
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/reactos/drivers/net/dd/ne2000/Makefile b/reactos/drivers/net/dd/ne2000/Makefile
index c5df070a56e..258b9c49b10 100644
--- a/reactos/drivers/net/dd/ne2000/Makefile
+++ b/reactos/drivers/net/dd/ne2000/Makefile
@@ -6,7 +6,7 @@ TARGET_TYPE = driver
 
 TARGET_NAME = ne2000
 
-TARGET_CFLAGS = -I./include -Werror -Wall
+TARGET_CFLAGS = -I./include -D__USE_W32API -Werror -Wall
 
 TARGET_OBJECTS = \
   ne2000/8390.o \
diff --git a/reactos/drivers/net/dd/ne2000/include/ne2000.h b/reactos/drivers/net/dd/ne2000/include/ne2000.h
index 4495faa6af7..2185c356b31 100644
--- a/reactos/drivers/net/dd/ne2000/include/ne2000.h
+++ b/reactos/drivers/net/dd/ne2000/include/ne2000.h
@@ -7,16 +7,7 @@
 #ifndef __NE2000_H
 #define __NE2000_H
 
-#ifdef _MSC_VER
-
-#ifndef ULONG_PTR
-#define ULONG ULONG_PTR
-#endif
-
-#include <ndis.h>
-#else
-#include <net/ndis.h>
-#endif
+#include <ddk/ndis.h>
 #include <8390.h>
 #include <debug.h>
 
diff --git a/reactos/drivers/net/dd/ne2000/ne2000/main.c b/reactos/drivers/net/dd/ne2000/ne2000/main.c
index 1fb9d99673a..c8f0e2516c9 100644
--- a/reactos/drivers/net/dd/ne2000/ne2000/main.c
+++ b/reactos/drivers/net/dd/ne2000/ne2000/main.c
@@ -844,9 +844,9 @@ DriverEntry(
     Miniport.QueryInformationHandler    = MiniportQueryInformation;
     Miniport.ReconfigureHandler         = MiniportReconfigure;
     Miniport.ResetHandler               = MiniportReset;
-    Miniport.u1.SendHandler             = MiniportSend;
+    Miniport.SendHandler                = MiniportSend;
     Miniport.SetInformationHandler      = MiniportSetInformation;
-    Miniport.u2.TransferDataHandler     = MiniportTransferData;
+    Miniport.TransferDataHandler        = MiniportTransferData;
 
     NdisMInitializeWrapper(&NdisWrapperHandle,
                            DriverObject,