Changeset 84a04dd in mainline for uspace/lib/usb/src

Timestamp:

2011-04-18T20:21:58Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

44b1674, c7d19d84, da1dd48, e3f1987

Parents:

8595577b (diff), 4125b7d (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:

C-style, more IPC hiding (#196, #187)

Removed obsoleted usb_pipe_start_session() and
usb_pipe_end_session().

Printf-like functions produces warning with bad modifiers.

usb_pipe_start_long_transfer() is of type void to save-up checks
that would rarely fail (failure is received upon trying to communicate
over such pipe).

Location:

uspace/lib/usb/src

Files:

• devdrv.c (modified) (1 diff)
• devpoll.c (modified) (3 diffs)
• hidparser.c (modified) (2 diffs)
• hidreport.c (modified) (2 diffs)
• pipepriv.c (modified) (3 diffs)
• pipepriv.h (modified) (2 diffs)
• pipes.c (modified) (2 diffs)
• pipesinit.c (modified) (2 diffs)
• pipesio.c (modified) (4 diffs)

uspace/lib/usb/src/devdrv.c

@@ -236 +236 @@
 
         /* It is worth to start a long transfer. */
-        rc = usb_pipe_start_long_transfer(ctrl_pipe);
-        if (rc != EOK) {
-                return rc;
-        }
+        usb_pipe_start_long_transfer(ctrl_pipe);
 
         /* Get the device descriptor. */

uspace/lib/usb/src/devpoll.c

@@ -78 +78 @@
                 usb_endpoint_mapping_t *mapping
                     = &polling_data->dev->pipes[polling_data->pipe_index];
-                usb_log_debug("Poll0x%x: started polling of `%s' - " \
+                usb_log_debug("Poll%p: started polling of `%s' - " \
                     "interface %d (%s,%d,%d), %zuB/%zu.\n",
                     polling_data,
@@ -100 +100 @@
                         if (rc == EOK) {
                                 usb_log_debug(
-                                    "Poll0x%x: received: '%s' (%zuB).\n",
+                                    "Poll%p: received: '%s' (%zuB).\n",
                                     polling_data,
                                     usb_debug_str_buffer(polling_data->buffer,
@@ -107 +107 @@
                         } else {
                                 usb_log_debug(
-                                    "Poll0x%x: polling failed: %s.\n",
+                                    "Poll%p: polling failed: %s.\n",
                                     polling_data, str_error(rc));
                         }

uspace/lib/usb/src/hidparser.c

@@ -167 +167 @@
 
                         usb_log_debug2(
-                                "i(%u) data(%X) value(%X): TAG %u, class %u, size %u - ", i, 
+                                "i(%zu) data(%X) value(%X): TAG %d, class %u, size %u - ", i,
                             data[i], usb_hid_report_tag_data_int32(data+i+1,item_size), 
                             tag, class, item_size);
@@ -576 +576 @@
                 report_item = list_get_instance(item, usb_hid_report_item_t, link);
 
-                usb_log_debug("\tOFFSET: %X\n", report_item->offset);
+                usb_log_debug("\tOFFSET: %zX\n", report_item->offset);
                 usb_log_debug("\tCOUNT: %X\n", report_item->count);
                 usb_log_debug("\tSIZE: %X\n", report_item->size);

uspace/lib/usb/src/hidreport.c

@@ -109 +109 @@
         
         if (*d != sizeof(usb_standard_hid_descriptor_t)) {
-                usb_log_error("HID descriptor hass wrong size (%u, expected %u"
+                usb_log_error("HID descriptor has wrong size (%u, expected %zu"
                     ")\n", *d, sizeof(usb_standard_hid_descriptor_t));
                 return EINVAL;
@@ -149 +149 @@
                 free(*report_desc);
                 *report_desc = NULL;
-                usb_log_error("Report descriptor has wrong size (%u, expected "
+                usb_log_error("Report descriptor has wrong size (%zu, expected "
                     "%u)\n", actual_size, length);
                 return EINVAL;

uspace/lib/usb/src/pipepriv.c

@@ -77 +77 @@
  *
  * @param pipe The USB pipe.
+ * @param hide_failure Whether to hide failure when adding reference
+ *      (use soft refcount).
  * @return Error code.
  * @retval EOK Currently always.
  */
-int pipe_add_ref(usb_pipe_t *pipe)
+int pipe_add_ref(usb_pipe_t *pipe, bool hide_failure)
 {
-another_try:
         pipe_acquire(pipe);
 
@@ -89 +90 @@
                 int phone = devman_device_connect(pipe->wire->hc_handle, 0);
                 if (phone < 0) {
-                        // TODO: treat some error as non-recoverable
-                        // and return error from here
+                        if (hide_failure) {
+                                pipe->refcount_soft++;
+                                phone = EOK;
+                        }
                         pipe_release(pipe);
-                        goto another_try;
+                        return phone;
                 }
                 /*
@@ -114 +117 @@
 {
         pipe_acquire(pipe);
+        if (pipe->refcount_soft > 0) {
+                pipe->refcount_soft--;
+                pipe_release(pipe);
+                return;
+        }
         assert(pipe->refcount > 0);
         pipe->refcount--;

uspace/lib/usb/src/pipepriv.h

@@ -37 +37 @@
 
 #include <usb/pipes.h>
+#include <bool.h>
 
 void pipe_acquire(usb_pipe_t *);
@@ -44 +45 @@
 void pipe_end_transaction(usb_pipe_t *);
 
-int pipe_add_ref(usb_pipe_t *);
+int pipe_add_ref(usb_pipe_t *, bool);
 void pipe_drop_ref(usb_pipe_t *);
 

uspace/lib/usb/src/pipes.c

@@ -229 +229 @@
 }
 
-
-/** Start a session on the endpoint pipe.
- *
- * A session is something inside what any communication occurs.
- * It is expected that sessions would be started right before the transfer
- * and ended - see usb_pipe_end_session() - after the last
- * transfer.
- * The reason for this is that session actually opens some communication
- * channel to the host controller (or to the physical hardware if you
- * wish) and thus it involves acquiring kernel resources.
- * Since they are limited, sessions shall not be longer than strictly
- * necessary.
- *
- * @deprecated
- * Obsoleted with introduction of usb_pipe_start_long_transfer
- *
- * @param pipe Endpoint pipe to start the session on.
- * @return Error code.
- */
-int usb_pipe_start_session(usb_pipe_t *pipe)
-{
-        usb_log_warning("usb_pipe_start_session() was deprecated.\n");
-        return EOK;
-}
-
-
-/** Ends a session on the endpoint pipe.
- *
- * @deprecated
- * Obsoleted with introduction of usb_pipe_end_long_transfer
- *
- * @see usb_pipe_start_session
- *
- * @param pipe Endpoint pipe to end the session on.
- * @return Error code.
- */
-int usb_pipe_end_session(usb_pipe_t *pipe)
-{
-        usb_log_warning("usb_pipe_end_session() was deprecated.\n");
-        return EOK;
-}
-
-/** Tell whether a session is started (open) on the endpoint pipe.
- *
- * The expected usage of this function is in assertions for some
- * nested functions.
- *
- * @param pipe Endpoint pipe in question.
- * @return Whether @p pipe has opened a session.
- */
-bool usb_pipe_is_session_started(usb_pipe_t *pipe)
-{
-        pipe_acquire(pipe);
-        bool started = pipe->refcount > 0;
-        pipe_release(pipe);
-        return started;
-}
-
 /** Prepare pipe for a long transfer.
  *
@@ -297 +239 @@
  * @return Error code.
  */
-int usb_pipe_start_long_transfer(usb_pipe_t *pipe)
-{
-        return pipe_add_ref(pipe);
+void usb_pipe_start_long_transfer(usb_pipe_t *pipe)
+{
+        (void) pipe_add_ref(pipe, true);
 }
 

uspace/lib/usb/src/pipesinit.c

@@ -365 +365 @@
         pipe->direction = direction;
         pipe->refcount = 0;
+        pipe->refcount_soft = 0;
         pipe->auto_reset_halt = false;
 
@@ -419 +420 @@
         int rc;
 
-        rc = usb_pipe_start_long_transfer(pipe);
-        if (rc != EOK) {
-                return rc;
-        }
-
+        usb_pipe_start_long_transfer(pipe);
 
         uint8_t dev_descr_start[CTRL_PIPE_MIN_PACKET_SIZE];

uspace/lib/usb/src/pipesio.c

@@ -173 +173 @@
 
         int rc;
-        rc = pipe_add_ref(pipe);
+        rc = pipe_add_ref(pipe, false);
         if (rc != EOK) {
                 return rc;
@@ -296 +296 @@
         int rc;
 
-        rc = pipe_add_ref(pipe);
+        rc = pipe_add_ref(pipe, false);
         if (rc != EOK) {
                 return rc;
@@ -447 +447 @@
         int rc;
 
-        rc = pipe_add_ref(pipe);
+        rc = pipe_add_ref(pipe, false);
         if (rc != EOK) {
                 return rc;
@@ -579 +579 @@
         int rc;
 
-        rc = pipe_add_ref(pipe);
+        rc = pipe_add_ref(pipe, false);
         if (rc != EOK) {
                 return rc;