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

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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) (8 diffs)

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

@@ -39 +39 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <devmap.h>
+#include <loc.h>
 #include <ipc/char.h>
 #include <async.h>
@@ -48 +48 @@
 #include <errno.h>
 #include <inttypes.h>
-
 #include "s3c24xx_uart.h"
 
-#define NAME "s3c24ser"
-#define NAMESPACE "char"
+#define NAME       "s3c24ser"
+#define NAMESPACE  "char"
 
 static irq_cmd_t uart_irq_cmds[] = {
@@ -68 +67 @@
 static s3c24xx_uart_t *uart;
 
-static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall);
+static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg);
 static void s3c24xx_uart_irq_handler(ipc_callid_t iid, ipc_call_t *call);
 static int s3c24xx_uart_init(s3c24xx_uart_t *uart);
@@ -79 +79 @@
         printf(NAME ": S3C24xx on-chip UART driver\n");
 
-        rc = devmap_driver_register(NAME, s3c24xx_uart_connection);
+        rc = loc_server_register(NAME, s3c24xx_uart_connection);
         if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
+                printf(NAME ": Unable to register server.\n");
                 return -1;
         }
@@ -92 +92 @@
                 return -1;
 
-        rc = devmap_device_register(NAMESPACE "/" NAME, &uart->devmap_handle);
+        rc = loc_service_register(NAMESPACE "/" NAME, &uart->service_id);
         if (rc != EOK) {
                 printf(NAME ": Unable to register device %s.\n",
@@ -110 +110 @@
 
 /** Character device connection handler. */
-static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall)
-{
-        ipc_callid_t callid;
-        ipc_call_t call;
-        sysarg_t method;
-        int retval;
-
+static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg)
+{
         /* 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);
-                switch (method) {
-                case IPC_M_PHONE_HUNGUP:
+        
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                sysarg_t method = IPC_GET_IMETHOD(call);
+                
+                if (!method) {
                         /* The other side has hung up. */
                         async_answer_0(callid, EOK);
                         return;
-                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_answer_0(callid, retval);
+                
+                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);
+                        }
+                }
         }
 }
@@ -155 +158 @@
                 uint32_t status = pio_read_32(&uart->io->uerstat);
 
-                if (uart->client_phone != -1) {
-                        async_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);
                 }
 
@@ -183 +187 @@
 
         uart->io = vaddr;
-        uart->client_phone = -1;
+        uart->client_sess = NULL;
 
         printf(NAME ": device at physical address %p, inr %" PRIun ".\n",