Author: sginsberg
Date: Sun Aug 16 14:53:31 2009
New Revision: 42734
URL: http://svn.reactos.org/svn/reactos?rev=42734&view=rev
Log:
- Woops, NDIS_PHYSICAL_MEDIUM got lost somehow... and NDIS_MEDIUM belongs in
ntddndis.h too
Modified:
trunk/reactos/include/ddk/ndis.h
trunk/reactos/include/ddk/ntddndis.h
Modified: trunk/reactos/include/ddk/ndis.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=42734&r1=42733&r2=42734&view=diff
==============================================================================
--- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Sun Aug 16 14:53:31 2009
@@ -306,25 +306,6 @@
typedef struct _GEN_GET_NETCARD_TIME {
ULONGLONG ReadTime;
} GEN_GET_NETCARD_TIME, *PGEN_GET_NETCARD_TIME;
-
-/* 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
-} NDIS_MEDIUM, *PNDIS_MEDIUM;
/* NDIS packet filter bits (OID_GEN_CURRENT_PACKET_FILTER) */
#define NDIS_PACKET_TYPE_DIRECTED 0x00000001
Modified: trunk/reactos/include/ddk/ntddndis.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddndis.h?rev=42734&r1=42733&r2=42734&view=diff
==============================================================================
--- trunk/reactos/include/ddk/ntddndis.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntddndis.h [iso-8859-1] Sun Aug 16 14:53:31 2009
@@ -134,6 +134,50 @@
ULONG Flags;
NDIS_PM_WAKE_UP_CAPABILITIES WakeUpCapabilities;
} NDIS_PNP_CAPABILITIES, *PNDIS_PNP_CAPABILITIES;
+
+/* 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
+} NDIS_MEDIUM, *PNDIS_MEDIUM;
+
+typedef enum _NDIS_PHYSICAL_MEDIUM
+{
+ NdisPhysicalMediumUnspecified,
+ NdisPhysicalMediumWirelessLan,
+ NdisPhysicalMediumCableModem,
+ NdisPhysicalMediumPhoneLine,
+ NdisPhysicalMediumPowerLine,
+ NdisPhysicalMediumDSL,
+ NdisPhysicalMediumFibreChannel,
+ NdisPhysicalMedium1394,
+ NdisPhysicalMediumWirelessWan,
+ NdisPhysicalMediumNative802_11,
+ NdisPhysicalMediumBluetooth,
+ NdisPhysicalMediumInfiniband,
+ NdisPhysicalMediumWiMax,
+ NdisPhysicalMediumUWB,
+ NdisPhysicalMedium802_3,
+ NdisPhysicalMedium802_5,
+ NdisPhysicalMediumIrda,
+ NdisPhysicalMediumWiredWAN,
+ NdisPhysicalMediumWiredCoWan,
+ NdisPhysicalMediumOther,
+ NdisPhysicalMediumMax
+} NDIS_PHYSICAL_MEDIUM, *PNDIS_PHYSICAL_MEDIUM;
/* Required Object IDs (OIDs) */
#define OID_GEN_SUPPORTED_LIST 0x00010101
