mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-22 06:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

move check highspeed to rusb_ra

Browse Source
This commit is contained in:
hathach 2023-07-07 18:41:16 +07:00
parent f7e7ba92ca
commit 0f53e746ff
4 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/portable/renesas/rusb2/dcd_rusb2.c
View File

@ -61,19 +61,6 @@
TU_ATTR_PACKED_BEGIN
TU_ATTR_BIT_FIELD_ORDER_BEGIN
typedef struct TU_ATTR_PACKED _ccrx_evenaccess {
union {
struct {
uint16_t : 8;
uint16_t TRCLR: 1;
uint16_t TRENB: 1;
uint16_t : 0;
};
uint16_t TRE;
};
uint16_t TRN;
} reg_pipetre_t;
typedef struct TU_ATTR_PACKED
{
void *buf; /* the start address of a transfer data buffer */
@ -114,14 +101,6 @@ static dcd_data_t _dcd;
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+
#ifdef RUSB2_SUPPORT_HIGHSPEED
#define is_highspeed_usbip(_p) (_p == 1)
#define is_highspeed_regbase(_reg) (_reg == RUSB2_REG(1))
#else
#define is_highspeed_usbip(_p) (false)
#define is_highspeed_regbase(_reg) (false)
#endif
static unsigned find_pipe(unsigned xfer)
{
switch (xfer) {
@ -215,7 +194,7 @@ static void pipe_write_packet(rusb2_reg_t * rusb, void *buf, volatile void *fifo
volatile uint8_t *ff8;
// Highspeed FIFO is 32-bit
if ( is_highspeed_regbase(rusb) ) {
if ( rusb2_is_highspeed_reg(rusb) ) {
// TODO 32-bit access for better performance
ff16 = (volatile uint16_t*) ((uintptr_t) fifo+2);
ff8 = (volatile uint8_t *) ((uintptr_t) fifo+3);
@ -706,7 +685,7 @@ void dcd_init(uint8_t rhport)
rusb2_module_start(rhport, true);
#ifdef RUSB2_SUPPORT_HIGHSPEED
if ( is_highspeed_usbip(rhport) ) {
if ( rusb2_is_highspeed_rhport(rhport) ) {
rusb->SYSCFG_b.HSE = 1;
// leave CLKSEL as default (0x11) 24Mhz
@ -787,7 +766,7 @@ void dcd_connect(uint8_t rhport)
{
rusb2_reg_t* rusb = RUSB2_REG(rhport);
if ( is_highspeed_usbip(rhport)) {
if ( rusb2_is_highspeed_rhport(rhport)) {
rusb->SYSCFG_b.CNEN = 1;
}
rusb->SYSCFG_b.DPRPU = 1;
@ -824,7 +803,7 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * ep_desc)
if (xfer == TUSB_XFER_ISOCHRONOUS) {
// Fullspeed ISO is limit to 256 bytes
if ( !is_highspeed_usbip(rhport) && mps > 256) {
if ( !rusb2_is_highspeed_rhport(rhport) && mps > 256) {
return false;
}
}
@ -838,7 +817,7 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * ep_desc)
/* setup pipe */
dcd_int_disable(rhport);
if ( is_highspeed_usbip(rhport) ) {
if ( rusb2_is_highspeed_rhport(rhport) ) {
// FIXME shouldn't be after pipe selection and config, also the BUFNMB should be changed
// depending on the allocation scheme
rusb->PIPEBUF = 0x7C08;

15
src/portable/renesas/rusb2/rusb2_ra.h
View File

@ -47,15 +47,15 @@ extern "C" {
#pragma GCC diagnostic pop
#endif
//--------------------------------------------------------------------+
//
//--------------------------------------------------------------------+
// IAR does not have __builtin_ctz
#if defined(__ICCARM__)
#define __builtin_ctz(x) __iar_builtin_CLZ(__iar_builtin_RBIT(x))
#endif
//--------------------------------------------------------------------+
//
//--------------------------------------------------------------------+
typedef struct {
uint32_t reg_base;
int32_t irqnum;
@ -78,6 +78,13 @@ static rusb2_controller_t rusb2_controller[] = {
#define RUSB2_REG(_p) ((rusb2_reg_t*) rusb2_controller[_p].reg_base)
#define rusb2_is_highspeed_rhport(_p) (_p == 1)
#define rusb2_is_highspeed_reg(_reg) (_reg == RUSB2_REG(1))
//--------------------------------------------------------------------+
// RUSB2 API
//--------------------------------------------------------------------+
TU_ATTR_ALWAYS_INLINE static inline void rusb2_module_start(uint8_t rhport, bool start) {
uint32_t const mask = 1U << (11+rhport);
if (start) {

9
src/portable/renesas/rusb2/rusb2_rx.h
View File

@ -42,6 +42,15 @@ TU_ATTR_ALWAYS_INLINE static inline rusb2_reg_t* RUSB2_REG(uint8_t rhport) {
return (rusb2_reg_t *) RUSB2_REG_BASE;
}
#define rusb2_is_highspeed_rhport(_p) (false)
#define rusb2_is_highspeed_reg(_reg) (false)
//--------------------------------------------------------------------+
//
//--------------------------------------------------------------------+
// Start/Stop MSTP TODO implement later
TU_ATTR_ALWAYS_INLINE static inline void rusb2_module_start(uint8_t rhport, bool start) {
(void) rhport;

14
src/portable/renesas/rusb2/rusb2_type.h
View File

@ -48,6 +48,20 @@ extern "C" {
TU_ATTR_PACKED_BEGIN
TU_ATTR_BIT_FIELD_ORDER_BEGIN
// TODO same as RUSB2_PIPE_TR_t
typedef struct TU_ATTR_PACKED _ccrx_evenaccess {
union {
struct {
uint16_t : 8;
uint16_t TRCLR: 1;
uint16_t TRENB: 1;
uint16_t : 0;
};
uint16_t TRE;
};
uint16_t TRN;
} reg_pipetre_t;
typedef struct {
union {
volatile uint16_t E; /* (@ 0x00000000) Pipe Transaction Counter Enable Register */