Changeset 30ec5ea in mainline

Timestamp:

2011-12-12T15:30:03Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c59dbdd5

Parents:

3538b0e

Message:

libusb: Rename read/write functions. Make del_ref function more robust.

Add doxygen.

Location:

uspace/lib/usb

Files:

• include/usb/hc.h (modified) (3 diffs)
• src/hc.c (modified) (3 diffs)

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

@@ -31 +31 @@
  */
 /** @file
- * General communication with host controller driver.
+ * General communication with host controller.
  */
 #ifndef LIBUSB_HC_H_
@@ -42 +42 @@
 #include <usb/usb.h>
 
-/** Connection to the host controller driver. */
+/** Connection to the host controller driver.
+ *
+ * This is a high level IPC communication wrapper. After the structure has been
+ * initialized using devman handle of an USB host controller, it
+ * will manage all communication to that host controller, including session
+ * creation/destruction and proper IPC protocol.
+ */
 typedef struct {
         /** Devman handle of the host controller. */
@@ -88 +94 @@
     usb_endpoint_t, usb_direction_t);
 
-int usb_hc_control_read(usb_hc_connection_t *, usb_address_t, usb_endpoint_t,
+int usb_hc_read(usb_hc_connection_t *, usb_address_t, usb_endpoint_t,
     uint64_t, void *, size_t, size_t *);
-int usb_hc_control_write(usb_hc_connection_t *, usb_address_t, usb_endpoint_t,
+int usb_hc_write(usb_hc_connection_t *, usb_address_t, usb_endpoint_t,
     uint64_t, const void *, size_t);
 

uspace/lib/usb/src/hc.c

@@ -64 +64 @@
         assert(connection);
         fibril_mutex_lock(&connection->guard);
+        if (connection->ref_count == 0) {
+                /* Closing already closed connection... */
+                assert(connection->hc_sess = NULL);
+                fibril_mutex_unlock(&connection->guard);
+                return EOK;
+        }
         --connection->ref_count;
         int ret = EOK;
@@ -232 +238 @@
 }
 /*----------------------------------------------------------------------------*/
-int usb_hc_control_read(usb_hc_connection_t *connection, usb_address_t address,
+int usb_hc_read(usb_hc_connection_t *connection, usb_address_t address,
     usb_endpoint_t endpoint, uint64_t setup, void *data, size_t size,
     size_t *real_size)
@@ -246 +252 @@
 }
 /*----------------------------------------------------------------------------*/
-int usb_hc_control_write(usb_hc_connection_t *connection, usb_address_t address,
+int usb_hc_write(usb_hc_connection_t *connection, usb_address_t address,
     usb_endpoint_t endpoint, uint64_t setup, const void *data, size_t size)
 {