Changeset b8b1e631 in mainline for uspace/drv/bus/usb/ehci/main.c
- Timestamp:
- 2011-12-03T11:10:06Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 30413b31
- Parents:
- 07fd4cd1 (diff), 1f5c9c96 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/ehci/main.c
r07fd4cd1 rb8b1e631 42 42 #include <usb/ddfiface.h> 43 43 #include <usb/debug.h> 44 #include <usb/host/hcd.h> 44 45 45 46 #include "pci.h" 46 #include "ehci.h" 47 48 #define NAME "ehci" 47 49 48 50 static int ehci_dev_add(ddf_dev_t *device); … … 57 59 }; 58 60 static ddf_dev_ops_t hc_ops = { 59 .interfaces[USBHC_DEV_IFACE] = & ehci_hc_iface,61 .interfaces[USBHC_DEV_IFACE] = &hcd_iface, 60 62 }; 61 63 … … 95 97 return ENOMEM; 96 98 } 99 hcd_t *ehci_hc = ddf_fun_data_alloc(hc_fun, sizeof(hcd_t)); 100 if (ehci_hc == NULL) { 101 usb_log_error("Failed to alloc generic HC driver.\n"); 102 return ENOMEM; 103 } 104 /* High Speed, no bandwidth */ 105 hcd_init(ehci_hc, USB_SPEED_HIGH, 0, NULL); 97 106 hc_fun->ops = &hc_ops; 98 107
Note:
See TracChangeset
for help on using the changeset viewer.