Changeset e98fe28c in mainline

Timestamp:

2012-01-21T17:07:13Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8d7ec69d, eaa0c3f

Parents:

01380b1

Message:

Not even identifiers and error messages should break layering/abstraction.

Location:

uspace/drv/char

Files:

• ps2mouse/ps2mouse.c (modified) (4 diffs)
• ps2mouse/ps2mouse.h (modified) (1 diff)
• xtkbd/xtkbd.c (modified) (3 diffs)
• xtkbd/xtkbd.h (modified) (1 diff)

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);
                 }

uspace/drv/char/ps2mouse/ps2mouse.h

@@ -43 +43 @@
         ddf_fun_t *mouse_fun;      /**< Mouse function. */
         async_sess_t *parent_sess; /**< Connection to device providing data. */
-        async_sess_t *input_sess;  /**< Callback connection to consumer. */
+        async_sess_t *client_sess;  /**< Callback connection to client. */
         fid_t polling_fibril;      /**< Fibril retrieving an parsing data. */
 } ps2_mouse_t;

uspace/drv/char/xtkbd/xtkbd.c

@@ -206 +206 @@
         assert(kbd);
         assert(dev);
-        kbd->input_sess = NULL;
+        kbd->client_sess = NULL;
         kbd->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
             dev->handle, IPC_FLAG_BLOCKING);
@@ -296 +296 @@
                 if (key != 0) {
                         async_exch_t *exch =
-                            async_exchange_begin(kbd->input_sess);
+                            async_exchange_begin(kbd->client_sess);
                         if (!exch) {
                                 ddf_msg(LVL_ERROR,
-                                    "Failed to create input exchange.");
+                                    "Failed creating exchange.");
                                 continue;
                         }
@@ -352 +352 @@
                 if (sess == NULL) {
                         ddf_msg(LVL_WARN,
-                            "Failed to create start input session");
+                            "Failed creating callback session");
                         async_answer_0(icallid, EAGAIN);
                         break;
                 }
-                if (kbd->input_sess == NULL) {
-                        kbd->input_sess = sess;
-                        ddf_msg(LVL_DEBUG, "Set input session");
+                if (kbd->client_sess == NULL) {
+                        kbd->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);
                 }

uspace/drv/char/xtkbd/xtkbd.h

@@ -43 +43 @@
         ddf_fun_t *kbd_fun;        /**< Keyboard function. */
         async_sess_t *parent_sess; /**< Connection to device providing data. */
-        async_sess_t *input_sess;  /**< Callback connection to consumer. */
+        async_sess_t *client_sess; /**< Callback connection to client. */
         fid_t polling_fibril;      /**< Fibril retrieving an parsing data. */
 } xt_kbd_t;