Index: uspace/drv/bus/usb/ehci/main.c =================================================================== --- uspace/drv/bus/usb/ehci/main.c (revision c89823612fa9a51ca793fabd7715c47a132b9e6c) +++ uspace/drv/bus/usb/ehci/main.c (revision 8d401811f32af8424341d4b6ab679c4c344e713c) @@ -67,19 +67,21 @@ { assert(device); - - addr_range_t reg_range; - int irq = 0; - - int ret = get_my_registers(device, ®_range, &irq); - if (ret != EOK) { - usb_log_error("Failed to get memory addresses for %" PRIun - ": %s.\n", ddf_dev_get_handle(device), str_error(ret)); + hw_res_list_parsed_t hw_res; + int ret = hcd_ddf_get_registers(device, &hw_res); + if (ret != EOK || + hw_res.irqs.count != 1 || hw_res.mem_ranges.count != 1) { + usb_log_error("Failed to get register memory addresses " + "for %" PRIun ": %s.\n", ddf_dev_get_handle(device), + str_error(ret)); return ret; } + addr_range_t regs = hw_res.mem_ranges.ranges[0]; + const int irq = hw_res.irqs.irqs[0]; + hw_res_list_parsed_clean(&hw_res); usb_log_info("Memory mapped regs at %p (size %zu), IRQ %d.\n", - RNGABSPTR(reg_range), RNGSZ(reg_range), irq); + RNGABSPTR(regs), RNGSZ(regs), irq); - ret = disable_legacy(device, ®_range); + ret = disable_legacy(device, ®s); if (ret != EOK) { usb_log_error("Failed to disable legacy USB: %s.\n", Index: uspace/drv/bus/usb/ehci/res.c =================================================================== --- uspace/drv/bus/usb/ehci/res.c (revision c89823612fa9a51ca793fabd7715c47a132b9e6c) +++ uspace/drv/bus/usb/ehci/res.c (revision 8d401811f32af8424341d4b6ab679c4c344e713c) @@ -66,44 +66,4 @@ #define DEFAULT_WAIT 1000 #define WAIT_STEP 10 - - -/** Get address of registers and IRQ for given device. - * - * @param[in] dev Device asking for the addresses. - * @param[out] mem_regs_p Pointer to the register range. - * @param[out] irq_no IRQ assigned to the device. - * @return Error code. - */ -int get_my_registers(ddf_dev_t *dev, - addr_range_t *mem_regs_p, int *irq_no) -{ - assert(dev); - - async_sess_t *parent_sess = devman_parent_device_connect( - EXCHANGE_SERIALIZE, ddf_dev_get_handle(dev), 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; - } - - if (hw_res.irqs.count != 1 || hw_res.mem_ranges.count != 1) { - hw_res_list_parsed_clean(&hw_res); - return ENOENT; - } - - if (mem_regs_p) - *mem_regs_p = hw_res.mem_ranges.ranges[0]; - if (irq_no) - *irq_no = hw_res.irqs.irqs[0]; - - hw_res_list_parsed_clean(&hw_res); - return EOK; -} /** Implements BIOS hands-off routine as described in EHCI spec Index: uspace/drv/bus/usb/ehci/res.h =================================================================== --- uspace/drv/bus/usb/ehci/res.h (revision c89823612fa9a51ca793fabd7715c47a132b9e6c) +++ uspace/drv/bus/usb/ehci/res.h (revision 8d401811f32af8424341d4b6ab679c4c344e713c) @@ -39,6 +39,4 @@ #include -int get_my_registers(ddf_dev_t *, addr_range_t *, int *); -int enable_interrupts(ddf_dev_t *); int disable_legacy(ddf_dev_t *, addr_range_t *); Index: uspace/drv/bus/usb/ohci/Makefile =================================================================== --- uspace/drv/bus/usb/ohci/Makefile (revision c89823612fa9a51ca793fabd7715c47a132b9e6c) +++ uspace/drv/bus/usb/ohci/Makefile (revision 8d401811f32af8424341d4b6ab679c4c344e713c) @@ -52,5 +52,4 @@ ohci_endpoint.c \ ohci_rh.c \ - res.c \ hw_struct/endpoint_descriptor.c \ hw_struct/transfer_descriptor.c Index: uspace/drv/bus/usb/ohci/ohci.c =================================================================== --- uspace/drv/bus/usb/ohci/ohci.c (revision c89823612fa9a51ca793fabd7715c47a132b9e6c) +++ uspace/drv/bus/usb/ohci/ohci.c (revision 8d401811f32af8424341d4b6ab679c4c344e713c) @@ -43,7 +43,5 @@ #include "ohci.h" -#include "res.h" #include "hc.h" - @@ -80,10 +78,8 @@ int device_setup_ohci(ddf_dev_t *device) { - - addr_range_t regs; - int irq = 0; - - int ret = get_my_registers(device, ®s, &irq); - if (ret != EOK) { + hw_res_list_parsed_t hw_res; + int ret = hcd_ddf_get_registers(device, &hw_res); + if (ret != EOK || + hw_res.irqs.count != 1 || hw_res.mem_ranges.count != 1) { usb_log_error("Failed to get register memory addresses " "for %" PRIun ": %s.\n", ddf_dev_get_handle(device), @@ -91,4 +87,8 @@ return ret; } + addr_range_t regs = hw_res.mem_ranges.ranges[0]; + const int irq = hw_res.irqs.irqs[0]; + hw_res_list_parsed_clean(&hw_res); + usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n", Index: pace/drv/bus/usb/ohci/res.c =================================================================== --- uspace/drv/bus/usb/ohci/res.c (revision c89823612fa9a51ca793fabd7715c47a132b9e6c) +++ (revision ) @@ -1,90 +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 "res.h" - -/** Get address of registers and IRQ for given device. - * - * @param[in] dev Device asking for the addresses. - * @param[out] p_regs Pointer to register range. - * @param[out] irq_no IRQ assigned to the device. - * @return Error code. - */ -int get_my_registers(ddf_dev_t *dev, addr_range_t *p_regs, int *irq_no) -{ - assert(dev); - - async_sess_t *parent_sess = - devman_parent_device_connect(EXCHANGE_SERIALIZE, - ddf_dev_get_handle(dev), 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 (p_regs) - *p_regs = hw_res.mem_ranges.ranges[0]; - if (irq_no) - *irq_no = hw_res.irqs.irqs[0]; - - hw_res_list_parsed_clean(&hw_res); - return EOK; -} - - -/** - * @} - */ Index: pace/drv/bus/usb/ohci/res.h =================================================================== --- uspace/drv/bus/usb/ohci/res.h (revision c89823612fa9a51ca793fabd7715c47a132b9e6c) +++ (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_RES_H -#define DRV_OHCI_RES_H - -#include -#include - -int get_my_registers(ddf_dev_t *, addr_range_t *, int *); -int enable_interrupts(ddf_dev_t *); - -#endif -/** - * @} - */ - Index: uspace/drv/bus/usb/uhci/res.c =================================================================== --- uspace/drv/bus/usb/uhci/res.c (revision c89823612fa9a51ca793fabd7715c47a132b9e6c) +++ uspace/drv/bus/usb/uhci/res.c (revision 8d401811f32af8424341d4b6ab679c4c344e713c) @@ -43,44 +43,4 @@ #include "res.h" -/** Get I/O address of registers and IRQ for given device. - * - * @param[in] dev Device asking for the addresses. - * @param[out] io_regs_p Pointer to register I/O range. - * @param[out] irq_no IRQ assigned to the device. - * @return Error code. - */ -int get_my_registers(ddf_dev_t *dev, addr_range_t *io_regs_p, int *irq_no) -{ - assert(dev); - - async_sess_t *parent_sess = - devman_parent_device_connect(EXCHANGE_SERIALIZE, - ddf_dev_get_handle(dev), 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 io range. */ - if (hw_res.irqs.count != 1 || hw_res.io_ranges.count != 1) { - hw_res_list_parsed_clean(&hw_res); - return EINVAL; - } - - if (io_regs_p) - *io_regs_p = hw_res.io_ranges.ranges[0]; - 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 clear legacy support register * Index: uspace/drv/bus/usb/uhci/res.h =================================================================== --- uspace/drv/bus/usb/uhci/res.h (revision c89823612fa9a51ca793fabd7715c47a132b9e6c) +++ uspace/drv/bus/usb/uhci/res.h (revision 8d401811f32af8424341d4b6ab679c4c344e713c) @@ -39,6 +39,4 @@ #include -int get_my_registers(ddf_dev_t *, addr_range_t *, int *); -int enable_interrupts(ddf_dev_t *); int disable_legacy(ddf_dev_t *); Index: uspace/drv/bus/usb/uhci/uhci.c =================================================================== --- uspace/drv/bus/usb/uhci/uhci.c (revision c89823612fa9a51ca793fabd7715c47a132b9e6c) +++ uspace/drv/bus/usb/uhci/uhci.c (revision 8d401811f32af8424341d4b6ab679c4c344e713c) @@ -77,16 +77,19 @@ int device_setup_uhci(ddf_dev_t *device) { - if (!device) - return EBADMEM; + assert(device); - addr_range_t regs; - int irq = 0; - - int ret = get_my_registers(device, ®s, &irq); - if (ret != EOK) { - usb_log_error("Failed to get I/O addresses for %" PRIun ": %s.\n", - ddf_dev_get_handle(device), str_error(ret)); + hw_res_list_parsed_t hw_res; + int ret = hcd_ddf_get_registers(device, &hw_res); + if (ret != EOK || + hw_res.irqs.count != 1 || hw_res.io_ranges.count != 1) { + usb_log_error("Failed to get register memory addresses " + "for %" PRIun ": %s.\n", ddf_dev_get_handle(device), + str_error(ret)); return ret; } + addr_range_t regs = hw_res.io_ranges.ranges[0]; + const int irq = hw_res.irqs.irqs[0]; + hw_res_list_parsed_clean(&hw_res); + usb_log_debug("I/O regs at %p (size %zu), IRQ %d.\n", RNGABSPTR(regs), RNGSZ(regs), irq);