Changes in uspace/drv/uhci/main.c [947d788:7972b51] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/uhci/main.c
r947d788 r7972b51 27 27 */ 28 28 #include <usb/hcdhubd.h> 29 #include <usb/debug.h>30 29 #include <errno.h> 31 #include "uhci.h"32 30 33 static device_ops_t uhci_ops = { 34 .interfaces[USBHC_DEV_IFACE] = &uhci_iface, 31 static int enqueue_transfer_out(usb_hc_device_t *hc, 32 usb_hcd_attached_device_info_t *dev, usb_hc_endpoint_info_t *endpoint, 33 void *buffer, size_t size, 34 usb_hcd_transfer_callback_out_t callback, void *arg) 35 { 36 printf("UHCI: transfer OUT [%d.%d (%s); %u]\n", 37 dev->address, endpoint->endpoint, 38 usb_str_transfer_type(endpoint->transfer_type), 39 size); 40 return ENOTSUP; 41 } 42 43 static int enqueue_transfer_setup(usb_hc_device_t *hc, 44 usb_hcd_attached_device_info_t *dev, usb_hc_endpoint_info_t *endpoint, 45 void *buffer, size_t size, 46 usb_hcd_transfer_callback_out_t callback, void *arg) 47 { 48 printf("UHCI: transfer SETUP [%d.%d (%s); %u]\n", 49 dev->address, endpoint->endpoint, 50 usb_str_transfer_type(endpoint->transfer_type), 51 size); 52 return ENOTSUP; 53 } 54 55 static int enqueue_transfer_in(usb_hc_device_t *hc, 56 usb_hcd_attached_device_info_t *dev, usb_hc_endpoint_info_t *endpoint, 57 void *buffer, size_t size, 58 usb_hcd_transfer_callback_in_t callback, void *arg) 59 { 60 printf("UHCI: transfer IN [%d.%d (%s); %u]\n", 61 dev->address, endpoint->endpoint, 62 usb_str_transfer_type(endpoint->transfer_type), 63 size); 64 return ENOTSUP; 65 } 66 67 static usb_hcd_transfer_ops_t uhci_transfer_ops = { 68 .transfer_out = enqueue_transfer_out, 69 .transfer_in = enqueue_transfer_in, 70 .transfer_setup = enqueue_transfer_setup 35 71 }; 36 72 37 static int uhci_add_ device(device_t *device)73 static int uhci_add_hc(usb_hc_device_t *device) 38 74 { 39 usb_dprintf(NAME, 1, "uhci_add_device() called\n"); 40 device->ops = &uhci_ops; 75 device->transfer_ops = &uhci_transfer_ops; 41 76 42 77 /* 43 78 * We need to announce the presence of our root hub. 44 79 */ 45 usb_dprintf(NAME, 2, "adding root hub\n");46 80 usb_hcd_add_root_hub(device); 47 81 … … 49 83 } 50 84 51 static driver_ops_t uhci_driver_ops = { 52 .add_device = uhci_add_device, 53 }; 54 55 static driver_t uhci_driver = { 56 .name = NAME, 57 .driver_ops = &uhci_driver_ops 85 usb_hc_driver_t uhci_driver = { 86 .name = "uhci", 87 .add_hc = uhci_add_hc 58 88 }; 59 89 … … 63 93 * Do some global initializations. 64 94 */ 65 sleep(5);66 usb_dprintf_enable(NAME, 5);67 95 68 return driver_main(&uhci_driver);96 return usb_hcd_main(&uhci_driver); 69 97 }
Note:
See TracChangeset
for help on using the changeset viewer.