Changeset f8e8738 in mainline for uspace/drv/uhci-rhd/port.c

Timestamp:

2011-04-07T20:22:40Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fee6381

Parents:

61257f4 (diff), a82889e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Changes from development

File:

• uspace/drv/uhci-rhd/port.c (modified) (5 diffs)

uspace/drv/uhci-rhd/port.c

@@ -43 +43 @@
 #include "port.h"
 
+static int uhci_port_check(void *port);
+static int uhci_port_reset_enable(int portno, void *arg);
 static int uhci_port_new_device(uhci_port_t *port, usb_speed_t speed);
 static int uhci_port_remove_device(uhci_port_t *port);
 static int uhci_port_set_enabled(uhci_port_t *port, bool enabled);
-static int uhci_port_check(void *port);
-static int uhci_port_reset_enable(int portno, void *arg);
 static void uhci_port_print_status(
     uhci_port_t *port, const port_status_t value);
@@ -74 +74 @@
         pio_write_16(port->address, value);
 }
-
 /*----------------------------------------------------------------------------*/
 /** Initialize UHCI root hub port instance.
@@ -259 +258 @@
 
         usb_address_t dev_addr;
-        int rc = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
+        int ret = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
             speed, uhci_port_reset_enable, port->number, port,
             &dev_addr, &port->attached_device, NULL, NULL, NULL);
 
-        if (rc != EOK) {
+        if (ret != EOK) {
                 usb_log_error("%s: Failed(%d) to add device: %s.\n",
-                    port->id_string, rc, str_error(rc));
+                    port->id_string, ret, str_error(ret));
                 uhci_port_set_enabled(port, false);
-                return rc;
+                return ret;
         }
 
@@ -287 +286 @@
 int uhci_port_remove_device(uhci_port_t *port)
 {
-        usb_log_error("%s: Don't know how to remove device %d.\n",
-            port->id_string, (unsigned int)port->attached_device);
-        return EOK;
+        usb_log_error("%s: Don't know how to remove device %llu.\n",
+            port->id_string, port->attached_device);
+        return ENOTSUP;
 }
 /*----------------------------------------------------------------------------*/
@@ -341 +340 @@
             (value & STATUS_CONNECTED_CHANGED) ? " CONNECTED-CHANGE," : "",
             (value & STATUS_CONNECTED) ? " CONNECTED," : "",
-            (value & STATUS_ALWAYS_ONE) ? " ALWAYS ONE" : " ERROR: NO ALWAYS ONE"
+            (value & STATUS_ALWAYS_ONE) ? " ALWAYS ONE" : " ERR: NO ALWAYS ONE"
         );
 }