Changeset eaa0c3f in mainline for uspace/drv/char/ps2mouse/ps2mouse.c

Timestamp:

2012-01-21T23:55:03Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

c38e417

Parents:

86c71de (diff), e98fe28c (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 with mainline

File:

• uspace/drv/char/ps2mouse/ps2mouse.c (modified) (4 diffs)

uspace/drv/char/ps2mouse/ps2mouse.c

@@ -116 +116 @@
         assert(mouse);
         assert(dev);
-        mouse->input_sess = NULL;
+        mouse->client_sess = NULL;
         mouse->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
             dev->handle, IPC_FLAG_BLOCKING);
@@ -218 +218 @@
 
                 async_exch_t *exch =
-                    async_exchange_begin(mouse->input_sess);
+                    async_exchange_begin(mouse->client_sess);
                 if (!exch) {
                         ddf_msg(LVL_ERROR,
-                            "Failed to create input exchange.");
+                            "Failed creating exchange.");
                         continue;
                 }
@@ -277 +277 @@
 
                 async_exch_t *exch =
-                    async_exchange_begin(mouse->input_sess);
+                    async_exchange_begin(mouse->client_sess);
                 if (!exch) {
                         ddf_msg(LVL_ERROR,
-                            "Failed to create input exchange.");
+                            "Failed creating exchange.");
                         continue;
                 }
@@ -386 +386 @@
                 if (sess == NULL) {
                         ddf_msg(LVL_WARN,
-                            "Failed to create start input session");
+                            "Failed creating client callback session");
                         async_answer_0(icallid, EAGAIN);
                         break;
                 }
-                if (mouse->input_sess == NULL) {
-                        mouse->input_sess = sess;
-                        ddf_msg(LVL_DEBUG, "Set input session");
+                if (mouse->client_sess == NULL) {
+                        mouse->client_sess = sess;
+                        ddf_msg(LVL_DEBUG, "Set client session");
                         async_answer_0(icallid, EOK);
                 } else {
-                        ddf_msg(LVL_ERROR, "Input session already set");
+                        ddf_msg(LVL_ERROR, "Client session already set");
                         async_answer_0(icallid, ELIMIT);
                 }