Changeset 973ef9fc in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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) (4 diffs)

uspace/drv/pciintel/pci.c

@@ -323 +323 @@
         if (range_addr != 0) {
                 printf(NAME ": device %s : ", dev->name);
-                printf("address = %x", range_addr);
-                printf(", size = %x\n", range_size);
+                printf("address = %" PRIx64, range_addr);
+                printf(", size = %x\n", (unsigned int) range_size);
         }
         
@@ -452 +452 @@
 static int pci_add_device(device_t *dev)
 {
+        int rc;
+
         printf(NAME ": pci_add_device\n");
         
@@ -466 +468 @@
                     "parent's driver.\n");
                 delete_pci_bus_data(bus_data);
-                return EPARTY;  /* FIXME: use another EC */
+                return dev->parent_phone;
         }
         
         hw_resource_list_t hw_resources;
         
-        if (!get_hw_resources(dev->parent_phone, &hw_resources)) {
+        rc = get_hw_resources(dev->parent_phone, &hw_resources);
+        if (rc != EOK) {
                 printf(NAME ": pci_add_device failed to get hw resources for "
                     "the device.\n");
                 delete_pci_bus_data(bus_data);
                 ipc_hangup(dev->parent_phone);
-                return EPARTY;  /* FIXME: use another EC */
+                return rc;
         }       
         
-        printf(NAME ": conf_addr = %x.\n",
+        printf(NAME ": conf_addr = %" PRIx64 ".\n",
             hw_resources.resources[0].res.io_range.address);
         
@@ -489 +492 @@
             (uint32_t) hw_resources.resources[0].res.io_range.address;
         
-        if (pio_enable((void *)bus_data->conf_io_addr, 8,
+        if (pio_enable((void *)(uintptr_t)bus_data->conf_io_addr, 8,
             &bus_data->conf_addr_port)) {
                 printf(NAME ": failed to enable configuration ports.\n");