Changeset 361e61b in mainline for uspace/lib/usb/include

Timestamp:

2011-03-21T14:23:15Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

55e388a1

Parents:

c32688d (diff), 48fe0c9 (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 with development

Location:

uspace/lib/usb/include/usb

Files:

• classes/hub.h (modified) (1 diff)
• devdrv.h (added)
• dp.h (modified) (1 diff)
• host/batch.h (added)
• host/device_keeper.h (moved) (moved from uspace/drv/uhci-hcd/utils/device_keeper.h ) (4 diffs)
• pipes.h (modified) (3 diffs)
• request.h (modified) (2 diffs)

uspace/lib/usb/include/usb/classes/hub.h

@@ -60 +60 @@
 } usb_hub_class_feature_t;
 
+/** Header of standard hub descriptor without the "variadic" part. */
+typedef struct {
+        /** Descriptor length. */
+        uint8_t length;
+        /** Descriptor type (0x29). */
+        uint8_t descriptor_type;
+        /** Number of downstream ports. */
+        uint8_t port_count;
+        /** Characteristics bitmask. */
+        uint16_t characteristics;
+        /** Time from power-on to stabilization of current on the port. */
+        uint8_t power_good_time;
+        /** Maximum current requirements in mA. */
+        uint8_t max_current;
+} __attribute__ ((packed)) usb_hub_descriptor_header_t;
 
 /**

uspace/lib/usb/include/usb/dp.h

@@ -77 +77 @@
     usb_dp_parser_data_t *, uint8_t *, uint8_t *);
 
+void usb_dp_walk_simple(uint8_t *, size_t, usb_dp_descriptor_nesting_t *,
+    void (*)(uint8_t *, size_t, void *), void *);
+
 #endif
 /**

uspace/lib/usb/include/usb/host/device_keeper.h

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbuhci
+/** @addtogroup libusb
  * @{
  */
@@ -33 +33 @@
  * @brief UHCI driver
  */
-#ifndef UTILS_DEVICE_KEEPER_H
-#define UTILS_DEVICE_KEEPER_H
+#ifndef LIBUSB_HOST_DEVICE_KEEPER_H
+#define LIBUSB_HOST_DEVICE_KEEPER_H
 #include <devman.h>
 #include <fibril_synch.h>
@@ -44 +44 @@
         usb_speed_t speed;
         bool occupied;
-        uint16_t toggle_status;
+        uint16_t toggle_status[2];
         devman_handle_t handle;
 };
@@ -63 +63 @@
 
 void device_keeper_reset_if_need(
-    device_keeper_t *instance, usb_target_t target, const unsigned char *setup_data);
+    device_keeper_t *instance, usb_target_t target,
+    const unsigned char *setup_data);
 
-int device_keeper_get_toggle(device_keeper_t *instance, usb_target_t target);
+int device_keeper_get_toggle(
+    device_keeper_t *instance, usb_target_t target, usb_direction_t direction);
 
-int device_keeper_set_toggle(
-    device_keeper_t *instance, usb_target_t target, bool toggle);
+int device_keeper_set_toggle(device_keeper_t *instance,
+    usb_target_t target, usb_direction_t direction, bool toggle);
 
 usb_address_t device_keeper_request(

uspace/lib/usb/include/usb/pipes.h

@@ -106 +106 @@
         const usb_endpoint_description_t *description;
         /** Interface number the endpoint must belong to (-1 for any). */
-        const int interface_no;
+        int interface_no;
         /** Found descriptor fitting the description. */
         usb_standard_endpoint_descriptor_t *descriptor;
@@ -123 +123 @@
 
 int usb_device_get_assigned_interface(ddf_dev_t *);
+usb_address_t usb_device_get_assigned_address(devman_handle_t);
 
 int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *,
@@ -129 +130 @@
 int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *,
     usb_device_connection_t *);
+int usb_endpoint_pipe_probe_default_control(usb_endpoint_pipe_t *);
 int usb_endpoint_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     size_t, uint8_t *, size_t, usb_device_connection_t *);
-
+int usb_endpoint_pipe_register(usb_endpoint_pipe_t *, unsigned int,
+    usb_hc_connection_t *);
+int usb_endpoint_pipe_unregister(usb_endpoint_pipe_t *, usb_hc_connection_t *);
 
 int usb_endpoint_pipe_start_session(usb_endpoint_pipe_t *);

uspace/lib/usb/include/usb/request.h

@@ -94 +94 @@
     uint16_t, uint16_t, void *, size_t, size_t *);
 
+int usb_request_get_status(usb_endpoint_pipe_t *, usb_request_recipient_t,
+    uint16_t, uint16_t *);
+int usb_request_clear_feature(usb_endpoint_pipe_t *, usb_request_type_t,
+    usb_request_recipient_t, uint16_t, uint16_t);
+int usb_request_set_feature(usb_endpoint_pipe_t *, usb_request_type_t,
+    usb_request_recipient_t, uint16_t, uint16_t);
 int usb_request_set_address(usb_endpoint_pipe_t *, usb_address_t);
 int usb_request_get_descriptor(usb_endpoint_pipe_t *, usb_request_type_t,
@@ -108 +114 @@
 int usb_request_get_full_configuration_descriptor_alloc(usb_endpoint_pipe_t *,
     int, void **, size_t *);
+int usb_request_set_descriptor(usb_endpoint_pipe_t *, usb_request_type_t,
+    usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void *, size_t);
+int usb_request_get_configuration(usb_endpoint_pipe_t *, uint8_t *);
 int usb_request_set_configuration(usb_endpoint_pipe_t *, uint8_t);
+int usb_request_get_interface(usb_endpoint_pipe_t *, uint8_t, uint8_t *);
+int usb_request_set_interface(usb_endpoint_pipe_t *, uint8_t, uint8_t);
 
 int usb_request_get_supported_languages(usb_endpoint_pipe_t *,