Index: uspace/lib/drv/Makefile =================================================================== --- uspace/lib/drv/Makefile (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/drv/Makefile (revision ae3ff9f5b199ff6a59b7eaaee63a16372db21e69) @@ -44,5 +44,6 @@ generic/remote_pci.c \ generic/remote_usbhc.c \ - generic/remote_usbhid.c + generic/remote_usbhid.c \ + generic/remote_ahci.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/lib/drv/generic/dev_iface.c =================================================================== --- uspace/lib/drv/generic/dev_iface.c (revision 77ad86ca9ec1edac5e39ab6e237ea58c13b85efb) +++ uspace/lib/drv/generic/dev_iface.c (revision ae3ff9f5b199ff6a59b7eaaee63a16372db21e69) @@ -46,4 +46,5 @@ #include "remote_usbhid.h" #include "remote_pci.h" +#include "remote_ahci.h" static iface_dipatch_table_t remote_ifaces = { @@ -55,5 +56,6 @@ &remote_usb_iface, &remote_usbhc_iface, - &remote_usbhid_iface + &remote_usbhid_iface, + &remote_ahci_iface } }; Index: uspace/lib/drv/generic/remote_ahci.c =================================================================== --- uspace/lib/drv/generic/remote_ahci.c (revision ae3ff9f5b199ff6a59b7eaaee63a16372db21e69) +++ uspace/lib/drv/generic/remote_ahci.c (revision ae3ff9f5b199ff6a59b7eaaee63a16372db21e69) @@ -0,0 +1,208 @@ +/* + * Copyright (c) 2012 Petr Jerman + * 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 +#include "ahci_iface.h" +#include "ddf/driver.h" + +typedef enum { + IPC_M_AHCI_GET_SATA_DEVICE_NAME, + IPC_M_AHCI_GET_NUM_BLOCKS, + IPC_M_AHCI_GET_BLOCK_SIZE, + IPC_M_AHCI_READ_BLOCKS, + IPC_M_AHCI_WRITE_BLOCKS +} ahci_iface_funcs_t; + +#define LO(ptr) \ + ((uint32_t) (((uint64_t) ((uintptr_t) (ptr))) & 0xffffffff)) + +#define HI(ptr) \ + ((uint32_t) (((uint64_t) ((uintptr_t) (ptr))) >> 32)) + +static void remote_ahci_get_sata_device_name(ddf_fun_t *, void *, ipc_callid_t, + ipc_call_t *); +static void remote_ahci_get_num_blocks(ddf_fun_t *, void *, ipc_callid_t, + ipc_call_t *); +static void remote_ahci_get_block_size(ddf_fun_t *, void *, ipc_callid_t, + ipc_call_t *); +static void remote_ahci_read_blocks(ddf_fun_t *, void *, ipc_callid_t, + ipc_call_t *); +static void remote_ahci_write_blocks(ddf_fun_t *, void *, ipc_callid_t, + ipc_call_t *); + +/** Remote AHCI interface operations. */ +static remote_iface_func_ptr_t remote_ahci_iface_ops [] = { + [IPC_M_AHCI_GET_SATA_DEVICE_NAME] = remote_ahci_get_sata_device_name, + [IPC_M_AHCI_GET_NUM_BLOCKS] = remote_ahci_get_num_blocks, + [IPC_M_AHCI_GET_BLOCK_SIZE] = remote_ahci_get_block_size, + [IPC_M_AHCI_READ_BLOCKS] = remote_ahci_read_blocks, + [IPC_M_AHCI_WRITE_BLOCKS] = remote_ahci_write_blocks +}; + +/** Remote AHCI interface structure. + */ +remote_iface_t remote_ahci_iface = { + .method_count = sizeof(remote_ahci_iface_ops) / + sizeof(remote_ahci_iface_ops[0]), + .methods = remote_ahci_iface_ops +}; + +void remote_ahci_get_sata_device_name(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + const ahci_iface_t *ahci_iface = (ahci_iface_t *) iface; + + if (ahci_iface->get_sata_device_name == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + const size_t sata_dev_name_length = + (size_t) DEV_IPC_GET_ARG1(*call); + + char* sata_dev_name = malloc(sata_dev_name_length); + + const int ret = ahci_iface->get_sata_device_name(fun, + sata_dev_name_length, sata_dev_name); + + size_t real_size; + ipc_callid_t cid; + if ((async_data_read_receive(&cid, &real_size)) && + (real_size == sata_dev_name_length)) + async_data_read_finalize(cid, sata_dev_name, sata_dev_name_length); + + async_answer_0(callid, ret); +} + +static void remote_ahci_get_num_blocks(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + const ahci_iface_t *ahci_iface = (ahci_iface_t *) iface; + + if (ahci_iface->get_num_blocks == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + uint64_t blocks; + const int ret = ahci_iface->get_num_blocks(fun, &blocks); + + if (ret != EOK) + async_answer_0(callid, ret); + else + async_answer_2(callid, EOK, HI(blocks), LO(blocks)); +} + +static void remote_ahci_get_block_size(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + const ahci_iface_t *ahci_iface = (ahci_iface_t *) iface; + + if (ahci_iface->get_block_size == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + size_t blocks; + const int ret = ahci_iface->get_block_size(fun, &blocks); + + if (ret != EOK) + async_answer_0(callid, ret); + else + async_answer_1(callid, EOK, blocks); +} + +void remote_ahci_read_blocks(ddf_fun_t *fun, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + const ahci_iface_t *ahci_iface = (ahci_iface_t *) iface; + + if (ahci_iface->read_blocks == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + size_t maxblock_size; + unsigned int flags; + + ipc_callid_t cid; + async_share_out_receive(&cid, &maxblock_size, &flags); + + void *buf; + async_share_out_finalize(cid, &buf); + + const uint64_t blocknum = + (((uint64_t) (DEV_IPC_GET_ARG1(*call))) << 32) | + (((uint64_t) (DEV_IPC_GET_ARG2(*call))) & 0xffffffff); + const size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call); + + const int ret = ahci_iface->read_blocks(fun, blocknum, cnt, buf); + + async_answer_0(callid, ret); +} + +void remote_ahci_write_blocks(ddf_fun_t *fun, void *iface, ipc_callid_t callid, + ipc_call_t *call) +{ + const ahci_iface_t *ahci_iface = (ahci_iface_t *) iface; + + if (ahci_iface->read_blocks == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + size_t maxblock_size; + unsigned int flags; + + ipc_callid_t cid; + async_share_out_receive(&cid, &maxblock_size, &flags); + + void *buf; + async_share_out_finalize(cid, &buf); + + const uint64_t blocknum = + (((uint64_t)(DEV_IPC_GET_ARG1(*call))) << 32) | + (((uint64_t)(DEV_IPC_GET_ARG2(*call))) & 0xffffffff); + const size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call); + + const int ret = ahci_iface->write_blocks(fun, blocknum, cnt, buf); + + async_answer_0(callid, ret); +} + +/** + * @} + */ Index: uspace/lib/drv/include/ahci_iface.h =================================================================== --- uspace/lib/drv/include/ahci_iface.h (revision ae3ff9f5b199ff6a59b7eaaee63a16372db21e69) +++ uspace/lib/drv/include/ahci_iface.h (revision ae3ff9f5b199ff6a59b7eaaee63a16372db21e69) @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2012 Petr Jerman + * 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 + * @addtogroup ahci + * @{ + */ +/** @file + * @brief AHCI interface definition. + */ + +#ifndef LIBDRV_AHCI_IFACE_H_ +#define LIBDRV_AHCI_IFACE_H_ + +#include "ddf/driver.h" +#include + +/** AHCI device communication interface. */ +typedef struct { + int (*get_sata_device_name)(ddf_fun_t *, size_t, char *); + int (*get_num_blocks)(ddf_fun_t *, uint64_t *); + int (*get_block_size)(ddf_fun_t *, size_t *); + int (*read_blocks)(ddf_fun_t *, uint64_t, size_t, void *); + int (*write_blocks)(ddf_fun_t *, uint64_t, size_t, void *); +} ahci_iface_t; + +#endif + +/** + * @} + */ Index: uspace/lib/drv/include/remote_ahci.h =================================================================== --- uspace/lib/drv/include/remote_ahci.h (revision ae3ff9f5b199ff6a59b7eaaee63a16372db21e69) +++ uspace/lib/drv/include/remote_ahci.h (revision ae3ff9f5b199ff6a59b7eaaee63a16372db21e69) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2012 Petr Jerman + * 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_AHCI_H_ +#define LIBDRV_REMOTE_AHCI_H_ + +extern remote_iface_t remote_ahci_iface; + +#endif + +/** + * @} + */