Changeset b7068da in mainline for uspace/drv/bus/pci/pciintel/pci.c

Timestamp:

2012-02-09T20:35:12Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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/bus/pci/pciintel/pci.c (modified) (2 diffs)

uspace/drv/bus/pci/pciintel/pci.c

@@ -92 +92 @@
 static bool pciintel_enable_interrupt(ddf_fun_t *fnode)
 {
-        /* This is an old ugly way, copied from ne2000 driver */
+        /* This is an old ugly way */
         assert(fnode);
         pci_fun_t *dev_data = (pci_fun_t *) fnode->driver_data;
@@ -187 +187 @@
 
 static hw_res_ops_t pciintel_hw_res_ops = {
-        &pciintel_get_resources,
-        &pciintel_enable_interrupt
+        .get_resource_list = &pciintel_get_resources,
+        .enable_interrupt = &pciintel_enable_interrupt,
 };