Skip to content

Commit dc3313b

Browse files
committed
feat(usb): add C5 HAL v2 CDC support
1 parent def9340 commit dc3313b

5 files changed

Lines changed: 282 additions & 5 deletions

File tree

‎libraries/USBDevice/inc/usbd_conf.h‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,17 @@ extern "C" {
3030
#include "stm32_def.h"
3131

3232
#if defined(USE_HALV2_DRIVER)
33-
#error "USB library is not yet compatible with HALv2 driver."
33+
#if !defined(STM32C5xx)
34+
#error "USB library is not yet compatible with this HALv2 driver."
35+
#endif
36+
37+
/* STM32C5 uses the HAL v2 USB DRD FS PCD. Keep the legacy USB name and
38+
* PMA buffer-kind names available to the common endpoint configuration. */
39+
#define USB USB_DRD_FS
40+
#define PCD_SNG_BUF HAL_PCD_SNG_BUF
41+
#define PCD_DBL_BUF HAL_PCD_DBL_BUF
42+
#define USB_IRQn USB_DRD_FS_IRQn
43+
#define USB_IRQHandler USB_DRD_FS_IRQHandler
3444
#else
3545
#if !defined(USB_BASE) && !defined(USB_OTG_DEVICE_BASE)
3646
#error "This board does not support USB! Select 'None' in the 'Tools->USB interface' menu"

‎libraries/USBDevice/src/cdc/usbd_cdc.c‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,11 @@ static uint8_t USBD_CDC_Setup(USBD_HandleTypeDef *pdev,
701701
static uint8_t USBD_CDC_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
702702
{
703703
USBD_CDC_HandleTypeDef *hcdc;
704+
#if defined(USE_HALV2_DRIVER)
705+
hal_pcd_handle_t *hpcd = (hal_pcd_handle_t *)pdev->pData;
706+
#else
704707
PCD_HandleTypeDef *hpcd = (PCD_HandleTypeDef *)pdev->pData;
708+
#endif
705709

706710
if (pdev->pClassDataCmsit[pdev->classId] == NULL) {
707711
return (uint8_t)USBD_FAIL;
@@ -710,7 +714,13 @@ static uint8_t USBD_CDC_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
710714
hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassDataCmsit[pdev->classId];
711715

712716
if ((pdev->ep_in[epnum & 0xFU].total_length > 0U) &&
713-
((pdev->ep_in[epnum & 0xFU].total_length % hpcd->IN_ep[epnum & 0xFU].maxpacket) == 0U)) {
717+
((pdev->ep_in[epnum & 0xFU].total_length %
718+
#if defined(USE_HALV2_DRIVER)
719+
hpcd->in_ep[epnum & 0xFU].max_packet
720+
#else
721+
hpcd->IN_ep[epnum & 0xFU].maxpacket
722+
#endif
723+
) == 0U)) {
714724
/* Update the packet total length */
715725
pdev->ep_in[epnum & 0xFU].total_length = 0U;
716726

‎libraries/USBDevice/src/usbd_conf.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
******************************************************************************
1818
*/
19-
#ifdef USBCON
19+
#if defined(USBCON) && !defined(USE_HALV2_DRIVER)
2020
/* Includes ------------------------------------------------------------------*/
2121
#include "usbd_core.h"
2222
#include "usbd_if.h"
@@ -718,6 +718,5 @@ void USBD_LL_Delay(uint32_t Delay)
718718
HAL_Delay(Delay);
719719
}
720720
#endif /* HAL_PCD_MODULE_ENABLED */
721-
#endif /* USBCON */
721+
#endif /* USBCON && !USE_HALV2_DRIVER */
722722
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
723-
Lines changed: 251 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,251 @@
1+
/**
2+
******************************************************************************
3+
* @file usbd_conf_c5.c
4+
* @brief STM32C5 HAL v2 USB device low-level adapter.
5+
******************************************************************************
6+
*/
7+
8+
#if defined(USBCON) && defined(USE_HALV2_DRIVER) && defined(STM32C5xx)
9+
10+
#include "usbd_core.h"
11+
#include "usbd_if.h"
12+
#include "usbd_ep_conf.h"
13+
14+
#ifndef USE_HAL_PCD_MODULE
15+
#error "USE_HAL_PCD_MODULE is required"
16+
#endif
17+
18+
static hal_pcd_handle_t g_hpcd;
19+
static USBD_HandleTypeDef *g_pdev;
20+
static uint8_t g_stalled_in;
21+
static uint8_t g_stalled_out;
22+
23+
static void USBD_C5_ErrorHandler(void)
24+
{
25+
Error_Handler();
26+
}
27+
28+
static void USBD_C5_ConfigPinsAndIrq(void)
29+
{
30+
/* USB DRD FS owns PA11/PA12 and configures these fixed USB pins itself
31+
* during peripheral initialization. Do not configure a GPIO alternate
32+
* function here: C5 USB differs from the older USB device IPs. */
33+
34+
HAL_RCC_USB_EnableClock();
35+
HAL_CORTEX_NVIC_SetPriority(USB_DRD_FS_IRQn, USBD_IRQ_PRIO, USBD_IRQ_SUBPRIO);
36+
HAL_CORTEX_NVIC_EnableIRQ(USB_DRD_FS_IRQn);
37+
}
38+
39+
void HAL_PCD_SetupStageCallback(hal_pcd_handle_t *hpcd)
40+
{
41+
USBD_LL_SetupStage(g_pdev, (uint8_t *)hpcd->setup);
42+
}
43+
44+
void HAL_PCD_DataOutStageCallback(hal_pcd_handle_t *hpcd, uint8_t epnum)
45+
{
46+
USBD_LL_DataOutStage(g_pdev, epnum, hpcd->out_ep[epnum].p_xfer_buffer);
47+
}
48+
49+
void HAL_PCD_DataInStageCallback(hal_pcd_handle_t *hpcd, uint8_t epnum)
50+
{
51+
USBD_LL_DataInStage(g_pdev, epnum, hpcd->in_ep[epnum].p_xfer_buffer);
52+
}
53+
54+
void HAL_PCD_SofCallback(hal_pcd_handle_t *hpcd)
55+
{
56+
(void)hpcd;
57+
USBD_LL_SOF(g_pdev);
58+
}
59+
60+
void HAL_PCD_ResetCallback(hal_pcd_handle_t *hpcd)
61+
{
62+
(void)hpcd;
63+
USBD_LL_Reset(g_pdev);
64+
USBD_LL_SetSpeed(g_pdev, USBD_SPEED_FULL);
65+
}
66+
67+
void HAL_PCD_SuspendCallback(hal_pcd_handle_t *hpcd)
68+
{
69+
(void)hpcd;
70+
USBD_LL_Suspend(g_pdev);
71+
}
72+
73+
void HAL_PCD_ResumeCallback(hal_pcd_handle_t *hpcd)
74+
{
75+
(void)hpcd;
76+
USBD_LL_Resume(g_pdev);
77+
}
78+
79+
void HAL_PCD_ISOOUTIncompleteCallback(hal_pcd_handle_t *hpcd, uint8_t epnum)
80+
{
81+
(void)hpcd;
82+
USBD_LL_IsoOUTIncomplete(g_pdev, epnum);
83+
}
84+
85+
void HAL_PCD_ISOINIncompleteCallback(hal_pcd_handle_t *hpcd, uint8_t epnum)
86+
{
87+
(void)hpcd;
88+
USBD_LL_IsoINIncomplete(g_pdev, epnum);
89+
}
90+
91+
void HAL_PCD_ConnectCallback(hal_pcd_handle_t *hpcd)
92+
{
93+
(void)hpcd;
94+
USBD_LL_DevConnected(g_pdev);
95+
}
96+
97+
void HAL_PCD_DisconnectCallback(hal_pcd_handle_t *hpcd)
98+
{
99+
(void)hpcd;
100+
USBD_LL_DevDisconnected(g_pdev);
101+
}
102+
103+
void USB_DRD_FS_IRQHandler(void)
104+
{
105+
HAL_PCD_IRQHandler(&g_hpcd);
106+
}
107+
108+
USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
109+
{
110+
hal_pcd_config_t config = {
111+
.dma_enable = HAL_PCD_DMA_DISABLED,
112+
.pcd_speed = HAL_PCD_SPEED_FS,
113+
.phy_interface = HAL_PCD_PHY_EMBEDDED_FS,
114+
.sof_enable = HAL_PCD_SOF_DISABLED,
115+
.lpm_enable = HAL_PCD_LPM_DISABLED,
116+
.battery_charging_enable = HAL_PCD_BCD_DISABLED,
117+
.vbus_sensing_enable = HAL_PCD_VBUS_SENSE_DISABLED,
118+
.bulk_doublebuffer_enable = HAL_PCD_BULK_DB_DISABLED,
119+
};
120+
121+
USBD_reenumerate();
122+
USBD_C5_ConfigPinsAndIrq();
123+
124+
g_pdev = pdev;
125+
g_stalled_in = 0U;
126+
g_stalled_out = 0U;
127+
pdev->pData = &g_hpcd;
128+
129+
if (HAL_PCD_Init(&g_hpcd, HAL_PCD_DRD_FS) != HAL_OK) {
130+
USBD_C5_ErrorHandler();
131+
}
132+
if (HAL_PCD_SetConfig(&g_hpcd, &config) != HAL_OK) {
133+
USBD_C5_ErrorHandler();
134+
}
135+
136+
for (uint32_t i = 0U; i < (DEV_NUM_EP + 1U); i++) {
137+
if (HAL_PCD_PMAConfig(&g_hpcd, ep_def[i].ep_adress, ep_def[i].ep_kind,
138+
ep_def[i].ep_size) != HAL_OK) {
139+
USBD_C5_ErrorHandler();
140+
}
141+
}
142+
143+
return USBD_OK;
144+
}
145+
146+
USBD_StatusTypeDef USBD_LL_DeInit(USBD_HandleTypeDef *pdev)
147+
{
148+
(void)pdev;
149+
HAL_CORTEX_NVIC_DisableIRQ(USB_DRD_FS_IRQn);
150+
HAL_PCD_DeInit(&g_hpcd);
151+
HAL_RCC_USB_DisableClock();
152+
g_pdev = NULL;
153+
return USBD_OK;
154+
}
155+
156+
USBD_StatusTypeDef USBD_LL_Start(USBD_HandleTypeDef *pdev)
157+
{
158+
(void)pdev;
159+
return (HAL_PCD_Start(&g_hpcd) == HAL_OK) ? USBD_OK : USBD_FAIL;
160+
}
161+
162+
USBD_StatusTypeDef USBD_LL_Stop(USBD_HandleTypeDef *pdev)
163+
{
164+
(void)pdev;
165+
return (HAL_PCD_Stop(&g_hpcd) == HAL_OK) ? USBD_OK : USBD_FAIL;
166+
}
167+
168+
USBD_StatusTypeDef USBD_LL_OpenEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
169+
uint8_t ep_type, uint16_t ep_mps)
170+
{
171+
(void)pdev;
172+
return (HAL_PCD_OpenEndpoint(&g_hpcd, ep_addr, ep_mps,
173+
(hal_pcd_ep_type_t)ep_type) == HAL_OK) ? USBD_OK : USBD_FAIL;
174+
}
175+
176+
USBD_StatusTypeDef USBD_LL_CloseEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
177+
{
178+
(void)pdev;
179+
return (HAL_PCD_CloseEndpoint(&g_hpcd, ep_addr) == HAL_OK) ? USBD_OK : USBD_FAIL;
180+
}
181+
182+
USBD_StatusTypeDef USBD_LL_FlushEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
183+
{
184+
(void)pdev;
185+
return (HAL_PCD_FlushEndpoint(&g_hpcd, ep_addr) == HAL_OK) ? USBD_OK : USBD_FAIL;
186+
}
187+
188+
USBD_StatusTypeDef USBD_LL_StallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
189+
{
190+
uint8_t mask = (uint8_t)(1U << (ep_addr & 0x0FU));
191+
(void)pdev;
192+
if ((ep_addr & 0x80U) != 0U) {
193+
g_stalled_in |= mask;
194+
} else {
195+
g_stalled_out |= mask;
196+
}
197+
return (HAL_PCD_SetEndpointStall(&g_hpcd, ep_addr) == HAL_OK) ? USBD_OK : USBD_FAIL;
198+
}
199+
200+
USBD_StatusTypeDef USBD_LL_ClearStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
201+
{
202+
uint8_t mask = (uint8_t)(1U << (ep_addr & 0x0FU));
203+
(void)pdev;
204+
if ((ep_addr & 0x80U) != 0U) {
205+
g_stalled_in &= (uint8_t)~mask;
206+
} else {
207+
g_stalled_out &= (uint8_t)~mask;
208+
}
209+
return (HAL_PCD_ClearEndpointStall(&g_hpcd, ep_addr) == HAL_OK) ? USBD_OK : USBD_FAIL;
210+
}
211+
212+
uint8_t USBD_LL_IsStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
213+
{
214+
uint8_t mask = (uint8_t)(1U << (ep_addr & 0x0FU));
215+
(void)pdev;
216+
return ((ep_addr & 0x80U) != 0U) ? ((g_stalled_in & mask) != 0U) :
217+
((g_stalled_out & mask) != 0U);
218+
}
219+
220+
USBD_StatusTypeDef USBD_LL_SetUSBAddress(USBD_HandleTypeDef *pdev, uint8_t dev_addr)
221+
{
222+
(void)pdev;
223+
return (HAL_PCD_SetDeviceAddress(&g_hpcd, dev_addr) == HAL_OK) ? USBD_OK : USBD_FAIL;
224+
}
225+
226+
USBD_StatusTypeDef USBD_LL_Transmit(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
227+
uint8_t *pbuf, uint32_t size)
228+
{
229+
(void)pdev;
230+
return (HAL_PCD_SetEndpointTransmit(&g_hpcd, ep_addr, pbuf, size) == HAL_OK) ? USBD_OK : USBD_FAIL;
231+
}
232+
233+
USBD_StatusTypeDef USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
234+
uint8_t *pbuf, uint32_t size)
235+
{
236+
(void)pdev;
237+
return (HAL_PCD_SetEndpointReceive(&g_hpcd, ep_addr, pbuf, size) == HAL_OK) ? USBD_OK : USBD_FAIL;
238+
}
239+
240+
uint32_t USBD_LL_GetRxDataSize(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
241+
{
242+
(void)pdev;
243+
return HAL_PCD_EP_GetRxCount(&g_hpcd, ep_addr);
244+
}
245+
246+
void USBD_LL_Delay(uint32_t delay)
247+
{
248+
HAL_Delay(delay);
249+
}
250+
251+
#endif /* USBCON && USE_HALV2_DRIVER && STM32C5xx */

‎libraries/USBDevice/src/usbd_if.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,13 @@ WEAK void USBD_reenumerate(void)
144144
#else
145145
digitalWriteFast(USBD_PULLUP_CONTROL_PINNAME, USBD_ATTACH_LEVEL);
146146
#endif /* defined(USBD_PULLUP_CONTROL_FLOATING) */
147+
#elif defined(STM32C5xx) && defined(USE_HALV2_DRIVER)
148+
/* HAL v2 PCD owns the internal pull-up but is not initialized yet when
149+
* this hook runs. Briefly pulling D+ low provides the same detach window. */
150+
pin_function(PA_12, STM_PIN_DATA(STM_MODE_OUTPUT_PP, LL_GPIO_PULL_NO, 0));
151+
digitalWriteFast(PA_12, LOW);
152+
delay(USBD_ENUM_DELAY);
153+
pin_function(PA_12, STM_PIN_DATA(STM_MODE_INPUT, LL_GPIO_PULL_NO, 0));
147154
#elif defined(USBD_HAVE_INTERNAL_PULLUPS)
148155
#if defined(SYSCFG_PMC_USB_PU)
149156
/**

0 commit comments

Comments
 (0)