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

Timestamp:

2011-02-25T20:55:51Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5f183dc

Parents:

cabda7f

Message:

properly report low speed devices

File:

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

uspace/drv/uhci-rhd/port.c

@@ -46 +46 @@
 #include "port_status.h"
 
-static int uhci_port_new_device(uhci_port_t *port);
+static int uhci_port_new_device(uhci_port_t *port, uint16_t status);
 static int uhci_port_remove_device(uhci_port_t *port);
 static int uhci_port_set_enabled(uhci_port_t *port, bool enabled);
@@ -122 +122 @@
                         }
 
+                        port_status_write(port_instance->address, STATUS_CONNECTED_CHANGED);
                         usb_log_debug("Change status erased on port %d.\n",
                             port_instance->number);
-                        port_status_write(port_instance->address, STATUS_CONNECTED_CHANGED);
 
                         if (port_status & STATUS_CONNECTED) {
                                 /* new device */
-                                uhci_port_new_device(port_instance);
+                                uhci_port_new_device(port_instance, port_status);
                         }
 
@@ -189 +189 @@
 
 /*----------------------------------------------------------------------------*/
-static int uhci_port_new_device(uhci_port_t *port)
+static int uhci_port_new_device(uhci_port_t *port, uint16_t status)
 {
         assert(port);
@@ -198 +198 @@
         usb_address_t dev_addr;
         int rc = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
-            USB_SPEED_FULL,
+            ((status & STATUS_LOW_SPEED) != 0) ? USB_SPEED_LOW : USB_SPEED_FULL,
             new_device_enable_port, port->number, port,
             &dev_addr, &port->attached_device, NULL, NULL, NULL);