Changeset d5c1051 in mainline for uspace/drv

Timestamp:

2017-12-20T22:25:34Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

39b54fe

Parents:

8610c2c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:22:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:25:34)

Message:

"Obviously harmless" error handling tweaks.

Location:

uspace/drv

Files:

• audio/hdaudio/pcm_iface.c (modified) (1 diff)
• audio/sb16/dsp.c (modified) (1 diff)
• block/ata_bd/ata_bd.c (modified) (3 diffs)
• block/usbmast/bo_trans.c (modified) (2 diffs)
• bus/pci/pciintel/pci.c (modified) (6 diffs)
• bus/usb/ohci/hw_struct/completion_codes.h (modified) (1 diff)
• bus/usb/usbmid/usbmid.c (modified) (1 diff)
• test/test3/test3.c (modified) (2 diffs)

uspace/drv/audio/hdaudio/pcm_iface.c

@@ -120 +120 @@
                 return 16384;
         default:
-                return ENOTSUP;
+                return -1;
         }
 }

uspace/drv/audio/sb16/dsp.c

@@ -290 +290 @@
                 return 16535;
         default:
-                return ENOTSUP;
+                return -1;
         }
 }

uspace/drv/block/ata_bd/ata_bd.c

@@ -145 +145 @@
 int ata_ctrl_init(ata_ctrl_t *ctrl, ata_base_t *res)
 {
-        int i, rc;
+        int i;
+        int rc;
         int n_disks;
 
@@ -210 +211 @@
 int ata_ctrl_remove(ata_ctrl_t *ctrl)
 {
-        int i, rc;
+        int i;
+        int rc;
 
         ddf_msg(LVL_DEBUG, ": ata_ctrl_remove()");
@@ -234 +236 @@
 int ata_ctrl_gone(ata_ctrl_t *ctrl)
 {
-        int i, rc;
+        int i;
+        int rc;
 
         ddf_msg(LVL_DEBUG, "ata_ctrl_gone()");

uspace/drv/block/usbmast/bo_trans.c

@@ -228 +228 @@
  *
  * @param mfun          Mass storage function
- * @return              Error code of maximum LUN (index, not count)
+ * @return              Maximum LUN (index, not count), or -1
  */
 int usb_massstor_get_max_lun(usbmast_dev_t *mdev)
@@ -240 +240 @@
             &data_recv_len);
         if (rc != EOK) {
-                return rc;
+                return -1;
         }
         if (data_recv_len != 1) {
-                return EEMPTY;
-        }
-        return (int) max_lun;
+                return -1;
+        }
+        return max_lun;
 }
 

uspace/drv/bus/pci/pciintel/pci.c

@@ -99 +99 @@
 }
 
-static int pciintel_fun_owns_interrupt(pci_fun_t *fun, int irq)
+static bool pciintel_fun_owns_interrupt(pci_fun_t *fun, int irq)
 {
         size_t i;
@@ -383 +383 @@
 {
         int rc;
+        int ret;
         char match_id_str[ID_MAX_STR_LEN];
 
         /* Vendor ID & Device ID, length(incl \0) 22 */
-        rc = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/ven=%04"
+        ret = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/ven=%04"
             PRIx16 "&dev=%04" PRIx16, fun->vendor_id, fun->device_id);
-        if (rc < 0) {
-                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
-                    str_error(rc));
+        if (ret < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str");
         }
 
@@ -399 +399 @@
 
         /* Class, subclass, prog IF, revision, length(incl \0) 47 */
-        rc = snprintf(match_id_str, ID_MAX_STR_LEN,
+        ret = snprintf(match_id_str, ID_MAX_STR_LEN,
             "pci/class=%02x&subclass=%02x&progif=%02x&revision=%02x",
             fun->class_code, fun->subclass_code, fun->prog_if, fun->revision);
-        if (rc < 0) {
-                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
-                    str_error(rc));
+        if (ret < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str");
         }
 
@@ -413 +412 @@
 
         /* Class, subclass, prog IF, length(incl \0) 35 */
-        rc = snprintf(match_id_str, ID_MAX_STR_LEN,
+        ret = snprintf(match_id_str, ID_MAX_STR_LEN,
             "pci/class=%02x&subclass=%02x&progif=%02x",
             fun->class_code, fun->subclass_code, fun->prog_if);
-        if (rc < 0) {
-                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
-                    str_error(rc));
+        if (ret < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str");
         }
 
@@ -427 +425 @@
 
         /* Class, subclass, length(incl \0) 25 */
-        rc = snprintf(match_id_str, ID_MAX_STR_LEN,
+        ret = snprintf(match_id_str, ID_MAX_STR_LEN,
             "pci/class=%02x&subclass=%02x",
             fun->class_code, fun->subclass_code);
-        if (rc < 0) {
-                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
-                    str_error(rc));
+        if (ret < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str");
         }
 
@@ -441 +438 @@
 
         /* Class, length(incl \0) 13 */
-        rc = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/class=%02x",
+        ret = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/class=%02x",
             fun->class_code);
-        if (rc < 0) {
-                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
-                    str_error(rc));
+        if (ret < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str");
         }
 

uspace/drv/bus/usb/ohci/hw_struct/completion_codes.h

@@ -54 +54 @@
 };
 
-inline static unsigned int cc_to_rc(unsigned int cc)
+inline static int cc_to_rc(unsigned int cc)
 {
         switch (cc) {

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -117 +117 @@
          * class name something humanly understandable.
          */
-        rc = asprintf(&child_name, "%s%hhu",
+        int ret = asprintf(&child_name, "%s%hhu",
             usb_str_class(interface_descriptor->interface_class),
             interface_descriptor->interface_number);
-        if (rc < 0) {
+        if (ret < 0) {
                 return ENOMEM;
         }

uspace/drv/test/test3/test3.c

@@ -71 +71 @@
         char *fun_name = NULL;
         
-        rc = asprintf(&fun_name, "%s%zu", base_name, index);
-        if (rc < 0) {
-                ddf_msg(LVL_ERROR, "Failed to format string: %s", str_error(rc));
+        if (asprintf(&fun_name, "%s%zu", base_name, index) < 0) {
+                ddf_msg(LVL_ERROR, "Failed to format string: No memory");
+                rc = ENOMEM;
                 goto leave;
         }
@@ -161 +161 @@
 
         for (i = 0; i < NUM_FUNCS; i++) {
-                rc = asprintf(&fun_name, "test3_%zu", i);
-                if (rc < 0) {
-                        ddf_msg(LVL_ERROR, "Failed to format string: %s", str_error(rc));
+                if (asprintf(&fun_name, "test3_%zu", i) < 0) {
+                        ddf_msg(LVL_ERROR, "Failed to format string: No memory");
                         return ENOMEM;
                 }