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

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

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>
@@ -95 +94 @@
         rc = devmap_device_register(NAMESPACE "/" NAME, &uart->devmap_handle);
         if (rc != EOK) {
-                devmap_hangup_phone(DEVMAP_DRIVER);
                 printf(NAME ": Unable to register device %s.\n",
                     NAMESPACE "/" NAME);
@@ -116 +114 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         int retval;
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 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:
@@ -145 +143 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }
@@ -192 +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. */