|
@@ -603,6 +603,17 @@ fail:
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+__weak uint32_t *ehci_get_portsc_register(struct ehci_hcor *hcor, int port)
|
|
|
|
+{
|
|
|
|
+ if (port < 0 || port >= CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS) {
|
|
|
|
+ /* Printing the message would cause a scan failure! */
|
|
|
|
+ debug("The request port(%u) is not configured\n", port);
|
|
|
|
+ return NULL;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return (uint32_t *)&hcor->or_portsc[port];
|
|
|
|
+}
|
|
|
|
+
|
|
int
|
|
int
|
|
ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
|
|
ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
|
|
int length, struct devrequest *req)
|
|
int length, struct devrequest *req)
|
|
@@ -629,11 +640,9 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
|
|
case USB_REQ_GET_STATUS | ((USB_RT_PORT | USB_DIR_IN) << 8):
|
|
case USB_REQ_GET_STATUS | ((USB_RT_PORT | USB_DIR_IN) << 8):
|
|
case USB_REQ_SET_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8):
|
|
case USB_REQ_SET_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8):
|
|
case USB_REQ_CLEAR_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8):
|
|
case USB_REQ_CLEAR_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8):
|
|
- if (!port || port > CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS) {
|
|
|
|
- printf("The request port(%d) is not configured\n", port - 1);
|
|
|
|
|
|
+ status_reg = ehci_get_portsc_register(ctrl->hcor, port - 1);
|
|
|
|
+ if (!status_reg)
|
|
return -1;
|
|
return -1;
|
|
- }
|
|
|
|
- status_reg = (uint32_t *)&ctrl->hcor->or_portsc[port - 1];
|
|
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
status_reg = NULL;
|
|
status_reg = NULL;
|