Changeset 969585f in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2011-04-01T20:49:28Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0053fa38, 5542b83, c6ba274

Parents:

8e7d724 (diff), ebcb05a (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 mainline changes

File:

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

uspace/drv/pciintel/pci.c

@@ -48 +48 @@
 
 #include <ddf/driver.h>
+#include <ddf/log.h>
 #include <devman.h>
 #include <ipc/devman.h>
@@ -325 +326 @@
 
         if (match_id_str == NULL) {
-                printf(NAME ": out of memory creating match ID.\n");
+                ddf_msg(LVL_ERROR, "Out of memory creating match ID.");
                 return;
         }
@@ -331 +332 @@
         rc = ddf_fun_add_match_id(fun->fnode, match_id_str, 90);
         if (rc != EOK) {
-                printf(NAME ": error adding match ID: %s\n",
+                ddf_msg(LVL_ERROR, "Failed adding match ID: %s",
                     str_error(rc));
         }
@@ -428 +429 @@
         
         if (range_addr != 0) {
-                printf(NAME ": function %s : ", fun->fnode->name);
-                printf("address = %" PRIx64, range_addr);
-                printf(", size = %x\n", (unsigned int) range_size);
+                ddf_msg(LVL_DEBUG, "Function %s : address = %" PRIx64
+                    ", size = %x", fun->fnode->name, range_addr,
+                    (unsigned int) range_size);
         }
         
@@ -455 +456 @@
         hw_res_list->count++;
         
-        printf(NAME ": function %s uses irq %x.\n", fun->fnode->name, irq);
+        ddf_msg(LVL_NOTE, "Function %s uses irq %x.", fun->fnode->name, irq);
 }
 
@@ -511 +512 @@
                         char *fun_name = pci_fun_create_name(fun);
                         if (fun_name == NULL) {
-                                printf(NAME ": out of memory.\n");
+                                ddf_msg(LVL_ERROR, "Out of memory.");
                                 return;
                         }
@@ -517 +518 @@
                         fnode = ddf_fun_create(bus->dnode, fun_inner, fun_name);
                         if (fnode == NULL) {
-                                printf(NAME ": error creating function.\n");
+                                ddf_msg(LVL_ERROR, "Failed creating function.");
                                 return;
                         }
@@ -531 +532 @@
                         fnode->driver_data = fun;
                         
-                        printf(NAME ": adding new function %s.\n",
+                        ddf_msg(LVL_DEBUG, "Adding new function %s.",
                             fnode->name);
                         
@@ -548 +549 @@
                                 child_bus = pci_conf_read_8(fun,
                                     PCI_BRIDGE_SEC_BUS_NUM);
-                                printf(NAME ": device is pci-to-pci bridge, "
-                                    "secondary bus number = %d.\n", bus_num);
+                                ddf_msg(LVL_DEBUG, "Device is pci-to-pci "
+                                    "bridge, secondary bus number = %d.",
+                                    bus_num);
                                 if (child_bus > bus_num)
                                         pci_bus_scan(bus, child_bus);
@@ -571 +573 @@
         int rc;
         
-        printf(NAME ": pci_add_device\n");
+        ddf_msg(LVL_DEBUG, "pci_add_device");
         dnode->parent_phone = -1;
         
         bus = pci_bus_new();
         if (bus == NULL) {
-                printf(NAME ": pci_add_device allocation failed.\n");
+                ddf_msg(LVL_ERROR, "pci_add_device allocation failed.");
                 rc = ENOMEM;
                 goto fail;
@@ -586 +588 @@
             IPC_FLAG_BLOCKING);
         if (dnode->parent_phone < 0) {
-                printf(NAME ": pci_add_device failed to connect to the "
-                    "parent's driver.\n");
+                ddf_msg(LVL_ERROR, "pci_add_device failed to connect to the "
+                    "parent's driver.");
                 rc = dnode->parent_phone;
                 goto fail;
@@ -596 +598 @@
         rc = hw_res_get_resource_list(dnode->parent_phone, &hw_resources);
         if (rc != EOK) {
-                printf(NAME ": pci_add_device failed to get hw resources for "
-                    "the device.\n");
+                ddf_msg(LVL_ERROR, "pci_add_device failed to get hw resources "
+                    "for the device.");
                 goto fail;
         }
         got_res = true;
         
-        printf(NAME ": conf_addr = %" PRIx64 ".\n",
+        ddf_msg(LVL_DEBUG, "conf_addr = %" PRIx64 ".",
             hw_resources.resources[0].res.io_range.address);
         
@@ -614 +616 @@
         if (pio_enable((void *)(uintptr_t)bus->conf_io_addr, 8,
             &bus->conf_addr_port)) {
-                printf(NAME ": failed to enable configuration ports.\n");
+                ddf_msg(LVL_ERROR, "Failed to enable configuration ports.");
                 rc = EADDRNOTAVAIL;
                 goto fail;
@@ -621 +623 @@
         
         /* Make the bus device more visible. It has no use yet. */
-        printf(NAME ": adding a 'ctl' function\n");
+        ddf_msg(LVL_DEBUG, "Adding a 'ctl' function");
         
         ctl = ddf_fun_create(bus->dnode, fun_exposed, "ctl");
         if (ctl == NULL) {
-                printf(NAME ": error creating control function.\n");
+                ddf_msg(LVL_ERROR, "Failed creating control function.");
                 rc = ENOMEM;
                 goto fail;
@@ -632 +634 @@
         rc = ddf_fun_bind(ctl);
         if (rc != EOK) {
-                printf(NAME ": error binding control function.\n");
+                ddf_msg(LVL_ERROR, "Failed binding control function.");
                 goto fail;
         }
         
         /* Enumerate functions. */
-        printf(NAME ": scanning the bus\n");
+        ddf_msg(LVL_DEBUG, "Scanning the bus");
         pci_bus_scan(bus, 0);
         
@@ -659 +661 @@
 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;
@@ -738 +741 @@
 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);