From 6fd8e6395b62fc3d2ffb1dc3d1647f4b782cb965 Mon Sep 17 00:00:00 2001 From: solosky Date: Wed, 24 Apr 2024 00:25:23 +0800 Subject: [PATCH] tinyusb port --- fw/application/Makefile | 1 + fw/application/src/main.c | 2 +- fw/application/src/mod/tusb/family.c | 339 +++------------------- fw/application/src/mod/tusb/tusb_config.h | 2 +- 4 files changed, 49 insertions(+), 295 deletions(-) diff --git a/fw/application/Makefile b/fw/application/Makefile index 451f34cb..f51dae7c 100644 --- a/fw/application/Makefile +++ b/fw/application/Makefile @@ -738,6 +738,7 @@ else CFLAGS += -DNDEBUG CFLAGS += -DU8G2_USE_LARGE_GB2312_FONT endif +CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_NRF5X CFLAGS += -DMBEDTLS_CONFIG_FILE=\"nrf_crypto_mbedtls_config.h\" CFLAGS += -DM_USE_THREAD_BACKEND=0 CFLAGS += -mcpu=cortex-m4 diff --git a/fw/application/src/main.c b/fw/application/src/main.c index a2204b20..4624ce09 100644 --- a/fw/application/src/main.c +++ b/fw/application/src/main.c @@ -286,7 +286,7 @@ int main(void) { #ifdef NRF52840_XXAA //usb_init(); board_init(); - tusb_init(); + tud_init(BOARD_TUD_RHPORT); #endif NRF_LOG_DEBUG("init done"); diff --git a/fw/application/src/mod/tusb/family.c b/fw/application/src/mod/tusb/family.c index 972f463c..6b700ddc 100644 --- a/fw/application/src/mod/tusb/family.c +++ b/fw/application/src/mod/tusb/family.c @@ -25,340 +25,93 @@ */ #include "bsp/board_api.h" -//#include "board.h" +// #include "board.h" // Suppress warning caused by mcu driver -#ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wcast-qual" -#pragma GCC diagnostic ignored "-Wcast-align" -#pragma GCC diagnostic ignored "-Wunused-parameter" -#pragma GCC diagnostic ignored "-Wundef" -#pragma GCC diagnostic ignored "-Wredundant-decls" -#endif -#include "nrfx.h" -#include "hal/nrf_gpio.h" -#include "drivers/include/nrfx_gpiote.h" -#include "drivers/include/nrfx_power.h" -#include "drivers/include/nrfx_uarte.h" -#include "drivers/include/nrfx_spim.h" - -#ifdef SOFTDEVICE_PRESENT +#include "nrf_log.h" +#include "nrf_sdh.h" +#include "nrf_sdh_soc.h" #include "nrf_sdm.h" #include "nrf_soc.h" -#endif - -#ifdef __GNUC__ -#pragma GCC diagnostic pop -#endif - +#include "nrfx.h" +#include "nrfx_power.h" //--------------------------------------------------------------------+ // Forward USB interrupt events to TinyUSB IRQ Handler //--------------------------------------------------------------------+ -void USBD_IRQHandler(void) { - tud_int_handler(0); -} +void USBD_IRQHandler(void) { tud_int_handler(0); } /*------------------------------------------------------------------*/ /* MACRO TYPEDEF CONSTANT ENUM *------------------------------------------------------------------*/ - -// Value is chosen to be as same as NRFX_POWER_USB_EVT_* in nrfx_power.h -enum { - USB_EVT_DETECTED = 0, - USB_EVT_REMOVED = 1, - USB_EVT_READY = 2 -}; - -#ifdef NRF5340_XXAA - #define LFCLK_SRC_RC CLOCK_LFCLKSRC_SRC_LFRC - #define VBUSDETECT_Msk USBREG_USBREGSTATUS_VBUSDETECT_Msk - #define OUTPUTRDY_Msk USBREG_USBREGSTATUS_OUTPUTRDY_Msk - #define GPIOTE_IRQn GPIOTE1_IRQn -#else - #define LFCLK_SRC_RC CLOCK_LFCLKSRC_SRC_RC - #define VBUSDETECT_Msk POWER_USBREGSTATUS_VBUSDETECT_Msk - #define OUTPUTRDY_Msk POWER_USBREGSTATUS_OUTPUTRDY_Msk -#endif - -static nrfx_uarte_t _uart_id = NRFX_UARTE_INSTANCE(0); - // tinyusb function that handles power event (detected, ready, removed) // We must call it within SD's SOC event handler, or set it as power event handler if SD is not enabled. extern void tusb_hal_nrf_power_event(uint32_t event); - -// nrf power callback, could be unused if SD is enabled or usb is disabled (board_test example) -TU_ATTR_UNUSED static void power_event_handler(nrfx_power_usb_evt_t event) { - tusb_hal_nrf_power_event((uint32_t) event); -} - -//------------- Host using MAX2341E -------------// -#if CFG_TUH_ENABLED && defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421 -static void max3421_init(void); -static nrfx_spim_t _spi = NRFX_SPIM_INSTANCE(1); -#endif - +// Value is chosen to be as same as NRFX_POWER_USB_EVT_* in nrfx_power.h +enum { USB_EVT_DETECTED = 0, USB_EVT_REMOVED = 1, USB_EVT_READY = 2 }; +#define VBUSDETECT_Msk POWER_USBREGSTATUS_VBUSDETECT_Msk +#define OUTPUTRDY_Msk POWER_USBREGSTATUS_OUTPUTRDY_Msk //--------------------------------------------------------------------+ // //--------------------------------------------------------------------+ void board_init(void) { - // stop LF clock just in case we jump from application without reset - // NRF_CLOCK->TASKS_LFCLKSTOP = 1UL; - - // // Use Internal OSC to compatible with all boards - // NRF_CLOCK->LFCLKSRC = LFCLK_SRC_RC; - // NRF_CLOCK->TASKS_LFCLKSTART = 1UL; - - // // // LED - // // nrf_gpio_cfg_output(LED_PIN); - // // board_led_write(false); + // Priorities 0, 1, 4 (nRF52) are reserved for SoftDevice + // 2 is highest for application + NVIC_SetPriority(USBD_IRQn, 2); - // // // Button - // // nrf_gpio_cfg_input(BUTTON_PIN, NRF_GPIO_PIN_PULLUP); - - // // 1ms tick timer - // SysTick_Config(SystemCoreClock / 1000); - - // UART - // nrfx_uarte_config_t uart_cfg = { - // .pseltxd = UART_TX_PIN, - // .pselrxd = UART_RX_PIN, - // .pselcts = NRF_UARTE_PSEL_DISCONNECTED, - // .pselrts = NRF_UARTE_PSEL_DISCONNECTED, - // .p_context = NULL, - // .baudrate = NRF_UARTE_BAUDRATE_115200, // CFG_BOARD_UART_BAUDRATE - // .interrupt_priority = 7, - // .hal_cfg = { - // .hwfc = NRF_UARTE_HWFC_DISABLED, - // .parity = NRF_UARTE_PARITY_EXCLUDED, - // } - // }; - - // nrfx_uarte_init(&_uart_id, &uart_cfg, NULL); //uart_handler); - - //------------- USB -------------// -#if CFG_TUD_ENABLED - // Priorities 0, 1, 4 (nRF52) are reserved for SoftDevice - // 2 is highest for application - NVIC_SetPriority(USBD_IRQn, 2); - - // USB power may already be ready at this time -> no event generated - // We need to invoke the handler based on the status initially - uint32_t usb_reg; - -#ifdef SOFTDEVICE_PRESENT - uint8_t sd_en = false; - sd_softdevice_is_enabled(&sd_en); + // USB power may already be ready at this time -> no event generated + // We need to invoke the handler based on the status initially + uint32_t usb_reg = 0; - if ( sd_en ) { sd_power_usbdetected_enable(true); sd_power_usbpwrrdy_enable(true); sd_power_usbremoved_enable(true); sd_power_usbregstatus_get(&usb_reg); - }else -#endif - { - // Power module init - const nrfx_power_config_t pwr_cfg = {0}; - nrfx_power_init(&pwr_cfg); - - // Register tusb function as USB power handler - // cause cast-function-type warning - const nrfx_power_usbevt_config_t config = {.handler = power_event_handler}; - nrfx_power_usbevt_init(&config); - nrfx_power_usbevt_enable(); - - // USB power may already be ready at this time -> no event generated - // We need to invoke the handler based on the status initially -#ifdef NRF5340_XXAA - usb_reg = NRF_USBREGULATOR->USBREGSTATUS; -#else - usb_reg = NRF_POWER->USBREGSTATUS; -#endif - } - - if ( usb_reg & VBUSDETECT_Msk ) tusb_hal_nrf_power_event(USB_EVT_DETECTED); - if ( usb_reg & OUTPUTRDY_Msk ) tusb_hal_nrf_power_event(USB_EVT_READY); -#endif - -#if CFG_TUH_ENABLED && defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421 - max3421_init(); -#endif - + if (usb_reg & VBUSDETECT_Msk) tusb_hal_nrf_power_event(USB_EVT_DETECTED); + if (usb_reg & OUTPUTRDY_Msk) tusb_hal_nrf_power_event(USB_EVT_READY); } -//--------------------------------------------------------------------+ -// Board porting API -//--------------------------------------------------------------------+ - -// void board_led_write(bool state) { -// nrf_gpio_pin_write(LED_PIN, state ? LED_STATE_ON : (1 - LED_STATE_ON)); -// } - -// uint32_t board_button_read(void) { -// return BUTTON_STATE_ACTIVE == nrf_gpio_pin_read(BUTTON_PIN); -// } - size_t board_get_unique_id(uint8_t id[], size_t max_len) { - (void) max_len; - -#ifdef NRF5340_XXAA - uintptr_t did_addr = (uintptr_t) NRF_FICR->INFO.DEVICEID; -#else - uintptr_t did_addr = (uintptr_t) NRF_FICR->DEVICEID; -#endif - - const uint8_t* device_id = (const uint8_t*) did_addr; - for(uint8_t i=0; i<8; i++) { - id[i] = device_id[i]; - } - return 8; + (void)max_len; + uintptr_t did_addr = (uintptr_t)NRF_FICR->DEVICEID; + const uint8_t *device_id = (const uint8_t *)did_addr; + for (uint8_t i = 0; i < 8; i++) { + id[i] = device_id[i]; + } + return 8; } -int board_uart_read(uint8_t* buf, int len) { - (void) buf; - (void) len; - return 0; -// return NRFX_SUCCESS == nrfx_uart_rx(&_uart_id, buf, (size_t) len) ? len : 0; +int board_uart_read(uint8_t *buf, int len) { + (void)buf; + (void)len; + return 0; + // return NRFX_SUCCESS == nrfx_uart_rx(&_uart_id, buf, (size_t) len) ? len : 0; } -int board_uart_write(void const* buf, int len) { - return (NRFX_SUCCESS == nrfx_uarte_tx(&_uart_id, (uint8_t const*) buf, (size_t) len)) ? len : 0; +int board_uart_write(void const *buf, int len) { + // return (NRFX_SUCCESS == nrfx_uarte_tx(&_uart_id, (uint8_t const *)buf, (size_t)len)) ? len : 0; } -#if CFG_TUSB_OS == OPT_OS_NONE -volatile uint32_t system_ticks = 0; - -// void SysTick_Handler(void) { -// system_ticks++; -// } - -// uint32_t board_millis(void) { -// return system_ticks; -// } - -#endif - -#ifdef SOFTDEVICE_PRESENT -//process SOC event from SD -uint32_t proc_soc(void) { - uint32_t soc_evt; - uint32_t err = sd_evt_get(&soc_evt); - - if (NRF_SUCCESS == err) - { - /*------------- usb power event handler -------------*/ - int32_t usbevt = (soc_evt == NRF_EVT_POWER_USB_DETECTED ) ? NRFX_POWER_USB_EVT_DETECTED: - (soc_evt == NRF_EVT_POWER_USB_POWER_READY) ? NRFX_POWER_USB_EVT_READY : - (soc_evt == NRF_EVT_POWER_USB_REMOVED ) ? NRFX_POWER_USB_EVT_REMOVED : -1; +static void tusb_power_sdh_soc_evt_handler(uint32_t evt_id, void *p_context); - if ( usbevt >= 0) tusb_hal_nrf_power_event(usbevt); - } +NRF_SDH_SOC_OBSERVER(m_soc_tusb, POWER_CONFIG_SOC_OBSERVER_PRIO, tusb_power_sdh_soc_evt_handler, NULL); +static void tusb_power_sdh_soc_evt_handler(uint32_t evt_id, void *p_context) { + int32_t usbevt = (evt_id == NRF_EVT_POWER_USB_DETECTED) ? NRFX_POWER_USB_EVT_DETECTED + : (evt_id == NRF_EVT_POWER_USB_POWER_READY) ? NRFX_POWER_USB_EVT_READY + : (evt_id == NRF_EVT_POWER_USB_REMOVED) ? NRFX_POWER_USB_EVT_REMOVED + : -1; - return err; -} - -uint32_t proc_ble(void) { - // do nothing with ble - return NRF_ERROR_NOT_FOUND; -} - -void SD_EVT_IRQHandler(void) { - // process BLE and SOC until there is no more events - while( (NRF_ERROR_NOT_FOUND != proc_ble()) || (NRF_ERROR_NOT_FOUND != proc_soc()) ) { - } + if (usbevt >= 0) { + tusb_hal_nrf_power_event(usbevt); + } } void nrf_error_cb(uint32_t id, uint32_t pc, uint32_t info) { - (void) id; - (void) pc; - (void) info; -} -#endif - -//--------------------------------------------------------------------+ -// API: SPI transfer with MAX3421E, must be implemented by application -//--------------------------------------------------------------------+ -#if CFG_TUH_ENABLED && defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421 - -void max3421_int_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) { - if (!(pin == MAX3421_INTR_PIN && action == NRF_GPIOTE_POLARITY_HITOLO)) return; - tuh_int_handler(1, true); + (void)id; + (void)pc; + (void)info; } - -static void max3421_init(void) { - // Somehow pca10056/95 is not working probably due to signal incompatible (1.8V 3v3) with MAC3421E !? - - // manually manage CS - nrf_gpio_cfg_output(MAX3421_CS_PIN); - nrf_gpio_pin_write(MAX3421_CS_PIN, 1); - - // USB host using max3421e usb controller via SPI - nrfx_spim_config_t cfg = { - .sck_pin = MAX3421_SCK_PIN, - .mosi_pin = MAX3421_MOSI_PIN, - .miso_pin = MAX3421_MISO_PIN, - .ss_pin = NRFX_SPIM_PIN_NOT_USED, - .ss_active_high = false, - .irq_priority = 3, - .orc = 0xFF, - // default setting 4 Mhz, Mode 0, MSB first - .frequency = NRF_SPIM_FREQ_4M, - .mode = NRF_SPIM_MODE_0, - .bit_order = NRF_SPIM_BIT_ORDER_MSB_FIRST, - }; - - // no handler --> blocking - nrfx_spim_init(&_spi, &cfg, NULL, NULL); - - // max3421e interrupt pin - nrfx_gpiote_init(1); - nrfx_gpiote_in_config_t in_config = NRFX_GPIOTE_CONFIG_IN_SENSE_HITOLO(true); - in_config.pull = NRF_GPIO_PIN_PULLUP; - - NVIC_SetPriority(GPIOTE_IRQn, 2); - - nrfx_gpiote_in_init(MAX3421_INTR_PIN, &in_config, max3421_int_handler); - nrfx_gpiote_trigger_enable(MAX3421_INTR_PIN, true); -} - -// API to enable/disable MAX3421 INTR pin interrupt -void tuh_max3421_int_api(uint8_t rhport, bool enabled) { - (void) rhport; - - // use NVIC_Enable/Disable instead since nrfx_gpiote_trigger_enable/disable clear pending and can miss interrupt - // when disabled and re-enabled. - if (enabled) { - NVIC_EnableIRQ(GPIOTE_IRQn); - } else { - NVIC_DisableIRQ(GPIOTE_IRQn); - } -} - -// API to control MAX3421 SPI CS -void tuh_max3421_spi_cs_api(uint8_t rhport, bool active) { - (void) rhport; - nrf_gpio_pin_write(MAX3421_CS_PIN, active ? 0 : 1); -} - -// API to transfer data with MAX3421 SPI -// Either tx_buf or rx_buf can be NULL, which means transfer is write or read only -bool tuh_max3421_spi_xfer_api(uint8_t rhport, uint8_t const* tx_buf, uint8_t* rx_buf, size_t xfer_bytes) { - (void) rhport; - - nrfx_spim_xfer_desc_t xfer = { - .p_tx_buffer = tx_buf, - .tx_length = tx_buf ? xfer_bytes : 0, - .p_rx_buffer = rx_buf, - .rx_length = rx_buf ? xfer_bytes : 0, - }; - - return nrfx_spim_xfer(&_spi, &xfer, 0) == NRFX_SUCCESS; -} - -#endif diff --git a/fw/application/src/mod/tusb/tusb_config.h b/fw/application/src/mod/tusb/tusb_config.h index fafb0df0..f58591ee 100644 --- a/fw/application/src/mod/tusb/tusb_config.h +++ b/fw/application/src/mod/tusb/tusb_config.h @@ -58,7 +58,7 @@ #endif #ifndef CFG_TUSB_DEBUG -#define CFG_TUSB_DEBUG 1 +#define CFG_TUSB_DEBUG 4 #endif // Enable Device stack