Changes in / [192466bc:1d7a74e] in mainline

Location:

uspace/drv/usbhub

Files:

• main.c (modified) (1 diff)
• usbhub.c (modified) (15 diffs)
• usbhub_private.h (modified) (6 diffs)

uspace/drv/usbhub/main.c

@@ -52 +52 @@
         while(true){
                 usb_hub_check_hub_changes();
-                async_usleep(1000 * 1000 );/// \TODO proper number once
+                async_usleep(1000 * 1000);
         }
         return 0;

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 = {
@@ -86 +85 @@
 
         // 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");
@@ -93 +98 @@
         int opResult;
         //printf("[usb_hub] starting control transaction\n");
-        
-        opResult = usb_drv_req_get_descriptor(hc, addr,
-                        USB_REQUEST_TYPE_CLASS,
-                        USB_DESCTYPE_HUB, 0, 0, serialized_descriptor,
+        opResult = usb_drv_sync_control_read(
+                        hc, target, &request, serialized_descriptor,
                         USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size);
-
         if (opResult != EOK) {
                 dprintf(1,"[usb_hub] failed when receiving hub descriptor, badcode = %d",opResult);
@@ -153 +155 @@
         int port;
         int opResult;
+        usb_device_request_setup_packet_t request;
         usb_target_t target;
         target.address = hub_info->usb_device->address;
@@ -170 +173 @@
         if(std_descriptor.configuration_count<1){
                 dprintf(1,"[usb_hub] THERE ARE NO CONFIGURATIONS AVAILABLE");
-                //shouldn`t I return?
         }
         /// \TODO check other configurations
@@ -182 +184 @@
         }
         //set configuration
-        opResult = usb_drv_req_set_configuration(hc, target.address,
-    config_descriptor.configuration_number);
-
+        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);
         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);
@@ -224 +229 @@
 
 
+
 //*********************************************
 //
@@ -231 +237 @@
 
 /**
- * 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
@@ -247 +253 @@
 
 /**
- * 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
@@ -276 +282 @@
 
 /**
- * Finalize adding new device after port reset
+ * finalize adding new device after port reset
  * @param hc
  * @param port
@@ -339 +345 @@
 
 /**
- * Unregister device address in hc
+ * unregister device address in hc
  * @param hc
  * @param port
@@ -349 +355 @@
         int opResult;
         
-        /** \TODO remove device from device manager - not yet implemented in
-         * devide manager
-         */
+        /// \TODO remove device
 
         hub->attached_devs[port].devman_handle=0;
@@ -372 +376 @@
 
 /**
- * Process interrupts on given hub port
+ * process interrupts on given hub port
  * @param hc
  * @param port
@@ -430 +434 @@
         usb_port_set_reset_completed(&status, false);
         usb_port_set_dev_connected(&status, false);
-        if (status>>16) {
-                dprintf(1,"[usb_hub]there was some unsupported change on port %d: %X",port,status);
-
+        if (status) {
+                dprintf(1,"[usb_hub]there was some unsupported change on port %d",port);
         }
         /// \TODO handle other changes
@@ -439 +442 @@
 }
 
-/**
- * Check changes on all known hubs.
+/* Check changes on all known hubs.
  */
 void usb_hub_check_hub_changes(void) {

uspace/drv/usbhub/usbhub_private.h

@@ -31 +31 @@
  */
 /** @file
- * @brief Hub driver private definitions
+ * @brief Hub driver.
  */
 
@@ -68 +68 @@
 
 /**
- * Create hub structure instance
+ * create hub structure instance
  *
  * Set the address and port count information most importantly.
@@ -78 +78 @@
 usb_hub_info_t * usb_create_hub_info(device_t * device, int hc);
 
-/** List of hubs maanged by this driver */
+/** list of hubs maanged by this driver */
 extern usb_general_list_t usb_hub_list;
 
-/** Lock for hub list*/
+/** lock for hub list*/
 extern futex_t usb_hub_list_lock;
 
 
 /**
- * Perform complete control read transaction
+ * perform complete control read transaction
  *
- * Manages all three steps of transaction: setup, read and finalize
+ * manages all three steps of transaction: setup, read and finalize
  * @param phone
  * @param target
- * @param request Request packet
- * @param rcvd_buffer Received data
+ * @param request request for data
+ * @param rcvd_buffer received data
  * @param rcvd_size
- * @param actual_size Actual size of received data
+ * @param actual_size actual size of received data
  * @return error code
  */
@@ -104 +104 @@
 
 /**
- * Perform complete control write transaction
+ * perform complete control write transaction
  *
- * Manages all three steps of transaction: setup, write and finalize
+ * manages all three steps of transaction: setup, write and finalize
  * @param phone
  * @param target
- * @param request Request packet to send data
+ * @param request request to send data
  * @param sent_buffer
  * @param sent_size
@@ -121 +121 @@
 
 /**
- * Set the device request to be a get hub descriptor request.
+ * set the device request to be a get hub descriptor request.
  * @warning the size is allways set to USB_HUB_MAX_DESCRIPTOR_SIZE
  * @param request
@@ -137 +137 @@
 }
 
-/**
- * Clear feature on hub port.
- *
- * @param hc Host controller telephone
- * @param address Hub address
- * @param port_index Port
- * @param feature Feature selector
- * @return Operation result
- */
 static inline int usb_hub_clear_port_feature(int hc, usb_address_t address,
     int port_index,