diff options
| author | sakumisu <[email protected]> | 2022-07-19 19:08:14 +0800 |
|---|---|---|
| committer | sakumisu <[email protected]> | 2022-07-19 19:08:14 +0800 |
| commit | decc40f95da46b32b695c409af66c90d0d135c33 (patch) | |
| tree | 4cf8d70771f2b202943837306dda2fa1289eb57b | |
| parent | 6334b79216c017059837e40d6566717bbbc38d34 (diff) | |
add ehci power config
| -rw-r--r-- | port/ehci/usb_ehci.c | 24 | ||||
| -rw-r--r-- | usb_config.h | 3 |
2 files changed, 17 insertions, 10 deletions
diff --git a/port/ehci/usb_ehci.c b/port/ehci/usb_ehci.c index b823d66e..4d349d4d 100644 --- a/port/ehci/usb_ehci.c +++ b/port/ehci/usb_ehci.c @@ -87,10 +87,10 @@ struct usb_ehci_qh_s { struct usb_ehci_epinfo_s *epinfo; /* Endpoint used for the transfer */ uint32_t fqp; /* First qTD in the list (physical address) */ -#if (__riscv_xlen == 64) - uint8_t pad[4]; /* Padding to assure 32-byte alignment */ +#if (CONFIG_DCACHE_LINE_SIZE == 64) + uint8_t pad[4]; /* Padding to assure 64-byte alignment */ #else - uint8_t pad[8]; /* Padding to assure 32-byte alignment */ + uint8_t pad[8]; /* Padding to assure 32-byte alignment */ #endif }; @@ -2168,7 +2168,13 @@ int usb_hc_hw_init(void) if (ret < 0) { return -2; } - +#ifdef CONFIG_USB_EHCI_PORT_POWER + for (uint8_t port = 1; i <= CONFIG_USBHOST_RHPORTS; port++) { + regval = usb_ehci_getreg(&HCOR->portsc[port - 1]); + regval |= EHCI_PORTSC_PP; + usb_ehci_putreg(regval, &HCOR->portsc[port - 1]); + } +#endif /* Enable EHCI interrupts. Interrupts are still disabled at the level of * the interrupt controller. */ @@ -2228,11 +2234,11 @@ int usbh_reset_port(const uint8_t port) return 0; } -__WEAK uint8_t usbh_get_port_speed(const uint8_t port) -{ - /* Defined by individual manufacturers */ - return 0; -} +// __WEAK uint8_t usbh_get_port_speed(const uint8_t port) +// { +// /* Defined by individual manufacturers */ +// return 0; +// } int usbh_ep0_reconfigure(usbh_epinfo_t ep, uint8_t dev_addr, uint8_t ep_mps, uint8_t speed) { diff --git a/usb_config.h b/usb_config.h index 5aafa627..f906a0c1 100644 --- a/usb_config.h +++ b/usb_config.h @@ -123,6 +123,7 @@ #define CONFIG_USB_EHCI_QTD_NUM (10) // #define CONFIG_USB_EHCI_INFO_ENABLE // #define CONFIG_USB_ECHI_HCOR_RESERVED_DISABLE -#define CONFIG_USB_EHCI_CONFIGFLAG +// #define CONFIG_USB_EHCI_CONFIGFLAG +// #define CONFIG_USB_EHCI_PORT_POWER #endif |