- Remove duplicate ntddndis.h in /psdk/ -- we already have it in /ddk/. Add the dupli...

- Remove "ntdd1934.h" -- this header should be named ntdd1394.h. We already have a copy named so, but the old incompatible header wasn't removed.

svn path=/trunk/; revision=42732

diff --git a/reactos/include/ddk/ndis.h b/reactos/include/ddk/ndis.h
index 4925d76..abd31c2 100644 (file)
--- a/reactos/include/ddk/ndis.h
+++ b/reactos/include/ddk/ndis.h
@@ -850,12 +850,6 @@ typedef struct _NDIS_PACKET_EXTENSION {
   PVOID  NdisPacketInfo[MaxPerPacketInfo];
 } NDIS_PACKET_EXTENSION, *PNDIS_PACKET_EXTENSION;
 
-typedef struct _NDIS_OBJECT_HEADER {
-  UCHAR  Type;
-  UCHAR  Revision;
-  USHORT  Size;
-} NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER;
-
 typedef struct _NDIS_GENERIC_OBJECT {
   NDIS_OBJECT_HEADER  Header;
   PVOID  Caller;

diff --git a/reactos/include/ddk/ntdd1934.h b/reactos/include/ddk/ntdd1934.h
deleted file mode 100644 (file)
index 151f111..0000000
--- a/reactos/include/ddk/ntdd1934.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-#ifndef _NTDD1394_H_
-#define _NTDD1394_H_
-
-#if (_MSC_VER >= 1020)
-#pragma once
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _IEEE1394_VDEV_PNP_REQUEST
-{
-  ULONG fulFlags;
-  ULONG Reserved;
-  ULARGE_INTEGER InstanceId;
-  UCHAR DeviceId;
-} IEEE1394_VDEV_PNP_REQUEST,*PIEEE1394_VDEV_PNP_REQUEST;
-
-
-typedef struct _IEEE1394_API_REQUEST
-{
-  ULONG RequestNumber;
-  ULONG Flags;
-  union
-  {
-    IEEE1394_VDEV_PNP_REQUEST AddVirtualDevice;
-    IEEE1394_VDEV_PNP_REQUEST RemoveVirtualDevice;
-  } u;
-} IEEE1394_API_REQUEST, *PIEEE1394_API_REQUEST;
-
-#define IEEE1394_API_ADD_VIRTUAL_DEVICE           0x00000001
-#define IEEE1394_API_REMOVE_VIRTUAL_DEVICE        0x00000002
-#define IEEE1394_REQUEST_FLAG_UNICODE             0x00000001
-#define IEEE1394_REQUEST_FLAG_PERSISTENT          0x00000002
-#define IEEE1394_REQUEST_FLAG_USE_LOCAL_HOST_EUI  0x00000004
-#define BUS1394_VIRTUAL_DEVICE_LIST_KEY           L"Virtual Device List"
-#define BUS1394_LOCAL_HOST_INSTANCE_KEY           L"LOCAL HOST EUI64"
-#define IOCTL_IEEE1394_API_REQUEST                CTL_CODE(FILE_DEVICE_UNKNOWN, 0x100, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-

diff --git a/reactos/include/ddk/ntddndis.h b/reactos/include/ddk/ntddndis.h
index 8ca9e0f..960fe4d 100644 (file)
--- a/reactos/include/ddk/ntddndis.h
+++ b/reactos/include/ddk/ntddndis.h
@@ -44,6 +44,81 @@ typedef enum _NDIS_DEVICE_POWER_STATE {
   NdisDeviceStateMaximum
 } NDIS_DEVICE_POWER_STATE, *PNDIS_DEVICE_POWER_STATE;
 
+typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE
+{
+    Ndis802_11IBSS,
+    Ndis802_11Infrastructure,
+    Ndis802_11AutoUnknown,
+    Ndis802_11InfrastructureMax
+} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE;
+
+typedef enum _NDIS_802_11_NETWORK_TYPE
+{
+    Ndis802_11FH,
+    Ndis802_11DS,
+    Ndis802_11OFDM5,
+    Ndis802_11OFDM24,
+    Ndis802_11Automode,
+    Ndis802_11NetworkTypeMax
+} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE;
+
+typedef struct _NDIS_OBJECT_HEADER
+{
+    UCHAR Type;
+    UCHAR Revision;
+    USHORT Size;
+} NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER;
+
+#define NDIS_802_11_LENGTH_SSID  32
+#define NDIS_802_11_LENGTH_RATES 8
+
+typedef UCHAR NDIS_802_11_MAC_ADDRESS[6];
+typedef LONG NDIS_802_11_RSSI;
+typedef UCHAR NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES];
+
+typedef struct _NDIS_802_11_SSID
+{
+    ULONG SsidLength;
+    UCHAR Ssid[NDIS_802_11_LENGTH_SSID];
+} NDIS_802_11_SSID, *PNDIS_802_11_SSID;
+
+typedef struct _NDIS_802_11_CONFIGURATION_FH
+{
+    ULONG Length;
+    ULONG HopPattern;
+    ULONG HopSet;
+    ULONG DwellTime;
+} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH;
+
+typedef struct _NDIS_802_11_CONFIGURATION
+{
+    ULONG Length;
+    ULONG BeaconPeriod;
+    ULONG ATIMWindow;
+    ULONG DSConfig;
+    NDIS_802_11_CONFIGURATION_FH FHConfig;
+} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION;
+
+typedef struct _NDIS_WLAN_BSSID
+{
+    ULONG Length;
+    NDIS_802_11_MAC_ADDRESS MacAddress;
+    UCHAR Reserved[2];
+    NDIS_802_11_SSID Ssid;
+    ULONG Privacy;
+    NDIS_802_11_RSSI Rssi;
+    NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
+    NDIS_802_11_CONFIGURATION Configuration;
+    NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
+    NDIS_802_11_RATES SupportedRates;
+} NDIS_WLAN_BSSID, *PNDIS_WLAN_BSSID;
+
+typedef struct _NDIS_802_11_BSSID_LIST
+{
+    ULONG NumberOfItems;
+    NDIS_WLAN_BSSID Bssid[1];
+} NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST;
+
 typedef struct _NDIS_PM_WAKE_UP_CAPABILITIES {
   NDIS_DEVICE_POWER_STATE  MinMagicPacketWakeUp;
   NDIS_DEVICE_POWER_STATE  MinPatternWakeUp;
@@ -146,6 +221,9 @@ typedef struct _NDIS_PNP_CAPABILITIES {
 #define OID_802_3_XMIT_TIMES_CRS_LOST     0x01020206
 #define OID_802_3_XMIT_LATE_COLLISIONS    0x01020207
 
+#define OID_802_11_BSSID_LIST      0x0D010217
+#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A
+
 /* OID_GEN_MINIPORT_INFO constants */
 #define NDIS_MINIPORT_BUS_MASTER                      0x00000001
 #define NDIS_MINIPORT_WDM_DRIVER                      0x00000002

diff --git a/reactos/include/psdk/ntddndis.h b/reactos/include/psdk/ntddndis.h
deleted file mode 100644 (file)
index 0e5c13e..0000000
--- a/reactos/include/psdk/ntddndis.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#ifndef _NTDDNDIS_
-#define _NTDDNDIS_
-
-/* Defines */
-#define NDIS_802_11_LENGTH_SSID  32
-#define NDIS_802_11_LENGTH_RATES 8
-
-#define OID_802_11_BSSID_LIST      0x0D010217
-#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A
-
-/* Enumerations */
-typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE
-{
-    Ndis802_11IBSS,
-    Ndis802_11Infrastructure,
-    Ndis802_11AutoUnknown,
-    Ndis802_11InfrastructureMax
-} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE;
-
-typedef enum _NDIS_802_11_NETWORK_TYPE
-{
-    Ndis802_11FH,
-    Ndis802_11DS,
-    Ndis802_11OFDM5,
-    Ndis802_11OFDM24,
-    Ndis802_11Automode,
-    Ndis802_11NetworkTypeMax
-} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE;
-
-/* Typedefs */
-typedef struct _NDIS_OBJECT_HEADER
-{
-    UCHAR Type;
-    UCHAR Revision;
-    USHORT Size;
-} NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER;
-
-typedef UCHAR NDIS_802_11_MAC_ADDRESS[6];
-typedef LONG NDIS_802_11_RSSI;
-typedef UCHAR NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES];
-
-typedef struct _NDIS_802_11_SSID
-{
-    ULONG SsidLength;
-    UCHAR Ssid[NDIS_802_11_LENGTH_SSID];
-} NDIS_802_11_SSID, *PNDIS_802_11_SSID;
-
-typedef struct _NDIS_802_11_CONFIGURATION_FH
-{
-    ULONG Length;
-    ULONG HopPattern;
-    ULONG HopSet;
-    ULONG DwellTime;
-} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH;
-
-typedef struct _NDIS_802_11_CONFIGURATION
-{
-    ULONG Length;
-    ULONG BeaconPeriod;
-    ULONG ATIMWindow;
-    ULONG DSConfig;
-    NDIS_802_11_CONFIGURATION_FH FHConfig;
-} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION;
-
-typedef struct _NDIS_WLAN_BSSID
-{
-    ULONG Length;
-    NDIS_802_11_MAC_ADDRESS MacAddress;
-    UCHAR Reserved[2];
-    NDIS_802_11_SSID Ssid;
-    ULONG Privacy;
-    NDIS_802_11_RSSI Rssi;
-    NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
-    NDIS_802_11_CONFIGURATION Configuration;
-    NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
-    NDIS_802_11_RATES SupportedRates;
-} NDIS_WLAN_BSSID, *PNDIS_WLAN_BSSID;
-
-typedef struct _NDIS_802_11_BSSID_LIST
-{
-    ULONG NumberOfItems;
-    NDIS_WLAN_BSSID Bssid[1];
-} NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST;
-
-/* 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;
-
-#endif