Changeset 192466bc in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-01-14T14:43:45Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

76cb03c

Parents:

1d7a74e (diff), b65ca41d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from usb/smekideki into usb/development

File:

• uspace/drv/usbhub/usbhub.c (modified) (15 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 = {
@@ -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
@@ -184 +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);
@@ -229 +224 @@
 
 
-
 //*********************************************
 //
@@ -237 +231 @@
 
 /**
- * convenience function for releasing default address and writing debug info
- * (these few lines are used too often to be written again and again)
+ * 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
@@ -253 +247 @@
 
 /**
- * reset the port with new device and reserve the default address
+ * Reset the port with new device and reserve the default address.
  * @param hc
  * @param port
@@ -282 +276 @@
 
 /**
- * finalize adding new device after port reset
+ * Finalize adding new device after port reset
  * @param hc
  * @param port
@@ -345 +339 @@
 
 /**
- * unregister device address in hc
+ * Unregister device address in hc
  * @param hc
  * @param port
@@ -355 +349 @@
         int opResult;
         
-        /// \TODO remove device
+        /** \TODO remove device from device manager - not yet implemented in
+         * devide manager
+         */
 
         hub->attached_devs[port].devman_handle=0;
@@ -376 +372 @@
 
 /**
- * process interrupts on given hub port
+ * Process interrupts on given hub port
  * @param hc
  * @param port
@@ -434 +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
@@ -442 +439 @@
 }
 
-/* Check changes on all known hubs.
+/**
+ * Check changes on all known hubs.
  */
 void usb_hub_check_hub_changes(void) {