Changeset 92574f4 in mainline for uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (5 diffs)

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

@@ -40 +40 @@
 #include <libarch/ddi.h>
 #include <devmap.h>
-#include <ipc/ipc.h>
 #include <ipc/char.h>
 #include <async.h>
@@ -119 +118 @@
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         while (1) {
@@ -127 +126 @@
                 case IPC_M_PHONE_HUNGUP:
                         /* The other side has hung up. */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         return;
                 case IPC_M_CONNECT_TO_ME:
@@ -144 +143 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }
@@ -191 +190 @@
         async_set_interrupt_received(s3c24xx_uart_irq_handler);
 
-        ipc_register_irq(inr, device_assign_devno(), 0, &uart_irq_code);
+        register_irq(inr, device_assign_devno(), 0, &uart_irq_code);
 
         /* Enable FIFO, Tx trigger level: empty, Rx trigger level: 1 byte. */