aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-05-11 18:15:50 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-12 15:02:22 -0400
commit7591157e1848b5db900b34016e2a2182329a93bb (patch)
tree47b1a5cfd7f4f1162831638d5be4514b3b8bc74b /drivers/usb
parent7390e8b0dee778b0a964337558990a91094e679a (diff)
usb/net: rndis: break out <linux/rndis.h> defines
As a first step to consolidate the RNDIS implementations, break out a common file with all the #defines and move it to <linux/rndis.h>. This also deletes the immediate duplicated defines in the <linux/rndis.h> file that yields a lot of compilation warnings. Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/ndis.h164
-rw-r--r--drivers/usb/gadget/rndis.h48
2 files changed, 1 insertions, 211 deletions
diff --git a/drivers/usb/gadget/ndis.h b/drivers/usb/gadget/ndis.h
index b0e52fc277b4..a19f72dec0cd 100644
--- a/drivers/usb/gadget/ndis.h
+++ b/drivers/usb/gadget/ndis.h
@@ -15,11 +15,6 @@
15#ifndef _LINUX_NDIS_H 15#ifndef _LINUX_NDIS_H
16#define _LINUX_NDIS_H 16#define _LINUX_NDIS_H
17 17
18
19#define NDIS_STATUS_MULTICAST_FULL 0xC0010009
20#define NDIS_STATUS_MULTICAST_EXISTS 0xC001000A
21#define NDIS_STATUS_MULTICAST_NOT_FOUND 0xC001000B
22
23enum NDIS_DEVICE_POWER_STATE { 18enum NDIS_DEVICE_POWER_STATE {
24 NdisDeviceStateUnspecified = 0, 19 NdisDeviceStateUnspecified = 0,
25 NdisDeviceStateD0, 20 NdisDeviceStateD0,
@@ -35,11 +30,6 @@ struct NDIS_PM_WAKE_UP_CAPABILITIES {
35 enum NDIS_DEVICE_POWER_STATE MinLinkChangeWakeUp; 30 enum NDIS_DEVICE_POWER_STATE MinLinkChangeWakeUp;
36}; 31};
37 32
38/* NDIS_PNP_CAPABILITIES.Flags constants */
39#define NDIS_DEVICE_WAKE_UP_ENABLE 0x00000001
40#define NDIS_DEVICE_WAKE_ON_PATTERN_MATCH_ENABLE 0x00000002
41#define NDIS_DEVICE_WAKE_ON_MAGIC_PACKET_ENABLE 0x00000004
42
43struct NDIS_PNP_CAPABILITIES { 33struct NDIS_PNP_CAPABILITIES {
44 __le32 Flags; 34 __le32 Flags;
45 struct NDIS_PM_WAKE_UP_CAPABILITIES WakeUpCapabilities; 35 struct NDIS_PM_WAKE_UP_CAPABILITIES WakeUpCapabilities;
@@ -54,158 +44,4 @@ struct NDIS_PM_PACKET_PATTERN {
54 __le32 PatternFlags; 44 __le32 PatternFlags;
55}; 45};
56 46
57
58/* Required Object IDs (OIDs) */
59#define OID_GEN_SUPPORTED_LIST 0x00010101
60#define OID_GEN_HARDWARE_STATUS 0x00010102
61#define OID_GEN_MEDIA_SUPPORTED 0x00010103
62#define OID_GEN_MEDIA_IN_USE 0x00010104
63#define OID_GEN_MAXIMUM_LOOKAHEAD 0x00010105
64#define OID_GEN_MAXIMUM_FRAME_SIZE 0x00010106
65#define OID_GEN_LINK_SPEED 0x00010107
66#define OID_GEN_TRANSMIT_BUFFER_SPACE 0x00010108
67#define OID_GEN_RECEIVE_BUFFER_SPACE 0x00010109
68#define OID_GEN_TRANSMIT_BLOCK_SIZE 0x0001010A
69#define OID_GEN_RECEIVE_BLOCK_SIZE 0x0001010B
70#define OID_GEN_VENDOR_ID 0x0001010C
71#define OID_GEN_VENDOR_DESCRIPTION 0x0001010D
72#define OID_GEN_CURRENT_PACKET_FILTER 0x0001010E
73#define OID_GEN_CURRENT_LOOKAHEAD 0x0001010F
74#define OID_GEN_DRIVER_VERSION 0x00010110
75#define OID_GEN_MAXIMUM_TOTAL_SIZE 0x00010111
76#define OID_GEN_PROTOCOL_OPTIONS 0x00010112
77#define OID_GEN_MAC_OPTIONS 0x00010113
78#define OID_GEN_MEDIA_CONNECT_STATUS 0x00010114
79#define OID_GEN_MAXIMUM_SEND_PACKETS 0x00010115
80#define OID_GEN_VENDOR_DRIVER_VERSION 0x00010116
81#define OID_GEN_SUPPORTED_GUIDS 0x00010117
82#define OID_GEN_NETWORK_LAYER_ADDRESSES 0x00010118
83#define OID_GEN_TRANSPORT_HEADER_OFFSET 0x00010119
84#define OID_GEN_MACHINE_NAME 0x0001021A
85#define OID_GEN_RNDIS_CONFIG_PARAMETER 0x0001021B
86#define OID_GEN_VLAN_ID 0x0001021C
87
88/* Optional OIDs */
89#define OID_GEN_MEDIA_CAPABILITIES 0x00010201
90#define OID_GEN_PHYSICAL_MEDIUM 0x00010202
91
92/* Required statistics OIDs */
93#define OID_GEN_XMIT_OK 0x00020101
94#define OID_GEN_RCV_OK 0x00020102
95#define OID_GEN_XMIT_ERROR 0x00020103
96#define OID_GEN_RCV_ERROR 0x00020104
97#define OID_GEN_RCV_NO_BUFFER 0x00020105
98
99/* Optional statistics OIDs */
100#define OID_GEN_DIRECTED_BYTES_XMIT 0x00020201
101#define OID_GEN_DIRECTED_FRAMES_XMIT 0x00020202
102#define OID_GEN_MULTICAST_BYTES_XMIT 0x00020203
103#define OID_GEN_MULTICAST_FRAMES_XMIT 0x00020204
104#define OID_GEN_BROADCAST_BYTES_XMIT 0x00020205
105#define OID_GEN_BROADCAST_FRAMES_XMIT 0x00020206
106#define OID_GEN_DIRECTED_BYTES_RCV 0x00020207
107#define OID_GEN_DIRECTED_FRAMES_RCV 0x00020208
108#define OID_GEN_MULTICAST_BYTES_RCV 0x00020209
109#define OID_GEN_MULTICAST_FRAMES_RCV 0x0002020A
110#define OID_GEN_BROADCAST_BYTES_RCV 0x0002020B
111#define OID_GEN_BROADCAST_FRAMES_RCV 0x0002020C
112#define OID_GEN_RCV_CRC_ERROR 0x0002020D
113#define OID_GEN_TRANSMIT_QUEUE_LENGTH 0x0002020E
114#define OID_GEN_GET_TIME_CAPS 0x0002020F
115#define OID_GEN_GET_NETCARD_TIME 0x00020210
116#define OID_GEN_NETCARD_LOAD 0x00020211
117#define OID_GEN_DEVICE_PROFILE 0x00020212
118#define OID_GEN_INIT_TIME_MS 0x00020213
119#define OID_GEN_RESET_COUNTS 0x00020214
120#define OID_GEN_MEDIA_SENSE_COUNTS 0x00020215
121#define OID_GEN_FRIENDLY_NAME 0x00020216
122#define OID_GEN_MINIPORT_INFO 0x00020217
123#define OID_GEN_RESET_VERIFY_PARAMETERS 0x00020218
124
125/* IEEE 802.3 (Ethernet) OIDs */
126#define NDIS_802_3_MAC_OPTION_PRIORITY 0x00000001
127
128#define OID_802_3_PERMANENT_ADDRESS 0x01010101
129#define OID_802_3_CURRENT_ADDRESS 0x01010102
130#define OID_802_3_MULTICAST_LIST 0x01010103
131#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104
132#define OID_802_3_MAC_OPTIONS 0x01010105
133#define OID_802_3_RCV_ERROR_ALIGNMENT 0x01020101
134#define OID_802_3_XMIT_ONE_COLLISION 0x01020102
135#define OID_802_3_XMIT_MORE_COLLISIONS 0x01020103
136#define OID_802_3_XMIT_DEFERRED 0x01020201
137#define OID_802_3_XMIT_MAX_COLLISIONS 0x01020202
138#define OID_802_3_RCV_OVERRUN 0x01020203
139#define OID_802_3_XMIT_UNDERRUN 0x01020204
140#define OID_802_3_XMIT_HEARTBEAT_FAILURE 0x01020205
141#define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206
142#define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207
143
144/* OID_GEN_MINIPORT_INFO constants */
145#define NDIS_MINIPORT_BUS_MASTER 0x00000001
146#define NDIS_MINIPORT_WDM_DRIVER 0x00000002
147#define NDIS_MINIPORT_SG_LIST 0x00000004
148#define NDIS_MINIPORT_SUPPORTS_MEDIA_QUERY 0x00000008
149#define NDIS_MINIPORT_INDICATES_PACKETS 0x00000010
150#define NDIS_MINIPORT_IGNORE_PACKET_QUEUE 0x00000020
151#define NDIS_MINIPORT_IGNORE_REQUEST_QUEUE 0x00000040
152#define NDIS_MINIPORT_IGNORE_TOKEN_RING_ERRORS 0x00000080
153#define NDIS_MINIPORT_INTERMEDIATE_DRIVER 0x00000100
154#define NDIS_MINIPORT_IS_NDIS_5 0x00000200
155#define NDIS_MINIPORT_IS_CO 0x00000400
156#define NDIS_MINIPORT_DESERIALIZE 0x00000800
157#define NDIS_MINIPORT_REQUIRES_MEDIA_POLLING 0x00001000
158#define NDIS_MINIPORT_SUPPORTS_MEDIA_SENSE 0x00002000
159#define NDIS_MINIPORT_NETBOOT_CARD 0x00004000
160#define NDIS_MINIPORT_PM_SUPPORTED 0x00008000
161#define NDIS_MINIPORT_SUPPORTS_MAC_ADDRESS_OVERWRITE 0x00010000
162#define NDIS_MINIPORT_USES_SAFE_BUFFER_APIS 0x00020000
163#define NDIS_MINIPORT_HIDDEN 0x00040000
164#define NDIS_MINIPORT_SWENUM 0x00080000
165#define NDIS_MINIPORT_SURPRISE_REMOVE_OK 0x00100000
166#define NDIS_MINIPORT_NO_HALT_ON_SUSPEND 0x00200000
167#define NDIS_MINIPORT_HARDWARE_DEVICE 0x00400000
168#define NDIS_MINIPORT_SUPPORTS_CANCEL_SEND_PACKETS 0x00800000
169#define NDIS_MINIPORT_64BITS_DMA 0x01000000
170
171#define NDIS_MEDIUM_802_3 0x00000000
172#define NDIS_MEDIUM_802_5 0x00000001
173#define NDIS_MEDIUM_FDDI 0x00000002
174#define NDIS_MEDIUM_WAN 0x00000003
175#define NDIS_MEDIUM_LOCAL_TALK 0x00000004
176#define NDIS_MEDIUM_DIX 0x00000005
177#define NDIS_MEDIUM_ARCENT_RAW 0x00000006
178#define NDIS_MEDIUM_ARCENT_878_2 0x00000007
179#define NDIS_MEDIUM_ATM 0x00000008
180#define NDIS_MEDIUM_WIRELESS_LAN 0x00000009
181#define NDIS_MEDIUM_IRDA 0x0000000A
182#define NDIS_MEDIUM_BPC 0x0000000B
183#define NDIS_MEDIUM_CO_WAN 0x0000000C
184#define NDIS_MEDIUM_1394 0x0000000D
185
186#define NDIS_PACKET_TYPE_DIRECTED 0x00000001
187#define NDIS_PACKET_TYPE_MULTICAST 0x00000002
188#define NDIS_PACKET_TYPE_ALL_MULTICAST 0x00000004
189#define NDIS_PACKET_TYPE_BROADCAST 0x00000008
190#define NDIS_PACKET_TYPE_SOURCE_ROUTING 0x00000010
191#define NDIS_PACKET_TYPE_PROMISCUOUS 0x00000020
192#define NDIS_PACKET_TYPE_SMT 0x00000040
193#define NDIS_PACKET_TYPE_ALL_LOCAL 0x00000080
194#define NDIS_PACKET_TYPE_GROUP 0x00000100
195#define NDIS_PACKET_TYPE_ALL_FUNCTIONAL 0x00000200
196#define NDIS_PACKET_TYPE_FUNCTIONAL 0x00000400
197#define NDIS_PACKET_TYPE_MAC_FRAME 0x00000800
198
199#define NDIS_MEDIA_STATE_CONNECTED 0x00000000
200#define NDIS_MEDIA_STATE_DISCONNECTED 0x00000001
201
202#define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA 0x00000001
203#define NDIS_MAC_OPTION_RECEIVE_SERIALIZED 0x00000002
204#define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND 0x00000004
205#define NDIS_MAC_OPTION_NO_LOOPBACK 0x00000008
206#define NDIS_MAC_OPTION_FULL_DUPLEX 0x00000010
207#define NDIS_MAC_OPTION_EOTX_INDICATION 0x00000020
208#define NDIS_MAC_OPTION_8021P_PRIORITY 0x00000040
209#define NDIS_MAC_OPTION_RESERVED 0x80000000
210
211#endif /* _LINUX_NDIS_H */ 47#endif /* _LINUX_NDIS_H */
diff --git a/drivers/usb/gadget/rndis.h b/drivers/usb/gadget/rndis.h
index 907c33008118..0647f2f34e89 100644
--- a/drivers/usb/gadget/rndis.h
+++ b/drivers/usb/gadget/rndis.h
@@ -15,58 +15,12 @@
15#ifndef _LINUX_RNDIS_H 15#ifndef _LINUX_RNDIS_H
16#define _LINUX_RNDIS_H 16#define _LINUX_RNDIS_H
17 17
18#include <linux/rndis.h>
18#include "ndis.h" 19#include "ndis.h"
19 20
20#define RNDIS_MAXIMUM_FRAME_SIZE 1518 21#define RNDIS_MAXIMUM_FRAME_SIZE 1518
21#define RNDIS_MAX_TOTAL_SIZE 1558 22#define RNDIS_MAX_TOTAL_SIZE 1558
22 23
23/* Remote NDIS Versions */
24#define RNDIS_MAJOR_VERSION 1
25#define RNDIS_MINOR_VERSION 0
26
27/* Status Values */
28#define RNDIS_STATUS_SUCCESS 0x00000000U /* Success */
29#define RNDIS_STATUS_FAILURE 0xC0000001U /* Unspecified error */
30#define RNDIS_STATUS_INVALID_DATA 0xC0010015U /* Invalid data */
31#define RNDIS_STATUS_NOT_SUPPORTED 0xC00000BBU /* Unsupported request */
32#define RNDIS_STATUS_MEDIA_CONNECT 0x4001000BU /* Device connected */
33#define RNDIS_STATUS_MEDIA_DISCONNECT 0x4001000CU /* Device disconnected */
34/* For all not specified status messages:
35 * RNDIS_STATUS_Xxx -> NDIS_STATUS_Xxx
36 */
37
38/* Message Set for Connectionless (802.3) Devices */
39#define REMOTE_NDIS_PACKET_MSG 0x00000001U
40#define REMOTE_NDIS_INITIALIZE_MSG 0x00000002U /* Initialize device */
41#define REMOTE_NDIS_HALT_MSG 0x00000003U
42#define REMOTE_NDIS_QUERY_MSG 0x00000004U
43#define REMOTE_NDIS_SET_MSG 0x00000005U
44#define REMOTE_NDIS_RESET_MSG 0x00000006U
45#define REMOTE_NDIS_INDICATE_STATUS_MSG 0x00000007U
46#define REMOTE_NDIS_KEEPALIVE_MSG 0x00000008U
47
48/* Message completion */
49#define REMOTE_NDIS_INITIALIZE_CMPLT 0x80000002U
50#define REMOTE_NDIS_QUERY_CMPLT 0x80000004U
51#define REMOTE_NDIS_SET_CMPLT 0x80000005U
52#define REMOTE_NDIS_RESET_CMPLT 0x80000006U
53#define REMOTE_NDIS_KEEPALIVE_CMPLT 0x80000008U
54
55/* Device Flags */
56#define RNDIS_DF_CONNECTIONLESS 0x00000001U
57#define RNDIS_DF_CONNECTION_ORIENTED 0x00000002U
58
59#define RNDIS_MEDIUM_802_3 0x00000000U
60
61/* from drivers/net/sk98lin/h/skgepnmi.h */
62#define OID_PNP_CAPABILITIES 0xFD010100
63#define OID_PNP_SET_POWER 0xFD010101
64#define OID_PNP_QUERY_POWER 0xFD010102
65#define OID_PNP_ADD_WAKE_UP_PATTERN 0xFD010103
66#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xFD010104
67#define OID_PNP_ENABLE_WAKE_UP 0xFD010106
68
69
70typedef struct rndis_init_msg_type 24typedef struct rndis_init_msg_type
71{ 25{
72 __le32 MessageType; 26 __le32 MessageType;
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-11 03:48:50 -0500