Embedded/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-01-31 05:52:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2263 from rgrr/compile-with-old-nordic-sdk

Browse Source 
dcd_nrf5x: make it compile also with old Nordic SDK
This commit is contained in:
Ha Thach 2024-04-16 12:08:13 +07:00 committed by GitHub
commit bebc00a851
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/portable/nordic/nrf5x/dcd_nrf5x.c
View File

@ -40,7 +40,6 @@
#include "nrf.h" #include "nrf.h"
#include "nrf_clock.h" #include "nrf_clock.h"
#include "nrf_power.h"
#include "nrfx_usbd_errata.h" #include "nrfx_usbd_errata.h"
#ifdef __GNUC__ #ifdef __GNUC__
@ -57,6 +56,26 @@
#include "mcu/mcu.h" #include "mcu/mcu.h"
#endif #endif
/* Try to detect nrfx version if not configured with CFG_TUD_NRF_NRFX_VERSION
* nrfx v1 and v2 are concurrently developed. There is no NRFX_VERSION only MDK VERSION which is as follows:
* - v2.6.0: 8.44.1, v2.5.0: 8.40.2, v2.4.0: 8.37.0, v2.3.0: 8.35.0, v2.2.0: 8.32.1, v2.1.0: 8.30.2, v2.0.0: 8.29.0
* - v1.9.0: 8.40.3, v1.8.6: 8.35.0 (conflict with v2.3.0), v1.8.5: 8.32.3, v1.8.4: 8.32.1 (conflict with v2.2.0),
* v1.8.2: 8.32.1 (conflict with v2.2.0), v1.8.1: 8.27.1
* Therefore the check for v1 would be:
* - MDK < 8.29.0 (v2.0), MDK == 8.32.3, 8.40.3
* - in case of conflict User of those version must upgrade to other 1.x version or set CFG_TUD_NRF_NRFX_VERSION
*/
#ifndef CFG_TUD_NRF_NRFX_VERSION
#define _MDK_VERSION (10000*MDK_MAJOR_VERSION + 100*MDK_MINOR_VERSION + MDK_MICRO_VERSION)
#if _MDK_VERSION < 82900 || _MDK_VERSION == 83203 || _MDK_VERSION == 84003
// nrfx <= 1.8.1, or 1.8.5 or 1.9.0
#define CFG_TUD_NRF_NRFX_VERSION 1
#else
#define CFG_TUD_NRF_NRFX_VERSION 2
#endif
#endif
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* MACRO TYPEDEF CONSTANT ENUM /* MACRO TYPEDEF CONSTANT ENUM
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
@ -110,21 +129,6 @@ static struct
/* Control / Bulk / Interrupt (CBI) Transfer /* Control / Bulk / Interrupt (CBI) Transfer
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
// NVIC_GetEnableIRQ is only available in CMSIS v5
#ifndef NVIC_GetEnableIRQ
static inline uint32_t NVIC_GetEnableIRQ(IRQn_Type IRQn)
{
if ((int32_t)(IRQn) >= 0)
{
return((uint32_t)(((NVIC->ISER[(((uint32_t)(int32_t)IRQn) >> 5UL)] & (1UL << (((uint32_t)(int32_t)IRQn) & 0x1FUL))) != 0UL) ? 1UL : 0UL));
}
else
{
return(0U);
}
}
#endif
// check if we are in ISR // check if we are in ISR
TU_ATTR_ALWAYS_INLINE static inline bool is_in_isr(void) TU_ATTR_ALWAYS_INLINE static inline bool is_in_isr(void)
{ {
@ -916,7 +920,11 @@ static bool hfclk_running(void)
} }
#endif #endif
#if CFG_TUD_NRF_NRFX_VERSION == 1
return nrf_clock_hf_is_running(NRF_CLOCK_HFCLK_HIGH_ACCURACY);
#else
return nrf_clock_hf_is_running(NRF_CLOCK, NRF_CLOCK_HFCLK_HIGH_ACCURACY); return nrf_clock_hf_is_running(NRF_CLOCK, NRF_CLOCK_HFCLK_HIGH_ACCURACY);
#endif
} }
static void hfclk_enable(void) static void hfclk_enable(void)
@ -937,9 +945,14 @@ static void hfclk_enable(void)
} }
#endif #endif
#if CFG_TUD_NRF_NRFX_VERSION == 1
nrf_clock_event_clear(NRF_CLOCK_EVENT_HFCLKSTARTED);
nrf_clock_task_trigger(NRF_CLOCK_TASK_HFCLKSTART);
#else
nrf_clock_event_clear(NRF_CLOCK, NRF_CLOCK_EVENT_HFCLKSTARTED); nrf_clock_event_clear(NRF_CLOCK, NRF_CLOCK_EVENT_HFCLKSTARTED);
nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_HFCLKSTART); nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_HFCLKSTART);
#endif #endif
#endif
} }
static void hfclk_disable(void) static void hfclk_disable(void)
@ -957,8 +970,12 @@ static void hfclk_disable(void)
} }
#endif #endif
#if CFG_TUD_NRF_NRFX_VERSION == 1
nrf_clock_task_trigger(NRF_CLOCK_TASK_HFCLKSTOP);
#else
nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_HFCLKSTOP); nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_HFCLKSTOP);
#endif #endif
#endif
} }
// Power & Clock Peripheral on nRF5x to manage USB // Power & Clock Peripheral on nRF5x to manage USB
@ -1101,6 +1118,7 @@ void tusb_hal_nrf_power_event (uint32_t event)
// Enable interrupt, priorities should be set by application // Enable interrupt, priorities should be set by application
NVIC_ClearPendingIRQ(USBD_IRQn); NVIC_ClearPendingIRQ(USBD_IRQn);
// Don't enable USBD interrupt yet, if dcd_init() did not finish yet // Don't enable USBD interrupt yet, if dcd_init() did not finish yet
// Interrupt will be enabled by tud_init(), when USB stack is ready // Interrupt will be enabled by tud_init(), when USB stack is ready
// to handle interrupts. // to handle interrupts.