Skip to content

Commit 10de75f

Browse files
BernardXiongBernardXiong
authored
Merge pull request #1744 from liruncong/master
消除usb结构体gcc编译时的相关警告
2 parents 1ae8048 + d3c08af commit 10de75f

File tree

9 files changed

+389
-304
lines changed

9 files changed

+389
-304
lines changed

‎components/drivers/usb/usbdevice/class/cdc_vcom.c‎

Lines changed: 82 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -133,83 +133,103 @@ const static struct ucdc_comm_descriptor _comm_desc =
133133
{
134134
#ifdef RT_USB_DEVICE_COMPOSITE
135135
/* Interface Association Descriptor */
136-
USB_DESC_LENGTH_IAD,
137-
USB_DESC_TYPE_IAD,
138-
USB_DYNAMIC,
139-
0x02,
140-
USB_CDC_CLASS_COMM,
141-
USB_CDC_SUBCLASS_ACM,
142-
USB_CDC_PROTOCOL_V25TER,
143-
0x00,
136+
{
137+
USB_DESC_LENGTH_IAD,
138+
USB_DESC_TYPE_IAD,
139+
USB_DYNAMIC,
140+
0x02,
141+
USB_CDC_CLASS_COMM,
142+
USB_CDC_SUBCLASS_ACM,
143+
USB_CDC_PROTOCOL_V25TER,
144+
0x00,
145+
},
144146
#endif
145147
/* Interface Descriptor */
146-
USB_DESC_LENGTH_INTERFACE,
147-
USB_DESC_TYPE_INTERFACE,
148-
USB_DYNAMIC,
149-
0x00,
150-
0x01,
151-
USB_CDC_CLASS_COMM,
152-
USB_CDC_SUBCLASS_ACM,
153-
USB_CDC_PROTOCOL_V25TER,
154-
0x00,
148+
{
149+
USB_DESC_LENGTH_INTERFACE,
150+
USB_DESC_TYPE_INTERFACE,
151+
USB_DYNAMIC,
152+
0x00,
153+
0x01,
154+
USB_CDC_CLASS_COMM,
155+
USB_CDC_SUBCLASS_ACM,
156+
USB_CDC_PROTOCOL_V25TER,
157+
0x00,
158+
},
155159
/* Header Functional Descriptor */
156-
0x05,
157-
USB_CDC_CS_INTERFACE,
158-
USB_CDC_SCS_HEADER,
159-
0x0110,
160+
{
161+
0x05,
162+
USB_CDC_CS_INTERFACE,
163+
USB_CDC_SCS_HEADER,
164+
0x0110,
165+
},
160166
/* Call Management Functional Descriptor */
161-
0x05,
162-
USB_CDC_CS_INTERFACE,
163-
USB_CDC_SCS_CALL_MGMT,
164-
0x00,
165-
USB_DYNAMIC,
167+
{
168+
0x05,
169+
USB_CDC_CS_INTERFACE,
170+
USB_CDC_SCS_CALL_MGMT,
171+
0x00,
172+
USB_DYNAMIC,
173+
},
166174
/* Abstract Control Management Functional Descriptor */
167-
0x04,
168-
USB_CDC_CS_INTERFACE,
169-
USB_CDC_SCS_ACM,
170-
0x02,
175+
{
176+
0x04,
177+
USB_CDC_CS_INTERFACE,
178+
USB_CDC_SCS_ACM,
179+
0x02,
180+
},
171181
/* Union Functional Descriptor */
172-
0x05,
173-
USB_CDC_CS_INTERFACE,
174-
USB_CDC_SCS_UNION,
175-
USB_DYNAMIC,
176-
USB_DYNAMIC,
182+
{
183+
0x05,
184+
USB_CDC_CS_INTERFACE,
185+
USB_CDC_SCS_UNION,
186+
USB_DYNAMIC,
187+
USB_DYNAMIC,
188+
},
177189
/* Endpoint Descriptor */
178-
USB_DESC_LENGTH_ENDPOINT,
179-
USB_DESC_TYPE_ENDPOINT,
180-
USB_DYNAMIC | USB_DIR_IN,
181-
USB_EP_ATTR_INT,
182-
0x08,
183-
0xFF,
190+
{
191+
USB_DESC_LENGTH_ENDPOINT,
192+
USB_DESC_TYPE_ENDPOINT,
193+
USB_DYNAMIC | USB_DIR_IN,
194+
USB_EP_ATTR_INT,
195+
0x08,
196+
0xFF,
197+
},
184198
};
185199

186200
/* data interface descriptor */
187201
const static struct ucdc_data_descriptor _data_desc =
188202
{
189203
/* interface descriptor */
190-
USB_DESC_LENGTH_INTERFACE,
191-
USB_DESC_TYPE_INTERFACE,
192-
USB_DYNAMIC,
193-
0x00,
194-
0x02,
195-
USB_CDC_CLASS_DATA,
196-
0x00,
197-
0x00,
198-
0x00,
204+
{
205+
USB_DESC_LENGTH_INTERFACE,
206+
USB_DESC_TYPE_INTERFACE,
207+
USB_DYNAMIC,
208+
0x00,
209+
0x02,
210+
USB_CDC_CLASS_DATA,
211+
0x00,
212+
0x00,
213+
0x00,
214+
},
199215
/* endpoint, bulk out */
200-
USB_DESC_LENGTH_ENDPOINT,
201-
USB_DESC_TYPE_ENDPOINT,
202-
USB_DYNAMIC | USB_DIR_OUT,
203-
USB_EP_ATTR_BULK,
204-
USB_CDC_BUFSIZE,
205-
0x00,
216+
{
217+
USB_DESC_LENGTH_ENDPOINT,
218+
USB_DESC_TYPE_ENDPOINT,
219+
USB_DYNAMIC | USB_DIR_OUT,
220+
USB_EP_ATTR_BULK,
221+
USB_CDC_BUFSIZE,
222+
0x00,
223+
},
206224
/* endpoint, bulk in */
207-
USB_DESC_LENGTH_ENDPOINT,
208-
USB_DESC_TYPE_ENDPOINT,
209-
USB_DYNAMIC | USB_DIR_IN,
210-
USB_EP_ATTR_BULK,
211-
USB_CDC_BUFSIZE,
212-
0x00,
225+
{
226+
USB_DESC_LENGTH_ENDPOINT,
227+
USB_DESC_TYPE_ENDPOINT,
228+
USB_DYNAMIC | USB_DIR_IN,
229+
USB_EP_ATTR_BULK,
230+
USB_CDC_BUFSIZE,
231+
0x00,
232+
},
213233
};
214234

215235
static char serno[_SER_NO_LEN + 1] = {'\0'};

‎components/drivers/usb/usbdevice/class/ecm.c‎

Lines changed: 79 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -80,82 +80,100 @@ const static struct ucdc_eth_descriptor _comm_desc =
8080
{
8181
#ifdef RT_USB_DEVICE_COMPOSITE
8282
/* Interface Association Descriptor */
83-
USB_DESC_LENGTH_IAD,
84-
USB_DESC_TYPE_IAD,
85-
USB_DYNAMIC,
86-
0x02,
87-
USB_CDC_CLASS_COMM,
88-
USB_CDC_SUBCLASS_ETH,
89-
USB_CDC_PROTOCOL_NONE,
90-
0x00,
83+
{
84+
USB_DESC_LENGTH_IAD,
85+
USB_DESC_TYPE_IAD,
86+
USB_DYNAMIC,
87+
0x02,
88+
USB_CDC_CLASS_COMM,
89+
USB_CDC_SUBCLASS_ETH,
90+
USB_CDC_PROTOCOL_NONE,
91+
0x00,
92+
},
9193
#endif
9294
/* Interface Descriptor */
93-
USB_DESC_LENGTH_INTERFACE,
94-
USB_DESC_TYPE_INTERFACE,
95-
USB_DYNAMIC,
96-
0x00,
97-
0x01,
98-
USB_CDC_CLASS_COMM,
99-
USB_CDC_SUBCLASS_ETH,
100-
USB_CDC_PROTOCOL_NONE,
101-
0x00,
95+
{
96+
USB_DESC_LENGTH_INTERFACE,
97+
USB_DESC_TYPE_INTERFACE,
98+
USB_DYNAMIC,
99+
0x00,
100+
0x01,
101+
USB_CDC_CLASS_COMM,
102+
USB_CDC_SUBCLASS_ETH,
103+
USB_CDC_PROTOCOL_NONE,
104+
0x00,
105+
},
102106
/* Header Functional Descriptor */
103-
sizeof(struct ucdc_header_descriptor),
104-
USB_CDC_CS_INTERFACE,
105-
USB_CDC_SCS_HEADER,
106-
0x0110,
107+
{
108+
sizeof(struct ucdc_header_descriptor),
109+
USB_CDC_CS_INTERFACE,
110+
USB_CDC_SCS_HEADER,
111+
0x0110,
112+
},
107113
/* Union Functional Descriptor */
108-
sizeof(struct ucdc_union_descriptor),
109-
USB_CDC_CS_INTERFACE,
110-
USB_CDC_SCS_UNION,
111-
USB_DYNAMIC,
112-
USB_DYNAMIC,
114+
{
115+
sizeof(struct ucdc_union_descriptor),
116+
USB_CDC_CS_INTERFACE,
117+
USB_CDC_SCS_UNION,
118+
USB_DYNAMIC,
119+
USB_DYNAMIC,
120+
},
113121
/* Abstract Control Management Functional Descriptor */
114-
sizeof(struct ucdc_enet_descriptor),
115-
USB_CDC_CS_INTERFACE,
116-
USB_CDC_SCS_ETH,
117-
USB_STRING_SERIAL_INDEX,
118-
{0,0,0,0},
119-
USB_ETH_MTU,
120-
0x00,
121-
0x00,
122+
{
123+
sizeof(struct ucdc_enet_descriptor),
124+
USB_CDC_CS_INTERFACE,
125+
USB_CDC_SCS_ETH,
126+
USB_STRING_SERIAL_INDEX,
127+
{0,0,0,0},
128+
USB_ETH_MTU,
129+
0x00,
130+
0x00,
131+
},
122132
/* Endpoint Descriptor */
123-
USB_DESC_LENGTH_ENDPOINT,
124-
USB_DESC_TYPE_ENDPOINT,
125-
USB_DIR_IN | USB_DYNAMIC,
126-
USB_EP_ATTR_INT,
127-
0x08,
128-
0xFF,
133+
{
134+
USB_DESC_LENGTH_ENDPOINT,
135+
USB_DESC_TYPE_ENDPOINT,
136+
USB_DIR_IN | USB_DYNAMIC,
137+
USB_EP_ATTR_INT,
138+
0x08,
139+
0xFF,
140+
},
129141
};
130142

131143
/* data interface descriptor */
132144
ALIGN(4)
133145
const static struct ucdc_data_descriptor _data_desc =
134146
{
135147
/* interface descriptor */
136-
USB_DESC_LENGTH_INTERFACE,
137-
USB_DESC_TYPE_INTERFACE,
138-
USB_DYNAMIC,
139-
0x00,
140-
0x02,
141-
USB_CDC_CLASS_DATA,
142-
USB_CDC_SUBCLASS_ETH,
143-
0x00,
144-
0x00,
148+
{
149+
USB_DESC_LENGTH_INTERFACE,
150+
USB_DESC_TYPE_INTERFACE,
151+
USB_DYNAMIC,
152+
0x00,
153+
0x02,
154+
USB_CDC_CLASS_DATA,
155+
USB_CDC_SUBCLASS_ETH,
156+
0x00,
157+
0x00,
158+
},
145159
/* endpoint, bulk out */
146-
USB_DESC_LENGTH_ENDPOINT,
147-
USB_DESC_TYPE_ENDPOINT,
148-
USB_DIR_OUT | USB_DYNAMIC,
149-
USB_EP_ATTR_BULK,
150-
USB_DYNAMIC,
151-
0x00,
160+
{
161+
USB_DESC_LENGTH_ENDPOINT,
162+
USB_DESC_TYPE_ENDPOINT,
163+
USB_DIR_OUT | USB_DYNAMIC,
164+
USB_EP_ATTR_BULK,
165+
USB_DYNAMIC,
166+
0x00,
167+
},
152168
/* endpoint, bulk in */
153-
USB_DESC_LENGTH_ENDPOINT,
154-
USB_DESC_TYPE_ENDPOINT,
155-
USB_DYNAMIC | USB_DIR_IN,
156-
USB_EP_ATTR_BULK,
157-
USB_DYNAMIC,
158-
0x00,
169+
{
170+
USB_DESC_LENGTH_ENDPOINT,
171+
USB_DESC_TYPE_ENDPOINT,
172+
USB_DYNAMIC | USB_DIR_IN,
173+
USB_EP_ATTR_BULK,
174+
USB_DYNAMIC,
175+
0x00,
176+
},
159177
};
160178

161179
ALIGN(4)

0 commit comments

Comments
 (0)