Skip to content

Commit bf0e8d1

Browse files
cumin777fpistm
authored andcommitted
feat(usb): add STM32C5 HAL v2 USB device support
1 parent 5ac665e commit bf0e8d1

7 files changed

Lines changed: 289 additions & 15 deletions

File tree

‎libraries/SrcWrapper/inc/stm32_def.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,13 @@ __STATIC_INLINE void LL_RTC_SetBinMixBCDU(RTC_TypeDef *RTCx, uint32_t BinMixBcdU
203203
}
204204
#endif // STM32U0xx
205205

206-
/* STM32G0xx, STM32U0xx and some STM32U5xx defined USB_DRD_FS */
206+
/* Some STM32 series define USB_DRD_FS instead of the legacy USB instance. */
207207
#if !defined(USB) && defined(USB_DRD_FS)
208208
#define USB USB_DRD_FS
209209
#define PinMap_USB PinMap_USB_DRD_FS
210-
#if defined(STM32H5xx) || defined(STM32U0xx) ||\
210+
#if defined(STM32C5xx)
211+
#define USB_BASE USB_DRD_FS_BASE
212+
#elif defined(STM32H5xx) || defined(STM32U0xx) ||\
211213
defined(STM32U3xx) || defined(STM32U5xx)
212214
#define USB_BASE USB_DRD_BASE
213215
#if !defined(__HAL_RCC_USB_CLK_ENABLE)

‎libraries/USBDevice/inc/usbd_conf.h‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ extern "C" {
2929
/* Includes ------------------------------------------------------------------*/
3030
#include "stm32_def.h"
3131

32-
#if defined(USE_HALV2_DRIVER)
33-
#error "USB library is not yet compatible with HALv2 driver."
34-
#else
3532
#if !defined(USB_BASE) && !defined(USB_OTG_DEVICE_BASE)
3633
#error "This board does not support USB! Select 'None' in the 'Tools->USB interface' menu"
3734
#endif
@@ -40,8 +37,6 @@ extern "C" {
4037
#endif
4138
#if !defined(USB_BASE) && !defined(USB_OTG_FS) && defined(USB_OTG_HS) && !defined(USE_USB_HS)
4239
#error "This board support only USB High Speed! Select 'High Speed' or 'High Speed in Full Speed mode' in the 'Tools->USB interface' menu"
43-
#endif
44-
4540
#endif
4641
#include <stdio.h>
4742
#include <stdlib.h>
@@ -77,7 +72,7 @@ extern "C" {
7772
#elif defined(STM32G0B1xx) || defined(STM32G0C1xx)
7873
#define USB_IRQn USB_UCPD1_2_IRQn
7974
#define USB_IRQHandler USB_UCPD1_2_IRQHandler
80-
#elif defined(STM32C0xx) || defined(STM32H5xx) || defined(STM32U0xx)
75+
#elif defined(STM32C0xx) || defined(STM32C5xx) || defined(STM32H5xx) || defined(STM32U0xx)
8176
#define USB_IRQn USB_DRD_FS_IRQn
8277
#define USB_IRQHandler USB_DRD_FS_IRQHandler
8378
#elif defined(STM32U5xx) && !defined(USB_DRD_FS)
@@ -90,6 +85,13 @@ extern "C" {
9085

9186
#endif /* USB_BASE */
9287

88+
#if !defined(PCD_SNG_BUF) && defined(HAL_PCD_SNG_BUF)
89+
#define PCD_SNG_BUF HAL_PCD_SNG_BUF
90+
#endif
91+
#if !defined(PCD_DBL_BUF) && defined(HAL_PCD_DBL_BUF)
92+
#define PCD_DBL_BUF HAL_PCD_DBL_BUF
93+
#endif
94+
9395
#ifndef __HAL_PCD_GATE_PHYCLOCK
9496
#define __HAL_PCD_GATE_PHYCLOCK(_DUMMY_)
9597
#endif

‎libraries/USBDevice/inc/usbd_ep_conf.h‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,21 @@ typedef struct {
6969

7070
#ifdef USBD_USE_CDC
7171
#define PMA_CDC_OUT_BASE (PMA_EP0_IN_ADDR + USB_MAX_EP0_SIZE)
72+
#if defined(STM32C5xx)
73+
/*
74+
* The C5 USB DRD FS peripheral is used with bulk double buffering disabled.
75+
* Keep each CDC endpoint in its own 64-byte PMA area; in particular, the
76+
* interrupt IN endpoint must not overlap the bulk IN data buffer.
77+
*/
78+
#define PMA_CDC_OUT_ADDR PMA_CDC_OUT_BASE
79+
#define PMA_CDC_IN_ADDR (PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE)
80+
#define PMA_CDC_CMD_ADDR (PMA_CDC_IN_ADDR + USB_FS_MAX_PACKET_SIZE)
81+
#else
7282
#define PMA_CDC_OUT_ADDR ((PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE) | \
7383
(PMA_CDC_OUT_BASE << 16U))
7484
#define PMA_CDC_IN_ADDR (PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE * 2)
7585
#define PMA_CDC_CMD_ADDR (PMA_CDC_IN_ADDR + CDC_CMD_PACKET_SIZE)
86+
#endif
7687
#endif /* USBD_USE_CDC */
7788
#ifdef USBD_USE_HID_COMPOSITE
7889
#define PMA_MOUSE_IN_ADDR (PMA_EP0_IN_ADDR + HID_MOUSE_EPIN_SIZE)
@@ -86,4 +97,4 @@ extern const ep_desc_t ep_def[DEV_NUM_EP + 1];
8697
#endif /* USBCON */
8798
#endif /* __USBD_EP_CONF_H */
8899

89-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
100+
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

‎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_confv2.c
4+
* @brief HAL v2 USB device low-level adapter.
5+
******************************************************************************
6+
*/
7+
8+
#if defined(USBCON) && defined(USE_HALV2_DRIVER)
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_V2_ConfigPinsAndIrq(void)
24+
{
25+
/* The HAL v2 USB DRD FS PCD owns PA11/PA12 and configures these fixed USB
26+
* pins during peripheral initialization. */
27+
28+
HAL_RCC_USB_EnableClock();
29+
HAL_CORTEX_NVIC_SetPriority(USB_IRQn, USBD_IRQ_PRIO, USBD_IRQ_SUBPRIO);
30+
HAL_CORTEX_NVIC_EnableIRQ(USB_IRQn);
31+
}
32+
33+
void HAL_PCD_SetupStageCallback(hal_pcd_handle_t *hpcd)
34+
{
35+
USBD_LL_SetupStage(g_pdev, (uint8_t *)hpcd->setup);
36+
}
37+
38+
void HAL_PCD_DataOutStageCallback(hal_pcd_handle_t *hpcd, uint8_t epnum)
39+
{
40+
USBD_LL_DataOutStage(g_pdev, epnum, hpcd->out_ep[epnum].p_xfer_buffer);
41+
}
42+
43+
void HAL_PCD_DataInStageCallback(hal_pcd_handle_t *hpcd, uint8_t epnum)
44+
{
45+
USBD_LL_DataInStage(g_pdev, epnum, hpcd->in_ep[epnum].p_xfer_buffer);
46+
}
47+
48+
void HAL_PCD_SofCallback(hal_pcd_handle_t *hpcd)
49+
{
50+
(void)hpcd;
51+
USBD_LL_SOF(g_pdev);
52+
}
53+
54+
void HAL_PCD_ResetCallback(hal_pcd_handle_t *hpcd)
55+
{
56+
(void)hpcd;
57+
USBD_LL_Reset(g_pdev);
58+
USBD_LL_SetSpeed(g_pdev, USBD_SPEED_FULL);
59+
}
60+
61+
void HAL_PCD_SuspendCallback(hal_pcd_handle_t *hpcd)
62+
{
63+
(void)hpcd;
64+
USBD_LL_Suspend(g_pdev);
65+
}
66+
67+
void HAL_PCD_ResumeCallback(hal_pcd_handle_t *hpcd)
68+
{
69+
(void)hpcd;
70+
USBD_LL_Resume(g_pdev);
71+
}
72+
73+
void HAL_PCD_ISOOUTIncompleteCallback(hal_pcd_handle_t *hpcd, uint8_t epnum)
74+
{
75+
(void)hpcd;
76+
USBD_LL_IsoOUTIncomplete(g_pdev, epnum);
77+
}
78+
79+
void HAL_PCD_ISOINIncompleteCallback(hal_pcd_handle_t *hpcd, uint8_t epnum)
80+
{
81+
(void)hpcd;
82+
USBD_LL_IsoINIncomplete(g_pdev, epnum);
83+
}
84+
85+
void HAL_PCD_ConnectCallback(hal_pcd_handle_t *hpcd)
86+
{
87+
(void)hpcd;
88+
USBD_LL_DevConnected(g_pdev);
89+
}
90+
91+
void HAL_PCD_DisconnectCallback(hal_pcd_handle_t *hpcd)
92+
{
93+
(void)hpcd;
94+
USBD_LL_DevDisconnected(g_pdev);
95+
}
96+
97+
void USB_IRQHandler(void)
98+
{
99+
HAL_PCD_IRQHandler(&g_hpcd);
100+
}
101+
102+
USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
103+
{
104+
hal_pcd_config_t config = {
105+
.dma_enable = HAL_PCD_DMA_DISABLED,
106+
.pcd_speed = HAL_PCD_SPEED_FS,
107+
.phy_interface = HAL_PCD_PHY_EMBEDDED_FS,
108+
.sof_enable = HAL_PCD_SOF_DISABLED,
109+
.lpm_enable = HAL_PCD_LPM_DISABLED,
110+
.battery_charging_enable = HAL_PCD_BCD_DISABLED,
111+
.vbus_sensing_enable = HAL_PCD_VBUS_SENSE_DISABLED,
112+
.bulk_doublebuffer_enable = HAL_PCD_BULK_DB_DISABLED,
113+
};
114+
115+
USBD_V2_ConfigPinsAndIrq();
116+
117+
g_pdev = pdev;
118+
g_stalled_in = 0U;
119+
g_stalled_out = 0U;
120+
pdev->pData = &g_hpcd;
121+
122+
if (HAL_PCD_Init(&g_hpcd, HAL_PCD_DRD_FS) != HAL_OK) {
123+
Error_Handler();
124+
}
125+
if (HAL_PCD_SetConfig(&g_hpcd, &config) != HAL_OK) {
126+
Error_Handler();
127+
}
128+
129+
for (uint32_t i = 0U; i < (DEV_NUM_EP + 1U); i++) {
130+
if (HAL_PCD_PMAConfig(&g_hpcd, ep_def[i].ep_adress, ep_def[i].ep_kind,
131+
ep_def[i].ep_size) != HAL_OK) {
132+
Error_Handler();
133+
}
134+
}
135+
136+
/* HAL v2 exposes the USB pull-up through the PCD device-connect API. Do
137+
* the startup detach after the PCD has been initialized instead of reaching
138+
* into a board-specific GPIO pin from the common re-enumeration helper.
139+
* HAL_PCD_Start() performs the matching attach once USB is ready. */
140+
(void)HAL_PCD_DeviceDisconnect(&g_hpcd);
141+
HAL_Delay(USBD_ENUM_DELAY);
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_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 */

‎libraries/USBDevice/src/usbd_ep_conf.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const ep_desc_t ep_def[] = {
3737
#else
3838
{0x00, PMA_EP0_OUT_ADDR, PCD_SNG_BUF},
3939
{0x80, PMA_EP0_IN_ADDR, PCD_SNG_BUF},
40-
#ifndef USBD_CDC_USE_SINGLE_BUFFER
40+
#if !defined(STM32C5xx) && !defined(USBD_CDC_USE_SINGLE_BUFFER)
4141
{CDC_OUT_EP, PMA_CDC_OUT_ADDR, PCD_DBL_BUF},
4242
#else
4343
{CDC_OUT_EP, PMA_CDC_OUT_ADDR, PCD_SNG_BUF},
@@ -72,4 +72,3 @@ const ep_desc_t ep_def[] = {
7272

7373
#endif /* HAL_PCD_MODULE_ENABLED && USBCON */
7474
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
75-

0 commit comments

Comments
 (0)