Changes in uspace/drv/pciintel/pci.c [5857be2:91579d5] in mainline

File:

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

uspace/drv/pciintel/pci.c

@@ -48 +48 @@
 
 #include <ddf/driver.h>
-#include <ddf/log.h>
 #include <devman.h>
 #include <ipc/devman.h>
@@ -96 +95 @@
         sysarg_t i8259;
 
-        int irc_phone = ENOTSUP;
-
-        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
-            || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) {
-                irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
-        }
-
+        int irc_phone = -1;
+        int irc_service = -1;
+
+        if ((sysinfo_get_value("apic", &apic) == EOK) && (apic)) {
+                irc_service = SERVICE_APIC;
+        } else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)) {
+                irc_service = SERVICE_I8259;
+        }
+
+        if (irc_service == -1) {
+                return false;
+        }
+
+        irc_phone = service_connect_blocking(irc_service, 0, 0);
         if (irc_phone < 0) {
                 return false;
         }
 
-        size_t i = 0;
-        hw_resource_list_t *res = &dev_data->hw_resources;
-        for (; i < res->count; i++) {
-                if (res->resources[i].type == INTERRUPT) {
-                        const int irq = res->resources[i].res.interrupt.irq;
-                        const int rc =
-                            async_req_1_0(irc_phone, IRC_ENABLE_INTERRUPT, irq);
+        size_t i;
+        for (i = 0; i < dev_data->hw_resources.count; i++) {
+                if (dev_data->hw_resources.resources[i].type == INTERRUPT) {
+                        int irq = dev_data->hw_resources.resources[i].res.interrupt.irq;
+                        int rc = async_req_1_0(irc_phone, IRC_ENABLE_INTERRUPT, irq);
                         if (rc != EOK) {
                                 async_hangup(irc_phone);
@@ -328 +332 @@
 
         if (match_id_str == NULL) {
-                ddf_msg(LVL_ERROR, "Out of memory creating match ID.");
+                printf(NAME ": out of memory creating match ID.\n");
                 return;
         }
@@ -334 +338 @@
         rc = ddf_fun_add_match_id(fun->fnode, match_id_str, 90);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding match ID: %s",
+                printf(NAME ": error adding match ID: %s\n",
                     str_error(rc));
         }
@@ -431 +435 @@
         
         if (range_addr != 0) {
-                ddf_msg(LVL_DEBUG, "Function %s : address = %" PRIx64
-                    ", size = %x", fun->fnode->name, range_addr,
-                    (unsigned int) range_size);
+                printf(NAME ": function %s : ", fun->fnode->name);
+                printf("address = %" PRIx64, range_addr);
+                printf(", size = %x\n", (unsigned int) range_size);
         }
         
@@ -458 +462 @@
         hw_res_list->count++;
         
-        ddf_msg(LVL_NOTE, "Function %s uses irq %x.", fun->fnode->name, irq);
+        printf(NAME ": function %s uses irq %x.\n", fun->fnode->name, irq);
 }
 
@@ -514 +518 @@
                         char *fun_name = pci_fun_create_name(fun);
                         if (fun_name == NULL) {
-                                ddf_msg(LVL_ERROR, "Out of memory.");
+                                printf(NAME ": out of memory.\n");
                                 return;
                         }
@@ -520 +524 @@
                         fnode = ddf_fun_create(bus->dnode, fun_inner, fun_name);
                         if (fnode == NULL) {
-                                ddf_msg(LVL_ERROR, "Failed creating function.");
+                                printf(NAME ": error creating function.\n");
                                 return;
                         }
@@ -534 +538 @@
                         fnode->driver_data = fun;
                         
-                        ddf_msg(LVL_DEBUG, "Adding new function %s.",
+                        printf(NAME ": adding new function %s.\n",
                             fnode->name);
                         
@@ -551 +555 @@
                                 child_bus = pci_conf_read_8(fun,
                                     PCI_BRIDGE_SEC_BUS_NUM);
-                                ddf_msg(LVL_DEBUG, "Device is pci-to-pci "
-                                    "bridge, secondary bus number = %d.",
-                                    bus_num);
+                                printf(NAME ": device is pci-to-pci bridge, "
+                                    "secondary bus number = %d.\n", bus_num);
                                 if (child_bus > bus_num)
                                         pci_bus_scan(bus, child_bus);
@@ -575 +578 @@
         int rc;
         
-        ddf_msg(LVL_DEBUG, "pci_add_device");
+        printf(NAME ": pci_add_device\n");
         dnode->parent_phone = -1;
         
         bus = pci_bus_new();
         if (bus == NULL) {
-                ddf_msg(LVL_ERROR, "pci_add_device allocation failed.");
+                printf(NAME ": pci_add_device allocation failed.\n");
                 rc = ENOMEM;
                 goto fail;
@@ -590 +593 @@
             IPC_FLAG_BLOCKING);
         if (dnode->parent_phone < 0) {
-                ddf_msg(LVL_ERROR, "pci_add_device failed to connect to the "
-                    "parent's driver.");
+                printf(NAME ": pci_add_device failed to connect to the "
+                    "parent's driver.\n");
                 rc = dnode->parent_phone;
                 goto fail;
@@ -600 +603 @@
         rc = hw_res_get_resource_list(dnode->parent_phone, &hw_resources);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "pci_add_device failed to get hw resources "
-                    "for the device.");
+                printf(NAME ": pci_add_device failed to get hw resources for "
+                    "the device.\n");
                 goto fail;
         }
         got_res = true;
         
-        ddf_msg(LVL_DEBUG, "conf_addr = %" PRIx64 ".",
+        printf(NAME ": conf_addr = %" PRIx64 ".\n",
             hw_resources.resources[0].res.io_range.address);
         
@@ -618 +621 @@
         if (pio_enable((void *)(uintptr_t)bus->conf_io_addr, 8,
             &bus->conf_addr_port)) {
-                ddf_msg(LVL_ERROR, "Failed to enable configuration ports.");
+                printf(NAME ": failed to enable configuration ports.\n");
                 rc = EADDRNOTAVAIL;
                 goto fail;
@@ -625 +628 @@
         
         /* Make the bus device more visible. It has no use yet. */
-        ddf_msg(LVL_DEBUG, "Adding a 'ctl' function");
+        printf(NAME ": adding a 'ctl' function\n");
         
         ctl = ddf_fun_create(bus->dnode, fun_exposed, "ctl");
         if (ctl == NULL) {
-                ddf_msg(LVL_ERROR, "Failed creating control function.");
+                printf(NAME ": error creating control function.\n");
                 rc = ENOMEM;
                 goto fail;
@@ -636 +639 @@
         rc = ddf_fun_bind(ctl);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding control function.");
+                printf(NAME ": error binding control function.\n");
                 goto fail;
         }
         
         /* Enumerate functions. */
-        ddf_msg(LVL_DEBUG, "Scanning the bus");
+        printf(NAME ": scanning the bus\n");
         pci_bus_scan(bus, 0);
         
@@ -663 +666 @@
 static void pciintel_init(void)
 {
-        ddf_log_init(NAME, LVL_ERROR);
         pci_fun_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops;
         pci_fun_ops.interfaces[PCI_DEV_IFACE] = &pci_dev_ops;
@@ -743 +745 @@
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS PCI bus driver (Intel method 1).\n");
+        printf(NAME ": HelenOS pci bus driver (intel method 1).\n");
         pciintel_init();
         return ddf_driver_main(&pci_driver);