Changes in uspace/drv/usbhub/usbhub.c [6986418:f40a1e2] in mainline

File:

• uspace/drv/usbhub/usbhub.c (modified) (19 diffs)

uspace/drv/usbhub/usbhub.c

@@ -46 +46 @@
 #include "usbhub_private.h"
 #include "port_status.h"
+#include "usb/usb.h"
 
 static usb_iface_t hub_usb_iface = {
@@ -75 +76 @@
         //get some hub info
         usb_address_t addr = usb_drv_get_my_address(hc, device);
-        dprintf(1,"[usb_hub] addres of newly created hub = %d", addr);
+        dprintf(1,"[usb_hub] address of newly created hub = %d", addr);
         /*if(addr<0){
                 //return result;
@@ -85 +86 @@
 
         // get hub descriptor
-        usb_target_t target;
-        target.address = addr;
-        target.endpoint = 0;
-        usb_device_request_setup_packet_t request;
-        //printf("[usb_hub] creating descriptor request\n");
-        usb_hub_set_descriptor_request(&request);
 
         //printf("[usb_hub] creating serialized descriptor\n");
@@ -98 +93 @@
         int opResult;
         //printf("[usb_hub] starting control transaction\n");
-        opResult = usb_drv_sync_control_read(
-                        hc, target, &request, serialized_descriptor,
+        
+        opResult = usb_drv_req_get_descriptor(hc, addr,
+                        USB_REQUEST_TYPE_CLASS,
+                        USB_DESCTYPE_HUB, 0, 0, serialized_descriptor,
                         USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size);
+
         if (opResult != EOK) {
                 dprintf(1,"[usb_hub] failed when receiving hub descriptor, badcode = %d",opResult);
@@ -155 +153 @@
         int port;
         int opResult;
-        usb_device_request_setup_packet_t request;
         usb_target_t target;
         target.address = hub_info->usb_device->address;
@@ -173 +170 @@
         if(std_descriptor.configuration_count<1){
                 dprintf(1,"[usb_hub] THERE ARE NO CONFIGURATIONS AVAILABLE");
-        }
+                //shouldn`t I return?
+        }
+        /// \TODO check other configurations
         usb_standard_configuration_descriptor_t config_descriptor;
         opResult = usb_drv_req_get_bare_configuration_descriptor(hc,
@@ -183 +182 @@
         }
         //set configuration
-        request.request_type = 0;
-        request.request = USB_DEVREQ_SET_CONFIGURATION;
-        request.index=0;
-        request.length=0;
-        request.value_high=0;
-        request.value_low = config_descriptor.configuration_number;
-        opResult = usb_drv_sync_control_write(hc, target, &request, NULL, 0);
+        opResult = usb_drv_req_set_configuration(hc, target.address,
+    config_descriptor.configuration_number);
+
         if (opResult != EOK) {
                 dprintf(1,"[usb_hub]something went wrong when setting hub`s configuration, %d", opResult);
         }
 
-
+        usb_device_request_setup_packet_t request;
         for (port = 1; port < hub_info->port_count+1; ++port) {
                 usb_hub_set_power_port_request(&request, port);
@@ -205 +200 @@
         //ports powered, hub seems to be enabled
 
-
         ipc_hangup(hc);
 
         //add the hub to list
+        futex_down(&usb_hub_list_lock);
         usb_lst_append(&usb_hub_list, hub_info);
+        futex_up(&usb_hub_list_lock);
+
         dprintf(1,"[usb_hub] hub info added to list");
         //(void)hub_info;
@@ -227 +224 @@
 
 
-
 //*********************************************
 //
@@ -235 +231 @@
 
 /**
- * reset the port with new device and reserve the default address
+ * Convenience function for releasing default address and writing debug info
+ * (these few lines are used too often to be written again and again).
+ * @param hc
+ * @return
+ */
+inline static int usb_hub_release_default_address(int hc){
+        int opResult;
+        dprintf(1,"[usb_hub] releasing default address");
+        opResult = usb_drv_release_default_address(hc);
+        if (opResult != EOK) {
+                dprintf(1,"[usb_hub] failed to release default address");
+        }
+        return opResult;
+}
+
+/**
+ * Reset the port with new device and reserve the default address.
  * @param hc
  * @param port
@@ -259 +271 @@
         if (opResult != EOK) {
                 dprintf(1,"[usb_hub] something went wrong when reseting a port");
-        }
-}
-
-/**
- * convenience function for releasing default address and writing debug info
- * (these few lines are used too often to be written again and again)
- * @param hc
- * @return
- */
-inline static int usb_hub_release_default_address(int hc){
-        int opResult;
-        dprintf(1,"[usb_hub] releasing default address");
-        opResult = usb_drv_release_default_address(hc);
-        if (opResult != EOK) {
-                dprintf(1,"[usb_hub] failed to release default address");
-        }
-        return opResult;
-}
-
-
-/**
- * finalize adding new device after port reset
+                usb_hub_release_default_address(hc);
+        }
+}
+
+/**
+ * Finalize adding new device after port reset
  * @param hc
  * @param port
@@ -343 +339 @@
 
 /**
- * unregister device address in hc, close the port
+ * Unregister device address in hc
  * @param hc
  * @param port
@@ -352 +348 @@
         //usb_device_request_setup_packet_t request;
         int opResult;
-        //disable port
-        /*usb_hub_set_disable_port_request(&request, port);
-        opResult = usb_drv_sync_control_write(
-                        hc, target,
-                        &request,
-                        NULL, 0
-                        );
-        if (opResult != EOK) {
-                //continue;
-                printf("[usb_hub] something went wrong when disabling a port\n");
-        }*/
-        /// \TODO remove device
+        
+        /** \TODO remove device from device manager - not yet implemented in
+         * devide manager
+         */
 
         hub->attached_devs[port].devman_handle=0;
@@ -384 +372 @@
 
 /**
- * process interrupts on given hub port
+ * Process interrupts on given hub port
  * @param hc
  * @param port
@@ -442 +430 @@
         usb_port_set_reset_completed(&status, false);
         usb_port_set_dev_connected(&status, false);
-        if (status) {
-                dprintf(1,"[usb_hub]there was some unsupported change on port %d",port);
+        if (status>>16) {
+                dprintf(1,"[usb_hub]there was some unsupported change on port %d: %X",port,status);
+
         }
         /// \TODO handle other changes
@@ -450 +439 @@
 }
 
-/* Check changes on all known hubs.
+/**
+ * Check changes on all known hubs.
  */
 void usb_hub_check_hub_changes(void) {
@@ -457 +447 @@
          */
         usb_general_list_t * lst_item;
+        futex_down(&usb_hub_list_lock);
         for (lst_item = usb_hub_list.next;
                         lst_item != &usb_hub_list;
                         lst_item = lst_item->next) {
+                futex_up(&usb_hub_list_lock);
                 usb_hub_info_t * hub_info = ((usb_hub_info_t*)lst_item->data);
                 /*
@@ -468 +460 @@
                 target.address = hub_info->usb_device->address;
                 target.endpoint = 1;/// \TODO get from endpoint descriptor
-                /*dprintf(1,"[usb_hub] checking changes for hub at addr %d",
-                    target.address);*/
+                dprintf(1,"[usb_hub] checking changes for hub at addr %d",
+                    target.address);
 
                 size_t port_count = hub_info->port_count;
@@ -510 +502 @@
                         }
                 }
+                free(change_bitmap);
 
                 ipc_hangup(hc);
-        }
+                futex_down(&usb_hub_list_lock);
+        }
+        futex_up(&usb_hub_list_lock);
 }