Changeset da7c0a9 in mainline for uspace/drv/usbhub/usbhub_private.h

Timestamp:

2011-02-20T22:51:44Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b476347

Parents:

063ead6f (diff), d37b235 (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/usbhub_private.h (modified) (6 diffs)

uspace/drv/usbhub/usbhub_private.h

@@ -45 +45 @@
 #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/devreq.h>
 #include <usb/debug.h>
 
@@ -77 +78 @@
  * @return
  */
-usb_hub_info_t * usb_create_hub_info(device_t * device, int hc);
+usb_hub_info_t * usb_create_hub_info(device_t * device);
 
 /** List of hubs maanged by this driver */
@@ -98 +99 @@
  * @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
-);
+);*/
 
 /**
@@ -115 +117 @@
  * @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
-);
+);*/
 
 /**
@@ -147 +149 @@
  * @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,
@@ -161 +160 @@
         };
         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);
 }