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

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (9 diffs)

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

@@ -42 +42 @@
 #include <ipc/char.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -51 +50 @@
 #include "s3c24xx_uart.h"
 
-// FIXME: remove this header
-#include <abi/ipc/methods.h>
-
-#define NAME "s3c24ser"
-#define NAMESPACE "char"
+#define NAME       "s3c24ser"
+#define NAMESPACE  "char"
 
 static irq_cmd_t uart_irq_cmds[] = {
@@ -64 +60 @@
 
 static irq_code_t uart_irq_code = {
+        0,
+        NULL,
         sizeof(uart_irq_cmds) / sizeof(irq_cmd_t),
         uart_irq_cmds
@@ -83 +81 @@
         printf(NAME ": S3C24xx on-chip UART driver\n");
 
-        rc = loc_server_register(NAME, s3c24xx_uart_connection);
+        async_set_client_connection(s3c24xx_uart_connection);
+        rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf(NAME ": Unable to register server.\n");
@@ -117 +116 @@
     void *arg)
 {
-        ipc_callid_t callid;
-        ipc_call_t call;
-        sysarg_t method;
-        int retval;
-
         /* Answer the IPC_M_CONNECT_ME_TO call. */
         async_answer_0(iid, EOK);
-
-        while (1) {
-                callid = async_get_call(&call);
-                method = IPC_GET_IMETHOD(call);
+        
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                sysarg_t method = IPC_GET_IMETHOD(call);
                 
                 if (!method) {
@@ -135 +130 @@
                 }
                 
-                switch (method) {
-                case IPC_M_CONNECT_TO_ME:
-                        printf(NAME ": creating callback connection\n");
-                        uart->client_phone = IPC_GET_ARG5(call);
-                        retval = 0;
-                        break;
-                case CHAR_WRITE_BYTE:
-                        printf(NAME ": write %" PRIun " to device\n",
-                            IPC_GET_ARG1(call));
-                        s3c24xx_uart_sendb(uart, (uint8_t) IPC_GET_ARG1(call));
-                        retval = 0;
-                        break;
-                default:
-                        retval = EINVAL;
-                        break;
+                async_sess_t *sess =
+                    async_callback_receive_start(EXCHANGE_SERIALIZE, &call);
+                if (sess != NULL) {
+                        if (uart->client_sess == NULL) {
+                                uart->client_sess = sess;
+                                async_answer_0(callid, EOK);
+                        } else
+                                async_answer_0(callid, ELIMIT);
+                } else {
+                        switch (method) {
+                        case CHAR_WRITE_BYTE:
+                                printf(NAME ": write %" PRIun " to device\n",
+                                    IPC_GET_ARG1(call));
+                                s3c24xx_uart_sendb(uart, (uint8_t) IPC_GET_ARG1(call));
+                                async_answer_0(callid, EOK);
+                                break;
+                        default:
+                                async_answer_0(callid, EINVAL);
+                        }
                 }
-                async_answer_0(callid, retval);
         }
 }
@@ -163 +161 @@
                 uint32_t status = pio_read_32(&uart->io->uerstat);
 
-                if (uart->client_phone != -1) {
-                        async_obsolete_msg_1(uart->client_phone, CHAR_NOTIF_BYTE,
-                            data);
+                if (uart->client_sess != NULL) {
+                        async_exch_t *exch = async_exchange_begin(uart->client_sess);
+                        async_msg_1(exch, CHAR_NOTIF_BYTE, data);
+                        async_exchange_end(exch);
                 }
 
@@ -191 +190 @@
 
         uart->io = vaddr;
-        uart->client_phone = -1;
+        uart->client_sess = NULL;
 
         printf(NAME ": device at physical address %p, inr %" PRIun ".\n",
@@ -198 +197 @@
         async_set_interrupt_received(s3c24xx_uart_irq_handler);
 
-        register_irq(inr, device_assign_devno(), 0, &uart_irq_code);
+        irq_register(inr, device_assign_devno(), 0, &uart_irq_code);
 
         /* Enable FIFO, Tx trigger level: empty, Rx trigger level: 1 byte. */