Changeset 5da7199 in mainline for uspace/srv/hw/char

Timestamp:

2011-09-09T17:18:06Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3781092, b7c33b0

Parents:

c69646f8

Message:

remove the obsolete async API

Location:

uspace/srv/hw/char

Files:

• i8042/i8042.c (modified) (6 diffs)
• i8042/i8042.h (modified) (3 diffs)
• s3c24xx_uart/s3c24xx_uart.c (modified) (6 diffs)
• s3c24xx_uart/s3c24xx_uart.h (modified) (2 diffs)

uspace/srv/hw/char/i8042/i8042.c

@@ -32 +32 @@
  * @ingroup kbd
  * @{
- */ 
+ */
 /** @file
  * @brief i8042 PS/2 port driver.
@@ -41 +41 @@
 #include <loc.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <unistd.h>
 #include <sysinfo.h>
@@ -49 +48 @@
 #include "i8042.h"
 
-// FIXME: remove this header
-#include <abi/ipc/methods.h>
-
-#define NAME "i8042"
-#define NAMESPACE "char"
+#define NAME       "i8042"
+#define NAMESPACE  "char"
 
 /* Interesting bits for status register */
@@ -145 +141 @@
 
         for (i = 0; i < MAX_DEVS; i++) {
-                i8042_port[i].client_phone = -1;
+                i8042_port[i].client_sess = NULL;
 
                 snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]);
@@ -257 +253 @@
                 }
                 
-                switch (method) {
-                case IPC_M_CONNECT_TO_ME:
-                        printf(NAME ": creating callback connection\n");
-                        if (i8042_port[dev_id].client_phone != -1) {
+                async_sess_t *sess =
+                    async_callback_receive_start(EXCHANGE_SERIALIZE, &call);
+                if (sess != NULL) {
+                        if (i8042_port[dev_id].client_sess == NULL) {
+                                i8042_port[dev_id].client_sess = sess;
+                                retval = EOK;
+                        } else
                                 retval = ELIMIT;
+                } else {
+                        switch (method) {
+                        case IPC_FIRST_USER_METHOD:
+                                printf(NAME ": write %" PRIun " to devid %d\n",
+                                    IPC_GET_ARG1(call), dev_id);
+                                i8042_port_write(dev_id, IPC_GET_ARG1(call));
+                                retval = 0;
+                                break;
+                        default:
+                                retval = EINVAL;
                                 break;
                         }
-                        i8042_port[dev_id].client_phone = IPC_GET_ARG5(call);
-                        retval = 0;
-                        break;
-                case IPC_FIRST_USER_METHOD:
-                        printf(NAME ": write %" PRIun " to devid %d\n",
-                            IPC_GET_ARG1(call), dev_id);
-                        i8042_port_write(dev_id, IPC_GET_ARG1(call));
-                        retval = 0;
-                        break;
-                default:
-                        retval = EINVAL;
-                        break;
                 }
+                
                 async_answer_0(callid, retval);
         }
@@ -305 +303 @@
         }
 
-        if (i8042_port[devid].client_phone != -1) {
-                async_obsolete_msg_1(i8042_port[devid].client_phone,
-                    IPC_FIRST_USER_METHOD, data);
+        if (i8042_port[devid].client_sess != NULL) {
+                async_exch_t *exch =
+                    async_exchange_begin(i8042_port[devid].client_sess);
+                async_msg_1(exch, IPC_FIRST_USER_METHOD, data);
+                async_exchange_end(exch);
         }
 }

uspace/srv/hw/char/i8042/i8042.h

@@ -39 +39 @@
 #define i8042_H_
 
+#include <sys/types.h>
 #include <libarch/ddi.h>
-#include <libarch/types.h>
+#include <async.h>
 
 /** i8042 HW I/O interface */
@@ -53 +54 @@
 typedef struct {
         service_id_t service_id;
-        int client_phone;
+        async_sess_t *client_sess;
 } i8042_port_t;
 
@@ -60 +61 @@
 /**
  * @}
- */ 
+ */

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[] = {
@@ -117 +113 @@
     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 +127 @@
                 }
                 
-                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 +158 @@
                 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 +187 @@
 
         uart->io = vaddr;
-        uart->client_phone = -1;
+        uart->client_sess = NULL;
 
         printf(NAME ": device at physical address %p, inr %" PRIun ".\n",

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h

@@ -39 +39 @@
 
 #include <sys/types.h>
+#include <async.h>
 
 /** S3C24xx UART I/O */
@@ -84 +85 @@
         s3c24xx_uart_io_t *io;
 
-        /** Callback phone to the client */
-        int client_phone;
+        /** Callback session to the client */
+        async_sess_t *client_sess;
 
         /** Service ID */