Changeset a9c674e0 in mainline

Timestamp:

2011-02-23T15:38:53Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

233e68d, a80849c

Parents:

eb1a2f4 (diff), d3880aa (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:

Merged small fixes and improvements

Fixed "usbinfo -t uhci" problem.

UHCI root hub prints less messages.

USB MID driver creates exposed "ctl" function (to provide at least
one function when interface drivers are not available).

Location:

uspace

Files:

• app/usbinfo/main.c (modified) (1 diff)
• drv/uhci-rhd/port.c (modified) (2 diffs)
• drv/usbmid/explore.c (modified) (1 diff)
• lib/usb/include/usb/pipes.h (modified) (1 diff)
• lib/usb/src/pipes.c (modified) (3 diffs)
• lib/usb/src/pipesio.c (modified) (4 diffs)

uspace/app/usbinfo/main.c

@@ -82 +82 @@
 
         if (str_cmp(path, "uhci") == 0) {
-                path = "/hw/pci0/00:01.2";
+                path = "/hw/pci0/00:01.2/uhci";
         }
 

uspace/drv/uhci-rhd/port.c

@@ -92 +92 @@
 
         while (1) {
-                usb_log_debug("Port(%d) status address %p:\n",
-                  port_instance->number, port_instance->address);
-
                 /* read register value */
                 port_status_t port_status =
@@ -100 +97 @@
 
                 /* debug print */
-                usb_log_info("Port(%d) status %#.4x\n",
-                  port_instance->number, port_status);
+                usb_log_debug("Port %d status at %p: 0x%04x.\n",
+                  port_instance->number, port_instance->address, port_status);
                 print_port_status(port_status);
 

uspace/drv/usbmid/explore.c

@@ -202 +202 @@
         if (interface_descriptors_count == (size_t) -1) {
                 usb_log_error("Problem parsing configuration descriptor.\n");
+                free(config_descriptor_raw);
+                free(interface_descriptors);
+                return false;
+        }
+
+        ddf_fun_t *ctl_fun = ddf_fun_create(dev->dev, fun_exposed, "ctl");
+        if (ctl_fun == NULL) {
+                usb_log_error("Failed to create control function.\n");
+                free(config_descriptor_raw);
+                free(interface_descriptors);
+                return false;
+        }
+        rc = ddf_fun_bind(ctl_fun);
+        if (rc != EOK) {
+                usb_log_error("Failed to bind control function: %s.\n",
+                    str_error(rc));
                 free(config_descriptor_raw);
                 free(interface_descriptors);

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

@@ -137 +137 @@
 int usb_endpoint_pipe_start_session(usb_endpoint_pipe_t *);
 int usb_endpoint_pipe_end_session(usb_endpoint_pipe_t *);
+bool usb_endpoint_pipe_is_session_started(usb_endpoint_pipe_t *);
 
 int usb_endpoint_pipe_read(usb_endpoint_pipe_t *, void *, size_t, size_t *);

uspace/lib/usb/src/pipes.c

@@ -200 +200 @@
         assert(pipe);
 
-        if (pipe->hc_phone >= 0) {
+        if (usb_endpoint_pipe_is_session_started(pipe)) {
                 return EBUSY;
         }
@@ -226 +226 @@
         assert(pipe);
 
-        if (pipe->hc_phone < 0) {
+        if (!usb_endpoint_pipe_is_session_started(pipe)) {
                 return ENOENT;
         }
@@ -238 +238 @@
 
         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_endpoint_pipe_is_session_started(usb_endpoint_pipe_t *pipe)
+{
+        return (pipe->hc_phone >= 0);
 }
 

uspace/lib/usb/src/pipesio.c

@@ -148 +148 @@
         }
 
-        if (pipe->hc_phone < 0) {
+        if (!usb_endpoint_pipe_is_session_started(pipe)) {
                 return EBADF;
         }
@@ -255 +255 @@
         }
 
-        if (pipe->hc_phone < 0) {
+        if (!usb_endpoint_pipe_is_session_started(pipe)) {
                 return EBADF;
         }
@@ -369 +369 @@
         }
 
-        if (pipe->hc_phone < 0) {
+        if (!usb_endpoint_pipe_is_session_started(pipe)) {
                 return EBADF;
         }
@@ -481 +481 @@
         }
 
-        if (pipe->hc_phone < 0) {
+        if (!usb_endpoint_pipe_is_session_started(pipe)) {
                 return EBADF;
         }