Changeset 92574f4 in mainline for uspace/drv/usbhub/usbhub_private.h

Timestamp:

2011-02-24T12:03:27Z (14 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/usbhub_private.h (modified) (7 diffs)

uspace/drv/usbhub/usbhub_private.h

@@ -42 +42 @@
 #include <adt/list.h>
 #include <bool.h>
-#include <driver.h>
+#include <ddf/driver.h>
 #include <fibril_synch.h>
 
+#include <usb/classes/hub.h>
 #include <usb/usb.h>
-#include <usb/usbdrv.h>
-#include <usb/classes/hub.h>
-#include <usb/devreq.h>
 #include <usb/debug.h>
+#include <usb/request.h>
 
 //************
@@ -61 +60 @@
 //************
 //
-// convenience debug printf
+// convenience debug printf for usb hub
 //
 //************
 #define dprintf(level, format, ...) \
-        usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__)
+        usb_log_printf((level), format "\n", ##__VA_ARGS__)
+
 
 /**
@@ -76 +76 @@
  * @return
  */
-usb_hub_info_t * usb_create_hub_info(device_t * device, int hc);
+usb_hub_info_t * usb_create_hub_info(ddf_dev_t * device);
 
 /** List of hubs maanged by this driver */
@@ -97 +97 @@
  * @return error code
  */
+/*
 int usb_drv_sync_control_read(
-    int phone, usb_target_t target,
+    usb_endpoint_pipe_t *pipe,
     usb_device_request_setup_packet_t * request,
     void * rcvd_buffer, size_t rcvd_size, size_t * actual_size
-);
+);*/
 
 /**
@@ -114 +115 @@
  * @return error code
  */
-int usb_drv_sync_control_write(
-    int phone, usb_target_t target,
+/*int usb_drv_sync_control_write(
+    usb_endpoint_pipe_t *pipe,
     usb_device_request_setup_packet_t * request,
     void * sent_buffer, size_t sent_size
-);
+);*/
 
 /**
@@ -146 +147 @@
  * @return Operation result
  */
-static inline int usb_hub_clear_port_feature(int hc, usb_address_t address,
+static inline int usb_hub_clear_port_feature(usb_endpoint_pipe_t *pipe,
     int port_index,
     usb_hub_class_feature_t feature) {
-        usb_target_t target = {
-                .address = address,
-                .endpoint = 0
-        };
+        
         usb_device_request_setup_packet_t clear_request = {
                 .request_type = USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE,
@@ -160 +158 @@
         };
         clear_request.value = feature;
-        return usb_drv_psync_control_write(hc, target, &clear_request,
+        return usb_endpoint_pipe_control_write(pipe, &clear_request,
             sizeof(clear_request), NULL, 0);
 }