Index: uspace/lib/drv/Makefile =================================================================== --- uspace/lib/drv/Makefile (revision a996ae31af28626eb224d0fc0318932c1f196c19) +++ uspace/lib/drv/Makefile (revision 85d2fe2e5b85f71ad9664a96db7ed7302e0f9f2b) @@ -35,4 +35,5 @@ generic/driver.c \ generic/dev_iface.c \ + generic/interrupt.c \ generic/log.c \ generic/logbuf.c \ Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision a996ae31af28626eb224d0fc0318932c1f196c19) +++ uspace/lib/drv/generic/driver.c (revision 85d2fe2e5b85f71ad9664a96db7ed7302e0f9f2b) @@ -70,20 +70,4 @@ FIBRIL_MUTEX_INITIALIZE(functions_mutex); -/** Interrupts */ -static interrupt_context_list_t interrupt_contexts; - -static irq_cmd_t default_cmds[] = { - { - .cmd = CMD_ACCEPT - } -}; - -static irq_code_t default_pseudocode = { - 0, - NULL, - sizeof(default_cmds) / sizeof(irq_cmd_t), - default_cmds -}; - static ddf_dev_t *create_device(void); static void delete_device(ddf_dev_t *); @@ -95,132 +79,4 @@ static void *function_get_ops(ddf_fun_t *, dev_inferface_idx_t); -static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall) -{ - int id = (int)IPC_GET_IMETHOD(*icall); - interrupt_context_t *ctx; - - ctx = find_interrupt_context_by_id(&interrupt_contexts, id); - if (ctx != NULL && ctx->handler != NULL) - (*ctx->handler)(ctx->dev, iid, icall); -} - -interrupt_context_t *create_interrupt_context(void) -{ - interrupt_context_t *ctx; - - ctx = (interrupt_context_t *) malloc(sizeof(interrupt_context_t)); - if (ctx != NULL) - memset(ctx, 0, sizeof(interrupt_context_t)); - - return ctx; -} - -void delete_interrupt_context(interrupt_context_t *ctx) -{ - if (ctx != NULL) - free(ctx); -} - -void init_interrupt_context_list(interrupt_context_list_t *list) -{ - memset(list, 0, sizeof(interrupt_context_list_t)); - fibril_mutex_initialize(&list->mutex); - list_initialize(&list->contexts); -} - -void -add_interrupt_context(interrupt_context_list_t *list, interrupt_context_t *ctx) -{ - fibril_mutex_lock(&list->mutex); - ctx->id = list->curr_id++; - list_append(&ctx->link, &list->contexts); - fibril_mutex_unlock(&list->mutex); -} - -void remove_interrupt_context(interrupt_context_list_t *list, - interrupt_context_t *ctx) -{ - fibril_mutex_lock(&list->mutex); - list_remove(&ctx->link); - fibril_mutex_unlock(&list->mutex); -} - -interrupt_context_t * -find_interrupt_context_by_id(interrupt_context_list_t *list, int id) -{ - interrupt_context_t *ctx; - - fibril_mutex_lock(&list->mutex); - - list_foreach(list->contexts, link) { - ctx = list_get_instance(link, interrupt_context_t, link); - if (ctx->id == id) { - fibril_mutex_unlock(&list->mutex); - return ctx; - } - } - - fibril_mutex_unlock(&list->mutex); - return NULL; -} - -interrupt_context_t * -find_interrupt_context(interrupt_context_list_t *list, ddf_dev_t *dev, int irq) -{ - interrupt_context_t *ctx; - - fibril_mutex_lock(&list->mutex); - - list_foreach(list->contexts, link) { - ctx = list_get_instance(link, interrupt_context_t, link); - if (ctx->irq == irq && ctx->dev == dev) { - fibril_mutex_unlock(&list->mutex); - return ctx; - } - } - - fibril_mutex_unlock(&list->mutex); - return NULL; -} - - -int -register_interrupt_handler(ddf_dev_t *dev, int irq, interrupt_handler_t *handler, - irq_code_t *pseudocode) -{ - interrupt_context_t *ctx = create_interrupt_context(); - - ctx->dev = dev; - ctx->irq = irq; - ctx->handler = handler; - - add_interrupt_context(&interrupt_contexts, ctx); - - if (pseudocode == NULL) - pseudocode = &default_pseudocode; - - int res = irq_register(irq, dev->handle, ctx->id, pseudocode); - if (res != EOK) { - remove_interrupt_context(&interrupt_contexts, ctx); - delete_interrupt_context(ctx); - } - - return res; -} - -int unregister_interrupt_handler(ddf_dev_t *dev, int irq) -{ - interrupt_context_t *ctx = find_interrupt_context(&interrupt_contexts, - dev, irq); - int res = irq_unregister(irq, dev->handle); - - if (ctx != NULL) { - remove_interrupt_context(&interrupt_contexts, ctx); - delete_interrupt_context(ctx); - } - - return res; -} - static void add_to_functions_list(ddf_fun_t *fun) { @@ -303,14 +159,4 @@ async_answer_0(iid, res); -} - -static void driver_dev_added(ipc_callid_t iid, ipc_call_t *icall) -{ - fibril_mutex_lock(&devices_mutex); - ddf_dev_t *dev = driver_get_device(IPC_GET_ARG1(*icall)); - fibril_mutex_unlock(&devices_mutex); - - if (dev != NULL && driver->driver_ops->device_added != NULL) - driver->driver_ops->device_added(dev); } @@ -462,8 +308,4 @@ case DRIVER_DEV_ADD: driver_dev_add(callid, &call); - break; - case DRIVER_DEV_ADDED: - async_answer_0(callid, EOK); - driver_dev_added(callid, &call); break; case DRIVER_DEV_REMOVE: @@ -753,5 +595,5 @@ /** Allocate driver-specific device data. */ -extern void *ddf_dev_data_alloc(ddf_dev_t *dev, size_t size) +void *ddf_dev_data_alloc(ddf_dev_t *dev, size_t size) { void *data; @@ -815,5 +657,5 @@ /** Allocate driver-specific function data. */ -extern void *ddf_fun_data_alloc(ddf_fun_t *fun, size_t size) +void *ddf_fun_data_alloc(ddf_fun_t *fun, size_t size) { void *data; @@ -1008,9 +850,6 @@ driver = drv; - /* Initialize the list of interrupt contexts. */ - init_interrupt_context_list(&interrupt_contexts); - - /* Set generic interrupt handler. */ - async_set_interrupt_received(driver_irq_handler); + /* Initialize interrupt module */ + interrupt_init(); /* Index: uspace/lib/drv/generic/interrupt.c =================================================================== --- uspace/lib/drv/generic/interrupt.c (revision 85d2fe2e5b85f71ad9664a96db7ed7302e0f9f2b) +++ uspace/lib/drv/generic/interrupt.c (revision 85d2fe2e5b85f71ad9664a96db7ed7302e0f9f2b) @@ -0,0 +1,215 @@ +/* + * Copyright (c) 2010 Lenka Trochtova + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @defgroup libdrv generic device driver support. + * @brief HelenOS generic device driver support. + * @{ + */ + +/** @file + */ + +#include +#include +#include + +#include "ddf/interrupt.h" + +static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall); +static interrupt_context_t *create_interrupt_context(void); +static void delete_interrupt_context(interrupt_context_t *ctx); +static void init_interrupt_context_list(interrupt_context_list_t *list); +static void add_interrupt_context(interrupt_context_list_t *list, + interrupt_context_t *ctx); +static void remove_interrupt_context(interrupt_context_list_t *list, + interrupt_context_t *ctx); +static interrupt_context_t *find_interrupt_context_by_id( + interrupt_context_list_t *list, int id); +static interrupt_context_t *find_interrupt_context( + interrupt_context_list_t *list, ddf_dev_t *dev, int irq); +int register_interrupt_handler(ddf_dev_t *dev, int irq, + interrupt_handler_t *handler, irq_code_t *pseudocode); +int unregister_interrupt_handler(ddf_dev_t *dev, int irq); + +/** Interrupts */ +static interrupt_context_list_t interrupt_contexts; + +static irq_cmd_t default_cmds[] = { + { + .cmd = CMD_ACCEPT + } +}; + +static irq_code_t default_pseudocode = { + 0, + NULL, + sizeof(default_cmds) / sizeof(irq_cmd_t), + default_cmds +}; + +void interrupt_init(void) +{ + /* Initialize the list of interrupt contexts. */ + init_interrupt_context_list(&interrupt_contexts); + + /* Set generic interrupt handler. */ + async_set_interrupt_received(driver_irq_handler); +} + +static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall) +{ + int id = (int)IPC_GET_IMETHOD(*icall); + interrupt_context_t *ctx; + + ctx = find_interrupt_context_by_id(&interrupt_contexts, id); + if (ctx != NULL && ctx->handler != NULL) + (*ctx->handler)(ctx->dev, iid, icall); +} + +static interrupt_context_t *create_interrupt_context(void) +{ + interrupt_context_t *ctx; + + ctx = (interrupt_context_t *) malloc(sizeof(interrupt_context_t)); + if (ctx != NULL) + memset(ctx, 0, sizeof(interrupt_context_t)); + + return ctx; +} + +static void delete_interrupt_context(interrupt_context_t *ctx) +{ + if (ctx != NULL) + free(ctx); +} + +static void init_interrupt_context_list(interrupt_context_list_t *list) +{ + memset(list, 0, sizeof(interrupt_context_list_t)); + fibril_mutex_initialize(&list->mutex); + list_initialize(&list->contexts); +} + +static void +add_interrupt_context(interrupt_context_list_t *list, interrupt_context_t *ctx) +{ + fibril_mutex_lock(&list->mutex); + ctx->id = list->curr_id++; + list_append(&ctx->link, &list->contexts); + fibril_mutex_unlock(&list->mutex); +} + +static void remove_interrupt_context(interrupt_context_list_t *list, + interrupt_context_t *ctx) +{ + fibril_mutex_lock(&list->mutex); + list_remove(&ctx->link); + fibril_mutex_unlock(&list->mutex); +} + +static interrupt_context_t * +find_interrupt_context_by_id(interrupt_context_list_t *list, int id) +{ + interrupt_context_t *ctx; + + fibril_mutex_lock(&list->mutex); + + list_foreach(list->contexts, link) { + ctx = list_get_instance(link, interrupt_context_t, link); + if (ctx->id == id) { + fibril_mutex_unlock(&list->mutex); + return ctx; + } + } + + fibril_mutex_unlock(&list->mutex); + return NULL; +} + +static interrupt_context_t * +find_interrupt_context(interrupt_context_list_t *list, ddf_dev_t *dev, int irq) +{ + interrupt_context_t *ctx; + + fibril_mutex_lock(&list->mutex); + + list_foreach(list->contexts, link) { + ctx = list_get_instance(link, interrupt_context_t, link); + if (ctx->irq == irq && ctx->dev == dev) { + fibril_mutex_unlock(&list->mutex); + return ctx; + } + } + + fibril_mutex_unlock(&list->mutex); + return NULL; +} + + +int +register_interrupt_handler(ddf_dev_t *dev, int irq, interrupt_handler_t *handler, + irq_code_t *pseudocode) +{ + interrupt_context_t *ctx = create_interrupt_context(); + + ctx->dev = dev; + ctx->irq = irq; + ctx->handler = handler; + + add_interrupt_context(&interrupt_contexts, ctx); + + if (pseudocode == NULL) + pseudocode = &default_pseudocode; + + int res = irq_register(irq, dev->handle, ctx->id, pseudocode); + if (res != EOK) { + remove_interrupt_context(&interrupt_contexts, ctx); + delete_interrupt_context(ctx); + } + + return res; +} + +int unregister_interrupt_handler(ddf_dev_t *dev, int irq) +{ + interrupt_context_t *ctx = find_interrupt_context(&interrupt_contexts, + dev, irq); + int res = irq_unregister(irq, dev->handle); + + if (ctx != NULL) { + remove_interrupt_context(&interrupt_contexts, ctx); + delete_interrupt_context(ctx); + } + + return res; +} + +/** + * @} + */ Index: uspace/lib/drv/generic/remote_nic.c =================================================================== --- uspace/lib/drv/generic/remote_nic.c (revision a996ae31af28626eb224d0fc0318932c1f196c19) +++ uspace/lib/drv/generic/remote_nic.c (revision 85d2fe2e5b85f71ad9664a96db7ed7302e0f9f2b) @@ -63,14 +63,11 @@ } -static void remote_nic_connect_to_nil(ddf_fun_t *dev, void *iface, - ipc_callid_t callid, ipc_call_t *call) -{ - nic_iface_t *nic_iface = (nic_iface_t *) iface; - assert(nic_iface->connect_to_nil); - - services_t nil_service = (services_t) IPC_GET_ARG2(*call); - nic_device_id_t device_id = (nic_device_id_t) IPC_GET_ARG3(*call); - - int rc = nic_iface->connect_to_nil(dev, nil_service, device_id); +static void remote_nic_callback_create(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + assert(nic_iface->callback_create); + + int rc = nic_iface->callback_create(dev); async_answer_0(callid, rc); } @@ -1203,5 +1200,5 @@ static remote_iface_func_ptr_t remote_nic_iface_ops[] = { &remote_nic_send_frame, - &remote_nic_connect_to_nil, + &remote_nic_callback_create, &remote_nic_get_state, &remote_nic_set_state, Index: uspace/lib/drv/include/ddf/driver.h =================================================================== --- uspace/lib/drv/include/ddf/driver.h (revision a996ae31af28626eb224d0fc0318932c1f196c19) +++ uspace/lib/drv/include/ddf/driver.h (revision 85d2fe2e5b85f71ad9664a96db7ed7302e0f9f2b) @@ -145,13 +145,4 @@ /** Ask driver to offline a specific function */ int (*fun_offline)(ddf_fun_t *); - - /** - * Notification that the device was succesfully added. - * The driver can do any blocking operation without - * blocking the device manager. - * - * XXX REMOVE THIS - */ - void (*device_added)(ddf_dev_t *dev); } driver_ops_t; Index: uspace/lib/drv/include/ddf/interrupt.h =================================================================== --- uspace/lib/drv/include/ddf/interrupt.h (revision a996ae31af28626eb224d0fc0318932c1f196c19) +++ uspace/lib/drv/include/ddf/interrupt.h (revision 85d2fe2e5b85f71ad9664a96db7ed7302e0f9f2b) @@ -64,16 +64,5 @@ } interrupt_context_list_t; -extern interrupt_context_t *create_interrupt_context(void); -extern void delete_interrupt_context(interrupt_context_t *); -extern void init_interrupt_context_list(interrupt_context_list_t *); -extern void add_interrupt_context(interrupt_context_list_t *, - interrupt_context_t *); -extern void remove_interrupt_context(interrupt_context_list_t *, - interrupt_context_t *); -extern interrupt_context_t *find_interrupt_context_by_id( - interrupt_context_list_t *, int); -extern interrupt_context_t *find_interrupt_context( - interrupt_context_list_t *, ddf_dev_t *, int); - +extern void interrupt_init(void); extern int register_interrupt_handler(ddf_dev_t *, int, interrupt_handler_t *, irq_code_t *); Index: uspace/lib/drv/include/ops/nic.h =================================================================== --- uspace/lib/drv/include/ops/nic.h (revision a996ae31af28626eb224d0fc0318932c1f196c19) +++ uspace/lib/drv/include/ops/nic.h (revision 85d2fe2e5b85f71ad9664a96db7ed7302e0f9f2b) @@ -38,5 +38,5 @@ #include -#include +#include #include @@ -46,5 +46,5 @@ /** Mandatory methods */ int (*send_frame)(ddf_fun_t *, void *, size_t); - int (*connect_to_nil)(ddf_fun_t *, services_t, nic_device_id_t); + int (*callback_create)(ddf_fun_t *); int (*get_state)(ddf_fun_t *, nic_device_state_t *); int (*set_state)(ddf_fun_t *, nic_device_state_t); Index: uspace/lib/drv/include/usbhc_iface.h =================================================================== --- uspace/lib/drv/include/usbhc_iface.h (revision a996ae31af28626eb224d0fc0318932c1f196c19) +++ uspace/lib/drv/include/usbhc_iface.h (revision 85d2fe2e5b85f71ad9664a96db7ed7302e0f9f2b) @@ -27,8 +27,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + /** @addtogroup libdrv * @addtogroup usb * @{ */ + /** @file * @brief USB host controller interface definition.