Skip to content

Commit 08441c1

Browse files
committed
将USB描述符相关移动到非零等待区
1 parent 13b302f commit 08441c1

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/usblib/config/usb_desc.c

+16-16
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "usb_conf.h"
1515

1616
/* USB Device Descriptors */
17-
const uint8_t USBD_DeviceDescriptor[] = {
17+
xdata const uint8_t USBD_DeviceDescriptor[] = {
1818
USBD_SIZE_DEVICE_DESC, // bLength
1919
0x01, // bDescriptorType
2020
0x10, 0x01, // bcdUSB
@@ -32,7 +32,7 @@ const uint8_t USBD_DeviceDescriptor[] = {
3232
};
3333

3434
/* USB Configration Descriptors */
35-
const uint8_t USBD_ConfigDescriptor[USBD_SIZE_CONFIG_DESC] = {
35+
xdata const uint8_t USBD_ConfigDescriptor[USBD_SIZE_CONFIG_DESC] = {
3636
/* Configuration Descriptor */
3737
0x09, // bLength
3838
0x02, // bDescriptorType
@@ -246,7 +246,7 @@ const uint8_t USBD_ConfigDescriptor[USBD_SIZE_CONFIG_DESC] = {
246246
};
247247

248248
/* USB String Descriptors */
249-
const uint8_t USBD_StringLangID[USBD_SIZE_STRING_LANGID] = {
249+
xdata const uint8_t USBD_StringLangID[USBD_SIZE_STRING_LANGID] = {
250250
USBD_SIZE_STRING_LANGID,
251251
USB_STRING_DESCRIPTOR_TYPE,
252252
0x04, 0x08, // LangID = 0x0804: Chinese (Simplified, China Mainland)
@@ -259,18 +259,18 @@ const uint8_t USBD_StringLangID[USBD_SIZE_STRING_LANGID] = {
259259
};
260260

261261
/* USB Device String Vendor */
262-
const uint8_t USBD_StringVendor[USBD_SIZE_STRING_VENDOR] = {
262+
xdata const uint8_t USBD_StringVendor[USBD_SIZE_STRING_VENDOR] = {
263263
USBD_SIZE_STRING_VENDOR,
264264
USB_STRING_DESCRIPTOR_TYPE,
265265
'S', 0, 'E', 0, 'G', 0, 'A', 0};
266266

267267
/* USB Device String Product */
268-
const uint8_t USBD_StringProduct[USBD_SIZE_STRING_PRODUCT] = {
268+
xdata const uint8_t USBD_StringProduct[USBD_SIZE_STRING_PRODUCT] = {
269269
USBD_SIZE_STRING_PRODUCT,
270270
USB_STRING_DESCRIPTOR_TYPE,
271271
0x53, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x47, 0x00, 0x45, 0x00, 0x4b, 0x00, 0x49, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, 0x00};
272272

273-
const uint8_t USBD_StringProduct_zh_hans[USBD_SIZE_STRING_PRODUCT_zh_hans] = {
273+
xdata const uint8_t USBD_StringProduct_zh_hans[USBD_SIZE_STRING_PRODUCT_zh_hans] = {
274274
USBD_SIZE_STRING_PRODUCT_zh_hans,
275275
USB_STRING_DESCRIPTOR_TYPE,
276276
0x53, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x47, 0x00, 0x45, 0x00, 0x4b, 0x00, 0x49, 0x00, 0x57, 0x88, 0x3a, 0x67, 0xce, 0x98, 0x3c, 0x68, 0xa7, 0x63, 0x36, 0x52, 0x68, 0x56};
@@ -281,48 +281,48 @@ uint8_t USBD_StringSerial[USBD_SIZE_STRING_SERIAL] = {
281281
USB_STRING_DESCRIPTOR_TYPE,
282282
'0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0};
283283

284-
const uint8_t USBD_StringConfig[USBD_SIZE_STRING_CONFIG] = {
284+
xdata const uint8_t USBD_StringConfig[USBD_SIZE_STRING_CONFIG] = {
285285
USBD_SIZE_STRING_CONFIG,
286286
USB_STRING_DESCRIPTOR_TYPE,
287287
'S', 0, 'i', 0, 'm', 0, 'D', 0, 'e', 0, 'v', 0, 'i', 0, 'c', 0, 'e', 0, 's', 0};
288288

289-
const uint8_t USBD_StringHIDIO[USBD_SIZE_STRING_HIDIO] = {
289+
xdata const uint8_t USBD_StringHIDIO[USBD_SIZE_STRING_HIDIO] = {
290290
USBD_SIZE_STRING_HIDIO,
291291
USB_STRING_DESCRIPTOR_TYPE,
292292
'I', 0, '/', 0, 'O', 0, ' ', 0, 'C', 0, 'O', 0, 'N', 0, 'T', 0, 'R', 0, 'O', 0, 'L', 0, ' ', 0, 'B', 0, 'D', 0, ';', 0, '1', 0, '5', 0, '2', 0, '5', 0, '7', 0, ';', 0, '0', 0, '1', 0, ';', 0, '9', 0, '0', 0, ';', 0, '1', 0, '8', 0, '3', 0, '1', 0, ';', 0, '6', 0, '6', 0, '7', 0, '9', 0, 'A', 0, ';', 0, '0', 0, '0', 0, ';', 0, 'G', 0, 'O', 0, 'U', 0, 'T', 0, '=', 0, '1', 0, '4', 0, '_', 0, 'A', 0, 'D', 0, 'I', 0, 'N', 0, '=', 0, '8', 0, ',', 0, 'E', 0, '_', 0, 'R', 0, 'O', 0, 'T', 0, 'I', 0, 'N', 0, '=', 0, '4', 0, '_', 0, 'C', 0, 'O', 0, 'I', 0, 'N', 0, 'I', 0, 'N', 0, '=', 0, '2', 0, '_', 0, 'S', 0, 'W', 0, 'I', 0, 'N', 0, '=', 0, '2', 0, ',', 0, 'E', 0, '_', 0, 'U', 0, 'Q', 0, '1', 0, '=', 0, '4', 0, '1', 0, ',', 0, '6', 0, ';', 0};
293293

294-
const uint8_t USBD_StringLEDIO[USBD_SIZE_STRING_LEDIO] = {
294+
xdata const uint8_t USBD_StringLEDIO[USBD_SIZE_STRING_LEDIO] = {
295295
USBD_SIZE_STRING_LEDIO,
296296
USB_STRING_DESCRIPTOR_TYPE,
297297
'L', 0, 'E', 0, 'D', 0, ' ', 0, 'B', 0, 'o', 0, 'a', 0, 'r', 0, 'd', 0, ' ', 0, 'C', 0, 'O', 0, 'M', 0, '3', 0};
298298

299-
const uint8_t USBD_StringLEDIO_zh_hans[USBD_SIZE_STRING_LEDIO_zh_hans] = {
299+
xdata const uint8_t USBD_StringLEDIO_zh_hans[USBD_SIZE_STRING_LEDIO_zh_hans] = {
300300
USBD_SIZE_STRING_LEDIO_zh_hans,
301301
USB_STRING_DESCRIPTOR_TYPE,
302302
0xbe, 0x8b, 0x07, 0x59, 0x6f, 0x70, 0x49, 0x51, 0x20, 0x00, 0x43, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x33, 0x00};
303303

304-
const uint8_t USBD_StringCardIO[USBD_SIZE_STRING_CARDIO] = {
304+
xdata const uint8_t USBD_StringCardIO[USBD_SIZE_STRING_CARDIO] = {
305305
USBD_SIZE_STRING_CARDIO,
306306
USB_STRING_DESCRIPTOR_TYPE,
307307
'C', 0, 'a', 0, 'r', 0, 'd', 0, ' ', 0, 'R', 0, 'e', 0, 'a', 0, 'd', 0, 'e', 0, 'r', 0, ' ', 0, 'C', 0, 'O', 0, 'M', 0, '1', 0};
308308

309-
const uint8_t USBD_StringCardIO_zh_hans[USBD_SIZE_STRING_CARDIO_zh_hans] = {
309+
xdata const uint8_t USBD_StringCardIO_zh_hans[USBD_SIZE_STRING_CARDIO_zh_hans] = {
310310
USBD_SIZE_STRING_CARDIO_zh_hans,
311311
USB_STRING_DESCRIPTOR_TYPE,
312312
0x4e, 0x00, 0x46, 0x00, 0x43, 0x00, 0xfb, 0x8b, 0x61, 0x53, 0x68, 0x56, 0x20, 0x00, 0x43, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x31, 0x00};
313313

314-
const uint8_t USBD_StringCustomHID[USBD_SIZE_STRING_CUSTOM_HID] = {
314+
xdata const uint8_t USBD_StringCustomHID[USBD_SIZE_STRING_CUSTOM_HID] = {
315315
USBD_SIZE_STRING_CUSTOM_HID,
316316
USB_STRING_DESCRIPTOR_TYPE,
317317
'S', 0, 'i', 0, 'm', 0, 'G', 0, 'E', 0, 'K', 0, 'I', 0, ' ', 0, 'C', 0, 'o', 0, 'n', 0, 'f', 0, 'i', 0, 'g', 0};
318318

319-
const uint8_t USBD_StringCustomHID_zh_hans[USBD_SIZE_STRING_CUSTOM_HID_zh_hans] = {
319+
xdata const uint8_t USBD_StringCustomHID_zh_hans[USBD_SIZE_STRING_CUSTOM_HID_zh_hans] = {
320320
USBD_SIZE_STRING_CUSTOM_HID_zh_hans,
321321
USB_STRING_DESCRIPTOR_TYPE,
322322
0x53, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x47, 0x00, 0x45, 0x00, 0x4b, 0x00, 0x49, 0x00, 0xbe, 0x8b, 0x6e, 0x7f};
323323

324324
/* HID Report Descriptor */
325-
const uint8_t USBD_HidRepDesc[USBD_SIZE_REPORT_DESC] =
325+
xdata const uint8_t USBD_HidRepDesc[USBD_SIZE_REPORT_DESC] =
326326
{
327327
0x05, 0x01, // Usage Page (Generic Desktop Ctrls)
328328
0x09, 0x04, // Usage (Joystick)
@@ -380,7 +380,7 @@ const uint8_t USBD_HidRepDesc[USBD_SIZE_REPORT_DESC] =
380380
0xC0, // End Collection
381381
};
382382

383-
const uint8_t USBD_HidCustomDesc[USBD_SIZE_CUSTOM_REPORT_DESC] = {
383+
xdata const uint8_t USBD_HidCustomDesc[USBD_SIZE_CUSTOM_REPORT_DESC] = {
384384
0x06, 0x00, 0xFF, // Usage Page (Vendor Defined 0xFF00)
385385
0x09, 0x01, // Usage (Vendor Usage 1)
386386
0xA1, 0x01, // Collection (Application)

0 commit comments

Comments
 (0)