andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename OHCI_RHPORTS to TUP_OHCI_RHPORTS

Browse Source
This commit is contained in:
hathach
2023-02-22 16:18:45 +07:00
parent 4e2afdf5e1
commit 4c846af53e
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/tusb_mcu.h
View File

@@ -55,7 +55,7 @@
#elif TU_CHECK_MCU(OPT_MCU_LPC175X_6X, OPT_MCU_LPC177X_8X, OPT_MCU_LPC40XX) #elif TU_CHECK_MCU(OPT_MCU_LPC175X_6X, OPT_MCU_LPC177X_8X, OPT_MCU_LPC40XX)
#define TUP_DCD_ENDPOINT_MAX 16 #define TUP_DCD_ENDPOINT_MAX 16
#define TUP_USBIP_OHCI #define TUP_USBIP_OHCI
#define OHCI_RHPORTS 2 #define TUP_OHCI_RHPORTS 2
#elif TU_CHECK_MCU(OPT_MCU_LPC18XX, OPT_MCU_LPC43XX) #elif TU_CHECK_MCU(OPT_MCU_LPC18XX, OPT_MCU_LPC43XX)
// TODO USB0 has 6, USB1 has 4 // TODO USB0 has 6, USB1 has 4

17
src/portable/ohci/ohci.c
View File

@@ -28,8 +28,8 @@
#if CFG_TUH_ENABLED && defined(TUP_USBIP_OHCI) #if CFG_TUH_ENABLED && defined(TUP_USBIP_OHCI)
#ifndef OHCI_RHPORTS #ifndef TUP_OHCI_RHPORTS
#error OHCI is enabled, but OHCI_RHPORTS is not defined. #error OHCI is enabled, but TUP_OHCI_RHPORTS is not defined.
#endif #endif
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
@@ -393,21 +393,20 @@ static void ed_list_remove_by_addr(ohci_ed_t * p_head, uint8_t dev_addr)
if (ed->dev_addr == dev_addr) if (ed->dev_addr == dev_addr)
{ {
//Prevent Host Controller from processing this ED while we remove it // Prevent Host Controller from processing this ED while we remove it
ed->skip = 1; ed->skip = 1;
// unlink ed // unlink ed, will also move up p_prev
p_prev->next = ed->next; p_prev->next = ed->next;
// point the removed ED's next pointer to list head to make sure HC can always safely move away from this ED // point the removed ED's next pointer to list head to make sure HC can always safely move away from this ED
ed->next = (uint32_t) _phys_addr(p_head); ed->next = (uint32_t) _phys_addr(p_head);
ed->used = 0; ed->used = 0;
ed->skip = 0; ed->skip = 0;
continue; }else
{
p_prev = (ohci_ed_t*) _virt_addr((void *)p_prev->next);
} }
// check next valid since we could remove it
if (p_prev->next) p_prev = (ohci_ed_t*) _virt_addr((void *)p_prev->next);
} }
} }
@@ -665,7 +664,7 @@ void hcd_int_handler(uint8_t hostid)
//------------- RootHub status -------------// //------------- RootHub status -------------//
if ( int_status & OHCI_INT_RHPORT_STATUS_CHANGE_MASK ) if ( int_status & OHCI_INT_RHPORT_STATUS_CHANGE_MASK )
{ {
for (int i = 0; i < OHCI_RHPORTS; i++) for (int i = 0; i < TUP_OHCI_RHPORTS; i++)
{ {
uint32_t const rhport_status = OHCI_REG->rhport_status[i] & RHPORT_ALL_CHANGE_MASK; uint32_t const rhport_status = OHCI_REG->rhport_status[i] & RHPORT_ALL_CHANGE_MASK;
if ( rhport_status & RHPORT_CONNECT_STATUS_CHANGE_MASK ) if ( rhport_status & RHPORT_CONNECT_STATUS_CHANGE_MASK )

6
src/portable/ohci/ohci.h
View File

@@ -267,7 +267,7 @@ typedef volatile struct
}; };
union { union {
uint32_t rhport_status[OHCI_RHPORTS]; uint32_t rhport_status[TUP_OHCI_RHPORTS];
struct { struct {
uint32_t current_connect_status : 1; uint32_t current_connect_status : 1;
uint32_t port_enable_status : 1; uint32_t port_enable_status : 1;
@@ -284,11 +284,11 @@ typedef volatile struct
uint32_t port_over_current_indicator_change : 1; uint32_t port_over_current_indicator_change : 1;
uint32_t port_reset_status_change : 1; uint32_t port_reset_status_change : 1;
uint32_t TU_RESERVED : 11; uint32_t TU_RESERVED : 11;
}rhport_status_bit[OHCI_RHPORTS]; }rhport_status_bit[TUP_OHCI_RHPORTS];
}; };
}ohci_registers_t; }ohci_registers_t;
TU_VERIFY_STATIC( sizeof(ohci_registers_t) == (0x54 + (4 * OHCI_RHPORTS)), "size is not correct"); TU_VERIFY_STATIC( sizeof(ohci_registers_t) == (0x54 + (4 * TUP_OHCI_RHPORTS)), "size is not correct");
#ifdef __cplusplus #ifdef __cplusplus
} }