Skip to content

Commit 5937f3e

Browse files
fpistmfpistm
committed
[USB] Fix endpoints configurations
Endpoints (EP) configuration was not properly set depending of USB class used and USB type (HS/FS/LS). Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 9ba484e commit 5937f3e

File tree

6 files changed

+180
-47
lines changed

6 files changed

+180
-47
lines changed

‎cores/arduino/stm32/usb/cdc/usbd_cdc.h‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ extern "C" {
2626
#endif
2727

2828
/* Includes ------------------------------------------------------------------*/
29-
#include "usbd_ioreq.h"
29+
#include "usbd_ioreq.h"
30+
#include "usbd_ep_conf.h"
3031

3132
/** @addtogroup STM32_USB_DEVICE_LIBRARY
3233
* @{
@@ -37,26 +38,18 @@ extern "C" {
3738
* @{
3839
*/
3940

40-
4141
/** @defgroup usbd_cdc_Exported_Defines
4242
* @{
4343
*/
44-
#define CDC_IN_EP 0x82U /* EP1 for data IN */
45-
#define CDC_OUT_EP 0x01U /* EP1 for data OUT */
46-
#define CDC_CMD_EP 0x83U /* EP2 for CDC commands */
47-
4844
#ifndef CDC_HS_BINTERVAL
49-
#define CDC_HS_BINTERVAL 0x10U
45+
#define CDC_HS_BINTERVAL 0x10U
5046
#endif /* CDC_HS_BINTERVAL */
5147

5248
#ifndef CDC_FS_BINTERVAL
53-
#define CDC_FS_BINTERVAL 0x10U
49+
#define CDC_FS_BINTERVAL 0x10U
5450
#endif /* CDC_FS_BINTERVAL */
5551

56-
/* CDC Endpoints parameters: you can fine tune these values depending on the needed baudrates and performance. */
57-
#define CDC_DATA_HS_MAX_PACKET_SIZE 512U /* Endpoint IN & OUT Packet size */
58-
#define CDC_DATA_FS_MAX_PACKET_SIZE 64U /* Endpoint IN & OUT Packet size */
59-
#define CDC_CMD_PACKET_SIZE 8U /* Control Endpoint Packet size */
52+
/* CDC Endpoints parameters */
6053

6154
#define USB_CDC_CONFIG_DESC_SIZ 67U
6255
#define CDC_DATA_HS_IN_PACKET_SIZE CDC_DATA_HS_MAX_PACKET_SIZE

‎cores/arduino/stm32/usb/cdc/usbd_cdc_if.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void CDC_continue_transmit(void);
5050
bool CDC_resume_receive(void);
5151
void CDC_init(void);
5252
void CDC_deInit(void);
53-
bool CDC_connected();
53+
bool CDC_connected(void);
5454

5555
#ifdef __cplusplus
5656
}

‎cores/arduino/stm32/usb/hid/usbd_hid_composite.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ extern "C" {
2929
#endif
3030

3131
/* Includes ------------------------------------------------------------------*/
32-
#include "usbd_ioreq.h"
32+
#include "usbd_ioreq.h"
33+
#include "usbd_ep_conf.h"
3334

3435
/** @addtogroup STM32_USB_DEVICE_LIBRARY
3536
* @{
@@ -46,12 +47,6 @@ extern "C" {
4647
#define HID_MOUSE_INTERFACE 0x00U
4748
#define HID_KEYBOARD_INTERFACE 0x01U
4849

49-
#define HID_MOUSE_EPIN_ADDR 0x81U
50-
#define HID_MOUSE_EPIN_SIZE 0x04U
51-
52-
#define HID_KEYBOARD_EPIN_ADDR 0x82U
53-
#define HID_KEYBOARD_EPIN_SIZE 0x08U
54-
5550
#define USB_COMPOSITE_HID_CONFIG_DESC_SIZ 59U
5651
#define USB_HID_DESC_SIZ 9U
5752
#define HID_MOUSE_REPORT_DESC_SIZE 74U

‎cores/arduino/stm32/usb/usbd_conf.c‎

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,15 @@
2020
/* Includes ------------------------------------------------------------------*/
2121
#include "usbd_core.h"
2222
#include "usbd_if.h"
23+
#include "usbd_ep_conf.h"
2324
#include "stm32yyxx_ll_pwr.h"
2425

2526
#ifndef HAL_PCD_MODULE_ENABLED
2627
#error "HAL_PCD_MODULE_ENABLED is required"
2728
#else
2829
/* Private typedef -----------------------------------------------------------*/
2930
/* Private define ------------------------------------------------------------*/
30-
/* Size in words, byte size divided by 2 */
31-
#define PMA_EP0_OUT_ADDR (8 * 4)
32-
#define PMA_EP0_IN_ADDR (PMA_EP0_OUT_ADDR + USB_MAX_EP0_SIZE)
33-
#define PMA_CDC_OUT_BASE (PMA_EP0_IN_ADDR + USB_MAX_EP0_SIZE)
34-
#define PMA_CDC_OUT_ADDR ((PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE) | \
35-
(PMA_CDC_OUT_BASE << 16U))
36-
#define PMA_CDC_IN_ADDR (PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE * 2)
37-
#define PMA_CDC_CMD_ADDR (PMA_CDC_IN_ADDR + USB_FS_MAX_PACKET_SIZE)
31+
3832
/* Private macro -------------------------------------------------------------*/
3933
/* Private variables ---------------------------------------------------------*/
4034
PCD_HandleTypeDef g_hpcd;
@@ -465,7 +459,7 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
465459
{
466460
USBD_reenumerate();
467461
/* Set common LL Driver parameters */
468-
g_hpcd.Init.dev_endpoints = 4;
462+
g_hpcd.Init.dev_endpoints = DEV_NUM_EP;
469463
g_hpcd.Init.ep0_mps = DEP0CTL_MPS_64;
470464
#if !defined(STM32F1xx) && !defined(STM32F2xx) || defined(USB)
471465
g_hpcd.Init.lpm_enable = DISABLE;
@@ -510,26 +504,17 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
510504
Error_Handler();
511505
}
512506

513-
#ifdef USE_USB_HS
514-
/* configure EPs FIFOs */
515-
HAL_PCDEx_SetRxFiFo(&g_hpcd, 0x200);
516-
HAL_PCDEx_SetTxFiFo(&g_hpcd, 0, 0x80);
517-
HAL_PCDEx_SetTxFiFo(&g_hpcd, 1, 0x40);
518-
HAL_PCDEx_SetTxFiFo(&g_hpcd, 2, 0x160);
519-
#else /* USE_USB_FS */
520-
#ifdef USB_OTG_FS
507+
508+
#if !defined (USB)
521509
/* configure EPs FIFOs */
522-
HAL_PCDEx_SetRxFiFo(&g_hpcd, 0x80);
523-
HAL_PCDEx_SetTxFiFo(&g_hpcd, 0, 0x40);
524-
HAL_PCDEx_SetTxFiFo(&g_hpcd, 1, 0x40);
525-
HAL_PCDEx_SetTxFiFo(&g_hpcd, 2, 0x40);
510+
HAL_PCDEx_SetRxFiFo(&g_hpcd, ep_def[0].ep_size);
511+
for (uint32_t i = 1; i < (DEV_NUM_EP + 1); i++) {
512+
HAL_PCDEx_SetTxFiFo(&g_hpcd, ep_def[i].ep_adress & 0xF, ep_def[i].ep_size);
513+
}
526514
#else
527-
HAL_PCDEx_PMAConfig(&g_hpcd, 0x00, PCD_SNG_BUF, PMA_EP0_OUT_ADDR);
528-
HAL_PCDEx_PMAConfig(&g_hpcd, 0x80, PCD_SNG_BUF, PMA_EP0_IN_ADDR);
529-
HAL_PCDEx_PMAConfig(&g_hpcd, 0x01, PCD_DBL_BUF, PMA_CDC_OUT_ADDR);
530-
HAL_PCDEx_PMAConfig(&g_hpcd, 0x82, PCD_SNG_BUF, PMA_CDC_IN_ADDR);
531-
HAL_PCDEx_PMAConfig(&g_hpcd, 0x83, PCD_SNG_BUF, PMA_CDC_CMD_ADDR);
532-
#endif
515+
for (uint32_t i = 0; i < (DEV_NUM_EP + 1); i++) {
516+
HAL_PCDEx_PMAConfig(&g_hpcd, ep_def[i].ep_adress, ep_def[i].ep_kind, ep_def[i].ep_size);
517+
}
533518
#endif /* USE_USB_HS */
534519
return USBD_OK;
535520
}

‎cores/arduino/stm32/usb/usbd_ep_conf.c‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
/**
2+
******************************************************************************
3+
* @file usbd_ep_conf.c
4+
* @brief USB Device endpoints configuration
5+
******************************************************************************
6+
* @attention
7+
*
8+
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
9+
* All rights reserved.</center></h2>
10+
*
11+
* This software component is licensed by ST under Ultimate Liberty license
12+
* SLA0044, the "License"; You may not use this file except in compliance with
13+
* the License. You may obtain a copy of the License at:
14+
* www.st.com/SLA0044
15+
*
16+
******************************************************************************
17+
*/
18+
#if defined(HAL_PCD_MODULE_ENABLED) && defined(USBCON)
19+
/* Includes ------------------------------------------------------------------*/
20+
#include "usbd_ep_conf.h"
21+
22+
#ifdef USBD_USE_CDC
23+
const ep_desc_t ep_def[] = {
24+
#ifdef USE_USB_HS
25+
{0x00, CDC_DATA_HS_MAX_PACKET_SIZE},
26+
{0x80, CDC_DATA_HS_MAX_PACKET_SIZE},
27+
{CDC_OUT_EP, CDC_DATA_HS_MAX_PACKET_SIZE},
28+
{CDC_IN_EP, CDC_DATA_HS_MAX_PACKET_SIZE},
29+
{CDC_CMD_EP, CDC_CMD_PACKET_SIZE}
30+
#else /* USE_USB_FS */
31+
#ifdef USB_OTG_FS
32+
{0x00, CDC_DATA_FS_MAX_PACKET_SIZE},
33+
{0x80, CDC_DATA_FS_MAX_PACKET_SIZE},
34+
{CDC_OUT_EP, CDC_DATA_FS_MAX_PACKET_SIZE},
35+
{CDC_IN_EP, CDC_DATA_FS_MAX_PACKET_SIZE},
36+
{CDC_CMD_EP, CDC_CMD_PACKET_SIZE}
37+
#else
38+
{0x00, PMA_EP0_OUT_ADDR, PCD_SNG_BUF},
39+
{0x80, PMA_EP0_IN_ADDR, PCD_SNG_BUF},
40+
{CDC_OUT_EP, PMA_CDC_OUT_ADDR, PCD_DBL_BUF},
41+
{CDC_IN_EP, PMA_CDC_IN_ADDR, PCD_SNG_BUF},
42+
{CDC_CMD_EP, PMA_CDC_CMD_ADDR, PCD_SNG_BUF}
43+
#endif
44+
#endif
45+
};
46+
#endif /* USBD_USE_CDC */
47+
48+
#ifdef USBD_USE_HID_COMPOSITE
49+
const ep_desc_t ep_def[] = {
50+
#if !defined (USB)
51+
#ifdef USE_USB_HS
52+
{0x00, USB_HS_MAX_PACKET_SIZE},
53+
{0x80, USB_HS_MAX_PACKET_SIZE},
54+
#else
55+
{0x00, USB_FS_MAX_PACKET_SIZE},
56+
{0x80, USB_FS_MAX_PACKET_SIZE},
57+
#endif
58+
{HID_MOUSE_EPIN_ADDR, HID_MOUSE_EPIN_SIZE},
59+
{HID_KEYBOARD_EPIN_ADDR, HID_KEYBOARD_EPIN_SIZE},
60+
#else
61+
{0x00, PMA_EP0_OUT_ADDR, PCD_SNG_BUF},
62+
{0x80, PMA_EP0_IN_ADDR, PCD_SNG_BUF},
63+
{HID_MOUSE_EPIN_ADDR, PMA_MOUSE_IN_ADDR, PCD_SNG_BUF},
64+
{HID_KEYBOARD_EPIN_ADDR, PMA_KEYBOARD_IN_ADDR, PCD_SNG_BUF},
65+
#endif
66+
};
67+
#endif /* USBD_USE_HID_COMPOSITE */
68+
69+
#endif /* HAL_PCD_MODULE_ENABLED && USBCON */
70+
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
71+

‎cores/arduino/stm32/usb/usbd_ep_conf.h‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
/**
2+
******************************************************************************
3+
* @file usbd_ep_conf.h
4+
* @brief USB Device endpoints configuration
5+
******************************************************************************
6+
* @attention
7+
*
8+
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
9+
* All rights reserved.</center></h2>
10+
*
11+
* This software component is licensed by ST under Ultimate Liberty license
12+
* SLA0044, the "License"; You may not use this file except in compliance with
13+
* the License. You may obtain a copy of the License at:
14+
* www.st.com/SLA0044
15+
*
16+
******************************************************************************
17+
*/
18+
19+
/* Define to prevent recursive inclusion -------------------------------------*/
20+
#ifndef __USBD_EP_CONF_H
21+
#define __USBD_EP_CONF_H
22+
23+
#ifdef USBCON
24+
25+
#include <stdint.h>
26+
#include "usbd_def.h"
27+
28+
typedef struct {
29+
uint32_t ep_adress; /* Endpoint address */
30+
uint32_t ep_size; /* Endpoint size */
31+
#if defined (USB)
32+
uint32_t ep_kind; /* PCD Endpoint Kind: PCD_SNG_BUF or PCD_DBL_BUF */
33+
#endif
34+
} ep_desc_t;
35+
36+
37+
/* CDC Endpoints Configurations */
38+
#ifdef USBD_USE_CDC
39+
40+
#define CDC_OUT_EP 0x01U /* EP1 for data OUT */
41+
#define CDC_IN_EP 0x82U /* EP1 for data IN */
42+
#define CDC_CMD_EP 0x83U /* EP2 for CDC commands */
43+
44+
#define DEV_NUM_EP 0x04U /* Device Endpoints number including EP0 */
45+
46+
/* CDC Endpoints parameters*/
47+
#define CDC_DATA_HS_MAX_PACKET_SIZE USB_HS_MAX_PACKET_SIZE /* Endpoint IN & OUT Packet size */
48+
#define CDC_DATA_FS_MAX_PACKET_SIZE USB_FS_MAX_PACKET_SIZE /* Endpoint IN & OUT Packet size */
49+
#define CDC_CMD_PACKET_SIZE 8U /* Control Endpoint Packet size */
50+
#endif /* USBD_USE_CDC */
51+
52+
53+
/* HID composite (Mouse + Keyboard) Endpoints Configurations */
54+
#ifdef USBD_USE_HID_COMPOSITE
55+
#define HID_MOUSE_EPIN_ADDR 0x81U
56+
#define HID_KEYBOARD_EPIN_ADDR 0x82U
57+
58+
#define HID_MOUSE_EPIN_SIZE 0x04U
59+
#define HID_KEYBOARD_EPIN_SIZE 0x08U
60+
61+
#define DEV_NUM_EP 0x03U /* Device Endpoints number including EP0 */
62+
#endif /* USBD_USE_HID_COMPOSITE */
63+
64+
/* Require DEV_NUM_EP to be defined */
65+
#if defined (USB)
66+
/* Size in words, byte size divided by 2 */
67+
#define PMA_EP0_OUT_ADDR (8 * DEV_NUM_EP)
68+
#define PMA_EP0_IN_ADDR (PMA_EP0_OUT_ADDR + USB_MAX_EP0_SIZE)
69+
70+
#ifdef USBD_USE_CDC
71+
#define PMA_CDC_OUT_BASE (PMA_EP0_IN_ADDR + USB_MAX_EP0_SIZE)
72+
#define PMA_CDC_OUT_ADDR ((PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE) | \
73+
(PMA_CDC_OUT_BASE << 16U))
74+
#define PMA_CDC_IN_ADDR (PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE * 2)
75+
#define PMA_CDC_CMD_ADDR (PMA_CDC_IN_ADDR + CDC_CMD_PACKET_SIZE)
76+
#endif /* USBD_USE_CDC */
77+
#ifdef USBD_USE_HID_COMPOSITE
78+
#define PMA_MOUSE_IN_ADDR (PMA_EP0_IN_ADDR + HID_MOUSE_EPIN_SIZE)
79+
#define PMA_KEYBOARD_IN_ADDR (PMA_MOUSE_IN_ADDR + HID_KEYBOARD_EPIN_SIZE)
80+
#endif /* USBD_USE_HID_COMPOSITE */
81+
#endif /* USB */
82+
83+
extern const ep_desc_t ep_def[DEV_NUM_EP + 1];
84+
85+
86+
#endif /* USBCON */
87+
#endif /* __USBD_EP_CONF_H */
88+
89+
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

0 commit comments

Comments
 (0)