Changeset 80cd7cd in mainline for uspace/drv/isa/isa.c

Timestamp:

2011-01-13T20:58:24Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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/isa/isa.c (modified) (3 diffs)

uspace/drv/isa/isa.c

@@ -51 +51 @@
 
 #include <driver.h>
-#include <resource.h>
+#include <ops/hw_res.h>
 
 #include <devman.h>
@@ -84 +84 @@
 }
 
-static resource_iface_t isa_child_res_iface = {
+static hw_res_ops_t isa_child_hw_res_ops = {
         &isa_get_child_resources,
         &isa_enable_child_interrupt
@@ -502 +502 @@
 static void isa_init() 
 {
-        isa_child_dev_ops.interfaces[HW_RES_DEV_IFACE] = &isa_child_res_iface;
+        isa_child_dev_ops.interfaces[HW_RES_DEV_IFACE] = &isa_child_hw_res_ops;
 }