Index: uspace/drv/bus/usb/ohci/Makefile =================================================================== --- uspace/drv/bus/usb/ohci/Makefile (revision 41455a2252d8399fc1db67b56337cc546b45a936) +++ uspace/drv/bus/usb/ohci/Makefile (revision 44c1a48a86ef01c638eca0e96b94f3ccb68f8af7) @@ -50,5 +50,5 @@ ohci_batch.c \ ohci_endpoint.c \ - pci.c \ + res.c \ root_hub.c \ hw_struct/endpoint_descriptor.c \ Index: uspace/drv/bus/usb/ohci/ohci.c =================================================================== --- uspace/drv/bus/usb/ohci/ohci.c (revision 41455a2252d8399fc1db67b56337cc546b45a936) +++ uspace/drv/bus/usb/ohci/ohci.c (revision 44c1a48a86ef01c638eca0e96b94f3ccb68f8af7) @@ -42,5 +42,5 @@ #include "ohci.h" -#include "pci.h" +#include "res.h" #include "hc.h" @@ -180,5 +180,5 @@ int irq = 0; - ret = pci_get_my_registers(device, ®_base, ®_size, &irq); + ret = get_my_registers(device, ®_base, ®_size, &irq); CHECK_RET_DEST_FREE_RETURN(ret, "Failed to get register memory addresses for %" PRIun ": %s.\n", @@ -211,5 +211,5 @@ /* Try to enable interrupts */ bool interrupts = false; - ret = pci_enable_interrupts(device); + ret = enable_interrupts(device); if (ret != EOK) { usb_log_warning("Failed to enable interrupts: %s." Index: pace/drv/bus/usb/ohci/pci.c =================================================================== --- uspace/drv/bus/usb/ohci/pci.c (revision 41455a2252d8399fc1db67b56337cc546b45a936) +++ (revision ) @@ -1,116 +1,0 @@ -/* - * Copyright (c) 2011 Jan Vesely - * 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 drvusbohci - * @{ - */ -/** - * @file - * PCI related functions needed by the OHCI driver. - */ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "pci.h" - -/** Get address of registers and IRQ for given device. - * - * @param[in] dev Device asking for the addresses. - * @param[out] mem_reg_address Base address of the memory range. - * @param[out] mem_reg_size Size of the memory range. - * @param[out] irq_no IRQ assigned to the device. - * @return Error code. - */ -int pci_get_my_registers(ddf_dev_t *dev, - uintptr_t *mem_reg_address, size_t *mem_reg_size, int *irq_no) -{ - assert(dev); - - async_sess_t *parent_sess = - devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle, - IPC_FLAG_BLOCKING); - if (!parent_sess) - return ENOMEM; - - hw_res_list_parsed_t hw_res; - hw_res_list_parsed_init(&hw_res); - const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0); - async_hangup(parent_sess); - if (ret != EOK) { - return ret; - } - - /* We want one irq and one mem range. */ - if (hw_res.irqs.count != 1 || hw_res.mem_ranges.count != 1) { - hw_res_list_parsed_clean(&hw_res); - return EINVAL; - } - - if (mem_reg_address) - *mem_reg_address = hw_res.mem_ranges.ranges[0].address; - if (mem_reg_size) - *mem_reg_size = hw_res.mem_ranges.ranges[0].size; - if (irq_no) - *irq_no = hw_res.irqs.irqs[0]; - - hw_res_list_parsed_clean(&hw_res); - return EOK; -} - -/** Call the PCI driver with a request to enable interrupts - * - * @param[in] device Device asking for interrupts - * @return Error code. - */ -int pci_enable_interrupts(ddf_dev_t *device) -{ - async_sess_t *parent_sess = - devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle, - IPC_FLAG_BLOCKING); - if (!parent_sess) - return ENOMEM; - - bool enabled = hw_res_enable_interrupt(parent_sess); - async_hangup(parent_sess); - - return enabled ? EOK : EIO; -} - -/** - * @} - */ Index: pace/drv/bus/usb/ohci/pci.h =================================================================== --- uspace/drv/bus/usb/ohci/pci.h (revision 41455a2252d8399fc1db67b56337cc546b45a936) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2011 Vojtech Horky - * 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 drvusbohci - * @{ - */ -/** @file - * PCI related functions needed by OHCI driver. - */ -#ifndef DRV_OHCI_PCI_H -#define DRV_OHCI_PCI_H - -#include - -int pci_get_my_registers(ddf_dev_t *, uintptr_t *, size_t *, int *); -int pci_enable_interrupts(ddf_dev_t *); -int pci_disable_legacy(ddf_dev_t *); - -#endif -/** - * @} - */ - Index: uspace/drv/bus/usb/ohci/res.c =================================================================== --- uspace/drv/bus/usb/ohci/res.c (revision 44c1a48a86ef01c638eca0e96b94f3ccb68f8af7) +++ uspace/drv/bus/usb/ohci/res.c (revision 44c1a48a86ef01c638eca0e96b94f3ccb68f8af7) @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2011 Jan Vesely + * 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 drvusbohci + * @{ + */ +/** + * @file + * PCI related functions needed by the OHCI driver. + */ + +#include +#include +#include +#include + +#include + +#include "res.h" + +/** Get address of registers and IRQ for given device. + * + * @param[in] dev Device asking for the addresses. + * @param[out] mem_reg_address Base address of the memory range. + * @param[out] mem_reg_size Size of the memory range. + * @param[out] irq_no IRQ assigned to the device. + * @return Error code. + */ +int get_my_registers(const ddf_dev_t *dev, + uintptr_t *mem_reg_address, size_t *mem_reg_size, int *irq_no) +{ + assert(dev); + + async_sess_t *parent_sess = + devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle, + IPC_FLAG_BLOCKING); + if (!parent_sess) + return ENOMEM; + + hw_res_list_parsed_t hw_res; + hw_res_list_parsed_init(&hw_res); + const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0); + async_hangup(parent_sess); + if (ret != EOK) { + return ret; + } + + /* We want one irq and one mem range. */ + if (hw_res.irqs.count != 1 || hw_res.mem_ranges.count != 1) { + hw_res_list_parsed_clean(&hw_res); + return EINVAL; + } + + if (mem_reg_address) + *mem_reg_address = hw_res.mem_ranges.ranges[0].address; + if (mem_reg_size) + *mem_reg_size = hw_res.mem_ranges.ranges[0].size; + if (irq_no) + *irq_no = hw_res.irqs.irqs[0]; + + hw_res_list_parsed_clean(&hw_res); + return EOK; +} + +/** Call the PCI driver with a request to enable interrupts + * + * @param[in] device Device asking for interrupts + * @return Error code. + */ +int enable_interrupts(const ddf_dev_t *device) +{ + async_sess_t *parent_sess = + devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle, + IPC_FLAG_BLOCKING); + if (!parent_sess) + return ENOMEM; + + const bool enabled = hw_res_enable_interrupt(parent_sess); + async_hangup(parent_sess); + + return enabled ? EOK : EIO; +} + +/** + * @} + */ Index: uspace/drv/bus/usb/ohci/res.h =================================================================== --- uspace/drv/bus/usb/ohci/res.h (revision 44c1a48a86ef01c638eca0e96b94f3ccb68f8af7) +++ uspace/drv/bus/usb/ohci/res.h (revision 44c1a48a86ef01c638eca0e96b94f3ccb68f8af7) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 drvusbohci + * @{ + */ +/** @file + * PCI related functions needed by OHCI driver. + */ +#ifndef DRV_OHCI_RES_H +#define DRV_OHCI_RES_H + +#include + +int get_my_registers(const ddf_dev_t *, uintptr_t *, size_t *, int *); +int enable_interrupts(const ddf_dev_t *); + +#endif +/** + * @} + */ +