Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision 7b616e23c349fc3f8cb4c5132825f4f5ef12c96a) +++ uspace/lib/c/generic/async.c (revision 91b604993517a2bdc14cfe1ede6902150ab29533) @@ -1048,14 +1048,14 @@ * * @param inr IRQ number. - * @param devno Device number of the device generating inr. * @param handler Notification handler. * @param data Notification handler client data. * @param ucode Top-half pseudocode handler. * - * @return Zero on success or a negative error code. - * - */ -int async_irq_subscribe(int inr, int devno, - async_notification_handler_t handler, void *data, const irq_code_t *ucode) + * @return IRQ capability handle on success. + * @return Negative error code. + * + */ +int async_irq_subscribe(int inr, async_notification_handler_t handler, + void *data, const irq_code_t *ucode) { notification_t *notification = @@ -1077,21 +1077,20 @@ futex_up(&async_futex); - return ipc_irq_subscribe(inr, devno, imethod, ucode); + return ipc_irq_subscribe(inr, imethod, ucode); } /** Unsubscribe from IRQ notification. * - * @param inr IRQ number. - * @param devno Device number of the device generating inr. + * @param cap IRQ capability handle. * * @return Zero on success or a negative error code. * */ -int async_irq_unsubscribe(int inr, int devno) +int async_irq_unsubscribe(int cap) { // TODO: Remove entry from hash table // to avoid memory leak - return ipc_irq_unsubscribe(inr, devno); + return ipc_irq_unsubscribe(cap); } @@ -1384,14 +1383,4 @@ async_new_connection(call->in_task_id, in_phone_hash, callid, call, handler, data); - return; - } - - /* Cloned connection */ - if (IPC_GET_IMETHOD(*call) == IPC_M_CLONE_ESTABLISH) { - // TODO: Currently ignores ports altogether - - /* Open new connection with fibril, etc. */ - async_new_connection(call->in_task_id, IPC_GET_ARG5(*call), - callid, call, fallback_port_handler, fallback_port_data); return; } @@ -2111,76 +2100,4 @@ return EOK; -} - -/** Wrapper for making IPC_M_CLONE_ESTABLISH calls using the async framework. - * - * Ask for a cloned connection to some service. - * - * @param mgmt Exchange management style. - * @param exch Exchange for sending the message. - * - * @return New session on success or NULL on error. - * - */ -async_sess_t *async_clone_establish(exch_mgmt_t mgmt, async_exch_t *exch) -{ - if (exch == NULL) { - errno = ENOENT; - return NULL; - } - - async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t)); - if (sess == NULL) { - errno = ENOMEM; - return NULL; - } - - ipc_call_t result; - - amsg_t *msg = amsg_create(); - if (!msg) { - free(sess); - errno = ENOMEM; - return NULL; - } - - msg->dataptr = &result; - msg->wdata.active = true; - - ipc_call_async_0(exch->phone, IPC_M_CLONE_ESTABLISH, msg, - reply_received); - - sysarg_t rc; - async_wait_for((aid_t) msg, &rc); - - if (rc != EOK) { - errno = rc; - free(sess); - return NULL; - } - - int phone = (int) IPC_GET_ARG5(result); - - if (phone < 0) { - errno = phone; - free(sess); - return NULL; - } - - sess->iface = 0; - sess->mgmt = mgmt; - sess->phone = phone; - sess->arg1 = 0; - sess->arg2 = 0; - sess->arg3 = 0; - - fibril_mutex_initialize(&sess->remote_state_mtx); - sess->remote_state_data = NULL; - - list_initialize(&sess->exch_list); - fibril_mutex_initialize(&sess->mutex); - atomic_set(&sess->refcnt, 0); - - return sess; } @@ -3153,64 +3070,4 @@ } -/** Wrapper for sending an exchange over different exchange for cloning - * - * @param exch Exchange to be used for sending. - * @param clone_exch Exchange to be cloned. - * - */ -int async_exchange_clone(async_exch_t *exch, async_exch_t *clone_exch) -{ - return async_req_1_0(exch, IPC_M_CONNECTION_CLONE, clone_exch->phone); -} - -/** Wrapper for receiving the IPC_M_CONNECTION_CLONE calls. - * - * If the current call is IPC_M_CONNECTION_CLONE then a new - * async session is created for the accepted phone. - * - * @param mgmt Exchange management style. - * - * @return New async session or NULL on failure. - * - */ -async_sess_t *async_clone_receive(exch_mgmt_t mgmt) -{ - /* Accept the phone */ - ipc_call_t call; - ipc_callid_t callid = async_get_call(&call); - int phone = (int) IPC_GET_ARG1(call); - - if ((IPC_GET_IMETHOD(call) != IPC_M_CONNECTION_CLONE) || - (phone < 0)) { - async_answer_0(callid, EINVAL); - return NULL; - } - - async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t)); - if (sess == NULL) { - async_answer_0(callid, ENOMEM); - return NULL; - } - - sess->iface = 0; - sess->mgmt = mgmt; - sess->phone = phone; - sess->arg1 = 0; - sess->arg2 = 0; - sess->arg3 = 0; - - fibril_mutex_initialize(&sess->remote_state_mtx); - sess->remote_state_data = NULL; - - list_initialize(&sess->exch_list); - fibril_mutex_initialize(&sess->mutex); - atomic_set(&sess->refcnt, 0); - - /* Acknowledge the cloned phone */ - async_answer_0(callid, EOK); - - return sess; -} - /** Wrapper for receiving the IPC_M_CONNECT_TO_ME calls. * Index: uspace/lib/c/generic/ddi.c =================================================================== --- uspace/lib/c/generic/ddi.c (revision 7b616e23c349fc3f8cb4c5132825f4f5ef12c96a) +++ uspace/lib/c/generic/ddi.c (revision 91b604993517a2bdc14cfe1ede6902150ab29533) @@ -50,14 +50,4 @@ #include "private/libc.h" - -/** Return unique device number. - * - * @return New unique device number. - * - */ -int device_assign_devno(void) -{ - return __SYSCALL0(SYS_DEVICE_ASSIGN_DEVNO); -} /** Map a piece of physical memory to task. Index: uspace/lib/c/generic/irq.c =================================================================== --- uspace/lib/c/generic/irq.c (revision 7b616e23c349fc3f8cb4c5132825f4f5ef12c96a) +++ uspace/lib/c/generic/irq.c (revision 91b604993517a2bdc14cfe1ede6902150ab29533) @@ -55,32 +55,29 @@ * * @param inr IRQ number. - * @param devno Device number of the device generating inr. * @param method Use this method for notifying me. * @param ucode Top-half pseudocode handler. + * + * @return IRQ capability handle returned by the kernel. + * @return Error code returned by the kernel. + * + */ +int ipc_irq_subscribe(int inr, sysarg_t method, const irq_code_t *ucode) +{ + if (ucode == NULL) + ucode = &default_ucode; + + return __SYSCALL3(SYS_IPC_IRQ_SUBSCRIBE, inr, method, (sysarg_t) ucode); +} + +/** Unsubscribe from IRQ notification. + * + * @param cap IRQ capability handle. * * @return Value returned by the kernel. * */ -int ipc_irq_subscribe(int inr, int devno, sysarg_t method, - const irq_code_t *ucode) +int ipc_irq_unsubscribe(int cap) { - if (ucode == NULL) - ucode = &default_ucode; - - return __SYSCALL4(SYS_IPC_IRQ_SUBSCRIBE, inr, devno, method, - (sysarg_t) ucode); -} - -/** Unsubscribe from IRQ notification. - * - * @param inr IRQ number. - * @param devno Device number of the device generating inr. - * - * @return Value returned by the kernel. - * - */ -int ipc_irq_unsubscribe(int inr, int devno) -{ - return __SYSCALL2(SYS_IPC_IRQ_UNSUBSCRIBE, inr, devno); + return __SYSCALL1(SYS_IPC_IRQ_UNSUBSCRIBE, cap); } Index: uspace/lib/c/include/async.h =================================================================== --- uspace/lib/c/include/async.h (revision 7b616e23c349fc3f8cb4c5132825f4f5ef12c96a) +++ uspace/lib/c/include/async.h (revision 91b604993517a2bdc14cfe1ede6902150ab29533) @@ -166,7 +166,7 @@ sysarg_t, async_port_handler_t, void *, port_id_t *); -extern int async_irq_subscribe(int, int, async_notification_handler_t, void *, +extern int async_irq_subscribe(int, async_notification_handler_t, void *, const irq_code_t *); -extern int async_irq_unsubscribe(int, int); +extern int async_irq_unsubscribe(int); extern int async_event_subscribe(event_type_t, async_notification_handler_t, @@ -343,5 +343,4 @@ sysarg_t *, sysarg_t *); -extern async_sess_t *async_clone_establish(exch_mgmt_t, async_exch_t *); extern async_sess_t *async_connect_me_to(exch_mgmt_t, async_exch_t *, sysarg_t, sysarg_t, sysarg_t); @@ -472,6 +471,4 @@ sysarg_t, sysarg_t, sysarg_t, ipc_call_t *); -extern int async_exchange_clone(async_exch_t *, async_exch_t *); -extern async_sess_t *async_clone_receive(exch_mgmt_t); extern async_sess_t *async_callback_receive(exch_mgmt_t); extern async_sess_t *async_callback_receive_start(exch_mgmt_t, ipc_call_t *); Index: uspace/lib/c/include/ipc/irq.h =================================================================== --- uspace/lib/c/include/ipc/irq.h (revision 7b616e23c349fc3f8cb4c5132825f4f5ef12c96a) +++ uspace/lib/c/include/ipc/irq.h (revision 91b604993517a2bdc14cfe1ede6902150ab29533) @@ -39,6 +39,6 @@ #include -extern int ipc_irq_subscribe(int, int, sysarg_t, const irq_code_t *); -extern int ipc_irq_unsubscribe(int, int); +extern int ipc_irq_subscribe(int, sysarg_t, const irq_code_t *); +extern int ipc_irq_unsubscribe(int); #endif Index: uspace/lib/drv/generic/interrupt.c =================================================================== --- uspace/lib/drv/generic/interrupt.c (revision 7b616e23c349fc3f8cb4c5132825f4f5ef12c96a) +++ uspace/lib/drv/generic/interrupt.c (revision 91b604993517a2bdc14cfe1ede6902150ab29533) @@ -44,13 +44,13 @@ int register_interrupt_handler(ddf_dev_t *dev, int irq, - interrupt_handler_t *handler, const irq_code_t *pseudocode) + interrupt_handler_t *handler, const irq_code_t *irq_code) { - return async_irq_subscribe(irq, dev->handle, - (async_notification_handler_t) handler, dev, pseudocode); + return async_irq_subscribe(irq, (async_notification_handler_t) handler, + dev, irq_code); } -int unregister_interrupt_handler(ddf_dev_t *dev, int irq) +int unregister_interrupt_handler(ddf_dev_t *dev, int cap) { - return async_irq_unsubscribe(irq, dev->handle); + return async_irq_unsubscribe(cap); } Index: uspace/lib/usbhost/src/ddf_helpers.c =================================================================== --- uspace/lib/usbhost/src/ddf_helpers.c (revision 7b616e23c349fc3f8cb4c5132825f4f5ef12c96a) +++ uspace/lib/usbhost/src/ddf_helpers.c (revision 91b604993517a2bdc14cfe1ede6902150ab29533) @@ -748,5 +748,6 @@ * @param[in] gen_irq_code IRQ code generator. * - * @return EOK on success or negative error code + * @return IRQ capability handle on success. + * @return Negative error code. */ int hcd_ddf_setup_interrupts(ddf_dev_t *device, @@ -770,22 +771,22 @@ /* Register handler to avoid interrupt lockup */ - int ret = register_interrupt_handler(device, irq, handler, &irq_code); + const int irq_cap = register_interrupt_handler(device, irq, handler, + &irq_code); irq_code_clean(&irq_code); + if (irq_cap < 0) { + usb_log_error("Failed to register interrupt handler: %s.\n", + str_error(irq_cap)); + return irq_cap; + } + + /* Enable interrupts */ + int ret = hcd_ddf_enable_interrupts(device); if (ret != EOK) { usb_log_error("Failed to register interrupt handler: %s.\n", str_error(ret)); - return ret; - } - - /* Enable interrupts */ - ret = hcd_ddf_enable_interrupts(device); - if (ret != EOK) { - usb_log_error("Failed to register interrupt handler: %s.\n", - str_error(ret)); - unregister_interrupt_handler(device, irq); - return ret; - } - assert(irq > 0); - return irq; + unregister_interrupt_handler(device, irq_cap); + return ret; + } + return irq_cap; } @@ -882,7 +883,8 @@ interrupt_handler_t *irq_handler = driver->irq_handler ? driver->irq_handler : ddf_hcd_gen_irq_handler; - const int irq = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler, - driver->irq_code_gen); - if (!(irq < 0)) { + const int irq_cap = hcd_ddf_setup_interrupts(device, &hw_res, + irq_handler, driver->irq_code_gen); + bool irqs_enabled = !(irq_cap < 0); + if (irqs_enabled) { usb_log_debug("Hw interrupts enabled.\n"); } @@ -899,5 +901,5 @@ /* Init hw driver */ hcd_t *hcd = dev_to_hcd(device); - ret = driver->init(hcd, &hw_res, !(irq < 0)); + ret = driver->init(hcd, &hw_res, irqs_enabled); hw_res_list_parsed_clean(&hw_res); if (ret != EOK) { @@ -907,5 +909,5 @@ /* Need working irq replacement to setup root hub */ - if ((irq < 0) && hcd->ops.status_hook) { + if (!irqs_enabled && hcd->ops.status_hook) { hcd->polling_fibril = fibril_create(interrupt_polling, hcd); if (hcd->polling_fibril == 0) { @@ -916,5 +918,5 @@ fibril_add_ready(hcd->polling_fibril); usb_log_warning("Failed to enable interrupts: %s." - " Falling back to polling.\n", str_error(irq)); + " Falling back to polling.\n", str_error(irq_cap)); } @@ -930,5 +932,5 @@ irq_unregister: /* Unregistering non-existent should be ok */ - unregister_interrupt_handler(device, irq); + unregister_interrupt_handler(device, irq_cap); hcd_ddf_clean_hc(device); return ret;