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

Timestamp:

2011-02-25T09:46:23Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d493ac17

Parents:

15b0432 (diff), a80849c (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:

merge with /usb/development

File:

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

uspace/drv/uhci-rhd/port.c

@@ -52 +52 @@
 int uhci_port_init(
   uhci_port_t *port, port_status_t *address, unsigned number,
-  unsigned usec, device_t *rh, int parent_phone)
+  unsigned usec, ddf_dev_t *rh, int parent_phone)
 {
         assert(port);
@@ -92 +92 @@
 
         while (1) {
-                usb_log_debug("Port(%d) status address %p:\n",
-                  port_instance->number, port_instance->address);
-
                 /* read register value */
                 port_status_t port_status =
@@ -100 +97 @@
 
                 /* debug print */
-                usb_log_info("Port(%d) status %#.4x\n",
-                  port_instance->number, port_status);
+                usb_log_debug("Port %d status at %p: 0x%04x.\n",
+                  port_instance->number, port_instance->address, port_status);
                 print_port_status(port_status);
 
@@ -187 +184 @@
             USB_SPEED_FULL,
             new_device_enable_port, port->number, port,
-            &dev_addr, &port->attached_device);
+            &dev_addr, &port->attached_device, NULL, NULL, NULL);
         if (rc != EOK) {
                 usb_log_error("Failed adding new device on port %u: %s.\n",