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

Timestamp:

2011-04-17T19:17:55Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

63517c2, cfbbe1d3

Parents:

ef354b6 (diff), 8595577b (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:

new report structure fixes

File:

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

uspace/drv/usbhub/usbhub_private.h

@@ -54 +54 @@
 //
 //************
-#define usb_new(type) (type*)malloc(sizeof(type))
 
 
-/**
- * Create hub structure instance
- *
- * Set the address and port count information most importantly.
- *
- * @param device
- * @param hc host controller phone
- * @return
- */
 usb_hub_info_t * usb_create_hub_info(ddf_dev_t * device);
 
@@ -110 +100 @@
 
 /**
- * create uint8_t array with serialized descriptor
+ * Clear feature on hub port.
  *
- * @param descriptor
- * @return newly created serializd descriptor pointer
+ * @param hc Host controller telephone
+ * @param address Hub address
+ * @param port_index Port
+ * @param feature Feature selector
+ * @return Operation result
  */
-void * usb_serialize_hub_descriptor(usb_hub_descriptor_t * descriptor);
+static inline int usb_hub_set_port_feature(usb_pipe_t *pipe,
+    int port_index,
+    usb_hub_class_feature_t feature) {
+
+        usb_device_request_setup_packet_t clear_request = {
+                .request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE,
+                .request = USB_DEVREQ_SET_FEATURE,
+                .length = 0,
+                .index = port_index
+        };
+        clear_request.value = feature;
+        return usb_pipe_control_write(pipe, &clear_request,
+            sizeof(clear_request), NULL, 0);
+}
+
 
 /**
- * create deserialized desriptor structure out of serialized descriptor
+ * Clear feature on hub port.
  *
- * The serialized descriptor must be proper usb hub descriptor,
- * otherwise an eerror might occur.
+ * @param pipe pipe to hub control endpoint
+ * @param feature Feature selector
+ * @return Operation result
+ */
+static inline int usb_hub_clear_feature(usb_pipe_t *pipe,
+    usb_hub_class_feature_t feature) {
+
+        usb_device_request_setup_packet_t clear_request = {
+                .request_type = USB_HUB_REQ_TYPE_CLEAR_HUB_FEATURE,
+                .request = USB_DEVREQ_CLEAR_FEATURE,
+                .length = 0,
+                .index = 0
+        };
+        clear_request.value = feature;
+        return usb_pipe_control_write(pipe, &clear_request,
+            sizeof(clear_request), NULL, 0);
+}
+
+/**
+ * Clear feature on hub port.
  *
- * @param sdescriptor serialized descriptor
- * @return newly created deserialized descriptor pointer
+ * @param pipe pipe to hub control endpoint
+ * @param feature Feature selector
+ * @return Operation result
  */
-usb_hub_descriptor_t * usb_deserialize_hub_desriptor(void * sdescriptor);
+static inline int usb_hub_set_feature(usb_pipe_t *pipe,
+    usb_hub_class_feature_t feature) {
+
+        usb_device_request_setup_packet_t clear_request = {
+                .request_type = USB_HUB_REQ_TYPE_CLEAR_HUB_FEATURE,
+                .request = USB_DEVREQ_SET_FEATURE,
+                .length = 0,
+                .index = 0
+        };
+        clear_request.value = feature;
+        return usb_pipe_control_write(pipe, &clear_request,
+            sizeof(clear_request), NULL, 0);
+}
+
+
+void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t * descriptor);
+
+void usb_serialize_hub_descriptor(usb_hub_descriptor_t * descriptor,
+    void * serialized_descriptor);
+
+usb_hub_descriptor_t * usb_create_deserialized_hub_desriptor(
+    void * serialized_descriptor);
+
+void usb_deserialize_hub_desriptor(void * serialized_descriptor,
+    usb_hub_descriptor_t * descriptor);