input: Add a function to add a keycode to the existing set

[u-boot] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index e65942ec58a68e851380b17b53ec22e1b96c1fe4..530bf5148b17e472a0f2f9317a7bad9614085abc 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -107,6 +107,7 @@ static int input_queue_ascii(struct input_config *config, int ch)
                        return -1; /* buffer full */
                config->fifo_in++;
        }
+       debug(" {%02x} ", ch);
        config->fifo[config->fifo_in] = (uchar)ch;
 
        return 0;
@@ -394,8 +395,8 @@ static int input_keycodes_to_ascii(struct input_config *config,
        return ch_count;
 }
 
-int input_send_keycodes(struct input_config *config,
-                       int keycode[], int num_keycodes)
+static int _input_send_keycodes(struct input_config *config, int keycode[],
+                               int num_keycodes, bool do_send)
 {
        char ch[num_keycodes * ANSI_CHAR_MAX];
        int count, i, same = 0;
@@ -420,8 +421,10 @@ int input_send_keycodes(struct input_config *config,
 
        count = input_keycodes_to_ascii(config, keycode, num_keycodes,
                                        ch, sizeof(ch), is_repeat ? 0 : same);
-       for (i = 0; i < count; i++)
-               input_queue_ascii(config, ch[i]);
+       if (do_send) {
+               for (i = 0; i < count; i++)
+                       input_queue_ascii(config, ch[i]);
+       }
        delay_ms = is_repeat ?
                        config->repeat_rate_ms :
                        config->repeat_delay_ms;
@@ -431,6 +434,41 @@ int input_send_keycodes(struct input_config *config,
        return count;
 }
 
+int input_send_keycodes(struct input_config *config, int keycode[],
+                       int num_keycodes)
+{
+       return _input_send_keycodes(config, keycode, num_keycodes, true);
+}
+
+int input_add_keycode(struct input_config *config, int new_keycode,
+                     bool release)
+{
+       int keycode[INPUT_MAX_MODIFIERS + 1];
+       int count, i;
+
+       /* Add the old keycodes which are not removed by this new one */
+       for (i = 0, count = 0; i < config->num_prev_keycodes; i++) {
+               int code = config->prev_keycodes[i];
+
+               if (new_keycode == code) {
+                       if (release)
+                               continue;
+                       new_keycode = -1;
+               }
+               keycode[count++] = code;
+       }
+
+       if (!release && new_keycode != -1)
+               keycode[count++] = new_keycode;
+       debug("\ncodes for %02x/%d: ", new_keycode, release);
+       for (i = 0; i < count; i++)
+               debug("%02x ", keycode[i]);
+       debug("\n");
+
+       /* Don't output any ASCII characters if this is a key release */
+       return _input_send_keycodes(config, keycode, count, !release);
+}
+
 int input_add_table(struct input_config *config, int left_keycode,
                    int right_keycode, const uchar *xlate, int num_entries)
 {