Changeset 338d54a7 in mainline for uspace/drv/hid

Timestamp:

2018-03-10T22:55:07Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

850fd32

Parents:

5ef16903

Message:

Gratuitous nested block makes ccheck sad.

Location:

uspace/drv/hid

Files:

• atkbd/atkbd.c (modified) (2 diffs)
• ps2mouse/ps2mouse.c (modified) (2 diffs)
• usbhid/kbd/kbddev.c (modified) (3 diffs)
• xtkbd/xtkbd.c (modified) (3 diffs)

uspace/drv/hid/atkbd/atkbd.c

@@ -302 +302 @@
         const sysarg_t method = IPC_GET_IMETHOD(*icall);
         at_kbd_t *kbd = ddf_dev_data_get(ddf_fun_get_dev(fun));
+        async_sess_t *sess;
 
         switch (method) {
-        case KBDEV_SET_IND: {
+        case KBDEV_SET_IND:
                 async_answer_0(icallid, ENOTSUP);
                 break;
-        }
         /*
          * This might be ugly but async_callback_receive_start makes no
          * difference for incorrect call and malloc failure.
          */
-        case IPC_M_CONNECT_TO_ME: {
-                async_sess_t *sess =
-                    async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
+        case IPC_M_CONNECT_TO_ME:
+                sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
 
                 /* Probably ENOMEM error, try again. */
@@ -334 +333 @@
 
                 break;
-        }
         default:
                 ddf_msg(LVL_ERROR, "Unknown method: %d.", (int)method);

uspace/drv/hid/ps2mouse/ps2mouse.c

@@ -408 +408 @@
         const sysarg_t method = IPC_GET_IMETHOD(*icall);
         ps2_mouse_t *mouse = ddf_dev_data_get(ddf_fun_get_dev(fun));
+        async_sess_t *sess;
 
         switch (method) {
         /* This might be ugly but async_callback_receive_start makes no
          * difference for incorrect call and malloc failure. */
-        case IPC_M_CONNECT_TO_ME: {
-                async_sess_t *sess =
-                    async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
+        case IPC_M_CONNECT_TO_ME:
+                sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
                 /* Probably ENOMEM error, try again. */
                 if (sess == NULL) {
@@ -431 +431 @@
                 }
                 break;
-        }
         default:
                 ddf_msg(LVL_ERROR, "Unknown method: %d.", (int)method);

uspace/drv/hid/usbhid/kbd/kbddev.c

@@ -165 +165 @@
         const sysarg_t method = IPC_GET_IMETHOD(*icall);
         usb_kbd_t *kbd_dev = ddf_fun_data_get(fun);
+        async_sess_t *sess;
 
         switch (method) {
@@ -174 +175 @@
         /* This might be ugly but async_callback_receive_start makes no
          * difference for incorrect call and malloc failure. */
-        case IPC_M_CONNECT_TO_ME: {
-                async_sess_t *sess =
-                    async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
+        case IPC_M_CONNECT_TO_ME:
+                sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
                 /* Probably ENOMEM error, try again. */
                 if (sess == NULL) {
@@ -194 +194 @@
                 }
                 break;
-        }
         default:
                         usb_log_error("%s: Unknown method: %d.",

uspace/drv/hid/xtkbd/xtkbd.c

@@ -338 +338 @@
         const sysarg_t method = IPC_GET_IMETHOD(*icall);
         xt_kbd_t *kbd = ddf_dev_data_get(ddf_fun_get_dev(fun));
+        unsigned mods;
+        async_sess_t *sess;
 
         switch (method) {
-        case KBDEV_SET_IND: {
+        case KBDEV_SET_IND:
                 /*
                  * XT keyboards do not support setting mods,
                  * assume AT keyboard with Scan Code Set 1.
                  */
-                const unsigned mods = IPC_GET_ARG1(*icall);
+                mods = IPC_GET_ARG1(*icall);
                 const uint8_t status = 0 |
                     ((mods & KM_CAPS_LOCK) ? LI_CAPS : 0) |
@@ -362 +364 @@
                 async_answer_0(icallid, rc);
                 break;
-        }
         /*
          * This might be ugly but async_callback_receive_start makes no
          * difference for incorrect call and malloc failure.
          */
-        case IPC_M_CONNECT_TO_ME: {
-                async_sess_t *sess =
-                    async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
+        case IPC_M_CONNECT_TO_ME:
+                sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
 
                 /* Probably ENOMEM error, try again. */
@@ -389 +389 @@
 
                 break;
-        }
         default:
                 ddf_msg(LVL_ERROR, "Unknown method: %d.", (int)method);