Index: uspace/lib/drv/generic/dev_iface.c =================================================================== --- uspace/lib/drv/generic/dev_iface.c (revision 36a6e115ddd4ad98943cea17b43d07993f875c56) +++ uspace/lib/drv/generic/dev_iface.c (revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50) @@ -37,11 +37,11 @@ #include "dev_iface.h" -#include "remote_res.h" -#include "remote_char.h" +#include "remote_hw_res.h" +#include "remote_char_dev.h" static iface_dipatch_table_t remote_ifaces = { .ifaces = { - &remote_res_iface, - &remote_char_iface + &remote_hw_res_iface, + &remote_char_dev_iface } }; Index: uspace/lib/drv/generic/remote_char.c =================================================================== --- uspace/lib/drv/generic/remote_char.c (revision 36a6e115ddd4ad98943cea17b43d07993f875c56) +++ uspace/lib/drv/generic/remote_char.c (revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50) @@ -37,5 +37,5 @@ #include -#include "char.h" +#include "char_dev.h" #include "driver.h" @@ -46,5 +46,5 @@ /** Remote character interface operations. */ -static remote_iface_func_ptr_t remote_char_iface_ops[] = { +static remote_iface_func_ptr_t remote_char_dev_iface_ops[] = { &remote_char_read, &remote_char_write @@ -56,8 +56,8 @@ * character interface. */ -remote_iface_t remote_char_iface = { - .method_count = sizeof(remote_char_iface_ops) / +remote_iface_t remote_char_dev_iface = { + .method_count = sizeof(remote_char_dev_iface_ops) / sizeof(remote_iface_func_ptr_t), - .methods = remote_char_iface_ops + .methods = remote_char_dev_iface_ops }; @@ -75,5 +75,5 @@ ipc_call_t *call) { - char_iface_t *char_iface = (char_iface_t *) iface; + char_dev_ops_t *char_iface = (char_dev_ops_t *) iface; ipc_callid_t cid; @@ -122,5 +122,5 @@ ipc_call_t *call) { - char_iface_t *char_iface = (char_iface_t *) iface; + char_dev_ops_t *char_iface = (char_dev_ops_t *) iface; ipc_callid_t cid; size_t len; Index: uspace/lib/drv/generic/remote_res.c =================================================================== --- uspace/lib/drv/generic/remote_res.c (revision 36a6e115ddd4ad98943cea17b43d07993f875c56) +++ uspace/lib/drv/generic/remote_res.c (revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50) @@ -38,20 +38,20 @@ #include "driver.h" -#include "resource.h" +#include "hw_res.h" -static void remote_res_get_resources(device_t *, void *, ipc_callid_t, +static void remote_res_get_resource_list(device_t *, void *, ipc_callid_t, ipc_call_t *); static void remote_res_enable_interrupt(device_t *, void *, ipc_callid_t, ipc_call_t *); -static remote_iface_func_ptr_t remote_res_iface_ops [] = { - &remote_res_get_resources, +static remote_iface_func_ptr_t remote_hw_res_iface_ops [] = { + &remote_res_get_resource_list, &remote_res_enable_interrupt }; -remote_iface_t remote_res_iface = { - .method_count = sizeof(remote_res_iface_ops) / +remote_iface_t remote_hw_res_iface = { + .method_count = sizeof(remote_hw_res_iface_ops) / sizeof(remote_iface_func_ptr_t), - .methods = remote_res_iface_ops + .methods = remote_hw_res_iface_ops }; @@ -59,5 +59,5 @@ ipc_callid_t callid, ipc_call_t *call) { - resource_iface_t *ires = (resource_iface_t *) iface; + hw_res_ops_t *ires = (hw_res_ops_t *) iface; if (NULL == ires->enable_interrupt) @@ -69,14 +69,14 @@ } -static void remote_res_get_resources(device_t *dev, void *iface, +static void remote_res_get_resource_list(device_t *dev, void *iface, ipc_callid_t callid, ipc_call_t *call) { - resource_iface_t *ires = (resource_iface_t *) iface; - if (NULL == ires->get_resources) { + hw_res_ops_t *ires = (hw_res_ops_t *) iface; + if (NULL == ires->get_resource_list) { ipc_answer_0(callid, ENOTSUP); return; } - hw_resource_list_t *hw_resources = ires->get_resources(dev); + hw_resource_list_t *hw_resources = ires->get_resource_list(dev); if (NULL == hw_resources){ ipc_answer_0(callid, ENOENT); Index: uspace/lib/drv/include/char.h =================================================================== --- uspace/lib/drv/include/char.h (revision 36a6e115ddd4ad98943cea17b43d07993f875c56) +++ (revision ) @@ -1,49 +1,0 @@ -/* - * 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_CHAR_H_ -#define LIBDRV_CHAR_H_ - -#include "driver.h" - -typedef struct char_iface { - int (*read)(device_t *, char *, size_t); - int (*write)(device_t *, char *, size_t); -} char_iface_t; - -#endif - -/** - * @} - */ Index: uspace/lib/drv/include/char_dev.h =================================================================== --- uspace/lib/drv/include/char_dev.h (revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50) +++ uspace/lib/drv/include/char_dev.h (revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50) @@ -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 libdrv + * @{ + */ +/** @file + */ + +#ifndef LIBDRV_CHAR_DEV_H_ +#define LIBDRV_CHAR_DEV_H_ + +#include "driver.h" + +typedef struct { + int (*read)(device_t *, char *, size_t); + int (*write)(device_t *, char *, size_t); +} char_dev_ops_t; + +#endif + +/** + * @} + */ Index: uspace/lib/drv/include/hw_res.h =================================================================== --- uspace/lib/drv/include/hw_res.h (revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50) +++ uspace/lib/drv/include/hw_res.h (revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50) @@ -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 LIBDRV_HW_RES_H_ +#define LIBDRV_HW_RES_H_ + +#include +#include + +typedef struct { + hw_resource_list_t *(*get_resource_list)(device_t *); + bool (*enable_interrupt)(device_t *); +} hw_res_ops_t; + +#endif + +/** + * @} + */ Index: uspace/lib/drv/include/remote_char.h =================================================================== --- uspace/lib/drv/include/remote_char.h (revision 36a6e115ddd4ad98943cea17b43d07993f875c56) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * 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_REMOTE_CHAR_H_ -#define LIBDRV_REMOTE_CHAR_H_ - -extern remote_iface_t remote_char_iface; - -#endif - -/** - * @} - */ Index: uspace/lib/drv/include/remote_char_dev.h =================================================================== --- uspace/lib/drv/include/remote_char_dev.h (revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50) +++ uspace/lib/drv/include/remote_char_dev.h (revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50) @@ -0,0 +1,44 @@ +/* + * 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_REMOTE_CHAR_DEV_H_ +#define LIBDRV_REMOTE_CHAR_DEV_H_ + +extern remote_iface_t remote_char_dev_iface; + +#endif + +/** + * @} + */ Index: uspace/lib/drv/include/remote_hw_res.h =================================================================== --- uspace/lib/drv/include/remote_hw_res.h (revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50) +++ uspace/lib/drv/include/remote_hw_res.h (revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50) @@ -0,0 +1,44 @@ +/* + * 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_REMOTE_HW_RES_H_ +#define LIBDRV_REMOTE_HW_RES_H_ + +extern remote_iface_t remote_hw_res_iface; + +#endif + +/** + * @} + */ Index: uspace/lib/drv/include/remote_res.h =================================================================== --- uspace/lib/drv/include/remote_res.h (revision 36a6e115ddd4ad98943cea17b43d07993f875c56) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * 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_REMOTE_RES_H_ -#define LIBDRV_REMOTE_RES_H_ - -extern remote_iface_t remote_res_iface; - -#endif - -/** - * @} - */ Index: uspace/lib/drv/include/resource.h =================================================================== --- uspace/lib/drv/include/resource.h (revision 36a6e115ddd4ad98943cea17b43d07993f875c56) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * 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_RESOURCE_H_ -#define LIBDRV_RESOURCE_H_ - -#include -#include - -typedef struct resource_iface { - hw_resource_list_t *(* get_resources)(device_t *); - bool (*enable_interrupt)(device_t *); -} resource_iface_t; - - -#endif - -/** - * @} - */