Index: uspace/lib/c/include/ddi.h =================================================================== --- uspace/lib/c/include/ddi.h (revision 369a5f8a1a86047b7259dfe2c89e8b6f05751cbb) +++ uspace/lib/c/include/ddi.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) @@ -43,4 +43,6 @@ extern int preemption_control(int); extern int pio_enable(void *, size_t, void **); +extern int interrupt_enable(int); +extern int interrupt_disable(int); #endif Index: uspace/lib/c/include/device/char.h =================================================================== --- uspace/lib/c/include/device/char.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) +++ uspace/lib/c/include/device/char.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) @@ -0,0 +1,49 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_DEVICE_HW_RES_H_ +#define LIBC_DEVICE_HW_RES_H_ + +typedef enum { + CHAR_READ_DEV = 0, + CHAR_WRITE_DEV +} hw_res_funcs_t; + +int read_dev(int dev_phone, void *buf, size_t len); +int write_dev(int dev_phone, void *buf, size_t len); + +#endif + +/** @} + */ Index: uspace/lib/c/include/device/hw_res.h =================================================================== --- uspace/lib/c/include/device/hw_res.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) +++ uspace/lib/c/include/device/hw_res.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) @@ -0,0 +1,105 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_DEVICE_HW_RES_H_ +#define LIBC_DEVICE_HW_RES_H_ + +#include +#include + +// HW resource provider interface + +typedef enum { + GET_RESOURCE_LIST = 0, + ENABLE_INTERRUPT +} hw_res_funcs_t; + +/** HW resource types. */ +typedef enum { + INTERRUPT, + IO_RANGE, + MEM_RANGE +} hw_res_type_t; + +typedef enum { + LITTLE_ENDIAN = 0, + BIG_ENDIAN +} endianness_t; + + +/** HW resource (e.g. interrupt, memory register, i/o register etc.). */ +typedef struct hw_resource { + hw_res_type_t type; + union { + struct { + uint64_t address; + endianness_t endianness; + size_t size; + } mem_range; + struct { + uint64_t address; + endianness_t endianness; + size_t size; + } io_range; + struct { + int irq; + } interrupt; + } res; +} hw_resource_t; + +typedef struct hw_resource_list { + size_t count; + hw_resource_t *resources; +} hw_resource_list_t; + +static inline void clean_hw_resource_list(hw_resource_list_t *hw_res) +{ + if(NULL != hw_res->resources) { + free(hw_res->resources); + hw_res->resources = NULL; + } + hw_res->count = 0; +} + + + +bool get_hw_resources(int dev_phone, hw_resource_list_t *hw_resources); + +bool enable_interrupt(int dev_phone); + + +#endif + +/** @} + */ Index: uspace/lib/c/include/devman.h =================================================================== --- uspace/lib/c/include/devman.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) +++ uspace/lib/c/include/devman.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2009 Jiri Svoboda + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_DEVMAN_H_ +#define LIBC_DEVMAN_H_ + +#include +#include +#include + + +int devman_get_phone(devman_interface_t, unsigned int); +void devman_hangup_phone(devman_interface_t iface); + +int devman_driver_register(const char *, async_client_conn_t); +int devman_child_device_register(const char *, match_id_list_t *, device_handle_t, device_handle_t *); + +int devman_device_connect(device_handle_t handle, unsigned int flags); +int devman_parent_device_connect(device_handle_t handle, unsigned int flags); + +int devman_device_get_handle(const char *pathname, device_handle_t *handle, unsigned int flags); + + +#endif + +/** @} + */ Index: uspace/lib/c/include/ipc/dev_iface.h =================================================================== --- uspace/lib/c/include/ipc/dev_iface.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) +++ uspace/lib/c/include/ipc/dev_iface.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) @@ -0,0 +1,52 @@ +/* + * 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. + */ + +#ifndef LIBC_IPC_DEV_IFACE_H_ +#define LIBC_IPC_DEV_IFACE_H_ + +#include +#include +#include +#include + +typedef enum { + HW_RES_DEV_IFACE = 0, + CHAR_DEV_IFACE, + // TODO add more interfaces + DEV_IFACE_MAX +} dev_inferface_idx_t; + +#define DEV_IFACE_ID(idx) ((idx) + IPC_FIRST_USER_METHOD) +#define DEV_IFACE_IDX(id) ((id) - IPC_FIRST_USER_METHOD) + +#define DEV_IFACE_COUNT DEV_IFACE_MAX +#define DEV_FIRST_CUSTOM_METHOD_IDX DEV_IFACE_MAX +#define DEV_FIRST_CUSTOM_METHOD DEV_IFACE_ID(DEV_FIRST_CUSTOM_METHOD_IDX) + + +#endif Index: uspace/lib/c/include/ipc/devman.h =================================================================== --- uspace/lib/c/include/ipc/devman.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) +++ uspace/lib/c/include/ipc/devman.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) @@ -0,0 +1,147 @@ +/* + * 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 devman + * @{ + */ + +#ifndef LIBC_IPC_DEVMAN_H_ +#define LIBC_IPC_DEVMAN_H_ + +#include +#include +#include +#include +#include + +#define DEVMAN_NAME_MAXLEN 256 + +typedef ipcarg_t device_handle_t; + +/** Ids of device models used for device-to-driver matching. + */ +typedef struct match_id { + /** Pointers to next and previous ids. + */ + link_t link; + /** Id of device model. + */ + const char *id; + /** Relevancy of device-to-driver match. + * The higher is the product of scores specified for the device by the bus driver and by the leaf driver, + * the more suitable is the leaf driver for handling the device. + */ + unsigned int score; +} match_id_t; + +/** List of ids for matching devices to drivers sorted + * according to match scores in descending order. + */ +typedef struct match_id_list { + link_t ids; +} match_id_list_t; + + +static inline match_id_t * create_match_id() +{ + match_id_t *id = malloc(sizeof(match_id_t)); + memset(id, 0, sizeof(match_id_t)); + return id; +} + +static inline void delete_match_id(match_id_t *id) +{ + if (id) { + if (NULL != id->id) { + free(id->id); + } + free(id); + } +} + +static inline void add_match_id(match_id_list_t *ids, match_id_t *id) +{ + match_id_t *mid = NULL; + link_t *link = ids->ids.next; + + while (link != &ids->ids) { + mid = list_get_instance(link, match_id_t,link); + if (mid->score < id->score) { + break; + } + link = link->next; + } + + list_insert_before(&id->link, link); +} + +static inline void init_match_ids(match_id_list_t *id_list) +{ + list_initialize(&id_list->ids); +} + +static inline void clean_match_ids(match_id_list_t *ids) +{ + link_t *link = NULL; + match_id_t *id; + + while(!list_empty(&ids->ids)) { + link = ids->ids.next; + list_remove(link); + id = list_get_instance(link, match_id_t, link); + delete_match_id(id); + } +} + +typedef enum { + DEVMAN_DRIVER = 1, + DEVMAN_CLIENT, + DEVMAN_CONNECT_TO_DEVICE, + DEVMAN_CONNECT_TO_PARENTS_DEVICE +} devman_interface_t; + +typedef enum { + DEVMAN_DRIVER_REGISTER = IPC_FIRST_USER_METHOD, + DEVMAN_ADD_CHILD_DEVICE, + DEVMAN_ADD_MATCH_ID + +} driver_to_devman_t; + +typedef enum { + DRIVER_ADD_DEVICE = IPC_FIRST_USER_METHOD + +} devman_to_driver_t; + +typedef enum { + DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD +} client_to_devman_t; + +#endif + +/** @} + */ Index: uspace/lib/c/include/ipc/driver.h =================================================================== --- uspace/lib/c/include/ipc/driver.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) +++ uspace/lib/c/include/ipc/driver.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) @@ -0,0 +1,50 @@ +/* + * 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 IPC_DRIVER_H_ +#define IPC_DRIVER_H_ + +typedef enum { + DRIVER_DEVMAN = 1, + DRIVER_CLIENT, + DRIVER_DRIVER +} driver_interface_t; + + +#endif + + +/** + * @} + */ Index: uspace/lib/c/include/ipc/serial.h =================================================================== --- uspace/lib/c/include/ipc/serial.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) +++ uspace/lib/c/include/ipc/serial.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) @@ -0,0 +1,14 @@ +#ifndef LIBC_FB_H_ +#define LIBC_FB_H_ + +#include + +typedef enum { + SERIAL_PUTCHAR = IPC_FIRST_USER_METHOD, + SERIAL_GETCHAR, + SERIAL_READ, + SERIAL_WRITE, +} serial_request_t; + + +#endif Index: uspace/lib/c/include/ipc/serial_ctl.h =================================================================== --- uspace/lib/c/include/ipc/serial_ctl.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) +++ uspace/lib/c/include/ipc/serial_ctl.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) @@ -0,0 +1,53 @@ +/* + * 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. + */ + +#ifndef LIBC_IPC_SERIAL_CTL_H_ +#define LIBC_IPC_SERIAL_CTL_H_ + +#include + +/** ipc methods for getting/setting serial communication properties + * 1st ipc arg: baud rate + * 2nd ipc arg: parity + * 3rd ipc arg: number of bits in one word + * 4th ipc arg: number of stop bits + */ +typedef enum { + SERIAL_GET_COM_PROPS = DEV_FIRST_CUSTOM_METHOD, + SERIAL_SET_COM_PROPS +} serial_ctl_t; + +typedef enum { + SERIAL_NO_PARITY = 0, + SERIAL_ODD_PARITY = 1, + SERIAL_EVEN_PARITY = 3, + SERIAL_MARK_PARITY = 5, + SERIAL_SPACE_PARITY = 7 +} serial_parity_t; + +#endif Index: uspace/lib/c/include/ipc/services.h =================================================================== --- uspace/lib/c/include/ipc/services.h (revision 369a5f8a1a86047b7259dfe2c89e8b6f05751cbb) +++ uspace/lib/c/include/ipc/services.h (revision d51ee2b4b8df06f1db92623840353f34771a405b) @@ -45,4 +45,5 @@ SERVICE_VFS, SERVICE_DEVMAP, + SERVICE_DEVMAN, SERVICE_FHC, SERVICE_OBIO,