Changeset 357b5f5 in mainline for uspace/drv/isa/isa.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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) (5 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
@@ -282 +282 @@
 
                 printf(NAME ": added io range (addr=0x%x, size=0x%x) to "
-                    "device %s\n", addr, len, dev->name);
+                    "device %s\n", (unsigned int) addr, (unsigned int) len,
+                    dev->name);
         }
 }
@@ -489 +490 @@
 static int isa_add_device(device_t *dev)
 {
-        printf(NAME ": isa_add_device, device handle = %d\n", dev->handle);
+        printf(NAME ": isa_add_device, device handle = %d\n",
+            (int) dev->handle);
 
         /* Add child devices. */
@@ -500 +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;
 }