Index: uspace/drv/block/ahci/ahci.c =================================================================== --- uspace/drv/block/ahci/ahci.c (revision a44424f1e58a9b794aa58fab718dd4a6929a3a7b) +++ uspace/drv/block/ahci/ahci.c (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) @@ -37,5 +37,5 @@ #include #include -#include +#include #include #include Index: uspace/drv/bus/pci/pciintel/pci.c =================================================================== --- uspace/drv/bus/pci/pciintel/pci.c (revision a44424f1e58a9b794aa58fab718dd4a6929a3a7b) +++ uspace/drv/bus/pci/pciintel/pci.c (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) @@ -153,5 +153,5 @@ -static int pci_config_space_write_32(ddf_fun_t *fun, uint32_t address, +static int config_space_write_32(ddf_fun_t *fun, uint32_t address, uint32_t data) { @@ -162,5 +162,5 @@ } -static int pci_config_space_write_16( +static int config_space_write_16( ddf_fun_t *fun, uint32_t address, uint16_t data) { @@ -171,5 +171,5 @@ } -static int pci_config_space_write_8( +static int config_space_write_8( ddf_fun_t *fun, uint32_t address, uint8_t data) { @@ -180,5 +180,5 @@ } -static int pci_config_space_read_32( +static int config_space_read_32( ddf_fun_t *fun, uint32_t address, uint32_t *data) { @@ -189,5 +189,5 @@ } -static int pci_config_space_read_16( +static int config_space_read_16( ddf_fun_t *fun, uint32_t address, uint16_t *data) { @@ -198,5 +198,5 @@ } -static int pci_config_space_read_8( +static int config_space_read_8( ddf_fun_t *fun, uint32_t address, uint8_t *data) { @@ -217,10 +217,10 @@ static pci_dev_iface_t pci_dev_ops = { - .config_space_read_8 = &pci_config_space_read_8, - .config_space_read_16 = &pci_config_space_read_16, - .config_space_read_32 = &pci_config_space_read_32, - .config_space_write_8 = &pci_config_space_write_8, - .config_space_write_16 = &pci_config_space_write_16, - .config_space_write_32 = &pci_config_space_write_32 + .config_space_read_8 = &config_space_read_8, + .config_space_read_16 = &config_space_read_16, + .config_space_read_32 = &config_space_read_32, + .config_space_write_8 = &config_space_write_8, + .config_space_write_16 = &config_space_write_16, + .config_space_write_32 = &config_space_write_32 }; Index: uspace/drv/bus/usb/ehci/res.c =================================================================== --- uspace/drv/bus/usb/ehci/res.c (revision a44424f1e58a9b794aa58fab718dd4a6929a3a7b) +++ uspace/drv/bus/usb/ehci/res.c (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) @@ -43,5 +43,5 @@ #include #include -#include +#include #include "res.h" Index: uspace/drv/bus/usb/uhci/res.c =================================================================== --- uspace/drv/bus/usb/uhci/res.c (revision a44424f1e58a9b794aa58fab718dd4a6929a3a7b) +++ uspace/drv/bus/usb/uhci/res.c (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) @@ -39,5 +39,5 @@ #include #include -#include +#include #include "res.h" Index: uspace/drv/nic/e1k/e1k.c =================================================================== --- uspace/drv/nic/e1k/e1k.c (revision a44424f1e58a9b794aa58fab718dd4a6929a3a7b) +++ uspace/drv/nic/e1k/e1k.c (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) @@ -50,5 +50,5 @@ #include #include -#include +#include #include #include Index: uspace/drv/nic/rtl8139/driver.c =================================================================== --- uspace/drv/nic/rtl8139/driver.c (revision a44424f1e58a9b794aa58fab718dd4a6929a3a7b) +++ uspace/drv/nic/rtl8139/driver.c (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) @@ -41,5 +41,5 @@ #include #include -#include +#include #include @@ -190,6 +190,4 @@ return; } - -#include /** Set PmEn (Power management enable) bit value Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision a44424f1e58a9b794aa58fab718dd4a6929a3a7b) +++ uspace/lib/c/Makefile (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) @@ -74,5 +74,4 @@ generic/device/graph_dev.c \ generic/device/nic.c \ - generic/device/pci.c \ generic/device/ahci.c \ generic/dhcp.c \ Index: uspace/lib/c/generic/device/pci.c =================================================================== --- uspace/lib/c/generic/device/pci.c (revision a44424f1e58a9b794aa58fab718dd4a6929a3a7b) +++ (revision ) @@ -1,116 +1,0 @@ -/* - * Copyright (c) 2011 Jiri Michalec - * 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 - -int pci_config_space_read_8(async_sess_t *sess, uint32_t address, uint8_t *val) -{ - sysarg_t res = 0; - - async_exch_t *exch = async_exchange_begin(sess); - int rc = async_req_2_1(exch, DEV_IFACE_ID(PCI_DEV_IFACE), - IPC_M_CONFIG_SPACE_READ_8, address, &res); - async_exchange_end(exch); - - *val = (uint8_t) res; - return rc; -} - -int pci_config_space_read_16(async_sess_t *sess, uint32_t address, - uint16_t *val) -{ - sysarg_t res = 0; - - async_exch_t *exch = async_exchange_begin(sess); - int rc = async_req_2_1(exch, DEV_IFACE_ID(PCI_DEV_IFACE), - IPC_M_CONFIG_SPACE_READ_16, address, &res); - async_exchange_end(exch); - - *val = (uint16_t) res; - return rc; -} - -int pci_config_space_read_32(async_sess_t *sess, uint32_t address, - uint32_t *val) -{ - sysarg_t res = 0; - - async_exch_t *exch = async_exchange_begin(sess); - int rc = async_req_2_1(exch, DEV_IFACE_ID(PCI_DEV_IFACE), - IPC_M_CONFIG_SPACE_READ_32, address, &res); - async_exchange_end(exch); - - *val = (uint32_t) res; - return rc; -} - -int pci_config_space_write_8(async_sess_t *sess, uint32_t address, uint8_t val) -{ - async_exch_t *exch = async_exchange_begin(sess); - int rc = async_req_3_0(exch, DEV_IFACE_ID(PCI_DEV_IFACE), - IPC_M_CONFIG_SPACE_WRITE_8, address, val); - async_exchange_end(exch); - - return rc; -} - -int pci_config_space_write_16(async_sess_t *sess, uint32_t address, - uint16_t val) -{ - async_exch_t *exch = async_exchange_begin(sess); - int rc = async_req_3_0(exch, DEV_IFACE_ID(PCI_DEV_IFACE), - IPC_M_CONFIG_SPACE_WRITE_16, address, val); - async_exchange_end(exch); - - return rc; -} - -int pci_config_space_write_32(async_sess_t *sess, uint32_t address, - uint32_t val) -{ - async_exch_t *exch = async_exchange_begin(sess); - int rc = async_req_3_0(exch, DEV_IFACE_ID(PCI_DEV_IFACE), - IPC_M_CONFIG_SPACE_WRITE_32, address, val); - async_exchange_end(exch); - - return rc; -} - -/** @} - */ Index: uspace/lib/c/include/device/pci.h =================================================================== --- uspace/lib/c/include/device/pci.h (revision a44424f1e58a9b794aa58fab718dd4a6929a3a7b) +++ (revision ) @@ -1,63 +1,0 @@ -/* - * Copyright (c) 2011 Jiri Michalec - * 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_PCI_H_ -#define LIBC_DEVICE_PCI_H_ - -#include - -#define PCI_DEVICE_ID 0x02 - -typedef enum { - IPC_M_CONFIG_SPACE_READ_8, - IPC_M_CONFIG_SPACE_READ_16, - IPC_M_CONFIG_SPACE_READ_32, - - IPC_M_CONFIG_SPACE_WRITE_8, - IPC_M_CONFIG_SPACE_WRITE_16, - IPC_M_CONFIG_SPACE_WRITE_32 -} pci_dev_iface_funcs_t; - -extern int pci_config_space_read_8(async_sess_t *, uint32_t, uint8_t *); -extern int pci_config_space_read_16(async_sess_t *, uint32_t, uint16_t *); -extern int pci_config_space_read_32(async_sess_t *, uint32_t, uint32_t *); - -extern int pci_config_space_write_8(async_sess_t *, uint32_t, uint8_t); -extern int pci_config_space_write_16(async_sess_t *, uint32_t, uint16_t); -extern int pci_config_space_write_32(async_sess_t *, uint32_t, uint32_t); - -#endif - -/** @} - */ Index: uspace/lib/drv/generic/remote_pci.c =================================================================== --- uspace/lib/drv/generic/remote_pci.c (revision a44424f1e58a9b794aa58fab718dd4a6929a3a7b) +++ uspace/lib/drv/generic/remote_pci.c (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) @@ -41,4 +41,87 @@ #include "ddf/driver.h" +typedef enum { + IPC_M_CONFIG_SPACE_READ_8, + IPC_M_CONFIG_SPACE_READ_16, + IPC_M_CONFIG_SPACE_READ_32, + + IPC_M_CONFIG_SPACE_WRITE_8, + IPC_M_CONFIG_SPACE_WRITE_16, + IPC_M_CONFIG_SPACE_WRITE_32 +} pci_dev_iface_funcs_t; + +int pci_config_space_read_8(async_sess_t *sess, uint32_t address, uint8_t *val) +{ + sysarg_t res = 0; + + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_2_1(exch, DEV_IFACE_ID(PCI_DEV_IFACE), + IPC_M_CONFIG_SPACE_READ_8, address, &res); + async_exchange_end(exch); + + *val = (uint8_t) res; + return rc; +} + +int pci_config_space_read_16(async_sess_t *sess, uint32_t address, + uint16_t *val) +{ + sysarg_t res = 0; + + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_2_1(exch, DEV_IFACE_ID(PCI_DEV_IFACE), + IPC_M_CONFIG_SPACE_READ_16, address, &res); + async_exchange_end(exch); + + *val = (uint16_t) res; + return rc; +} + +int pci_config_space_read_32(async_sess_t *sess, uint32_t address, + uint32_t *val) +{ + sysarg_t res = 0; + + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_2_1(exch, DEV_IFACE_ID(PCI_DEV_IFACE), + IPC_M_CONFIG_SPACE_READ_32, address, &res); + async_exchange_end(exch); + + *val = (uint32_t) res; + return rc; +} + +int pci_config_space_write_8(async_sess_t *sess, uint32_t address, uint8_t val) +{ + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_3_0(exch, DEV_IFACE_ID(PCI_DEV_IFACE), + IPC_M_CONFIG_SPACE_WRITE_8, address, val); + async_exchange_end(exch); + + return rc; +} + +int pci_config_space_write_16(async_sess_t *sess, uint32_t address, + uint16_t val) +{ + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_3_0(exch, DEV_IFACE_ID(PCI_DEV_IFACE), + IPC_M_CONFIG_SPACE_WRITE_16, address, val); + async_exchange_end(exch); + + return rc; +} + +int pci_config_space_write_32(async_sess_t *sess, uint32_t address, + uint32_t val) +{ + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_3_0(exch, DEV_IFACE_ID(PCI_DEV_IFACE), + IPC_M_CONFIG_SPACE_WRITE_32, address, val); + async_exchange_end(exch); + + return rc; +} + static void remote_config_space_read_8(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); static void remote_config_space_read_16(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *); Index: uspace/lib/drv/include/pci_dev_iface.h =================================================================== --- uspace/lib/drv/include/pci_dev_iface.h (revision a44424f1e58a9b794aa58fab718dd4a6929a3a7b) +++ uspace/lib/drv/include/pci_dev_iface.h (revision 99e8fb7bd498e63f4a9fb1eb4573407fd0186f0d) @@ -40,13 +40,13 @@ #include "ddf/driver.h" -typedef enum { - IPC_M_CONFIG_SPACE_READ_8, - IPC_M_CONFIG_SPACE_READ_16, - IPC_M_CONFIG_SPACE_READ_32, +#define PCI_DEVICE_ID 0x02 - IPC_M_CONFIG_SPACE_WRITE_8, - IPC_M_CONFIG_SPACE_WRITE_16, - IPC_M_CONFIG_SPACE_WRITE_32 -} pci_dev_iface_funcs_t; +extern int pci_config_space_read_8(async_sess_t *, uint32_t, uint8_t *); +extern int pci_config_space_read_16(async_sess_t *, uint32_t, uint16_t *); +extern int pci_config_space_read_32(async_sess_t *, uint32_t, uint32_t *); + +extern int pci_config_space_write_8(async_sess_t *, uint32_t, uint8_t); +extern int pci_config_space_write_16(async_sess_t *, uint32_t, uint16_t); +extern int pci_config_space_write_32(async_sess_t *, uint32_t, uint32_t); /** PCI device communication interface. */