Changes in uspace/drv/ns8250/ns8250.c [77429d3:be942bc] in mainline

File:

• uspace/drv/ns8250/ns8250.c (modified) (6 diffs)

uspace/drv/ns8250/ns8250.c

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