merge CFG_TUSB_RHPORT1_MODE into CFG_TUSB_RHPORT0_MODE

each port is 1 byte for easy maintenance
This commit is contained in:
hathach
2020-05-26 15:21:23 +07:00
parent 62a746bdc7
commit fad088719e
9 changed files with 66 additions and 49 deletions
+4 -4
View File
@@ -149,7 +149,7 @@ void board_init(void)
* status feedback from the distribution switch. GPIO54 is used for VBUS sensing. 15Kohm pull-down
* resistors are always active
*/
#if CFG_TUSB_RHPORT0_MODE
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_DEVICE | OPT_MODE_HOST)
Chip_USB0_Init();
// // Reset controller
@@ -185,7 +185,7 @@ void board_init(void)
* of VBUS can be read via U31.
* JP16 shall not be inserted.
*/
#if CFG_TUSB_RHPORT1_MODE
#if CFG_TUSB_RHPORT0_MODE & ((OPT_MODE_DEVICE | OPT_MODE_HOST) << 8)
Chip_USB1_Init();
// // Reset controller
@@ -232,11 +232,11 @@ void USB0_IRQHandler(void)
void USB1_IRQHandler(void)
{
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_HOST << 8)
tuh_isr(1);
#endif
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_DEVICE << 8)
tud_int_handler(1);
#endif
}
+4 -4
View File
@@ -43,11 +43,11 @@ void USB0_IRQHandler(void)
void USB1_IRQHandler(void)
{
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_HOST << 8)
tuh_isr(1);
#endif
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_DEVICE << 8)
tud_int_handler(1);
#endif
}
@@ -163,7 +163,7 @@ void board_init(void)
};
// USB0
#if CFG_TUSB_RHPORT0_MODE
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_DEVICE | OPT_MODE_HOST)
Chip_USB0_Init();
// // Reset controller
@@ -180,7 +180,7 @@ void board_init(void)
#endif
// USB1
#if CFG_TUSB_RHPORT1_MODE
#if CFG_TUSB_RHPORT0_MODE & ((OPT_MODE_DEVICE | OPT_MODE_HOST) << 8)
Chip_USB1_Init();
// // Reset controller
+2 -2
View File
@@ -134,11 +134,11 @@ void USB_OTG1_IRQHandler(void)
void USB_OTG2_IRQHandler(void)
{
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_HOST << 8)
tuh_isr(1);
#endif
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_DEVICE << 8)
tud_int_handler(1);
#endif
}
+2 -2
View File
@@ -134,11 +134,11 @@ void USB_OTG1_IRQHandler(void)
void USB_OTG2_IRQHandler(void)
{
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_HOST << 8)
tuh_isr(1);
#endif
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_DEVICE << 8)
tud_int_handler(1);
#endif
}
+2 -2
View File
@@ -134,11 +134,11 @@ void USB_OTG1_IRQHandler(void)
void USB_OTG2_IRQHandler(void)
{
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_HOST << 8)
tuh_isr(1);
#endif
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_DEVICE << 8)
tud_int_handler(1);
#endif
}
+4 -4
View File
@@ -161,7 +161,7 @@ void board_init(void)
* status feedback from the distribution switch. GPIO54 is used for VBUS sensing. 15Kohm pull-down
* resistors are always active
*/
#if CFG_TUSB_RHPORT0_MODE
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_DEVICE | OPT_MODE_HOST)
Chip_USB0_Init();
// // Reset controller
@@ -197,7 +197,7 @@ void board_init(void)
* of VBUS can be read via U31.
* JP16 shall not be inserted.
*/
#if CFG_TUSB_RHPORT1_MODE
#if CFG_TUSB_RHPORT0_MODE & ((OPT_MODE_DEVICE | OPT_MODE_HOST) << 8)
Chip_USB1_Init();
// // Reset controller
@@ -235,11 +235,11 @@ void USB0_IRQHandler(void)
void USB1_IRQHandler(void)
{
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_HOST << 8)
tuh_isr(1);
#endif
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_DEVICE << 8)
tud_int_handler(1);
#endif
}
+2 -2
View File
@@ -135,11 +135,11 @@ void USB_OTG1_IRQHandler(void)
void USB_OTG2_IRQHandler(void)
{
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_HOST << 8)
tuh_isr(1);
#endif
#if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
#if CFG_TUSB_RHPORT0_MODE & (OPT_MODE_DEVICE << 8)
tud_int_handler(1);
#endif
}