Changeset 7a1757e in mainline

Timestamp:

2015-07-05T01:19: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:

9e9d018e

Parents:

eb34d8e

Message:

usbmast: downgrade cmd_fail to warning

set debug level explicitly

Location:

uspace/drv/bus/usb/usbmast

Files:

• main.c (modified) (2 diffs)
• scsi_ms.c (modified) (1 diff)

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

@@ -44 +44 @@
 #include <usb/classes/massstor.h>
 #include <errno.h>
+#include <io/logctl.h>
 #include <str_error.h>
 #include "cmdw.h"
@@ -400 +401 @@
 {
         log_init(NAME);
-
+        logctl_set_log_level(NAME, LVL_NOTE);
         return usb_driver_main(&usbmast_driver);
 }

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

@@ -86 +86 @@
         rc = usb_massstor_cmd(mfun, 0xDEADBEEF, &cmd);
 
-        if (rc != EOK || cmd.status != CMDS_GOOD) {
-                usb_log_error("Test Unit Ready failed, device %s: %s.\n",
-                   usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));
-                return rc;
-        }
+        if (rc != EOK) {
+                usb_log_error("Test Unit Ready failed on device %s: %s.",
+                   usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));
+                return rc;
+        }
+        /* Ignore command error here. If there's something wrong
+         * with the device the following commands will fail too.
+         */
+        if (cmd.status != CMDS_GOOD)
+                usb_log_warning("Test Unit Ready command failed on device %s.",
+                   usb_device_get_name(mfun->mdev->usb_dev));
 
         return EOK;