Changes in uspace/srv/hw/char/i8042/i8042.c [5da7199:ffa2c8ef] in mainline

File:

• uspace/srv/hw/char/i8042/i8042.c (modified) (10 diffs)

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

@@ -32 +32 @@
  * @ingroup kbd
  * @{
- */
+ */ 
 /** @file
  * @brief i8042 PS/2 port driver.
@@ -39 +39 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <loc.h>
+#include <devmap.h>
 #include <async.h>
 #include <unistd.h>
@@ -46 +46 @@
 #include <errno.h>
 #include <inttypes.h>
+
 #include "i8042.h"
 
-#define NAME       "i8042"
-#define NAMESPACE  "char"
+#define NAME "i8042"
+#define NAMESPACE "char"
 
 /* Interesting bits for status register */
@@ -118 +119 @@
 
 static void i8042_irq_handler(ipc_callid_t iid, ipc_call_t *call);
-static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall);
 static int i8042_init(void);
 static void i8042_port_write(int devid, uint8_t data);
@@ -131 +132 @@
         printf(NAME ": i8042 PS/2 port driver\n");
 
-        rc = loc_server_register(NAME, i8042_connection);
+        rc = devmap_driver_register(NAME, i8042_connection);
         if (rc < 0) {
-                printf(NAME ": Unable to register server.\n");
+                printf(NAME ": Unable to register driver.\n");
                 return rc;
         }
@@ -141 +142 @@
 
         for (i = 0; i < MAX_DEVS; i++) {
-                i8042_port[i].client_sess = NULL;
+                i8042_port[i].client_phone = -1;
 
                 snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]);
-                rc = loc_service_register(name, &i8042_port[i].service_id);
+                rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
                 if (rc != EOK) {
                         printf(NAME ": Unable to register device %s.\n", name);
@@ -212 +213 @@
 
 /** Character device connection handler */
-static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         ipc_callid_t callid;
         ipc_call_t call;
         sysarg_t method;
-        service_id_t dsid;
+        devmap_handle_t dh;
         int retval;
         int dev_id, i;
@@ -224 +225 @@
 
         /* Get the device handle. */
-        dsid = IPC_GET_ARG1(*icall);
+        dh = IPC_GET_ARG1(*icall);
 
         /* Determine which disk device is the client connecting to. */
         dev_id = -1;
         for (i = 0; i < MAX_DEVS; i++) {
-                if (i8042_port[i].service_id == dsid)
+                if (i8042_port[i].devmap_handle == dh)
                         dev_id = i;
         }
@@ -246 +247 @@
                 callid = async_get_call(&call);
                 method = IPC_GET_IMETHOD(call);
-                
-                if (!method) {
+                switch (method) {
+                case IPC_M_PHONE_HUNGUP:
                         /* The other side has hung up. */
                         async_answer_0(callid, EOK);
                         return;
-                }
-                
-                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
+                case IPC_M_CONNECT_TO_ME:
+                        printf(NAME ": creating callback connection\n");
+                        if (i8042_port[dev_id].client_phone != -1) {
                                 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);
         }
@@ -303 +299 @@
         }
 
-        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);
+        if (i8042_port[devid].client_phone != -1) {
+                async_msg_1(i8042_port[devid].client_phone,
+                    IPC_FIRST_USER_METHOD, data);
         }
 }