[ros-diffs] [ion] 20672: - Get NE2000 driver to build on msvc/ddk.

[ion at svn.reactos.org]

- Get NE2000 driver to build on msvc/ddk.
Modified: trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h
Modified: trunk/reactos/w32api/include/ddk/ndis.h
  _____  

Modified: trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h
--- trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h
2006-01-07 21:38:40 UTC (rev 20671)
+++ trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h
2006-01-07 21:45:51 UTC (rev 20672)
@@ -7,6 +7,9 @@

 #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>
@@ -59,7 +62,7 @@
     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];
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ndis.h
--- trunk/reactos/w32api/include/ddk/ndis.h	2006-01-07 21:38:40 UTC
(rev 20671)
+++ trunk/reactos/w32api/include/ddk/ndis.h	2006-01-07 21:45:51 UTC
(rev 20672)
@@ -412,15 +412,15 @@

     struct {
       UCHAR  MiniportReserved[2 * sizeof(PVOID)];
       UCHAR  WrapperReserved[2 * sizeof(PVOID)];
-    } s1;
+    };
     struct {
       UCHAR  MiniportReservedEx[3 * sizeof(PVOID)];
       UCHAR  WrapperReservedEx[sizeof(PVOID)];
-    } s2;
+    };
     struct {
       UCHAR  MacReserved[4 * sizeof(PVOID)];
-    } s3;
-  } u;
+    };
+  };
   ULONG_PTR  Reserved[2];
   UCHAR  ProtocolReserved[1];
 } NDIS_PACKET, *PNDIS_PACKET, **PPNDIS_PACKET;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20060107/ec9653ee/attachment.html