Index: uspace/drv/block/ahci/ahci.c =================================================================== --- uspace/drv/block/ahci/ahci.c (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) +++ uspace/drv/block/ahci/ahci.c (revision 7f620e8406775dfd73a55d55e17b5fe29550ed8b) @@ -111,9 +111,9 @@ } -static int ahci_get_sata_device_name(ddf_fun_t *, size_t, char *); -static int ahci_get_num_blocks(ddf_fun_t *, uint64_t *); -static int ahci_get_block_size(ddf_fun_t *, size_t *); -static int ahci_read_blocks(ddf_fun_t *, uint64_t, size_t, void *); -static int ahci_write_blocks(ddf_fun_t *, uint64_t, size_t, void *); +static int get_sata_device_name(ddf_fun_t *, size_t, char *); +static int get_num_blocks(ddf_fun_t *, uint64_t *); +static int get_block_size(ddf_fun_t *, size_t *); +static int read_blocks(ddf_fun_t *, uint64_t, size_t, void *); +static int write_blocks(ddf_fun_t *, uint64_t, size_t, void *); static int ahci_identify_device(sata_dev_t *); @@ -139,9 +139,9 @@ static ahci_iface_t ahci_interface = { - .get_sata_device_name = &ahci_get_sata_device_name, - .get_num_blocks = &ahci_get_num_blocks, - .get_block_size = &ahci_get_block_size, - .read_blocks = &ahci_read_blocks, - .write_blocks = &ahci_write_blocks + .get_sata_device_name = &get_sata_device_name, + .get_num_blocks = &get_num_blocks, + .get_block_size = &get_block_size, + .read_blocks = &read_blocks, + .write_blocks = &write_blocks }; @@ -180,5 +180,5 @@ * */ -static int ahci_get_sata_device_name(ddf_fun_t *fun, +static int get_sata_device_name(ddf_fun_t *fun, size_t sata_dev_name_length, char *sata_dev_name) { @@ -196,5 +196,5 @@ * */ -static int ahci_get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks) +static int get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks) { sata_dev_t *sata = fun_sata_dev(fun); @@ -211,5 +211,5 @@ * */ -static int ahci_get_block_size(ddf_fun_t *fun, size_t *block_size) +static int get_block_size(ddf_fun_t *fun, size_t *block_size) { sata_dev_t *sata = fun_sata_dev(fun); @@ -228,5 +228,5 @@ * */ -static int ahci_read_blocks(ddf_fun_t *fun, uint64_t blocknum, +static int read_blocks(ddf_fun_t *fun, uint64_t blocknum, size_t count, void *buf) { @@ -271,5 +271,5 @@ * */ -static int ahci_write_blocks(ddf_fun_t *fun, uint64_t blocknum, +static int write_blocks(ddf_fun_t *fun, uint64_t blocknum, size_t count, void *buf) { Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) +++ uspace/lib/c/Makefile (revision 7f620e8406775dfd73a55d55e17b5fe29550ed8b) @@ -74,5 +74,4 @@ generic/device/graph_dev.c \ generic/device/nic.c \ - generic/device/ahci.c \ generic/dhcp.c \ generic/dnsr.c \ Index: uspace/lib/c/generic/device/ahci.c =================================================================== --- uspace/lib/c/generic/device/ahci.c (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) +++ (revision ) @@ -1,185 +1,0 @@ -/* - * 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 libc - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -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 MAX_NAME_LENGTH 1024 - -#define LO(ptr) \ - ((uint32_t) (((uint64_t) ((uintptr_t) (ptr))) & 0xffffffff)) - -#define HI(ptr) \ - ((uint32_t) (((uint64_t) ((uintptr_t) (ptr))) >> 32)) - -async_sess_t* ahci_get_sess(devman_handle_t funh, char **name) -{ - // FIXME: Use a better way than substring match - - *name = NULL; - - char devn[MAX_NAME_LENGTH]; - int rc = devman_fun_get_name(funh, devn, MAX_NAME_LENGTH); - if (rc != EOK) - return NULL; - - size_t devn_size = str_size(devn); - - if ((devn_size > 5) && (str_lcmp(devn, "ahci_", 5) == 0)) { - async_sess_t *sess = devman_device_connect(EXCHANGE_PARALLEL, - funh, IPC_FLAG_BLOCKING); - - if (sess) { - *name = str_dup(devn); - return sess; - } - } - - return NULL; -} - -int ahci_get_sata_device_name(async_sess_t *sess, size_t sata_dev_name_length, - char *sata_dev_name) -{ - async_exch_t *exch = async_exchange_begin(sess); - if (!exch) - return EINVAL; - - aid_t req = async_send_2(exch, DEV_IFACE_ID(AHCI_DEV_IFACE), - IPC_M_AHCI_GET_SATA_DEVICE_NAME, sata_dev_name_length, NULL); - - async_data_read_start(exch, sata_dev_name, sata_dev_name_length); - - sysarg_t rc; - async_wait_for(req, &rc); - - return rc; -} - -int ahci_get_num_blocks(async_sess_t *sess, uint64_t *blocks) -{ - async_exch_t *exch = async_exchange_begin(sess); - if (!exch) - return EINVAL; - - sysarg_t blocks_hi; - sysarg_t blocks_lo; - int rc = async_req_1_2(exch, DEV_IFACE_ID(AHCI_DEV_IFACE), - IPC_M_AHCI_GET_NUM_BLOCKS, &blocks_hi, &blocks_lo); - - async_exchange_end(exch); - - if (rc == EOK) { - *blocks = (((uint64_t) blocks_hi) << 32) - | (((uint64_t) blocks_lo) & 0xffffffff); - } - - return rc; -} - -int ahci_get_block_size(async_sess_t *sess, size_t *blocks_size) -{ - async_exch_t *exch = async_exchange_begin(sess); - if (!exch) - return EINVAL; - - sysarg_t bs; - int rc = async_req_1_1(exch, DEV_IFACE_ID(AHCI_DEV_IFACE), - IPC_M_AHCI_GET_BLOCK_SIZE, &bs); - - async_exchange_end(exch); - - if (rc == EOK) - *blocks_size = (size_t) bs; - - return rc; -} - -int ahci_read_blocks(async_sess_t *sess, uint64_t blocknum, size_t count, - void *buf) -{ - async_exch_t *exch = async_exchange_begin(sess); - if (!exch) - return EINVAL; - - aid_t req; - req = async_send_4(exch, DEV_IFACE_ID(AHCI_DEV_IFACE), - IPC_M_AHCI_READ_BLOCKS, HI(blocknum), LO(blocknum), count, NULL); - - async_share_out_start(exch, buf, AS_AREA_READ | AS_AREA_WRITE); - - async_exchange_end(exch); - - sysarg_t rc; - async_wait_for(req, &rc); - - return rc; -} - -int ahci_write_blocks(async_sess_t *sess, uint64_t blocknum, size_t count, - void* buf) -{ - async_exch_t *exch = async_exchange_begin(sess); - if (!exch) - return EINVAL; - - aid_t req = async_send_4(exch, DEV_IFACE_ID(AHCI_DEV_IFACE), - IPC_M_AHCI_WRITE_BLOCKS, HI(blocknum), LO(blocknum), count, NULL); - - async_share_out_start(exch, buf, AS_AREA_READ | AS_AREA_WRITE); - - async_exchange_end(exch); - - sysarg_t rc; - async_wait_for(req, &rc); - - return rc; -} - -/** @} - */ Index: uspace/lib/c/include/device/ahci.h =================================================================== --- uspace/lib/c/include/device/ahci.h (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) +++ (revision ) @@ -1,53 +1,0 @@ -/* - * 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 libc - * @{ - */ -/** @file - * @brief AHCI interface definition. - */ - -#ifndef LIBC_DEVICE_AHCI_H_ -#define LIBC_DEVICE_AHCI_H_ - -#include -#include - -extern async_sess_t* ahci_get_sess(devman_handle_t, char **); - -extern int ahci_get_sata_device_name(async_sess_t *, size_t, char *); -extern int ahci_get_num_blocks(async_sess_t *, uint64_t *); -extern int ahci_get_block_size(async_sess_t *, size_t *); -extern int ahci_read_blocks(async_sess_t *, uint64_t, size_t, void *); -extern int ahci_write_blocks(async_sess_t *, uint64_t, size_t, void *); - -#endif - -/** @} - */ Index: uspace/lib/drv/generic/remote_ahci.c =================================================================== --- uspace/lib/drv/generic/remote_ahci.c (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) +++ uspace/lib/drv/generic/remote_ahci.c (revision 7f620e8406775dfd73a55d55e17b5fe29550ed8b) @@ -33,5 +33,7 @@ */ +#include #include +#include #include #include @@ -48,4 +50,6 @@ } ahci_iface_funcs_t; +#define MAX_NAME_LENGTH 1024 + #define LO(ptr) \ ((uint32_t) (((uint64_t) ((uintptr_t) (ptr))) & 0xffffffff)) @@ -53,4 +57,128 @@ #define HI(ptr) \ ((uint32_t) (((uint64_t) ((uintptr_t) (ptr))) >> 32)) + +async_sess_t* ahci_get_sess(devman_handle_t funh, char **name) +{ + // FIXME: Use a better way than substring match + + *name = NULL; + + char devn[MAX_NAME_LENGTH]; + int rc = devman_fun_get_name(funh, devn, MAX_NAME_LENGTH); + if (rc != EOK) + return NULL; + + size_t devn_size = str_size(devn); + + if ((devn_size > 5) && (str_lcmp(devn, "ahci_", 5) == 0)) { + async_sess_t *sess = devman_device_connect(EXCHANGE_PARALLEL, + funh, IPC_FLAG_BLOCKING); + + if (sess) { + *name = str_dup(devn); + return sess; + } + } + + return NULL; +} + +int ahci_get_sata_device_name(async_sess_t *sess, size_t sata_dev_name_length, + char *sata_dev_name) +{ + async_exch_t *exch = async_exchange_begin(sess); + if (!exch) + return EINVAL; + + aid_t req = async_send_2(exch, DEV_IFACE_ID(AHCI_DEV_IFACE), + IPC_M_AHCI_GET_SATA_DEVICE_NAME, sata_dev_name_length, NULL); + + async_data_read_start(exch, sata_dev_name, sata_dev_name_length); + + sysarg_t rc; + async_wait_for(req, &rc); + + return rc; +} + +int ahci_get_num_blocks(async_sess_t *sess, uint64_t *blocks) +{ + async_exch_t *exch = async_exchange_begin(sess); + if (!exch) + return EINVAL; + + sysarg_t blocks_hi; + sysarg_t blocks_lo; + int rc = async_req_1_2(exch, DEV_IFACE_ID(AHCI_DEV_IFACE), + IPC_M_AHCI_GET_NUM_BLOCKS, &blocks_hi, &blocks_lo); + + async_exchange_end(exch); + + if (rc == EOK) { + *blocks = (((uint64_t) blocks_hi) << 32) + | (((uint64_t) blocks_lo) & 0xffffffff); + } + + return rc; +} + +int ahci_get_block_size(async_sess_t *sess, size_t *blocks_size) +{ + async_exch_t *exch = async_exchange_begin(sess); + if (!exch) + return EINVAL; + + sysarg_t bs; + int rc = async_req_1_1(exch, DEV_IFACE_ID(AHCI_DEV_IFACE), + IPC_M_AHCI_GET_BLOCK_SIZE, &bs); + + async_exchange_end(exch); + + if (rc == EOK) + *blocks_size = (size_t) bs; + + return rc; +} + +int ahci_read_blocks(async_sess_t *sess, uint64_t blocknum, size_t count, + void *buf) +{ + async_exch_t *exch = async_exchange_begin(sess); + if (!exch) + return EINVAL; + + aid_t req; + req = async_send_4(exch, DEV_IFACE_ID(AHCI_DEV_IFACE), + IPC_M_AHCI_READ_BLOCKS, HI(blocknum), LO(blocknum), count, NULL); + + async_share_out_start(exch, buf, AS_AREA_READ | AS_AREA_WRITE); + + async_exchange_end(exch); + + sysarg_t rc; + async_wait_for(req, &rc); + + return rc; +} + +int ahci_write_blocks(async_sess_t *sess, uint64_t blocknum, size_t count, + void* buf) +{ + async_exch_t *exch = async_exchange_begin(sess); + if (!exch) + return EINVAL; + + aid_t req = async_send_4(exch, DEV_IFACE_ID(AHCI_DEV_IFACE), + IPC_M_AHCI_WRITE_BLOCKS, HI(blocknum), LO(blocknum), count, NULL); + + async_share_out_start(exch, buf, AS_AREA_READ | AS_AREA_WRITE); + + async_exchange_end(exch); + + sysarg_t rc; + async_wait_for(req, &rc); + + return rc; +} static void remote_ahci_get_sata_device_name(ddf_fun_t *, void *, ipc_callid_t, Index: uspace/lib/drv/include/ahci_iface.h =================================================================== --- uspace/lib/drv/include/ahci_iface.h (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) +++ uspace/lib/drv/include/ahci_iface.h (revision 7f620e8406775dfd73a55d55e17b5fe29550ed8b) @@ -41,4 +41,12 @@ #include +extern async_sess_t* ahci_get_sess(devman_handle_t, char **); + +extern int ahci_get_sata_device_name(async_sess_t *, size_t, char *); +extern int ahci_get_num_blocks(async_sess_t *, uint64_t *); +extern int ahci_get_block_size(async_sess_t *, size_t *); +extern int ahci_read_blocks(async_sess_t *, uint64_t, size_t, void *); +extern int ahci_write_blocks(async_sess_t *, uint64_t, size_t, void *); + /** AHCI device communication interface. */ typedef struct { Index: uspace/srv/bd/sata_bd/Makefile =================================================================== --- uspace/srv/bd/sata_bd/Makefile (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) +++ uspace/srv/bd/sata_bd/Makefile (revision 7f620e8406775dfd73a55d55e17b5fe29550ed8b) @@ -29,4 +29,6 @@ USPACE_PREFIX = ../../.. BINARY = sata_bd +EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include +LIBS = $(LIBDRV_PREFIX)/libdrv.a SOURCES = \ Index: uspace/srv/bd/sata_bd/sata_bd.c =================================================================== --- uspace/srv/bd/sata_bd/sata_bd.c (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) +++ uspace/srv/bd/sata_bd/sata_bd.c (revision 7f620e8406775dfd73a55d55e17b5fe29550ed8b) @@ -39,4 +39,5 @@ #include #include +#include #include #include @@ -45,5 +46,5 @@ #include -#include +#include #include "sata_bd.h"