Index: uspace/drv/uhci-rhd/Makefile =================================================================== --- uspace/drv/uhci-rhd/Makefile (revision 0c8562c421888776c2785780f2277e3be1f145ba) +++ uspace/drv/uhci-rhd/Makefile (revision 3005db61128349f59da18688e7201b4cd3da5931) @@ -35,5 +35,4 @@ main.c \ port.c \ - port_status.c \ root_hub.c Index: uspace/drv/uhci-rhd/port.c =================================================================== --- uspace/drv/uhci-rhd/port.c (revision 0c8562c421888776c2785780f2277e3be1f145ba) +++ uspace/drv/uhci-rhd/port.c (revision 3005db61128349f59da18688e7201b4cd3da5931) @@ -123,5 +123,5 @@ /* read register value */ - port_status_t port_status = port_status_read(instance->address); + port_status_t port_status = uhci_port_read_status(instance); /* debug print mutex */ @@ -131,5 +131,5 @@ usb_log_debug2("Port(%p - %d): Status: %#04x. === %u\n", instance->address, instance->number, port_status, count++); -// print_port_status(port_status); + print_port_status("Port", port_status); fibril_mutex_unlock(&dbg_mtx); @@ -163,5 +163,5 @@ } else { /* Write one to WC bits, to ack changes */ - port_status_write(instance->address, port_status); + uhci_port_write_status(instance, port_status); usb_log_debug("Port(%p - %d): Change status ACK.\n", instance->address, instance->number); @@ -203,12 +203,11 @@ usb_log_debug("Port(%p - %d): Reset Signal start.\n", port->address, port->number); - port_status_t port_status = - port_status_read(port->address); + port_status_t port_status = uhci_port_read_status(port); port_status |= STATUS_IN_RESET; - port_status_write(port->address, port_status); + uhci_port_write_status(port, port_status); async_usleep(10000); - port_status = port_status_read(port->address); + port_status = uhci_port_read_status(port); port_status &= ~STATUS_IN_RESET; - port_status_write(port->address, port_status); + uhci_port_write_status(port, port_status); usb_log_debug("Port(%p - %d): Reset Signal stop.\n", port->address, port->number); @@ -278,5 +277,5 @@ /* Read register value */ - port_status_t port_status = port_status_read(port->address); + port_status_t port_status = uhci_port_read_status(port); /* Set enabled bit */ @@ -288,5 +287,5 @@ /* Write new value. */ - port_status_write(port->address, port_status); + uhci_port_write_status(port, port_status); usb_log_info("Port(%p-%d): %sabled port.\n", Index: uspace/drv/uhci-rhd/port.h =================================================================== --- uspace/drv/uhci-rhd/port.h (revision 0c8562c421888776c2785780f2277e3be1f145ba) +++ uspace/drv/uhci-rhd/port.h (revision 3005db61128349f59da18688e7201b4cd3da5931) @@ -58,4 +58,17 @@ void uhci_port_fini(uhci_port_t *port); + +static inline port_status_t uhci_port_read_status(uhci_port_t *port) +{ + assert(port); + return pio_read_16(port->address); +} + +static inline void uhci_port_write_status( + uhci_port_t *port, port_status_t value) +{ + assert(port); + pio_write_16(port->address, value); +} #endif /** Index: pace/drv/uhci-rhd/port_status.c =================================================================== --- uspace/drv/uhci-rhd/port_status.c (revision 0c8562c421888776c2785780f2277e3be1f145ba) +++ (revision ) @@ -1,77 +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 usb - * @{ - */ -/** @file - * @brief UHCI driver - */ -#include -#include - -#include - -#include "port_status.h" - -struct flag_name -{ - uint16_t flag; - const char *name; -}; - -static const struct flag_name flags[] = -{ - { STATUS_SUSPEND, "suspended" }, - { STATUS_IN_RESET, "in reset" }, - { STATUS_LOW_SPEED, "low speed device" }, - { STATUS_ALWAYS_ONE, "always 1 bit" }, - { STATUS_RESUME, "resume" }, - { STATUS_LINE_D_MINUS, "line D- value" }, - { STATUS_LINE_D_PLUS, "line D+ value" }, - { STATUS_ENABLED_CHANGED, "enabled changed" }, - { STATUS_ENABLED, "enabled" }, - { STATUS_CONNECTED_CHANGED, "connected changed" }, - { STATUS_CONNECTED, "connected" } -}; - -/** Prints portr status in a human readable way. - * - * @param[in] value Port value to print. - * @return Error code. - */ -void print_port_status(port_status_t value) -{ - unsigned i = 0; - for (;i < sizeof(flags)/sizeof(struct flag_name); ++i) { - usb_log_debug2("\t%s status: %s.\n", flags[i].name, - ((value & flags[i].flag) != 0) ? "YES" : "NO"); - } -} -/** - * @} - */ Index: uspace/drv/uhci-rhd/port_status.h =================================================================== --- uspace/drv/uhci-rhd/port_status.h (revision 0c8562c421888776c2785780f2277e3be1f145ba) +++ uspace/drv/uhci-rhd/port_status.h (revision 3005db61128349f59da18688e7201b4cd3da5931) @@ -54,12 +54,20 @@ #define STATUS_SUSPEND (1 << 12) -static inline port_status_t port_status_read(port_status_t * address) - { return pio_read_16(address); } -static inline void port_status_write( - port_status_t *address, port_status_t value) - { pio_write_16(address, value); } - -void print_port_status(const port_status_t status); +static inline void print_port_status( + const char* prefix, const port_status_t value) +{ + usb_log_debug2("%s Port status:%s%s%s%s%s%s%s%s.\n", + prefix, + (value & STATUS_SUSPEND) ? " SUSPENDED," : "", + (value & STATUS_IN_RESET) ? " IN RESET," : "", + (value & STATUS_LOW_SPEED) ? " LOWSPEED," : "", + (value & STATUS_ENABLED_CHANGED) ? " ENABLED-CHANGE," : "", + (value & STATUS_ENABLED) ? " ENABLED," : "", + (value & STATUS_CONNECTED_CHANGED) ? " CONNECTED-CHANGE," : "", + (value & STATUS_CONNECTED) ? " CONNECTED," : "", + (value & STATUS_ALWAYS_ONE) ? " ALWAYS ONE" : " ERROR: NO ALWAYS ONE" + ); +} #endif /**