Changeset 132ab5d1 in mainline for uspace/drv/bus/pci/pciintel/pci.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/drv/bus/pci/pciintel/pci.c (modified) (7 diffs)

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");
         }
 
@@ -514 +510 @@
 #define MEM_MASK (~0xf)
         
-        io = (bool) (val & 1);
+        io = (val & 1) != 0;
         if (io) {
                 addrw64 = false;