Changes in uspace/drv/bus/pci/pciintel/pci.c [d5c1051:d51838f] in mainline

File:

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

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

@@ -99 +99 @@
 }
 
-static bool pciintel_fun_owns_interrupt(pci_fun_t *fun, int irq)
+static int pciintel_fun_owns_interrupt(pci_fun_t *fun, int irq)
 {
         size_t i;
@@ -293 +293 @@
         const uint32_t conf_addr = CONF_ADDR(fun->bus, fun->dev, fun->fn, reg);
         pci_bus_t *bus = pci_bus_from_fun(fun);
-        uint32_t val = 0;
+        uint32_t val;
         
         fibril_mutex_lock(&bus->conf_mutex);
@@ -383 +383 @@
 {
         int rc;
-        int ret;
         char match_id_str[ID_MAX_STR_LEN];
 
         /* Vendor ID & Device ID, length(incl \0) 22 */
-        ret = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/ven=%04"
+        rc = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/ven=%04"
             PRIx16 "&dev=%04" PRIx16, fun->vendor_id, fun->device_id);
-        if (ret < 0) {
-                ddf_msg(LVL_ERROR, "Failed creating match ID str");
+        if (rc < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
+                    str_error(rc));
         }
 
@@ -399 +399 @@
 
         /* Class, subclass, prog IF, revision, length(incl \0) 47 */
-        ret = snprintf(match_id_str, ID_MAX_STR_LEN,
+        rc = 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 (ret < 0) {
-                ddf_msg(LVL_ERROR, "Failed creating match ID str");
+        if (rc < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
+                    str_error(rc));
         }
 
@@ -412 +413 @@
 
         /* Class, subclass, prog IF, length(incl \0) 35 */
-        ret = snprintf(match_id_str, ID_MAX_STR_LEN,
+        rc = 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 (ret < 0) {
-                ddf_msg(LVL_ERROR, "Failed creating match ID str");
+        if (rc < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
+                    str_error(rc));
         }
 
@@ -425 +427 @@
 
         /* Class, subclass, length(incl \0) 25 */
-        ret = snprintf(match_id_str, ID_MAX_STR_LEN,
+        rc = snprintf(match_id_str, ID_MAX_STR_LEN,
             "pci/class=%02x&subclass=%02x",
             fun->class_code, fun->subclass_code);
-        if (ret < 0) {
-                ddf_msg(LVL_ERROR, "Failed creating match ID str");
+        if (rc < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
+                    str_error(rc));
         }
 
@@ -438 +441 @@
 
         /* Class, length(incl \0) 13 */
-        ret = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/class=%02x",
+        rc = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/class=%02x",
             fun->class_code);
-        if (ret < 0) {
-                ddf_msg(LVL_ERROR, "Failed creating match ID str");
+        if (rc < 0) {
+                ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
+                    str_error(rc));
         }
 
@@ -510 +514 @@
 #define MEM_MASK (~0xf)
         
-        io = (val & 1) != 0;
+        io = (bool) (val & 1);
         if (io) {
                 addrw64 = false;