Changes in uspace/drv/usbhub/usbhub_private.h [d493ac17:5097bed4] in mainline

File:

• uspace/drv/usbhub/usbhub_private.h (modified) (6 diffs)

uspace/drv/usbhub/usbhub_private.h

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbhub
+/** @addtogroup usb
  * @{
  */
 /** @file
- * @brief Hub driver private definitions
+ * @brief Hub driver.
  */
 
@@ -42 +42 @@
 #include <adt/list.h>
 #include <bool.h>
-#include <ddf/driver.h>
-#include <fibril_synch.h>
+#include <driver.h>
+#include <futex.h>
 
+#include <usb/usb.h>
+#include <usb/usbdrv.h>
 #include <usb/classes/hub.h>
-#include <usb/usb.h>
+#include <usb/devreq.h>
 #include <usb/debug.h>
-#include <usb/request.h>
 
 //************
@@ -60 +61 @@
 //************
 //
-// convenience debug printf for usb hub
+// convenience debug printf
 //
 //************
 #define dprintf(level, format, ...) \
-        usb_log_printf((level), format "\n", ##__VA_ARGS__)
-
+        usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__)
 
 /**
- * Create hub structure instance
+ * create hub structure instance
  *
  * Set the address and port count information most importantly.
@@ -76 +76 @@
  * @return
  */
-usb_hub_info_t * usb_create_hub_info(ddf_dev_t * device);
+usb_hub_info_t * usb_create_hub_info(device_t * device, int hc);
 
-/** List of hubs maanged by this driver */
+/** list of hubs maanged by this driver */
 extern usb_general_list_t usb_hub_list;
 
-/** Lock for hub list*/
-extern fibril_mutex_t usb_hub_list_lock;
+/** lock for hub list*/
+extern futex_t usb_hub_list_lock;
 
 
 /**
- * Perform complete control read transaction
+ * perform complete control read transaction
  *
- * Manages all three steps of transaction: setup, read and finalize
+ * manages all three steps of transaction: setup, read and finalize
  * @param phone
  * @param target
- * @param request Request packet
- * @param rcvd_buffer Received data
+ * @param request request for data
+ * @param rcvd_buffer received data
  * @param rcvd_size
- * @param actual_size Actual size of received data
+ * @param actual_size actual size of received data
  * @return error code
  */
-/*
 int usb_drv_sync_control_read(
-    usb_endpoint_pipe_t *pipe,
+    int phone, usb_target_t target,
     usb_device_request_setup_packet_t * request,
     void * rcvd_buffer, size_t rcvd_size, size_t * actual_size
-);*/
+);
 
 /**
- * Perform complete control write transaction
+ * perform complete control write transaction
  *
- * Manages all three steps of transaction: setup, write and finalize
+ * manages all three steps of transaction: setup, write and finalize
  * @param phone
  * @param target
- * @param request Request packet to send data
+ * @param request request to send data
  * @param sent_buffer
  * @param sent_size
  * @return error code
  */
-/*int usb_drv_sync_control_write(
-    usb_endpoint_pipe_t *pipe,
+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
-);*/
+);
 
 /**
- * Set the device request to be a get hub descriptor request.
+ * set the device request to be a get hub descriptor request.
  * @warning the size is allways set to USB_HUB_MAX_DESCRIPTOR_SIZE
  * @param request
@@ -138 +137 @@
 }
 
-/**
- * Clear feature on hub port.
- *
- * @param hc Host controller telephone
- * @param address Hub address
- * @param port_index Port
- * @param feature Feature selector
- * @return Operation result
- */
-static inline int usb_hub_clear_port_feature(usb_endpoint_pipe_t *pipe,
+static inline int usb_hub_clear_port_feature(int hc, usb_address_t address,
     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,
@@ -158 +151 @@
         };
         clear_request.value = feature;
-        return usb_endpoint_pipe_control_write(pipe, &clear_request,
+        return usb_drv_psync_control_write(hc, target, &clear_request,
             sizeof(clear_request), NULL, 0);
 }
 
-/**
- * @brief create uint8_t array with serialized descriptor
- *
- * @param descriptor
- * @return newly created serializd descriptor pointer
- */
-void * usb_serialize_hub_descriptor(usb_hub_descriptor_t * descriptor);
-
-/**
- * @brief create deserialized desriptor structure out of serialized descriptor
- *
- * The serialized descriptor must be proper usb hub descriptor,
- * otherwise an eerror might occur.
- *
- * @param sdescriptor serialized descriptor
- * @return newly created deserialized descriptor pointer
- */
-usb_hub_descriptor_t * usb_deserialize_hub_desriptor(void * sdescriptor);