Changeset 92574f4 in mainline for uspace/drv/usbhub/utils.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

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

uspace/drv/usbhub/utils.c

@@ -33 +33 @@
  * @brief various utilities
  */
-#include <driver.h>
+#include <ddf/driver.h>
 #include <bool.h>
 #include <errno.h>
 
 #include <usbhc_iface.h>
-#include <usb/usbdrv.h>
 #include <usb/descriptor.h>
-#include <usb/devreq.h>
 #include <usb/classes/hub.h>
 
@@ -114 +112 @@
 
 //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
-                ) {
+    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 +156 @@
 
 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 +186 @@
         //finalize
         opResult = usb_drv_async_control_write_status(phone, target,
-                        &handle);
+            &handle);
         if (opResult != EOK) {
                 return opResult;
@@ -199 +197 @@
 }
 
-
+*/