Merge commit '4edf86b3a6405c1b3331288fabb02ffed3664c60' into feature/sw_pll_sync_ua

This commit is contained in:
Ed
2024-01-18 14:39:53 +00:00

View File

@@ -1,4 +1,4 @@
// Copyright 2011-2023 XMOS LIMITED. // Copyright 2011-2024 XMOS LIMITED.
// This Software is subject to the terms of the XMOS Public Licence: Version 1. // This Software is subject to the terms of the XMOS Public Licence: Version 1.
/** /**
* @file xua_ep0_descriptors.h * @file xua_ep0_descriptors.h
@@ -772,6 +772,11 @@ typedef struct
unsigned char configDesc_DFU[DFU_LENGTH]; unsigned char configDesc_DFU[DFU_LENGTH];
#endif #endif
#ifdef USB_CONTROL_DESCS
/* Inferface descriptor for control */
unsigned char itfDesc_control[9];
#endif
#ifdef IAP #ifdef IAP
USB_Descriptor_Interface_t iAP_Interface; USB_Descriptor_Interface_t iAP_Interface;
USB_Descriptor_Endpoint_t iAP_Out_Endpoint; USB_Descriptor_Endpoint_t iAP_Out_Endpoint;
@@ -2104,6 +2109,21 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
#endif #endif
#endif /* (XUA_DFU_EN == 1) */ #endif /* (XUA_DFU_EN == 1) */
#ifdef USB_CONTROL_DESCS
{
/* Control interface descriptor */
0x09, /* 0 bLength : Size of this descriptor, in bytes. (field size 1 bytes) */
0x04, /* 1 bDescriptorType : INTERFACE descriptor. (field size 1 bytes) */
(INTERFACE_NUMBER_MISC_CONTROL), /* 2 bInterfaceNumber */
0x00, /* 3 bAlternateSetting : Index of this setting. (field size 1 bytes) */
0x00, /* 4 bNumEndpoints : 0 endpoints. (field size 1 bytes) */
USB_CLASS_VENDOR_SPECIFIC, /* 5 bInterfaceClass : Vendor specific. (field size 1 bytes) */
0xFF, /* 6 bInterfaceSubclass : (field size 1 bytes) */
0xFF, /* 7 bInterfaceProtocol : Unused. (field size 1 bytes) */
offsetof(StringDescTable_t, ctrlStr)/sizeof(char *), /* 8 iInterface */
},
#endif
#ifdef IAP #ifdef IAP
/* Interface descriptor */ /* Interface descriptor */
.iAP_Interface = .iAP_Interface =