Changeset 83a2f43 in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2011-02-15T19:43:50Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

af6b5157

Parents:

34588a80

Message:

Rename bunch of stuff so that it starts with 'ddf_'.

File:

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

uspace/drv/pciintel/pci.c

@@ -72 +72 @@
 #define PCI_BUS_FROM_FUN(fun) ((fun)->busptr)
 
-static hw_resource_list_t *pciintel_get_resources(function_t *fnode)
+static hw_resource_list_t *pciintel_get_resources(ddf_fun_t *fnode)
 {
         pci_fun_t *fun = PCI_FUN(fnode);
@@ -81 +81 @@
 }
 
-static bool pciintel_enable_interrupt(function_t *fnode)
+static bool pciintel_enable_interrupt(ddf_fun_t *fnode)
 {
         /* TODO */
@@ -93 +93 @@
 };
 
-static device_ops_t pci_fun_ops;
-
-static int pci_add_device(device_t *);
+static ddf_dev_ops_t pci_fun_ops;
+
+static int pci_add_device(ddf_dev_t *);
 
 /** PCI bus driver standard operations */
@@ -367 +367 @@
 void pci_bus_scan(pci_bus_t *bus, int bus_num) 
 {
-        function_t *fnode;
+        ddf_fun_t *fnode;
         pci_fun_t *fun;
         
@@ -459 +459 @@
 }
 
-static int pci_add_device(device_t *dnode)
+static int pci_add_device(ddf_dev_t *dnode)
 {
         pci_bus_t *bus = NULL;
-        function_t *ctl = NULL;
+        ddf_fun_t *ctl = NULL;
         bool got_res = false;
         int rc;
@@ -633 +633 @@
         printf(NAME ": HelenOS pci bus driver (intel method 1).\n");
         pciintel_init();
-        return driver_main(&pci_driver);
+        return ddf_driver_main(&pci_driver);
 }