Changeset 80cd7cd in mainline for uspace/drv/ns8250/ns8250.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/ns8250/ns8250.c (modified) (6 diffs)

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;
 }
@@ -432 +431 @@
 {
         ns8250_dev_data_t *data = (ns8250_dev_data_t *) dev->driver_data;
-        int res;
-        
-        /* Enable interrupt globally. */
-        res = interrupt_enable(data->irq);
-        if (res != EOK)
-                return res;
         
         /* Enable interrupt on the serial port. */
@@ -924 +917 @@
         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;
 }