Changeset 79c8a96 in mainline for uspace/drv/usbhub/utils.c

Timestamp:

2011-03-21T10:27:44Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2e1d5d70, c15070c

Parents:

81dce9f (diff), f0fdc7d (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:

Development branch changes

File:

• uspace/drv/usbhub/utils.c (modified) (3 diffs)

uspace/drv/usbhub/utils.c

@@ -88 +88 @@
 
         if (sdescriptor[1] != USB_DESCTYPE_HUB) {
-                dprintf(1,"[usb_hub] wrong descriptor %x\n",sdescriptor[1]);
+                usb_log_warning("trying to deserialize wrong descriptor %x\n",sdescriptor[1]);
                 return NULL;
         }
@@ -103 +103 @@
                         ? 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) {
@@ -111 +111 @@
 }
 
-//control transactions
-/*
-int usb_drv_sync_control_read(
-    int phone, usb_target_t target,
-    usb_device_request_setup_packet_t * request,
-    void * rcvd_buffer, size_t rcvd_size, size_t * actual_size
-) {
-        usb_handle_t handle;
-        int opResult;
-        //setup
-        opResult = usb_drv_async_control_read_setup(phone, target,
-            request, sizeof (usb_device_request_setup_packet_t),
-            &handle);
-        if (opResult != EOK) {
-                return opResult;
-        }
-        opResult = usb_drv_async_wait_for(handle);
-        if (opResult != EOK) {
-                return opResult;
-        }
-        //read
-        opResult = usb_drv_async_control_read_data(phone, target,
-                        rcvd_buffer, rcvd_size, actual_size,
-                        &handle);
-        if (opResult != EOK) {
-                return opResult;
-        }
-        opResult = usb_drv_async_wait_for(handle);
-        if (opResult != EOK) {
-                return opResult;
-        }
-        //finalize
-        opResult = usb_drv_async_control_read_status(phone, target,
-                        &handle);
-        if (opResult != EOK) {
-                return opResult;
-        }
-        opResult = usb_drv_async_wait_for(handle);
-        if (opResult != EOK) {
-                return opResult;
-        }
-        return EOK;
-}
-
-int usb_drv_sync_control_write(
-    int phone, usb_target_t target,
-    usb_device_request_setup_packet_t * request,
-    void * sent_buffer, size_t sent_size
-) {
-        usb_handle_t handle;
-        int opResult;
-        //setup
-        opResult = usb_drv_async_control_write_setup(phone, target,
-            request, sizeof (usb_device_request_setup_packet_t),
-            &handle);
-        if (opResult != EOK) {
-                return opResult;
-        }
-        opResult = usb_drv_async_wait_for(handle);
-        if (opResult != EOK) {
-                return opResult;
-        }
-        //write
-        opResult = usb_drv_async_control_write_data(phone, target,
-                        sent_buffer, sent_size,
-                        &handle);
-        if (opResult != EOK) {
-                return opResult;
-        }
-        opResult = usb_drv_async_wait_for(handle);
-        if (opResult != EOK) {
-                return opResult;
-        }
-        //finalize
-        opResult = usb_drv_async_control_write_status(phone, target,
-            &handle);
-        if (opResult != EOK) {
-                return opResult;
-        }
-        opResult = usb_drv_async_wait_for(handle);
-        if (opResult != EOK) {
-                return opResult;
-        }
-        return EOK;
-}
-
-*/
-