Changeset 92f924c8 in mainline

Timestamp:

2011-01-07T13:27:58Z (13 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

Location:

uspace

Files:

• drv/uhci/Makefile (modified) (1 diff)
• drv/uhci/root_hub/port.c (modified) (4 diffs)
• drv/uhci/root_hub/root_hub.c (modified) (2 diffs)
• drv/uhci/uhci.c (modified) (1 diff)
• drv/uhci/utils/hc_synchronizer.c (added)
• drv/uhci/utils/hc_synchronizer.h (added)
• lib/usb/include/usb/devreq.h (modified) (2 diffs)

uspace/drv/uhci/Makefile

@@ -38 +38 @@
         root_hub/port_status.c \
         root_hub/root_hub.c \
-        uhci.c
+        uhci.c \
+        utils/hc_synchronizer.c
 
 include $(USPACE_PREFIX)/Makefile.common

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 );

uspace/drv/uhci/root_hub/root_hub.c

@@ -26 +26 @@
         /* add fibrils for periodic port checks */
         unsigned i = 0;
-        for (; i< UHCI_ROOT_HUB_PORT_COUNT; ++i) {
+        for (; i < UHCI_ROOT_HUB_PORT_COUNT; ++i) {
                 /* mind pointer arithmetics */
                 uhci_port_init(
@@ -37 +37 @@
                 }
                 fibril_add_ready(hub->checker[i]);
+                uhci_print_verbose(" added fibril for port %d: %p.\n", i, hub->checker[i]);
         }
 

uspace/drv/uhci/uhci.c

@@ -89 +89 @@
             usb_str_transfer_type(transfer_type),
             size);
+//      callback( dev, USB_OUTCOME_OK, arg );
 
         return ENOTSUP;

uspace/lib/usb/include/usb/devreq.h

@@ -70 +70 @@
         /** Main parameter to the request. */
         union {
+                uint16_t value;
                 /* FIXME: add #ifdefs according to host endianess */
                 struct {
@@ -75 +76 @@
                         uint8_t value_high;
                 };
-                uint16_t value;
         };
         /** Auxiliary parameter to the request.