Changeset 6610565b in mainline for uspace/drv

Timestamp:

2011-01-10T16:20:56Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1ffa73b, 8048c648, 8426912a, 977fcea, f401312

Parents:

a97ea0f (diff), 4a5c6c1 (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

Location:

uspace/drv

Files:

• isa/isa.c (modified) (3 diffs)
• ns8250/ns8250.c (modified) (5 diffs)
• pciintel/pci.c (modified) (7 diffs)
• rootpc/rootpc.c (modified) (3 diffs)
• test1/char.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;
 }
 

uspace/drv/ns8250/ns8250.c

@@ -53 +53 @@
 
 #include <driver.h>
-#include <char.h>
-#include <resource.h>
+#include <ops/char_dev.h>
 
 #include <devman.h>
@@ -227 +226 @@
 
 /** The character interface's callbacks. */
-static char_iface_t ns8250_char_iface = {
+static char_dev_ops_t ns8250_char_dev_ops = {
         .read = &ns8250_read,
         .write = &ns8250_write
@@ -347 +346 @@
         
         /* Get hw resources. */
-        ret = get_hw_resources(dev->parent_phone, &hw_resources);
+        ret = hw_res_get_resource_list(dev->parent_phone, &hw_resources);
         if (ret != EOK) {
                 printf(NAME ": failed to get hw resources for the device "
@@ -394 +393 @@
         }
         
-        clean_hw_resource_list(&hw_resources);
+        hw_res_clean_resource_list(&hw_resources);
         return ret;
         
 failed:
         ns8250_dev_cleanup(dev);
-        clean_hw_resource_list(&hw_resources);
+        hw_res_clean_resource_list(&hw_resources);
         return ret;
 }
@@ -924 +923 @@
         ns8250_dev_ops.close = &ns8250_close;
         
-        ns8250_dev_ops.interfaces[CHAR_DEV_IFACE] = &ns8250_char_iface;
+        ns8250_dev_ops.interfaces[CHAR_DEV_IFACE] = &ns8250_char_dev_ops;
         ns8250_dev_ops.default_handler = &ns8250_default_handler;
 }

uspace/drv/pciintel/pci.c

@@ -49 +49 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-#include <resource.h>
+#include <ops/hw_res.h>
 #include <device/hw_res.h>
 #include <ddi.h>
@@ -77 +77 @@
 }
 
-static resource_iface_t pciintel_child_res_iface = {
+static hw_res_ops_t pciintel_child_hw_res_ops = {
         &pciintel_get_child_resources,
         &pciintel_enable_child_interrupt
@@ -473 +473 @@
         hw_resource_list_t hw_resources;
         
-        rc = get_hw_resources(dev->parent_phone, &hw_resources);
+        rc = hw_res_get_resource_list(dev->parent_phone, &hw_resources);
         if (rc != EOK) {
                 printf(NAME ": pci_add_device failed to get hw resources for "
@@ -497 +497 @@
                 delete_pci_bus_data(bus_data);
                 ipc_hangup(dev->parent_phone);
-                clean_hw_resource_list(&hw_resources);
+                hw_res_clean_resource_list(&hw_resources);
                 return EADDRNOTAVAIL;
         }
@@ -508 +508 @@
         pci_bus_scan(dev, 0);
         
-        clean_hw_resource_list(&hw_resources);
+        hw_res_clean_resource_list(&hw_resources);
         
         return EOK;
@@ -515 +515 @@
 static void pciintel_init(void)
 {
-        pci_child_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_child_res_iface;
+        pci_child_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_child_hw_res_ops;
 }
 
@@ -537 +537 @@
 {
         if (dev_data != NULL) {
-                clean_hw_resource_list(&dev_data->hw_resources);
+                hw_res_clean_resource_list(&dev_data->hw_resources);
                 free(dev_data);
         }

uspace/drv/rootpc/rootpc.c

@@ -50 +50 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-#include <resource.h>
+#include <ops/hw_res.h>
 #include <device/hw_res.h>
 
@@ -107 +107 @@
 }
 
-static resource_iface_t child_res_iface = {
+static hw_res_ops_t child_hw_res_ops = {
         &rootpc_get_child_resources,
         &rootpc_enable_child_interrupt
@@ -190 +190 @@
 static void root_pc_init(void)
 {
-        rootpc_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_res_iface;
+        rootpc_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_hw_res_ops;
 }
 

uspace/drv/test1/char.c

@@ -33 +33 @@
 #include <errno.h>
 #include <mem.h>
-#include <char.h>
+#include <ops/char_dev.h>
 
 #include "test1.h"
@@ -46 +46 @@
 }
 
-static char_iface_t char_interface = {
+static char_dev_ops_t char_dev_ops = {
         .read = &impl_char_read,
         .write = &imp_char_write
@@ -52 +52 @@
 
 device_ops_t char_device_ops = {
-        .interfaces[CHAR_DEV_IFACE] = &char_interface
+        .interfaces[CHAR_DEV_IFACE] = &char_dev_ops
 };