8000 Update USB configuration to allow to use the USBMicrophone library (U… · stm32duino/Arduino_Core_STM32@635b829 · GitHub
[go: up one dir, main page]
Skip to content

Commit 635b829

Browse files
author
fpr
committed
Update USB configuration to allow to use the USBMicrophone library (USB Audio class)
Signed-off-by: fpr <fabien.perroquin@wi6labs.com>
1 parent a4dff02 commit 635b829

File tree

2 files changed

+8
-29
lines changed

2 files changed

+8
-29
lines changed

‎variants/DISCO_L475VG_IOT/usb/usbd_conf.c

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -193,32 +193,11 @@ void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)
193193
*/
194194
void HAL_PCD_ResetCallback(PCD_HandleTypeDef *hpcd)
195195
{
196-
USBD_SpeedTypeDef speed = USBD_SPEED_FULL;
197-
198-
/* Set USB Current Speed */
199-
switch(hpcd->Init.speed)
200-
{
201-
//Not supported on STM32L4xx boards
202-
#ifndef STM32L4xx
203-
case PCD_SPEED_HIGH:
204-
speed = USBD_SPEED_HIGH;
205-
break;
206-
#endif
207-
208-
case PCD_SPEED_FULL:
209-
speed = USBD_SPEED_FULL;
210-
break;
211-
212-
default:
213-
speed = USBD_SPEED_FULL;
214-
break;
215-
}
216-
217196
/* Reset Device */
218197
USBD_LL_Reset(hpcd->pData);
219198

220199
/* Set USB Current Speed */
221-
USBD_LL_SetSpeed(hpcd->pData, speed);
200+
USBD_LL_SetSpeed(hpcd->pData, USBD_SPEED_FULL);
222201
}
223202

224203
/**
@@ -329,9 +308,9 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
329308
{
330309
/* Set LL Driver parameters */
331310
g_hpcd.Instance = USB_OTG_FS;
332-
g_hpcd.Init.dev_endpoints = 4;
311+
g_hpcd.Init.dev_endpoints = 2;
333312
g_hpcd.Init.use_dedicated_ep1 = 0;
334-
g_hpcd.Init.ep0_mps = 0x40;
313+
g_hpcd.Init.ep0_mps = DEP0CTL_MPS_64;
335314
g_hpcd.Init.dma_enable = 0;
336315
g_hpcd.Init.low_power_enable = 0;
337316
g_hpcd.Init.lpm_enable = 0;
@@ -340,17 +319,17 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
340319
g_hpcd.Init.Sof_enable = 0;
341320
g_hpcd.Init.speed = PCD_SPEED_FULL;
342321
g_hpcd.Init.vbus_sensing_enable = 1;
322+
g_hpcd.Init.use_external_vbus = 0;
343323
/* Link The driver to the stack */
344324
g_hpcd.pData = pdev;
345325
pdev->pData = &g_hpcd;
346326
/* Initialize LL Driver */
347327
HAL_PCD_Init(&g_hpcd);
348328

349329
/* configure EPs FIFOs */
350-
HAL_PCDEx_SetRxFiFo(&g_hpcd, 0x80);
351-
HAL_PCDEx_SetTxFiFo(&g_hpcd, 0, 0x40);
352-
HAL_PCDEx_SetTxFiFo(&g_hpcd, 1, 0x10);
353-
HAL_PCDEx_SetTxFiFo(&g_hpcd, 2, 0x10);
330+
HAL_PCDEx_SetRxFiFo(&g_hpcd, 0x36);
331+
HAL_PCDEx_SetTxFiFo(&g_hpcd, 0, 0x32);
332+
HAL_PCDEx_SetTxFiFo(&g_hpcd, 1, 0xC8);
354333

355334
return USBD_OK;
356335
}

‎variants/DISCO_L475VG_IOT/usb/usbd_conf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#define USBD_LPM_ENABLED 0
6262

6363
/* Common Config */
64-
#define USBD_MAX_NUM_INTERFACES 1
64+
#define USBD_MAX_NUM_INTERFACES 2
6565
#define USBD_MAX_NUM_CONFIGURATION 1
6666
#define USBD_MAX_STR_DESC_SIZ 0x100
6767
#define USBD_SUPPORT_USER_STRING 0

0 commit comments

Comments
 (0)
0