Changeset bdb23c63 in mainline

Timestamp:

2011-12-14T14:12:44Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22ecbde

Parents:

cbd568b

Message:

libusbdev: Remove unused mutex.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/driver.h (modified) (1 diff)
• include/usb/dev/pipes.h (modified) (2 diffs)
• src/pipes.c (modified) (1 diff)

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -72 +72 @@
 /** USB device structure. */
 typedef struct {
+        /** Connection to USB hc, used by wire and arbitrary requests. */
         usb_hc_connection_t hc_conn;
         /** Connection backing the pipes.

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

@@ -39 +39 @@
 #include <ddf/driver.h>
 #include <fibril_synch.h>
-#include <async.h>
 #include <usb/usb.h>
 #include <usb/descriptor.h>
@@ -46 +45 @@
 #define CTRL_PIPE_MIN_PACKET_SIZE 8
 /** Abstraction of a logical connection to USB device endpoint.
- * It encapsulates endpoint attributes (transfer type etc.) as well
- * as information about currently running sessions.
+ * It encapsulates endpoint attributes (transfer type etc.).
  * 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_sess_mutex), lock @c guard first.
- * It is not necessary to lock @c guard if you want to lock @c hc_sess_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;

uspace/lib/usbdev/src/pipes.c

@@ -311 +311 @@
         assert(connection);
 
-        fibril_mutex_initialize(&pipe->guard);
         pipe->wire = connection;
         pipe->endpoint_no = endpoint_no;