Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 1db5669ba6b4304571c0fad33329fc19b51b9f26) +++ uspace/lib/c/Makefile (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) @@ -69,4 +69,5 @@ generic/device/hw_res.c \ generic/device/hw_res_parsed.c \ + generic/device/pio_window.c \ generic/device/char_dev.c \ generic/device/clock_dev.c \ Index: uspace/lib/c/generic/device/pio_window.c =================================================================== --- uspace/lib/c/generic/device/pio_window.c (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) +++ uspace/lib/c/generic/device/pio_window.c (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2013 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. + */ + + /** @addtogroup libc + * @{ + */ +/** @file + */ + +#include +#include +#include + +int pio_window_get(async_sess_t *sess, pio_window_t *pio_win) +{ + int rc; + + async_exch_t *exch = async_exchange_begin(sess); + if (!exch) + return ENOMEM; + + rc = async_req_1_0(exch, DEV_IFACE_ID(PIO_WINDOW_DEV_IFACE), + PIO_WINDOW_GET); + if (rc != EOK) { + async_exchange_end(exch); + return rc; + } + + rc = async_data_read_start(exch, pio_win, sizeof(*pio_win)); + async_exchange_end(exch); + + return rc; +} + +/** @} + */ + Index: uspace/lib/c/include/device/pio_window.h =================================================================== --- uspace/lib/c/include/device/pio_window.h (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) +++ uspace/lib/c/include/device/pio_window.h (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2013 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. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_DEVICE_PIO_WINDOW_H_ +#define LIBC_DEVICE_PIO_WINDOW_H_ + +#include +#include + +/** PIO_WINDOW provider interface */ +typedef enum { + PIO_WINDOW_GET = 0, +} pio_window_method_t; + +typedef struct { + struct { + uintptr_t base; + size_t size; + } mem, io; +} pio_window_t; + +extern int pio_window_get(async_sess_t *, pio_window_t *); + +#endif + +/** @} + */ Index: uspace/lib/c/include/ipc/dev_iface.h =================================================================== --- uspace/lib/c/include/ipc/dev_iface.h (revision 1db5669ba6b4304571c0fad33329fc19b51b9f26) +++ uspace/lib/c/include/ipc/dev_iface.h (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) @@ -36,4 +36,5 @@ typedef enum { HW_RES_DEV_IFACE = 0, + PIO_WINDOW_DEV_IFACE, /** Character device interface */ Index: uspace/lib/drv/Makefile =================================================================== --- uspace/lib/drv/Makefile (revision 1db5669ba6b4304571c0fad33329fc19b51b9f26) +++ uspace/lib/drv/Makefile (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) @@ -41,4 +41,5 @@ generic/remote_audio_pcm.c \ generic/remote_hw_res.c \ + generic/remote_pio_window.c \ generic/remote_char_dev.c \ generic/remote_graph_dev.c \ Index: uspace/lib/drv/generic/dev_iface.c =================================================================== --- uspace/lib/drv/generic/dev_iface.c (revision 1db5669ba6b4304571c0fad33329fc19b51b9f26) +++ uspace/lib/drv/generic/dev_iface.c (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) @@ -40,4 +40,5 @@ #include "dev_iface.h" #include "remote_hw_res.h" +#include "remote_pio_window.h" #include "remote_char_dev.h" #include "remote_clock_dev.h" @@ -58,4 +59,5 @@ [AUDIO_PCM_BUFFER_IFACE] = &remote_audio_pcm_iface, [HW_RES_DEV_IFACE] = &remote_hw_res_iface, + [PIO_WINDOW_DEV_IFACE] = &remote_pio_window_iface, [CHAR_DEV_IFACE] = &remote_char_dev_iface, [GRAPH_DEV_IFACE] = &remote_graph_dev_iface, Index: uspace/lib/drv/generic/remote_pio_window.c =================================================================== --- uspace/lib/drv/generic/remote_pio_window.c (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) +++ uspace/lib/drv/generic/remote_pio_window.c (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2013 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. + */ + +/** @addtogroup libdrv + * @{ + */ +/** @file + */ + +#include +#include + +#include "ops/pio_window.h" +#include "ddf/driver.h" + +static void remote_pio_window_get(ddf_fun_t *, void *, ipc_callid_t, + ipc_call_t *); + +static remote_iface_func_ptr_t remote_pio_window_iface_ops [] = { + [PIO_WINDOW_GET] = &remote_pio_window_get +}; + +remote_iface_t remote_pio_window_iface = { + .method_count = sizeof(remote_pio_window_iface_ops) / + sizeof(remote_iface_func_ptr_t), + .methods = remote_pio_window_iface_ops +}; + +static void remote_pio_window_get(ddf_fun_t *fun, void *ops, + ipc_callid_t callid, ipc_call_t *call) +{ + pio_window_ops_t *pio_win_ops = (pio_window_ops_t *) ops; + size_t len; + + if (!pio_win_ops->get_pio_window) { + async_answer_0(callid, ENOTSUP); + return; + } + + pio_window_t *pio_window = pio_win_ops->get_pio_window(fun); + if (!pio_window) { + async_answer_0(callid, ENOENT); + return; + } + + async_answer_0(callid, EOK); + + if (!async_data_read_receive(&callid, &len)) { + /* Protocol error - the recipient is not accepting data */ + return; + } + + async_data_read_finalize(callid, pio_window, len); +} + +/** + * @} + */ Index: uspace/lib/drv/include/ops/pio_window.h =================================================================== --- uspace/lib/drv/include/ops/pio_window.h (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) +++ uspace/lib/drv/include/ops/pio_window.h (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2013 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. + */ + +/** @addtogroup libdrv + * @{ + */ +/** @file + */ + +#ifndef LIBDRV_OPS_PIO_WINDOW_H_ +#define LIBDRV_OPS_PIO_WINDOW_H_ + +#include +#include +#include "../ddf/driver.h" + +typedef struct { + pio_window_t *(* get_pio_window)(ddf_fun_t *); +} pio_window_ops_t; + +#endif + +/** + * @} + */ Index: uspace/lib/drv/include/remote_pio_window.h =================================================================== --- uspace/lib/drv/include/remote_pio_window.h (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) +++ uspace/lib/drv/include/remote_pio_window.h (revision 0a42894321fbd1640ea0e2c4d698b82b724a9a2a) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2013 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. + */ + +/** @addtogroup libdrv + * @{ + */ +/** @file + */ + +#ifndef LIBDRV_REMOTE_PIO_WINDOW_H_ +#define LIBDRV_REMOTE_PIO_WINDOW_H_ + +extern remote_iface_t remote_pio_window_iface; + +#endif + +/** + * @} + */