diff options
Diffstat (limited to 'drivers/usb/host/ehci-pci.c')
| -rw-r--r-- | drivers/usb/host/ehci-pci.c | 15 | 
1 files changed, 7 insertions, 8 deletions
| diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 020ab1135..29af02dc5 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -23,7 +23,6 @@  #include <usb.h>  #include "ehci.h" -#include "ehci-core.h"  #ifdef CONFIG_PCI_EHCI_DEVICE  static struct pci_device_id ehci_pci_ids[] = { @@ -39,7 +38,7 @@ static struct pci_device_id ehci_pci_ids[] = {   * Create the appropriate control structures to manage   * a new EHCI host controller.   */ -int ehci_hcd_init(void) +int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)  {  	pci_dev_t pdev; @@ -49,14 +48,14 @@ int ehci_hcd_init(void)  		return -1;  	} -	hccr = (struct ehci_hccr *)pci_map_bar(pdev, +	*hccr = (struct ehci_hccr *)pci_map_bar(pdev,  			PCI_BASE_ADDRESS_0, PCI_REGION_MEM); -	hcor = (struct ehci_hcor *)((uint32_t) hccr + -			HC_LENGTH(ehci_readl(&hccr->cr_capbase))); +	*hcor = (struct ehci_hcor *)((uint32_t) *hccr + +			HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));  	debug("EHCI-PCI init hccr 0x%x and hcor 0x%x hc_length %d\n", -			(uint32_t)hccr, (uint32_t)hcor, -			(uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase))); +			(uint32_t)*hccr, (uint32_t)*hcor, +			(uint32_t)HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));  	return 0;  } @@ -65,7 +64,7 @@ int ehci_hcd_init(void)   * Destroy the appropriate control structures corresponding   * the the EHCI host controller.   */ -int ehci_hcd_stop(void) +int ehci_hcd_stop(int index)  {  	return 0;  } |