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

Timestamp:

2011-04-09T18:26:22Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

2ad98fd

Parents:

f35b294 (diff), 97e7e8a (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 usb/development

Location:

uspace/lib/usb/include/usb

Files:

• devdrv.h (modified) (1 diff)
• host/device_keeper.h (modified) (1 diff)
• pipes.h (modified) (5 diffs)
• usb.h (modified) (1 diff)

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/device_keeper.h

@@ -73 +73 @@
 void usb_device_keeper_add_ep(
     usb_device_keeper_t *instance, usb_address_t address, endpoint_t *ep);
+void usb_device_keeper_del_ep(
+    usb_device_keeper_t *instance, usb_address_t address, endpoint_t *ep);
 
 void usb_device_keeper_reserve_default_address(

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;