Changeset dc4c19e in mainline for uspace/lib/usb/include

Timestamp:

2011-04-10T12:18:09Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

60c0573

Parents:

a49e171 (diff), 82e8861 (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:

Development changes

Location:

uspace/lib/usb/include/usb

Files:

• classes/hub.h (modified) (2 diffs)
• devdrv.h (modified) (1 diff)
• host/batch.h (modified) (1 diff)
• host/device_keeper.h (modified) (2 diffs)
• host/endpoint.h (modified) (3 diffs)
• host/usb_endpoint_manager.h (modified) (1 diff)
• hub.h (modified) (1 diff)
• pipes.h (modified) (5 diffs)
• usb.h (modified) (1 diff)

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

@@ -43 +43 @@
  */
 typedef enum {
+        USB_HUB_FEATURE_HUB_LOCAL_POWER = 0,
+        USB_HUB_FEATURE_HUB_OVER_CURRENT = 1,
         USB_HUB_FEATURE_C_HUB_LOCAL_POWER = 0,
         USB_HUB_FEATURE_C_HUB_OVER_CURRENT = 1,
@@ -59 +61 @@
         /* USB_HUB_FEATURE_ = , */
 } usb_hub_class_feature_t;
+
 
 /** Header of standard hub descriptor without the "variadic" part. */

uspace/lib/usb/include/usb/devdrv.h

@@ -169 +169 @@
     usb_polling_callback_t, size_t, usb_polling_terminted_callback_t, void *);
 
+int usb_device_retrieve_descriptors(usb_pipe_t *, usb_device_descriptors_t *);
+int usb_device_create_pipes(ddf_dev_t *, usb_device_connection_t *,
+    usb_endpoint_description_t **, uint8_t *, size_t, int, int,
+    usb_endpoint_mapping_t **, size_t *);
+int usb_device_destroy_pipes(ddf_dev_t *, usb_endpoint_mapping_t *, size_t);
+
+size_t usb_interface_count_alternates(uint8_t *, size_t, uint8_t);
+
 #endif
 /**

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

@@ -92 +92 @@
 void usb_transfer_batch_call_in(usb_transfer_batch_t *instance);
 void usb_transfer_batch_call_out(usb_transfer_batch_t *instance);
-void usb_transfer_batch_finish(usb_transfer_batch_t *instance, int error);
+void usb_transfer_batch_finish(usb_transfer_batch_t *instance);
+
+static inline void usb_transfer_batch_finish_error(
+    usb_transfer_batch_t *instance, int error)
+{
+        assert(instance);
+        instance->error = error;
+        usb_transfer_batch_finish(instance);
+}
 
 #endif

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

@@ -71 +71 @@
 void usb_device_keeper_init(usb_device_keeper_t *instance);
 
-void usb_device_keeper_add_ep(
-    usb_device_keeper_t *instance, usb_address_t address, endpoint_t *ep);
-
 void usb_device_keeper_reserve_default_address(
     usb_device_keeper_t *instance, usb_speed_t speed);
@@ -96 +93 @@
 usb_speed_t usb_device_keeper_get_speed(usb_device_keeper_t *instance,
     usb_address_t address);
-
-void usb_device_keeper_use_control(usb_device_keeper_t *instance,
-    usb_target_t target);
-
-void usb_device_keeper_release_control(usb_device_keeper_t *instance,
-    usb_target_t target);
-
 #endif
 /**

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

@@ -39 +39 @@
 #include <bool.h>
 #include <adt/list.h>
+#include <fibril_synch.h>
+
 #include <usb/usb.h>
 
@@ -48 +50 @@
         usb_speed_t speed;
         size_t max_packet_size;
-        bool active;
         unsigned toggle:1;
-        link_t same_device_eps;
+        fibril_mutex_t guard;
+        fibril_condvar_t avail;
+        volatile bool active;
 } endpoint_t;
 
@@ -59 +62 @@
 void endpoint_destroy(endpoint_t *instance);
 
+void endpoint_use(endpoint_t *instance);
+
+void endpoint_release(endpoint_t *instance);
+
 int endpoint_toggle_get(endpoint_t *instance);
 
 void endpoint_toggle_set(endpoint_t *instance, int toggle);
 
-void endpoint_toggle_reset(link_t *ep);
-
-void endpoint_toggle_reset_filtered(link_t *ep, usb_endpoint_t epn);
-
+void endpoint_toggle_reset_filtered(endpoint_t *instance, usb_target_t target);
 #endif
 /**

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

@@ -78 +78 @@
     size_t *bw);
 
+void usb_endpoint_manager_reset_if_need(
+    usb_endpoint_manager_t *instance, usb_target_t target, const uint8_t *data);
 #endif
 /**

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

@@ -59 +59 @@
 } usb_hc_attached_device_t;
 
-int usb_hc_reserve_default_address(usb_hc_connection_t *, usb_speed_t);
-int usb_hc_release_default_address(usb_hc_connection_t *);
-
 usb_address_t usb_hc_request_address(usb_hc_connection_t *, usb_speed_t);
 int usb_hc_register_device(usb_hc_connection_t *,

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

@@ -42 +42 @@
 #include <ipc/devman.h>
 #include <ddf/driver.h>
+#include <fibril_synch.h>
 
 /** Abstraction of a physical connection to the device.
@@ -59 +60 @@
  * This endpoint must be bound with existing usb_device_connection_t
  * (i.e. the wire to send data over).
+ *
+ * Locking order: if you want to lock both mutexes
+ * (@c guard and @c hc_phone_mutex), lock @c guard first.
+ * It is not necessary to lock @c guard if you want to lock @c hc_phone_mutex
+ * only.
  */
 typedef struct {
+        /** Guard of the whole pipe. */
+        fibril_mutex_t guard;
+
         /** The connection used for sending the data. */
         usb_device_connection_t *wire;
@@ -78 +87 @@
         /** Phone to the host controller.
          * Negative when no session is active.
+         * It is an error to access this member without @c hc_phone_mutex
+         * being locked.
+         * If call over the phone is to be made, it must be preceeded by
+         * call to pipe_add_ref() [internal libusb function].
          */
         int hc_phone;
+
+        /** Guard for serialization of requests over the phone. */
+        fibril_mutex_t hc_phone_mutex;
+
+        /** Number of active transfers over the pipe. */
+        int refcount;
 } usb_pipe_t;
 
@@ -134 +153 @@
 int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     size_t, uint8_t *, size_t, usb_device_connection_t *);
+int usb_pipe_register_with_speed(usb_pipe_t *, usb_speed_t,
+    unsigned int, usb_hc_connection_t *);
 int usb_pipe_register(usb_pipe_t *, unsigned int, usb_hc_connection_t *);
 int usb_pipe_unregister(usb_pipe_t *, usb_hc_connection_t *);
@@ -140 +161 @@
 int usb_pipe_end_session(usb_pipe_t *);
 bool usb_pipe_is_session_started(usb_pipe_t *);
+
+int usb_pipe_start_long_transfer(usb_pipe_t *);
+void usb_pipe_end_long_transfer(usb_pipe_t *);
 
 int usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *);

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

@@ -77 +77 @@
         USB_SPEED_FULL,
         /** USB 2.0 high speed (480Mbits/s). */
-        USB_SPEED_HIGH
+        USB_SPEED_HIGH,
+        /** Psuedo-speed serving as a boundary. */
+        USB_SPEED_MAX
 } usb_speed_t;