[ros-diffs] [reactos] 01/01: [DDK][PSDK] Add some missing NDIS definitions/types. Caught by Benjamin Aerni.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a67dfd191b606fdc7eeb2...

commit 6a67dfd191b606fdc7eeb25213133b3aa3414bb6
Author:     Hermès Bélusca-Maïto [e-mail]
AuthorDate: Sun May 5 23:18:45 2019 +0200
Commit:     Hermès Bélusca-Maïto [e-mail]
CommitDate: Sun May 5 23:19:53 2019 +0200

[DDK][PSDK] Add some missing NDIS definitions/types. Caught by Benjamin Aerni.
---
 sdk/include/ddk/ndis.h      | 20 +++++++++++++++++++-
 sdk/include/ddk/netpnp.h    |  7 -------
 sdk/include/psdk/ntddndis.h | 13 +++++++++++++
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/sdk/include/ddk/ndis.h b/sdk/include/ddk/ndis.h
index 028dd1f49b..916ba98e55 100644
--- a/sdk/include/ddk/ndis.h
+++ b/sdk/include/ddk/ndis.h
@@ -986,7 +986,6 @@ typedef NTSTATUS
 typedef struct _OID_LIST    OID_LIST, *POID_LIST;

/* PnP state */
-
 typedef enum _NDIS_PNP_DEVICE_STATE {
   NdisPnPDeviceAdded,
   NdisPnPDeviceStarted,
@@ -997,6 +996,25 @@ typedef enum _NDIS_PNP_DEVICE_STATE {
   NdisPnPDeviceSurpriseRemoved
 } NDIS_PNP_DEVICE_STATE;

+typedef enum _NDIS_DEVICE_PNP_EVENT {
+  NdisDevicePnPEventQueryRemoved,
+  NdisDevicePnPEventRemoved,
+  NdisDevicePnPEventSurpriseRemoved,
+  NdisDevicePnPEventQueryStopped,
+  NdisDevicePnPEventStopped,
+  NdisDevicePnPEventPowerProfileChanged,
+#if NDIS_SUPPORT_NDIS6
+  NdisDevicePnPEventFilterListChanged,
+#endif /* NDIS_SUPPORT_NDIS6 */
+  NdisDevicePnPEventMaximum
+} NDIS_DEVICE_PNP_EVENT, *PNDIS_DEVICE_PNP_EVENT;
+
+/* Power profiles */
+typedef enum _NDIS_POWER_PROFILE {
+  NdisPowerProfileBattery,
+  NdisPowerProfileAcOnLine
+} NDIS_POWER_PROFILE, *PNDIS_POWER_PROFILE;
+
 #define	NDIS_DEVICE_NOT_STOPPABLE                 0x00000001
 #define	NDIS_DEVICE_NOT_REMOVEABLE                0x00000002
 #define	NDIS_DEVICE_NOT_SUSPENDABLE               0x00000004
diff --git a/sdk/include/ddk/netpnp.h b/sdk/include/ddk/netpnp.h
index a7fb0ef483..4db2f63a6f 100644
--- a/sdk/include/ddk/netpnp.h
+++ b/sdk/include/ddk/netpnp.h
@@ -37,10 +37,3 @@ typedef struct _NET_PNP_EVENT {
   ULONG_PTR TdiReserved[4];
   ULONG_PTR TdiClientReserved[4];
 } NET_PNP_EVENT, *PNET_PNP_EVENT;
-
-/* FIXME : This belongs to ndis.h */
-typedef enum _NDIS_DEVICE_PNP_EVENT {
-  NdisDevicePnPEventSurpriseRemoved,
-  NdisDevicePnPEventPowerProfileChanged,
-  NdisDevicePnPEventMaximum
-} NDIS_DEVICE_PNP_EVENT, *PNDIS_DEVICE_PNP_EVENT;
diff --git a/sdk/include/psdk/ntddndis.h b/sdk/include/psdk/ntddndis.h
index 720eeeec86..b8b63cdc10 100644
--- a/sdk/include/psdk/ntddndis.h
+++ b/sdk/include/psdk/ntddndis.h
@@ -318,6 +318,19 @@ typedef ULONG NDIS_OID, *PNDIS_OID;
 #define OID_802_11_WEP_STATUS                   0x0D01011B
 #define OID_802_11_RELOAD_DEFAULTS              0x0D01011C

+/* PnP and Power Management (PM) OIDs */
+#define OID_PNP_CAPABILITIES                    0xFD010100
+#define OID_PNP_SET_POWER                       0xFD010101
+#define OID_PNP_QUERY_POWER                     0xFD010102
+#define OID_PNP_ADD_WAKE_UP_PATTERN             0xFD010103
+#define OID_PNP_REMOVE_WAKE_UP_PATTERN          0xFD010104
+#define OID_PNP_WAKE_UP_PATTERN_LIST            0xFD010105
+#define OID_PNP_ENABLE_WAKE_UP                  0xFD010106
+
+/* Optional PnP/PM statistics OIDs */
+#define OID_PNP_WAKE_UP_OK                      0xFD020200
+#define OID_PNP_WAKE_UP_ERROR                   0xFD020201
+
 /* OID_GEN_MINIPORT_INFO constants */
 #define NDIS_MINIPORT_BUS_MASTER                      0x00000001
 #define NDIS_MINIPORT_WDM_DRIVER                      0x00000002