Changeset 92f924c8 in mainline for uspace/drv/uhci/root_hub/port.c

Timestamp:

2011-01-07T13:27:58Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7bd34e5

Parents:

28f660d

Message:

block fibril until address is assigned

File:

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

uspace/drv/uhci/root_hub/port.c

@@ -1 +1 @@
 
+#include <atomic.h>
+#include <errno.h>
 #include <usb/devreq.h>
 #include <usb/usb.h>
-#include <errno.h>
 
 #include "debug.h"
@@ -8 +9 @@
 #include "port.h"
 #include "port_status.h"
+#include "utils/hc_synchronizer.h"
 
 struct usb_match {
@@ -104 +106 @@
         pio_write_16( port->address, port_status.raw_value );
 
-        uhci_print_info( "Enabled port %d.\n", port );
+        uhci_print_info( "Enabled port %d.\n", port->number );
         return EOK;
 }
@@ -191 +193 @@
         /* get new address */
         const usb_address_t usb_address =
-          usb_address_keeping_request( &uhci_instance->address_manager );
+          usb_address_keeping_request(&uhci_instance->address_manager);
+
+        if (usb_address <= 0) {
+                return usb_address;
+        }
 
         /* assign new address */
         usb_target_t new_device = { USB_ADDRESS_DEFAULT, 0 };
-        usb_device_request_setup_packet_t data;
+        usb_device_request_setup_packet_t data =
+        {
+                .request_type = 0,
+                .request = USB_DEVREQ_SET_ADDRESS,
+                { .value = usb_address },
+                .index = 0,
+                .length = 0
+        };
+
+        sync_value_t value;
 
         uhci_setup(
-          hc, new_device, USB_TRANSFER_CONTROL, &data, sizeof(data), NULL, NULL );
-        uhci_print_verbose( "address assignment sent, waiting to complete.\n" );
-
+          hc, new_device, USB_TRANSFER_CONTROL, &data, sizeof(data),
+                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 );