Changeset 8b5690f in mainline for uspace/drv/ns8250/ns8250.c

Timestamp:

2011-02-03T05:11:01Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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) (4 diffs)

uspace/drv/ns8250/ns8250.c

@@ -256 +256 @@
         
         if (dev->parent_phone > 0) {
-                ipc_hangup(dev->parent_phone);
+                async_hangup(dev->parent_phone);
                 dev->parent_phone = 0;
         }
@@ -431 +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. */
@@ -894 +888 @@
                 ns8250_get_props(dev, &baud_rate, &parity, &word_length,
                     &stop_bits);
-                ipc_answer_4(callid, EOK, baud_rate, parity, word_length,
+                async_answer_4(callid, EOK, baud_rate, parity, word_length,
                     stop_bits);
                 break;
@@ -905 +899 @@
                 ret = ns8250_set_props(dev, baud_rate, parity, word_length,
                     stop_bits);
-                ipc_answer_0(callid, ret);
+                async_answer_0(callid, ret);
                 break;
                 
         default:
-                ipc_answer_0(callid, ENOTSUP);
+                async_answer_0(callid, ENOTSUP);
         }
 }