- Get NE2000 driver to build on msvc/ddk.

svn path=/trunk/; revision=20672

diff --git a/reactos/drivers/net/dd/ne2000/include/ne2000.h b/reactos/drivers/net/dd/ne2000/include/ne2000.h
index 56a63c7..785aa47 100644 (file)
--- a/reactos/drivers/net/dd/ne2000/include/ne2000.h
+++ b/reactos/drivers/net/dd/ne2000/include/ne2000.h
@@ -7,6 +7,9 @@
 #ifndef __NE2000_H
 #define __NE2000_H
 
 #ifndef __NE2000_H
 #define __NE2000_H
 

+#define NDIS_MINIPORT_DRIVER 1
+#define NDIS_LEGACY_MINIPORT 1
+#define NDIS51_MINIPORT 1

 #include <ndis.h>
 #include <8390.h>
 #include <debug.h>
 #include <ndis.h>
 #include <8390.h>
 #include <debug.h>


@@ -59,7 +62,7 @@ typedef struct _MINIPORT_RESERVED
     PNDIS_PACKET Next;
 } MINIPORT_RESERVED, *PMINIPORT_RESERVED;
 
     PNDIS_PACKET Next;
 } MINIPORT_RESERVED, *PMINIPORT_RESERVED;
 

-#define RESERVED(Packet) ((PMINIPORT_RESERVED)((Packet)->u.s1.MiniportReserved))
+#define RESERVED(Packet) ((PMINIPORT_RESERVED)((Packet)->MiniportReserved))

 
 typedef UCHAR DRIVER_HARDWARE_ADDRESS[DRIVER_LENGTH_OF_ADDRESS];
 
 
 typedef UCHAR DRIVER_HARDWARE_ADDRESS[DRIVER_LENGTH_OF_ADDRESS];
 

diff --git a/reactos/w32api/include/ddk/ndis.h b/reactos/w32api/include/ddk/ndis.h
index c6d6b32..76cd5d3 100644 (file)
--- a/reactos/w32api/include/ddk/ndis.h
+++ b/reactos/w32api/include/ddk/ndis.h
@@ -412,15 +412,15 @@ typedef struct _NDIS_PACKET {
     struct {
       UCHAR  MiniportReserved[2 * sizeof(PVOID)];
       UCHAR  WrapperReserved[2 * sizeof(PVOID)];
     struct {
       UCHAR  MiniportReserved[2 * sizeof(PVOID)];
       UCHAR  WrapperReserved[2 * sizeof(PVOID)];

-    } s1;
+    };

     struct {
       UCHAR  MiniportReservedEx[3 * sizeof(PVOID)];
       UCHAR  WrapperReservedEx[sizeof(PVOID)];
     struct {
       UCHAR  MiniportReservedEx[3 * sizeof(PVOID)];
       UCHAR  WrapperReservedEx[sizeof(PVOID)];

-    } s2;
+    };

     struct {
       UCHAR  MacReserved[4 * sizeof(PVOID)];
     struct {
       UCHAR  MacReserved[4 * sizeof(PVOID)];

-    } s3;
-  } u;
+    };
+  };

   ULONG_PTR  Reserved[2];
   UCHAR  ProtocolReserved[1];
 } NDIS_PACKET, *PNDIS_PACKET, **PPNDIS_PACKET;
   ULONG_PTR  Reserved[2];
   UCHAR  ProtocolReserved[1];
 } NDIS_PACKET, *PNDIS_PACKET, **PPNDIS_PACKET;