Changeset 925a21e in mainline for uspace/srv/hw/char/i8042/i8042.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/i8042/i8042.c (modified) (9 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 <devmap.h>
+#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 <kernel/ipc/ipc_methods.h>
-
-#define NAME "i8042"
-#define NAMESPACE "char"
+#define NAME       "i8042"
+#define NAMESPACE  "char"
 
 /* Interesting bits for status register */
@@ -135 +131 @@
         printf(NAME ": i8042 PS/2 port driver\n");
 
-        rc = devmap_driver_register(NAME, i8042_connection);
+        rc = loc_server_register(NAME, i8042_connection);
         if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
+                printf(NAME ": Unable to register server.\n");
                 return rc;
         }
@@ -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]);
-                rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
+                rc = loc_service_register(name, &i8042_port[i].service_id);
                 if (rc != EOK) {
                         printf(NAME ": Unable to register device %s.\n", name);
@@ -221 +217 @@
         ipc_call_t call;
         sysarg_t method;
-        devmap_handle_t dh;
+        service_id_t dsid;
         int retval;
         int dev_id, i;
@@ -228 +224 @@
 
         /* Get the device handle. */
-        dh = IPC_GET_ARG1(*icall);
+        dsid = 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].devmap_handle == dh)
+                if (i8042_port[i].service_id == dsid)
                         dev_id = 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);
         }
 }