From 72b3777efa02e166e8225de99b9d32d0f694e7d1 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Fri, 1 Apr 2022 16:14:27 +0200 Subject: [PATCH 2/4] Make class-less version for iso tests --- src/usb_desc.c | 20 ++++++++++---------- src/usb_prop.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/usb_desc.c b/src/usb_desc.c index 2565b73..46cb43d 100644 --- a/src/usb_desc.c +++ b/src/usb_desc.c @@ -79,9 +79,9 @@ const uint8_t Speaker_ConfigDescriptor[] = 0x00, /* bInterfaceNumber */ 0x00, /* bAlternateSetting */ 0x00, /* bNumEndpoints */ - USB_DEVICE_CLASS_AUDIO, /* bInterfaceClass */ - AUDIO_SUBCLASS_AUDIOCONTROL, /* bInterfaceSubClass */ - AUDIO_PROTOCOL_UNDEFINED, /* bInterfaceProtocol */ + 0x00, /* was USB_DEVICE_CLASS_AUDIO, * bInterfaceClass */ + 0x00, /* AUDIO_SUBCLASS_AUDIOCONTROL, * bInterfaceSubClass */ + 0x00, /* AUDIO_PROTOCOL_UNDEFINED, * bInterfaceProtocol */ 0x00, /* iInterface */ /* 09 byte*/ @@ -143,9 +143,9 @@ const uint8_t Speaker_ConfigDescriptor[] = 0x01, /* bInterfaceNumber */ 0x00, /* bAlternateSetting */ 0x00, /* bNumEndpoints */ - USB_DEVICE_CLASS_AUDIO, /* bInterfaceClass */ - AUDIO_SUBCLASS_AUDIOSTREAMING, /* bInterfaceSubClass */ - AUDIO_PROTOCOL_UNDEFINED, /* bInterfaceProtocol */ + 0x00, /* was USB_DEVICE_CLASS_AUDIO, * bInterfaceClass */ + 0x00, /* AUDIO_SUBCLASS_AUDIOSTREAMING,* bInterfaceSubClass */ + 0x00, /* AUDIO_PROTOCOL_UNDEFINED, * bInterfaceProtocol */ 0x00, /* iInterface */ /* 09 byte*/ @@ -156,9 +156,9 @@ const uint8_t Speaker_ConfigDescriptor[] = 0x01, /* bInterfaceNumber */ 0x01, /* bAlternateSetting */ 0x01, /* bNumEndpoints */ - USB_DEVICE_CLASS_AUDIO, /* bInterfaceClass */ - AUDIO_SUBCLASS_AUDIOSTREAMING, /* bInterfaceSubClass */ - AUDIO_PROTOCOL_UNDEFINED, /* bInterfaceProtocol */ + 0x00, /* was USB_DEVICE_CLASS_AUDIO, * bInterfaceClass */ + 0x00, /* AUDIO_SUBCLASS_AUDIOSTREAMING,* bInterfaceSubClass */ + 0x00, /* AUDIO_PROTOCOL_UNDEFINED, * bInterfaceProtocol */ 0x00, /* iInterface */ /* 09 byte*/ @@ -241,7 +241,7 @@ uint8_t Speaker_StringSerial[SPEAKER_SIZ_STRING_SERIAL] = { SPEAKER_SIZ_STRING_SERIAL, /* bLength */ USB_STRING_DESCRIPTOR_TYPE, /* bDescriptorType */ - 'S', 0, 'T', 0, 'M', 0, '3', 0, '2', 0 + 'T', 0, 'e', 0, 's', 0, 't', 0, '1', 0 }; /* Extern variables ----------------------------------------------------------*/ /* Private function prototypes -----------------------------------------------*/ diff --git a/src/usb_prop.c b/src/usb_prop.c index ee6e137..43b0901 100644 --- a/src/usb_prop.c +++ b/src/usb_prop.c @@ -115,7 +115,7 @@ void Speaker_init() { /* Update the serial number string descriptor with the data from the unique ID*/ - Get_SerialNum(); + // Get_SerialNum(); /* Initialize the current configuration */ pInformation->Current_Configuration = 0; -- 2.25.1