Changeset cd50486 in mainline for uspace/drv/usbhub/utils.c

Timestamp:

2011-02-06T22:03:55Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

25971d2

Parents:

1110ebd (diff), 960ff451 (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 development/ changes

File:

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

uspace/drv/usbhub/utils.c

@@ -116 +116 @@
 
 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
-                ) {
+    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);
+            request, sizeof (usb_device_request_setup_packet_t),
+            &handle);
         if (opResult != EOK) {
                 return opResult;
@@ -158 +158 @@
 
 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
-                ) {
+    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);
+            request, sizeof (usb_device_request_setup_packet_t),
+            &handle);
         if (opResult != EOK) {
                 return opResult;
@@ -188 +188 @@
         //finalize
         opResult = usb_drv_async_control_write_status(phone, target,
-                        &handle);
+            &handle);
         if (opResult != EOK) {
                 return opResult;