Changes in uspace/drv/ns8250/ns8250.c [ffa2c8ef:7e752b2] in mainline

File:

• uspace/drv/ns8250/ns8250.c (modified) (13 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
@@ -256 +257 @@
         
         if (dev->parent_phone > 0) {
-                async_hangup(dev->parent_phone);
+                ipc_hangup(dev->parent_phone);
                 dev->parent_phone = 0;
         }
@@ -273 +274 @@
         
         /* Gain control over port's registers. */
-        if (pio_enable((void *)(uintptr_t) data->io_addr, REG_COUNT,
+        if (pio_enable((void *) data->io_addr, REG_COUNT,
             (void **) &data->port)) {
                 printf(NAME ": error - cannot gain the port %#" PRIx32 " for device "
@@ -341 +342 @@
                 printf(NAME ": failed to connect to the parent driver of the "
                     "device %s.\n", dev->name);
-                ret = dev->parent_phone;
+                ret = EPARTY;   /* FIXME: use another EC */
                 goto failed;
         }
         
         /* Get hw resources. */
-        ret = hw_res_get_resource_list(dev->parent_phone, &hw_resources);
-        if (ret != EOK) {
+        if (!get_hw_resources(dev->parent_phone, &hw_resources)) {
                 printf(NAME ": failed to get hw resources for the device "
                     "%s.\n", dev->name);
+                ret = EPARTY;   /* FIXME: use another EC */
                 goto failed;
         }
@@ -373 +374 @@
                                 printf(NAME ": i/o range assigned to the device "
                                     "%s is too small.\n", dev->name);
-                                ret = ELIMIT;
+                                ret = EPARTY;   /* FIXME: use another EC */
                                 goto failed;
                         }
@@ -389 +390 @@
                 printf(NAME ": missing hw resource(s) for the device %s.\n",
                     dev->name);
-                ret = ENOENT;
+                ret = EPARTY;   /* FIXME: use another EC */
                 goto failed;
         }
         
-        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. */
@@ -720 +727 @@
 {
         printf(NAME ": ns8250_add_device %s (handle = %d)\n",
-            dev->name, (int) dev->handle);
+            dev->name, dev->handle);
         
         int res = ns8250_dev_initialize(dev);
@@ -880 +887 @@
     ipc_call_t *call)
 {
-        sysarg_t method = IPC_GET_IMETHOD(*call);
+        ipcarg_t method = IPC_GET_METHOD(*call);
         int ret;
         unsigned int baud_rate, parity, word_length, stop_bits;
@@ -888 +895 @@
                 ns8250_get_props(dev, &baud_rate, &parity, &word_length,
                     &stop_bits);
-                async_answer_4(callid, EOK, baud_rate, parity, word_length,
+                ipc_answer_4(callid, EOK, baud_rate, parity, word_length,
                     stop_bits);
                 break;
@@ -899 +906 @@
                 ret = ns8250_set_props(dev, baud_rate, parity, word_length,
                     stop_bits);
-                async_answer_0(callid, ret);
+                ipc_answer_0(callid, ret);
                 break;
                 
         default:
-                async_answer_0(callid, ENOTSUP);
+                ipc_answer_0(callid, ENOTSUP);
         }
 }
@@ -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;
 }