diff --git a/sdk/include/psdk/ntddndis.h b/sdk/include/psdk/ntddndis.h index 7fc06daeeb4..2d04db5d9eb 100644 --- a/sdk/include/psdk/ntddndis.h +++ b/sdk/include/psdk/ntddndis.h @@ -183,27 +183,42 @@ typedef struct _NDIS_PNP_CAPABILITIES { NDIS_PM_WAKE_UP_CAPABILITIES WakeUpCapabilities; } NDIS_PNP_CAPABILITIES, *PNDIS_PNP_CAPABILITIES; +/* Type (OID_GEN_VLAN_ID) */ +typedef ULONG NDIS_VLAN_ID; + /* NDIS driver medium (OID_GEN_MEDIA_SUPPORTED / OID_GEN_MEDIA_IN_USE) */ typedef enum _NDIS_MEDIUM { - NdisMedium802_3, - NdisMedium802_5, - NdisMediumFddi, - NdisMediumWan, - NdisMediumLocalTalk, - NdisMediumDix, - NdisMediumArcnetRaw, - NdisMediumArcnet878_2, - NdisMediumAtm, - NdisMediumWirelessWan, - NdisMediumIrda, - NdisMediumBpc, - NdisMediumCoWan, - NdisMedium1394, - NdisMediumMax + NdisMedium802_3, + NdisMedium802_5, + NdisMediumFddi, + NdisMediumWan, + NdisMediumLocalTalk, + NdisMediumDix, // Not a real medium + NdisMediumArcnetRaw, + NdisMediumArcnet878_2, + NdisMediumAtm, + NdisMediumWirelessWan, + NdisMediumIrda, + NdisMediumBpc, + NdisMediumCoWan, + NdisMedium1394, + NdisMediumInfiniBand, +#if ((NTDDI_VERSION >= NTDDI_VISTA) || NDIS_SUPPORT_NDIS6) + NdisMediumTunnel, + NdisMediumNative802_11, + NdisMediumLoopback, +#endif +#if (NTDDI_VERSION >= NTDDI_WIN7) + NdisMediumWiMAX, + NdisMediumIP, +#endif + NdisMediumMax // Not a real medium } NDIS_MEDIUM, *PNDIS_MEDIUM; +/* Physical medium type (OID_GEN_PHYSICAL_MEDIUM) */ typedef enum _NDIS_PHYSICAL_MEDIUM { + // Windows Server 2003 SP1 Platform SDK (or earlier?) NdisPhysicalMediumUnspecified, NdisPhysicalMediumWirelessLan, NdisPhysicalMediumCableModem, @@ -215,6 +230,7 @@ typedef enum _NDIS_PHYSICAL_MEDIUM NdisPhysicalMediumWirelessWan, NdisPhysicalMediumNative802_11, NdisPhysicalMediumBluetooth, + // Windows SDK 7.1A (or earlier?) NdisPhysicalMediumInfiniband, NdisPhysicalMediumWiMax, NdisPhysicalMediumUWB, @@ -224,7 +240,10 @@ typedef enum _NDIS_PHYSICAL_MEDIUM NdisPhysicalMediumWiredWAN, NdisPhysicalMediumWiredCoWan, NdisPhysicalMediumOther, - NdisPhysicalMediumMax + // Windows SDK 10.0.16299.0 (or earlier?) + NdisPhysicalMediumNative802_15_4, + // Always + NdisPhysicalMediumMax // Not a real physical medium } NDIS_PHYSICAL_MEDIUM, *PNDIS_PHYSICAL_MEDIUM; typedef ULONG NDIS_OID, *PNDIS_OID;