kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 18:13:49 +01:00
Code Releases Activity

Merge pull request #17812 from benpicco/boards/blxxxpill-usb

Browse Source 
boards/blxxxpill: configure usbdev_fs
This commit is contained in:
Marian Buschsieweke 2022-10-14 01:10:23 +02:00 committed by GitHub
commit ea0a53521f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/common/blxxxpill/Kconfig
View File

@ -17,6 +17,7 @@ config BOARD_COMMON_BLXXXPILL
select HAS_PERIPH_TIMER select HAS_PERIPH_TIMER
select HAS_PERIPH_UART select HAS_PERIPH_UART
select HAS_PERIPH_QDEC select HAS_PERIPH_QDEC
select HAS_PERIPH_USBDEV
# Clock configuration # Clock configuration
select BOARD_HAS_HSE select BOARD_HAS_HSE

1
boards/common/blxxxpill/Makefile.features
View File

@ -11,3 +11,4 @@ FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_qdec FEATURES_PROVIDED += periph_qdec
FEATURES_PROVIDED += periph_usbdev

26
boards/common/blxxxpill/include/periph_conf.h
View File

@ -310,6 +310,32 @@ static const spi_conf_t spi_config[] = {
#define SPI_NUMOF ARRAY_SIZE(spi_config) #define SPI_NUMOF ARRAY_SIZE(spi_config)
/** @} */ /** @} */
/**
* @brief USB device FS configuration
*/
static const stm32_usbdev_fs_config_t stm32_usbdev_fs_config[] = {
{
.base_addr = (uintptr_t)USB,
.rcc_mask = RCC_APB1ENR_USBEN,
.irqn = USB_LP_CAN1_RX0_IRQn,
.apb = APB1,
.dm = GPIO_PIN(PORT_A, 11),
.dp = GPIO_PIN(PORT_A, 12),
.af = GPIO_AF_UNDEF,
.disconn = GPIO_UNDEF,
},
};
/**
* @brief Interrupt function name mapping
*/
#define USBDEV_ISR isr_usb_lp_can1_rx0
/**
* @brief Number of available USB device FS peripherals
*/
#define USBDEV_NUMOF ARRAY_SIZE(stm32_usbdev_fs_config)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

3
cpu/stm32/Makefile.dep
View File

@ -4,7 +4,8 @@
USEMODULE += periph stm32_clk stm32_vectors USEMODULE += periph stm32_clk stm32_vectors
ifneq (,$(filter periph_usbdev,$(FEATURES_USED))) ifneq (,$(filter periph_usbdev,$(FEATURES_USED)))
ifeq (,$(filter f3 wb,$(CPU_FAM))) # TODO: STM32F105xx and STM32F107xx also use synopsys_dwc2
ifeq (,$(filter f1 f3 wb,$(CPU_FAM)))
USEMODULE += usbdev_synopsys_dwc2 USEMODULE += usbdev_synopsys_dwc2
endif endif
USEMODULE += ztimer USEMODULE += ztimer

2
cpu/stm32/include/periph/cpu_gpio.h
View File

@ -116,10 +116,10 @@ typedef enum {
GPIO_AF13, /**< use alternate function 13 */ GPIO_AF13, /**< use alternate function 13 */
GPIO_AF14, /**< use alternate function 14 */ GPIO_AF14, /**< use alternate function 14 */
GPIO_AF15, /**< use alternate function 15 */ GPIO_AF15, /**< use alternate function 15 */
#endif
#endif #endif
GPIO_AF_UNDEF /** an UNDEF value definition, e.g. for register GPIO_AF_UNDEF /** an UNDEF value definition, e.g. for register
based spi */ based spi */
#endif
} gpio_af_t; } gpio_af_t;
#ifdef CPU_FAM_STM32F1 #ifdef CPU_FAM_STM32F1

2
cpu/stm32/periph/Makefile
View File

@ -51,7 +51,7 @@ endif
# Select the correct implementation for `periph_usbdev` # Select the correct implementation for `periph_usbdev`
ifneq (,$(filter periph_usbdev,$(USEMODULE))) ifneq (,$(filter periph_usbdev,$(USEMODULE)))
ifneq (,$(filter f3 wb,$(CPU_FAM))) ifneq (,$(filter f1 f3 wb,$(CPU_FAM)))
SRC += usbdev_fs.c SRC += usbdev_fs.c
endif endif
endif endif

6
tests/sys_fido2_ctap/Makefile.ci Normal file
View File

@ -0,0 +1,6 @@
BOARD_INSUFFICIENT_MEMORY := \
blackpill \
blackpill-128kib \
bluepill \
bluepill-128kib \
#