Changeset 1ffa73b in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2011-01-10T16:33:08Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b207803

Parents:

863d45e (diff), 6610565b (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 development/ changes

File:

• uspace/drv/pciintel/pci.c (modified) (7 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
@@ -473 +473 @@
         hw_resource_list_t hw_resources;
         
-        rc = 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 "
@@ -497 +497 @@
                 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;
         }
@@ -508 +508 @@
         pci_bus_scan(dev, 0);
         
-        clean_hw_resource_list(&hw_resources);
+        hw_res_clean_resource_list(&hw_resources);
         
         return EOK;
@@ -515 +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;
 }
 
@@ -537 +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);
         }