Changeset 6843a9c in mainline for uspace/drv/infrastructure/rootmac/rootmac.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/drv/infrastructure/rootmac/rootmac.c (modified) (3 diffs)

uspace/drv/infrastructure/rootmac/rootmac.c

@@ -125 +125 @@
  *
  */
-static int rootmac_add_device(ddf_dev_t *dev)
+static int rootmac_dev_add(ddf_dev_t *dev)
 {
         /* Register functions */
@@ -136 +136 @@
 /** The root device driver's standard operations. */
 static driver_ops_t rootmac_ops = {
-        .add_device = &rootmac_add_device
+        .dev_add = &rootmac_dev_add
 };
 
@@ -161 +161 @@
 
 static hw_res_ops_t fun_hw_res_ops = {
-        &rootmac_get_resources,
-        &rootmac_enable_interrupt
+        .get_resource_list = &rootmac_get_resources,
+        .enable_interrupt = &rootmac_enable_interrupt
 };