laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Move global variables

Browse Source
This commit is contained in:
lucianom
2020-03-04 17:16:35 +00:00
parent b5d2aae3d6
commit 3f2d0eb6f7
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib_xua/src/core/endpoint0/xua_endpoint0.c
View File

@@ -107,6 +107,13 @@ unsigned g_curStreamAlt_In = 0;
/* Global variable for current USB bus speed (i.e. FS/HS) */ /* Global variable for current USB bus speed (i.e. FS/HS) */
XUD_BusSpeed_t g_curUsbSpeed = 0; XUD_BusSpeed_t g_curUsbSpeed = 0;
/* Global variables for current USB Vendor and Product strings */
char g_vendor_str[XUA_MAX_STR_LEN] = VENDOR_STR;
#if (AUDIO_CLASS == 2)
char g_product_str[XUA_MAX_STR_LEN] = PRODUCT_STR_A2;
#else
char g_product_str[XUA_MAX_STR_LEN] = PRODUCT_STR_A1;
#endif
/* Subslot */ /* Subslot */
const unsigned g_subSlot_Out_HS[OUTPUT_FORMAT_COUNT] = {HS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES, const unsigned g_subSlot_Out_HS[OUTPUT_FORMAT_COUNT] = {HS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES,
@@ -222,6 +229,7 @@ void XUA_Endpoint0_setVendorId(unsigned short vid) {
devDesc_Audio2.idVendor = vid; devDesc_Audio2.idVendor = vid;
#endif // AUDIO_CLASS == 1} #endif // AUDIO_CLASS == 1}
} }
void concatenateAndCopyStrings(char* string1, char* string2, char* string_buffer) { void concatenateAndCopyStrings(char* string1, char* string2, char* string_buffer) {
uint32_t string_size = MIN(strlen(string1), XUA_MAX_STR_LEN-1); uint32_t string_size = MIN(strlen(string1), XUA_MAX_STR_LEN-1);
@@ -244,7 +252,7 @@ void concatenateAndCopyStrings(char* string1, char* string2, char* string_buffer
} }
void XUA_Endpoint0_setStrTable() { void XUA_Endpoint0_setStrTable() {
// update Vendor string // update Vendor strings
concatenateAndCopyStrings(g_vendor_str, "", g_strTable.vendorStr); concatenateAndCopyStrings(g_vendor_str, "", g_strTable.vendorStr);
#if (AUDIO_CLASS == 2) #if (AUDIO_CLASS == 2)
concatenateAndCopyStrings(g_vendor_str, " Clock Selector", g_strTable.clockSelectorStr); concatenateAndCopyStrings(g_vendor_str, " Clock Selector", g_strTable.clockSelectorStr);
@@ -266,7 +274,7 @@ void XUA_Endpoint0_setStrTable() {
concatenateAndCopyStrings(g_vendor_str, " MIDI Out", g_strTable.midiOutStr); concatenateAndCopyStrings(g_vendor_str, " MIDI Out", g_strTable.midiOutStr);
concatenateAndCopyStrings(g_vendor_str, " MIDI In", g_strTable.midiInStr); concatenateAndCopyStrings(g_vendor_str, " MIDI In", g_strTable.midiInStr);
#endif #endif
// update product string // update product strings
#if (AUDIO_CLASS_FALLBACK) || (AUDIO_CLASS == 1) #if (AUDIO_CLASS_FALLBACK) || (AUDIO_CLASS == 1)
concatenateAndCopyStrings(g_product_str, "", g_strTable.productStr_Audio1); concatenateAndCopyStrings(g_product_str, "", g_strTable.productStr_Audio1);
concatenateAndCopyStrings(g_product_str, "", g_strTable.outputInterfaceStr_Audio1); concatenateAndCopyStrings(g_product_str, "", g_strTable.outputInterfaceStr_Audio1);

6
lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
View File

@@ -404,12 +404,6 @@ StringDescTable_t g_strTable =
.iAP_EANativeTransport_InterfaceStr = IAP2_EA_NATIVE_TRANS_PROTOCOL_NAME, .iAP_EANativeTransport_InterfaceStr = IAP2_EA_NATIVE_TRANS_PROTOCOL_NAME,
#endif #endif
}; };
char g_vendor_str[XUA_MAX_STR_LEN] = VENDOR_STR;
#if (AUDIO_CLASS == 2)
char g_product_str[XUA_MAX_STR_LEN] = PRODUCT_STR_A2;
#else
char g_product_str[XUA_MAX_STR_LEN] = PRODUCT_STR_A1;
#endif
/***** Device Descriptors *****/ /***** Device Descriptors *****/