Changeset 10096231 in mainline

Timestamp:

2010-12-10T16:44:57Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

fa9b606

Parents:

c01255c

Message:

hub is successfully initialized

Location:

uspace

Files:

• drv/usbhub/usbhub.h (modified) (1 diff)
• drv/usbhub/usbhub_private.h (modified) (4 diffs)
• drv/usbhub/utils.c (modified) (8 diffs)
• drv/vhc/hubops.c (modified) (2 diffs)
• lib/usb/include/usb/classes/hub.h (modified) (1 diff)
• lib/usbvirt/transaction.c (modified) (1 diff)

uspace/drv/usbhub/usbhub.h

@@ -50 +50 @@
 } usb_hub_info_t;
 
-
 int usb_add_hub_device(device_t *);
 

uspace/drv/usbhub/usbhub_private.h

@@ -42 +42 @@
 #include <driver.h>
 #include <usb/usb.h>
+#include <usb/classes/hub.h>
 #include <usb/devreq.h>
 
@@ -152 +153 @@
  * @param request
  * @param addr
+ * \TODO this will be obsolete see usb/dev_req.h
  */
 static inline void usb_hub_set_set_address_request(
@@ -169 +171 @@
  * @param addr
  */
-static inline void usb_hub_get_descriptor_request(
+static inline void usb_hub_set_descriptor_request(
 usb_device_request_setup_packet_t * request
 ){
@@ -175 +177 @@
         request->request_type = USB_HUB_REQ_TYPE_GET_DESCRIPTOR;
         request->request = USB_HUB_REQUEST_GET_DESCRIPTOR;
-        request->value = USB_DESCTYPE_HUB;
+        request->value_high = USB_DESCTYPE_HUB;
+        request->value_low = 0;
         request->length = USB_HUB_MAX_DESCRIPTOR_SIZE;
 }

uspace/drv/usbhub/utils.c

@@ -89 +89 @@
 usb_hub_descriptor_t * usb_deserialize_hub_desriptor(void * serialized_descriptor) {
         uint8_t * sdescriptor = (uint8_t*) serialized_descriptor;
-        if (sdescriptor[1] != USB_DESCTYPE_HUB) return NULL;
+
+        if (sdescriptor[1] != USB_DESCTYPE_HUB) {
+                printf("[usb_hub] wrong descriptor %x\n",sdescriptor[1]);
+                return NULL;
+        }
+
         usb_hub_descriptor_t * result = usb_new(usb_hub_descriptor_t);
-        //uint8_t size = sdescriptor[0];
+        
+
         result->ports_count = sdescriptor[2];
         /// @fixme handling of endianness??
@@ -99 +105 @@
         size_t var_size = result->ports_count / 8 + ((result->ports_count % 8 > 0) ? 1 : 0);
         result->devices_removable = (uint8_t*) malloc(var_size);
-
+        //printf("[usb_hub] getting removable devices data \n");
         size_t i;
         for (i = 0; i < var_size; ++i) {
@@ -298 +304 @@
 
 
-        printf("[usb_hub] phone to hc = %d\n", hc);
+        //printf("[usb_hub] phone to hc = %d\n", hc);
         if (hc < 0) {
                 return result;
         }
         //get some hub info
-        /// \TODO get correct params
         usb_address_t addr = usb_drv_get_my_address(hc, device);
         addr = 7;
@@ -320 +325 @@
         target.endpoint = 0;
         usb_device_request_setup_packet_t request;
-        usb_hub_get_descriptor_request(&request);
+        //printf("[usb_hub] creating descriptor request\n");
+        usb_hub_set_descriptor_request(&request);
+
+        //printf("[usb_hub] creating serialized descriptor\n");
         void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE);
         usb_hub_descriptor_t * descriptor;
         size_t received_size;
         int opResult;
-
+        //printf("[usb_hub] starting control transaction\n");
         opResult = usb_drv_sync_control_read(
                         hc, target, &request, serialized_descriptor,
                         USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size);
         if (opResult != EOK) {
-                printf("[usb_hub] failed when receiving hub descriptor \n");
-        }
+                printf("[usb_hub] failed when receiving hub descriptor, badcode = %d\n",opResult);
+                ///\TODO memory leak will occur here!
+                return result;
+        }
+        //printf("[usb_hub] deserializing descriptor\n");
         descriptor = usb_deserialize_hub_desriptor(serialized_descriptor);
+        if(descriptor==NULL){
+                printf("[usb_hub] could not deserialize descriptor \n");
+                result->port_count = 1;///\TODO this code is only for debug!!!
+                return result;
+        }
+        //printf("[usb_hub] setting port count to %d\n",descriptor->ports_count);
         result->port_count = descriptor->ports_count;
+        //printf("[usb_hub] freeing data\n");
         free(serialized_descriptor);
+        free(descriptor->devices_removable);
         free(descriptor);
 
@@ -362 +381 @@
         //get hc connection
         /// \TODO correct params
-        int hc = usb_drv_hc_connect(NULL, 0);
+        int hc = usb_drv_hc_connect(dev, 0);
 
         usb_hub_info_t * hub_info = usb_create_hub_info(dev, hc);
@@ -416 +435 @@
         int opResult;
         printf("[usb_hub] some connection changed\n");
+
         opResult = usb_drv_reserve_default_address(hc);
         if (opResult != EOK) {
                 printf("[usb_hub] cannot assign default address, it is probably used\n");
+                return;
         }
         //reset port
@@ -456 +477 @@
         if (opResult != EOK) {
                 printf("[usb_hub] could not set address for new device\n");
+                //will retry later...
+                return;
         }
         usb_drv_release_default_address(hc);
@@ -461 +484 @@
 
         /// \TODO driver work
+        //add_child_device.....
 }
 

uspace/drv/vhc/hubops.c

@@ -195 +195 @@
 }
 
-static int get_hub_descriptor(uint8_t descriptor_type,
-    uint8_t descriptor_index, uint16_t length)
-{
+static int get_hub_descriptor(struct usbvirt_device *dev,
+    uint8_t descriptor_index,
+    uint8_t descriptor_type, uint16_t length)
+{
+        if (descriptor_type == USB_DESCTYPE_HUB) {
+                int rc = dev->control_transfer_reply(dev, 0,
+                    &hub_descriptor, hub_descriptor.length);
+
+                return rc;
+
+        }
+
         return ENOTSUP;
 }
@@ -313 +322 @@
                         
                 case USB_HUB_REQUEST_GET_DESCRIPTOR:
-                        return get_hub_descriptor(request->value_low,
+                        return get_hub_descriptor(dev, request->value_low,
                             request->value_high, request->length);
                         

uspace/lib/usb/include/usb/classes/hub.h

@@ -177 +177 @@
 
 /** @brief hub class request codes*/
+/// \TODO these are duplicit to standart descriptors
 typedef enum {
     /**  */

uspace/lib/usbvirt/transaction.c

@@ -184 +184 @@
                                 actual_size = size;
                         }
+                        device->lib_debug(device, 1, USBVIRT_DEBUGTAG_TRANSACTION,
+                            "in transaction: will copy %zu bytes", actual_size);
                         if (actual_size > 0) {
                                 memcpy(buffer, transfer->data, actual_size);