Index: uspace/lib/libc/include/devman.h =================================================================== --- uspace/lib/libc/include/devman.h (revision 92413defc319a30e0b83ed8a0996c59ffd9cd882) +++ uspace/lib/libc/include/devman.h (revision 67ba3090d4246ace5e0aefc167571850e5b115b1) @@ -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 67ba3090d4246ace5e0aefc167571850e5b115b1) @@ -55,11 +55,6 @@ } devman_to_driver_t; +#endif - - - - - - - -#endif +/** @} + */ Index: uspace/lib/libdrv/Makefile =================================================================== --- uspace/lib/libdrv/Makefile (revision 67ba3090d4246ace5e0aefc167571850e5b115b1) +++ uspace/lib/libdrv/Makefile (revision 67ba3090d4246ace5e0aefc167571850e5b115b1) @@ -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 67ba3090d4246ace5e0aefc167571850e5b115b1) +++ uspace/lib/libdrv/generic/driver.c (revision 67ba3090d4246ace5e0aefc167571850e5b115b1) @@ -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 67ba3090d4246ace5e0aefc167571850e5b115b1) +++ uspace/lib/libdrv/include/driver.h (revision 67ba3090d4246ace5e0aefc167571850e5b115b1) @@ -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 + +/** + * @} + */