Changeset a6abe20 in mainline

Timestamp:

2015-06-30T03:09:18Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

26d6f73

Parents:

f9599b9c

Message:

usbmast: Sanitize logging

Report the error condition.
Don't use custom verbosity control, that's what logctl_set_log_level is for.

File:

• uspace/drv/bus/usb/usbmast/bo_trans.c (modified) (6 diffs)

uspace/drv/bus/usb/usbmast/bo_trans.c

@@ -44 +44 @@
 #include "usbmast.h"
 
-bool usb_mast_verbose = false;
 
 #define MASTLOG(format, ...) \
-        do { \
-                if (usb_mast_verbose) { \
-                        usb_log_debug2("USB cl08: " format, ##__VA_ARGS__); \
-                } \
-        } while (false)
+        usb_log_debug2("USB cl08: " format, ##__VA_ARGS__)
 
 /** Send command via bulk-only transport.
@@ -93 +88 @@
             usb_debug_str_buffer((uint8_t *) &cbw, sizeof(cbw), 0),
             str_error(rc));
-        if (rc != EOK)
-                return EIO;
+        if (rc != EOK) {
+                usb_log_error("Bulk out write failed: %s\n", str_error(rc));
+                return EIO;
+        }
 
         MASTLOG("Transferring data.\n");
@@ -119 +116 @@
                     usb_device_get_default_pipe(mfun->mdev->usb_dev), dpipe);
         } else if (rc != EOK) {
+                usb_log_error("Failed to transfer data: %s", str_error(rc));
                 return EIO;
         }
@@ -131 +129 @@
             str_error(rc));
         if (rc != EOK) {
-                MASTLOG("rc != EOK\n");
+                usb_log_error("Failed to read CSW: %s", str_error(rc));
                 return EIO;
         }
 
         if (csw_size != sizeof(csw)) {
-                MASTLOG("csw_size != sizeof(csw)\n");
+                usb_log_error("Received CSW of incorrect size.");
                 return EIO;
         }
 
         if (csw.dCSWTag != tag) {
-                MASTLOG("csw.dCSWTag != tag\n");
+                usb_log_error("Received CSW with incorrect tag. (expected: %"
+                    PRIX32" received: %"PRIx32, tag, csw.dCSWTag);
                 return EIO;
         }
@@ -153 +152 @@
                 break;
         case cbs_failed:
-                MASTLOG("Command failed\n");
                 cmd->status = CMDS_FAILED;
+                usb_log_error("CBS Failed.\n");
                 break;
         case cbs_phase_error:
-                MASTLOG("Phase error\n");
+                usb_log_error("CBS phase error.\n");
                 rc = EIO;
                 break;
         default:
+                usb_log_error("CBS other error.\n");
                 rc = EIO;
                 break;
@@ -167 +167 @@
         const size_t residue = uint32_usb2host(csw.dCSWDataResidue);
         if (residue > dbuf_size) {
-                MASTLOG("residue > dbuf_size\n");
+                usb_log_error("Residue > buffer size (%zu > %zu).\n",
+                    residue, dbuf_size);
                 return EIO;
         }