Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 92413defc319a30e0b83ed8a0996c59ffd9cd882) +++ uspace/Makefile (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) @@ -97,4 +97,5 @@ lib/softint \ lib/softfloat \ + lib/libdrv ifeq ($(UARCH),amd64) Index: uspace/lib/libc/include/devman.h =================================================================== --- uspace/lib/libc/include/devman.h (revision 92413defc319a30e0b83ed8a0996c59ffd9cd882) +++ uspace/lib/libc/include/devman.h (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) @@ -1,5 +1,5 @@ /* * Copyright (c) 2009 Jiri Svoboda - * Copyright (c) 2010 Lenka Trochtova * + * Copyright (c) 2010 Lenka Trochtova * All rights reserved. * Index: uspace/lib/libc/include/ipc/devman.h =================================================================== --- uspace/lib/libc/include/ipc/devman.h (revision 92413defc319a30e0b83ed8a0996c59ffd9cd882) +++ uspace/lib/libc/include/ipc/devman.h (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) @@ -55,11 +55,6 @@ } devman_to_driver_t; +#endif - - - - - - - -#endif +/** @} + */ Index: uspace/lib/libdrv/Makefile =================================================================== --- uspace/lib/libdrv/Makefile (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) +++ uspace/lib/libdrv/Makefile (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# 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. +# + +USPACE_PREFIX = ../.. +LIBS = $(LIBC_PREFIX)/libc.a +EXTRA_CFLAGS = -Iinclude + +OUTPUT = libdrv.a + +SOURCES = \ + generic/driver.c + +include ../Makefile.common Index: uspace/lib/libdrv/generic/driver.c =================================================================== --- uspace/lib/libdrv/generic/driver.c (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) +++ uspace/lib/libdrv/generic/driver.c (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) @@ -0,0 +1,137 @@ +/* + * 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 +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "driver.h" + +static driver_t *driver; + +static void driver_connection_devman(ipc_callid_t iid, ipc_call_t *icall) +{ + /* Accept connection */ + ipc_answer_0(iid, EOK); + + bool cont = true; + while (cont) { + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + + switch (IPC_GET_METHOD(call)) { + case IPC_M_PHONE_HUNGUP: + cont = false; + continue; + case DRIVER_ADD_DEVICE: + // TODO + break; + default: + if (!(callid & IPC_CALLID_NOTIFICATION)) + ipc_answer_0(callid, ENOENT); + } + } + +} + +static void driver_connection_driver(ipc_callid_t iid, ipc_call_t *icall) +{ + // TODO later +} + +static void driver_connection_client(ipc_callid_t iid, ipc_call_t *icall) +{ + // TODO later +} + + +/** Function for handling connections to device driver. + * + */ +static void driver_connection(ipc_callid_t iid, ipc_call_t *icall) +{ + ipc_callid_t callid; + /* Select interface */ + switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) { + case DRIVER_DEVMAN: + // handle PnP events from device manager + driver_connection_devman(iid, icall); + break; + case DRIVER_DRIVER: + // handle request from drivers of child devices + driver_connection_driver(iid, icall); + break; + case DRIVER_CLIENT: + // handle requests from client applications + driver_connection_client(iid, icall); + break; + + default: + /* No such interface */ + ipc_answer_0(iid, ENOENT); + } +} + +int driver_main(driver_t *drv) +{ + // remember the driver structure - driver_ops will be called by generic handler for incoming connections + driver = drv; + + // register driver by device manager with generic handler for incoming connections + printf("%s: sending registration request to devman.\n", driver->name); + devman_driver_register(driver->name, driver_connection); + + async_manager(); + + // Never reached + return 0; +} + +/** + * @} + */ Index: uspace/lib/libdrv/include/driver.h =================================================================== --- uspace/lib/libdrv/include/driver.h (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) +++ uspace/lib/libdrv/include/driver.h (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) @@ -0,0 +1,67 @@ +/* + * 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. + */ + +/** @addtogroup libdrv + * @{ + */ +/** @file + */ + +#ifndef LIBDRV_DRIVER_H_ +#define LIBDRV_DRIVER_H_ + +typedef enum { + DRIVER_DEVMAN = 1, + DRIVER_CLIENT, + DRIVER_DRIVER +} driver_interface_t; + +typedef struct device { + int parent_handle; + ipcarg_t parent_phone; + // TODO add more items - parent bus type etc. + int handle; +} device_t; + +typedef struct driver_ops { + bool (*add_device)(device_t *dev); + // TODO add other generic driver operations +} driver_ops_t; + +typedef struct driver { + const char *name; + driver_ops_t *driver_ops; +} driver_t; + +int driver_main(driver_t *drv); + +#endif + +/** + * @} + */ Index: uspace/srv/Makefile.common =================================================================== --- uspace/srv/Makefile.common (revision 92413defc319a30e0b83ed8a0996c59ffd9cd882) +++ uspace/srv/Makefile.common (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) @@ -49,4 +49,5 @@ LIBPCI_PREFIX = $(USPACE_PREFIX)/lib/libpci SOFTINT_PREFIX = $(USPACE_PREFIX)/lib/softint +LIBDRV_PREFIX = $(USPACE_PREFIX)/lib/libdrv LINK_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision 92413defc319a30e0b83ed8a0996c59ffd9cd882) +++ uspace/srv/devman/devman.c (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) @@ -428,12 +428,57 @@ } +void set_driver_phone(driver_t *driver, ipcarg_t phone) +{ + fibril_mutex_lock(&driver->driver_mutex); + assert(DRIVER_STARTING == driver->state); + driver->phone = phone; + fibril_mutex_unlock(&driver->driver_mutex); +} + +/** + * Notify driver about the devices to which it was assigned. + * + * The driver's mutex must be locked. + * + * @param driver the driver to which the devices are passed. + */ +static void pass_devices_to_driver(driver_t *driver) +{ + node_t *dev; + link_t *link; + + link = driver->devices.next; + while (link != &driver->devices) { + dev = list_get_instance(link, node_t, driver_devices); + add_device(driver, dev); + link = link->next; + } +} + +/** Finish the initialization of a driver after it has succesfully started and registered itself by the device manager. + * + * Pass devices formerly matched to the driver to the driver and remember the driver is running and fully functional now. + * + * @param driver the driver which registered itself as running by the device manager. + */ +void initialize_running_driver(driver_t *driver) +{ + fibril_mutex_lock(&driver->driver_mutex); + + // pass devices which have been already assigned to the driver to the driver + pass_devices_to_driver(driver); + + // change driver's state to running + driver->state = DRIVER_RUNNING; + + fibril_mutex_unlock(&driver->driver_mutex); +} + /** Pass a device to running driver. * * @param drv the driver's structure. * @param node the device's node in the device tree. - * - * @return true on success, false otherwise. - */ -bool add_device(driver_t *drv, node_t *node) + */ +void add_device(driver_t *drv, node_t *node) { printf(NAME ": add_device\n"); @@ -506,2 +551,4 @@ } +/** @} + */ Index: uspace/srv/devman/devman.h =================================================================== --- uspace/srv/devman/devman.h (revision 92413defc319a30e0b83ed8a0996c59ffd9cd882) +++ uspace/srv/devman/devman.h (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) @@ -191,8 +191,10 @@ void add_driver(driver_list_t *drivers_list, driver_t *drv); void attach_driver(node_t *node, driver_t *drv); -bool add_device(driver_t *drv, node_t *node); +void add_device(driver_t *drv, node_t *node); bool start_driver(driver_t *drv); driver_t * find_driver(driver_list_t *drv_list, const char *drv_name); +void set_driver_phone(driver_t *driver, ipcarg_t phone); +void initialize_running_driver(driver_t *driver); @@ -260,2 +262,5 @@ #endif + +/** @} + */ Index: uspace/srv/devman/main.c =================================================================== --- uspace/srv/devman/main.c (revision 92413defc319a30e0b83ed8a0996c59ffd9cd882) +++ uspace/srv/devman/main.c (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) @@ -60,30 +60,4 @@ /** - * - * - * Driver's mutex must be locked. - */ -static void pass_devices_to_driver(driver_t *driver) -{ - - - - -} - -static void init_running_driver(driver_t *driver) -{ - fibril_mutex_lock(&driver->driver_mutex); - - // pass devices which have been already assigned to the driver to the driver - pass_devices_to_driver(driver); - - // change driver's state to running - driver->state = DRIVER_RUNNING; - - fibril_mutex_unlock(&driver->driver_mutex); -} - -/** * Register running driver. */ @@ -134,8 +108,6 @@ } - fibril_mutex_lock(&driver->driver_mutex); - assert(DRIVER_STARTING == driver->state); - driver->phone = IPC_GET_ARG5(call); - fibril_mutex_unlock(&driver->driver_mutex); + // remember driver's phone + set_driver_phone(driver, IPC_GET_ARG5(call)); printf(NAME ": the %s driver was successfully registered as running.\n", driver->name); @@ -160,5 +132,5 @@ return; - init_running_driver(driver); + initialize_running_driver(driver); ipc_callid_t callid; @@ -251,2 +223,5 @@ return 0; } + +/** @} + */ Index: uspace/srv/drivers/root/Makefile =================================================================== --- uspace/srv/drivers/root/Makefile (revision 92413defc319a30e0b83ed8a0996c59ffd9cd882) +++ uspace/srv/drivers/root/Makefile (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) @@ -27,5 +27,5 @@ USPACE_PREFIX = ../../.. -LIBS = $(LIBC_PREFIX)/libc.a +LIBS = $(LIBC_PREFIX)/libc.a $(LIBDRV_PREFIX)/libdrv.a OUTPUT = root @@ -35,2 +35,4 @@ include ../../Makefile.common + +EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include Index: uspace/srv/drivers/root/root.c =================================================================== --- uspace/srv/drivers/root/root.c (revision 92413defc319a30e0b83ed8a0996c59ffd9cd882) +++ uspace/srv/drivers/root/root.c (revision c16cf623b359a6846e36f73f2bc995be0ffb2716) @@ -28,5 +28,5 @@ /** - * @defgroup root device driver. + * @defgroup root Root device driver. * @brief HelenOS root device driver. * @{ @@ -37,7 +37,4 @@ #include -#include -#include -#include #include #include @@ -48,136 +45,12 @@ #include +#include #include #include - -//////////////////////////////////////// -// rudiments of generic driver support -// TODO - create library(ies) for this functionality -//////////////////////////////////////// - -typedef enum { - DRIVER_DEVMAN = 1, - DRIVER_CLIENT, - DRIVER_DRIVER -} driver_interface_t; - -typedef struct device { - int parent_handle; - ipcarg_t parent_phone; - // TODO add more items - parent bus type etc. - int handle; -} device_t; - -typedef struct driver_ops { - bool (*add_device)(device_t *dev); - // TODO add other generic driver operations -} driver_ops_t; - -typedef struct driver { - const char *name; - driver_ops_t *driver_ops; -} driver_t; - - -static driver_t *driver; - - -static void driver_connection_devman(ipc_callid_t iid, ipc_call_t *icall) -{ - /* Accept connection */ - ipc_answer_0(iid, EOK); - - bool cont = true; - while (cont) { - ipc_call_t call; - ipc_callid_t callid = async_get_call(&call); - - switch (IPC_GET_METHOD(call)) { - case IPC_M_PHONE_HUNGUP: - cont = false; - continue; - case DRIVER_ADD_DEVICE: - // TODO - break; - default: - if (!(callid & IPC_CALLID_NOTIFICATION)) - ipc_answer_0(callid, ENOENT); - } - } - -} - -static void driver_connection_driver(ipc_callid_t iid, ipc_call_t *icall) -{ - // TODO later -} - -static void driver_connection_client(ipc_callid_t iid, ipc_call_t *icall) -{ - // TODO later -} - - - - -/** Function for handling connections to device driver. - * - */ -static void driver_connection(ipc_callid_t iid, ipc_call_t *icall) -{ - ipc_callid_t callid; - /* Select interface */ - switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) { - case DRIVER_DEVMAN: - // handle PnP events from device manager - driver_connection_devman(iid, icall); - break; - case DRIVER_DRIVER: - // handle request from drivers of child devices - driver_connection_driver(iid, icall); - break; - case DRIVER_CLIENT: - // handle requests from client applications - driver_connection_client(iid, icall); - break; - - default: - /* No such interface */ - ipc_answer_0(iid, ENOENT); - } -} - - - -int driver_main(driver_t *drv) -{ - // remember driver structure - driver_ops will be called by generic handler for incoming connections - driver = drv; - - // register driver by device manager with generic handler for incoming connections - printf("%s: sending registration request to devman.\n", driver->name); - devman_driver_register(driver->name, driver_connection); - - async_manager(); - - // Never reached - return 0; - -} - -//////////////////////////////////////// -// ROOT driver -//////////////////////////////////////// - #define NAME "root" - - -bool root_add_device(device_t *dev) -{ - // TODO add root device and register its children - return true; -} +static bool root_add_device(device_t *dev); +static bool root_init(); static driver_ops_t root_ops = { @@ -190,5 +63,11 @@ }; -bool root_init() +static bool root_add_device(device_t *dev) +{ + // TODO add root device and register its children + return true; +} + +static bool root_init() { // TODO driver initialization @@ -206,2 +85,6 @@ return driver_main(&root_driver); } + +/** + * @} + */