Changes in uspace/drv/isa/isa.c [41b56084:7e752b2] in mainline

File:

• uspace/drv/isa/isa.c (modified) (5 diffs)

uspace/drv/isa/isa.c

@@ -51 +51 @@
 
 #include <driver.h>
-#include <ops/hw_res.h>
+#include <resource.h>
 
 #include <devman.h>
@@ -84 +84 @@
 }
 
-static hw_res_ops_t isa_child_hw_res_ops = {
+static resource_iface_t isa_child_res_iface = {
         &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", (unsigned int) addr, (unsigned int) len,
-                    dev->name);
+                    "device %s\n", addr, len, dev->name);
         }
 }
@@ -490 +489 @@
 static int isa_add_device(device_t *dev)
 {
-        printf(NAME ": isa_add_device, device handle = %d\n",
-            (int) dev->handle);
+        printf(NAME ": isa_add_device, device handle = %d\n", dev->handle);
 
         /* Add child devices. */
@@ -502 +500 @@
 static void isa_init() 
 {
-        isa_child_dev_ops.interfaces[HW_RES_DEV_IFACE] = &isa_child_hw_res_ops;
+        isa_child_dev_ops.interfaces[HW_RES_DEV_IFACE] = &isa_child_res_iface;
 }