Changeset 5e168be1 in mainline

Timestamp:

2011-04-14T10:22:06Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

fa0f53b

Parents:

8989f48f

Message:

Optional debugging messages for auto polling

Location:

uspace/lib/usb

Files:

• include/usb/devpoll.h (modified) (1 diff)
• src/devpoll.c (modified) (7 diffs)

uspace/lib/usb/include/usb/devpoll.h

@@ -40 +40 @@
 
 typedef struct {
+        /** Level of debugging messages from auto polling.
+         * 0 - nothing
+         * 1 - inform about errors and polling start/end
+         * 2 - also dump every retrieved buffer
+         */
+        int debug;
         /** Maximum number of consecutive errors before polling termination. */
         size_t max_failures;

uspace/lib/usb/src/devpoll.c

@@ -36 +36 @@
 #include <usb/request.h>
 #include <usb/debug.h>
+#include <usb/classes/classes.h>
 #include <errno.h>
 #include <str_error.h>
@@ -45 +46 @@
 /** Data needed for polling. */
 typedef struct {
+        int debug;
         size_t max_failures;
         useconds_t delay;
@@ -73 +75 @@
             = polling_data->dev->pipes[polling_data->pipe_index].pipe;
         
-        usb_log_debug("Pipe interface number: %d, protocol: %d, subclass: %d, max packet size: %d\n", 
-            polling_data->dev->pipes[polling_data->pipe_index].interface_no,
-            polling_data->dev->pipes[polling_data->pipe_index].description->interface_protocol,
-            polling_data->dev->pipes[polling_data->pipe_index].description->interface_subclass,
-            pipe->max_packet_size);
+        if (polling_data->debug > 0) {
+                usb_endpoint_mapping_t *mapping
+                    = &polling_data->dev->pipes[polling_data->pipe_index];
+                usb_log_debug("Poll0x%x: started polling of `%s' - " \
+                    "interface %d (%s,%d,%d), %zuB/%zu.\n",
+                    polling_data,
+                    polling_data->dev->ddf_dev->name,
+                    (int) mapping->interface->interface_number,
+                    usb_str_class(mapping->interface->interface_class),
+                    (int) mapping->interface->interface_subclass,
+                    (int) mapping->interface->interface_protocol,
+                    polling_data->request_size, pipe->max_packet_size);
+        }
 
         size_t failed_attempts = 0;
@@ -86 +96 @@
                 rc = usb_pipe_read(pipe, polling_data->buffer,
                     polling_data->request_size, &actual_size);
+
+                if (polling_data->debug > 1) {
+                        if (rc == EOK) {
+                                usb_log_debug(
+                                    "Poll0x%x: received: '%s' (%zuB).\n",
+                                    polling_data,
+                                    usb_debug_str_buffer(polling_data->buffer,
+                                        actual_size, 16),
+                                    actual_size);
+                        } else {
+                                usb_log_debug(
+                                    "Poll0x%x: polling failed: %s.\n",
+                                    polling_data, str_error(rc));
+                        }
+                }
 
                 /* If the pipe stalled, we can try to reset the stall. */
@@ -129 +154 @@
         }
 
-        if (failed_attempts > 0) {
-                usb_log_error(
-                    "Polling of device `%s' terminated: recurring failures.\n",
-                    polling_data->dev->ddf_dev->name);
-        }
-
         if (polling_data->on_polling_end != NULL) {
                 polling_data->on_polling_end(polling_data->dev,
                     failed_attempts > 0, polling_data->custom_arg);
+        }
+
+        if (polling_data->debug > 0) {
+                if (failed_attempts > 0) {
+                        usb_log_error(
+                            "Polling of device `%s' terminated: %s.\n",
+                            polling_data->dev->ddf_dev->name,
+                            "recurring failures");
+                } else {
+                        usb_log_debug(
+                            "Polling of device `%s' terminated by user.\n",
+                            polling_data->dev->ddf_dev->name
+                        );
+                }
         }
 
@@ -186 +219 @@
         }
 
+        auto_polling->debug = 1;
         auto_polling->auto_clear_halt = true;
         auto_polling->delay = 0;
@@ -252 +286 @@
         polling_data->custom_arg = arg;
 
+        polling_data->debug = polling->debug;
         polling_data->max_failures = polling->max_failures;
         if (polling->delay >= 0) {