Changeset 15d0046 in mainline for uspace/drv/bus/usb/ohci/ohci.c
- Timestamp:
- 2014-09-12T13:22:33Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 9b20126
- Parents:
- 8db09e4 (diff), 105d8d6 (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/ohci/ohci.c
r8db09e4 r15d0046 34 34 */ 35 35 36 /* XXX Fix this */37 #define _DDF_DATA_IMPLANT38 39 36 #include <errno.h> 40 37 #include <str_error.h> … … 62 59 /** IRQ handling callback, identifies device 63 60 * 64 * @param[in] dev DDF instance of the device to use.65 61 * @param[in] iid (Unused). 66 62 * @param[in] call Pointer to the call that represents interrupt. 67 */ 68 static void irq_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call) 63 * @param[in] dev DDF instance of the device to use. 64 * 65 */ 66 static void irq_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev) 69 67 { 70 68 assert(dev); 71 69 72 70 ohci_t *ohci = dev_to_ohci(dev); 73 71 if (!ohci) { … … 75 73 return; 76 74 } 75 77 76 const uint16_t status = IPC_GET_ARG1(*call); 78 77 hc_interrupt(&ohci->hc, status); … … 165 164 166 165 ddf_fun_set_ops(instance->hc_fun, &hc_ops); 167 ddf_fun_data_implant(instance->hc_fun, &instance->hc);168 166 169 167 instance->rh_fun = ddf_fun_create(device, fun_inner, "ohci_rh"); … … 214 212 } 215 213 216 rc = hc_init(&instance->hc, ®s, interrupts);214 rc = hc_init(&instance->hc, instance->hc_fun, ®s, interrupts); 217 215 if (rc != EOK) { 218 216 usb_log_error("Failed to init ohci_hcd: %s.\n", str_error(rc));
Note:
See TracChangeset
for help on using the changeset viewer.