[cgutman] 40944: - Fix NDIS 3.0 miniport characteristics based on MSDN documentation - Add NDIS 5.1 miniport characteristics also based on MSDN documentation

Author: cgutman
Date: Sun May 17 02:43:25 2009
New Revision: 40944

URL: http://svn.reactos.org/svn/reactos?rev=40944&view=rev
Log:
 - Fix NDIS 3.0 miniport characteristics based on MSDN documentation
 - Add NDIS 5.1 miniport characteristics also based on MSDN documentation

Modified:
    trunk/reactos/include/ddk/ndis.h

Modified: trunk/reactos/include/ddk/ndis.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=4094...
==============================================================================
--- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Sun May 17 02:43:25 2009
@@ -3708,7 +3708,6 @@
 #define NDIS30_MINIPORT_CHARACTERISTICS_S \
   UCHAR  MajorNdisVersion; \
   UCHAR  MinorNdisVersion; \
-  USHORT Filler; \
   UINT  Reserved; \
   W_CHECK_FOR_HANG_HANDLER  CheckForHangHandler; \
   W_DISABLE_INTERRUPT_HANDLER  DisableInterruptHandler; \
@@ -3720,15 +3719,9 @@
   W_QUERY_INFORMATION_HANDLER  QueryInformationHandler; \
   W_RECONFIGURE_HANDLER  ReconfigureHandler; \
   W_RESET_HANDLER  ResetHandler; \
-  _ANONYMOUS_UNION union { \
-    W_SEND_HANDLER  SendHandler; \
-    WM_SEND_HANDLER  WanSendHandler; \
-  } _UNION_NAME(u1); \
+  W_SEND_HANDLER  SendHandler; \
   W_SET_INFORMATION_HANDLER  SetInformationHandler; \
-  _ANONYMOUS_UNION union { \
-    W_TRANSFER_DATA_HANDLER  TransferDataHandler; \
-    WM_TRANSFER_DATA_HANDLER  WanTransferDataHandler; \
-  } _UNION_NAME(u2);
+  W_TRANSFER_DATA_HANDLER  TransferDataHandler;

typedef struct _NDIS30_MINIPORT_CHARACTERISTICS {
   NDIS30_MINIPORT_CHARACTERISTICS_S
@@ -3848,10 +3841,42 @@
   IN NDIS_HANDLE  MiniportAdapterContext,
   IN PVOID  CancelId);

+typedef VOID DDKAPI
+(*W_PNP_EVENT_NOTIFY_HANDLER)(
+  IN NDIS_HANDLE  MiniportAdapterContext,
+  IN NDIS_DEVICE_PNP_EVENT  PnPEvent,
+  IN PVOID  InformationBuffer,
+  IN ULONG  InformationBufferLength);
+
+typedef VOID DDKAPI
+(*W_MINIPORT_SHUTDOWN_HANDLER)(
+  IN PVOID  ShutdownContext);
+
+#ifdef __cplusplus
+
+#define NDIS51_MINIPORT_CHARACTERISTICS_S \
+  NDIS50_MINIPORT_CHARACTERISTICS  Ndis50Chars; \
+  W_CANCEL_SEND_PACKETS_HANDLER  CancelSendPacketsHandler; \
+  W_PNP_EVENT_NOTIFY_HANDLER  PnPEventNotifyHandler; \
+  W_MINIPORT_SHUTDOWN_HANDLER  AdapterShutdownHandler;
+
+#else
+
+#define NDIS51_MINIPORT_CHARACTERISTICS_S \
+  NDIS50_MINIPORT_CHARACTERISTICS_S \
+  W_CANCEL_SEND_PACKETS_HANDLER  CancelSendPacketsHandler; \
+  W_PNP_EVENT_NOTIFY_HANDLER  PnPEventNotifyHandler; \
+  W_MINIPORT_SHUTDOWN_HANDLER  AdapterShutdownHandler;
+
+#endif
+
+typedef struct _NDIS51_MINIPORT_CHARACTERISTICS {
+   NDIS51_MINIPORT_CHARACTERISTICS_S
+} NDIS51_MINIPORT_CHARACTERISTICS, *PSNDIS51_MINIPORT_CHARACTERISTICS;

#if defined(NDIS51_MINIPORT)
 typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
-  NDIS50_MINIPORT_CHARACTERISTICS_S
+  NDIS51_MINIPORT_CHARACTERISTICS_S
 } NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
 #elif defined(NDIS50_MINIPORT)
 typedef struct _NDIS_MINIPORT_CHARACTERISTICS {