Changeset 357b5f5 in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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) (9 diffs)

uspace/drv/pciintel/pci.c

@@ -49 +49 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-#include <resource.h>
+#include <ops/hw_res.h>
 #include <device/hw_res.h>
 #include <ddi.h>
@@ -77 +77 @@
 }
 
-static resource_iface_t pciintel_child_res_iface = {
+static hw_res_ops_t pciintel_child_hw_res_ops = {
         &pciintel_get_child_resources,
         &pciintel_enable_child_interrupt
@@ -324 +324 @@
                 printf(NAME ": device %s : ", dev->name);
                 printf("address = %" PRIx64, range_addr);
-                printf(", size = %x\n", range_size);
+                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 = hw_res_get_resource_list(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;
         }       
         
@@ -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");
                 delete_pci_bus_data(bus_data);
                 ipc_hangup(dev->parent_phone);
-                clean_hw_resource_list(&hw_resources);
+                hw_res_clean_resource_list(&hw_resources);
                 return EADDRNOTAVAIL;
         }
@@ -505 +508 @@
         pci_bus_scan(dev, 0);
         
-        clean_hw_resource_list(&hw_resources);
+        hw_res_clean_resource_list(&hw_resources);
         
         return EOK;
@@ -512 +515 @@
 static void pciintel_init(void)
 {
-        pci_child_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_child_res_iface;
+        pci_child_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_child_hw_res_ops;
 }
 
@@ -534 +537 @@
 {
         if (dev_data != NULL) {
-                clean_hw_resource_list(&dev_data->hw_resources);
+                hw_res_clean_resource_list(&dev_data->hw_resources);
                 free(dev_data);
         }