Changeset 15701921 in mainline

Timestamp:

2011-01-07T15:47:00Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8f748215

Parents:

8324b65

Message:

Remember device attached to the port

fix port disable routine:

• no need to change enabled_change flag
  • properly report action (enabled/disabled)

add error handling in address assignment

Location:

uspace/drv/uhci/root_hub

Files:

• port.c (modified) (5 diffs)
• port.h (modified) (2 diffs)

uspace/drv/uhci/root_hub/port.c

@@ -37 +37 @@
 
                 /* debug print */
-                uhci_print_info("Port(%d) status %#x:\n",
+                uhci_print_info("Port(%d) status %#.4x:\n",
                   port_instance->number, port_status.raw_value);
                 print_port_status( &port_status );
@@ -48 +48 @@
                                 /* TODO */
                                 /* remove device here */
+                                uhci_print_error(
+                                  "Don't know how to remove device %#x.\n",
+                                  port_instance->attached_device);
+                                uhci_port_set_enabled(port_instance, false);
                         }
                 }
@@ -78 +82 @@
         if (address <= 0) { /* address assigning went wrong */
                 uhci_port_set_enabled(port, false);
-                uhci_print_error("Failed to assign address to the device");
+                uhci_print_error("Failed to assign address to the device.\n");
                 return ENOMEM;
         }
 
         /* report to devman */
-        devman_handle_t child = 0;
-        report_new_device(port->hc, address, port->number, &child);
+        assert( port->attached_device == 0 );
+        report_new_device(port->hc, address, port->number,
+                &port->attached_device);
 
         /* bind address */
         usb_address_keeping_devman_bind(&uhci_instance->address_manager,
-          address, child);
+          address, port->attached_device);
 
         return EOK;
@@ -102 +107 @@
 
         /* enable port: register write */
-        port_status.status.enabled_change = 0;
-        port_status.status.enabled = (bool)enabled;
+        port_status.status.enabled = enabled;
         pio_write_16( port->address, port_status.raw_value );
 
-        uhci_print_info( "Enabled port %d.\n", port->number );
+        uhci_print_info( "%s port %d.\n",
+          enabled ? "Enabled" : "Disabled", port->number );
         return EOK;
 }
@@ -216 +221 @@
         uhci_setup(
           hc, new_device, USB_TRANSFER_CONTROL, &data, sizeof(data),
-                sync_out_callback, (void*)&value );
+                sync_out_callback, (void*)&value);
         uhci_print_verbose("address assignment sent, waiting to complete.\n");
 
         sync_wait_for(&value);
-
-        uhci_print_info( "Assigned address %#x.\n", usb_address );
-
+        if (value.result != USB_OUTCOME_OK) {
+                uhci_print_error(
+                  "Failed to assign address to the connected device.\n");
+                usb_address_keeping_release(&uhci_instance->address_manager,
+                  usb_address);
+                return -1;
+        }
+
+        uhci_print_info("Assigned address %#x.\n", usb_address);
         return usb_address;
 }

uspace/drv/uhci/root_hub/port.h

@@ -47 +47 @@
         unsigned number;
         unsigned wait_period_usec;
+        devman_handle_t attached_device;
 } uhci_port_t;
 
@@ -58 +59 @@
         port->number = number;
         port->wait_period_usec = usec;
+        port->attached_device = 0;
 }