Input: keyboard - fix formatting issues (e0785572) · Commits · e / devices / android_kernel_teracube_mt6765

drivers/char/keyboard.c

+147 −131

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ static struct input_handler kbd_handler;
		static DEFINE_SPINLOCK(kbd_event_lock);
		static unsigned long key_down[BITS_TO_LONGS(KEY_CNT)]; /* keyboard key bitmap */
		static unsigned char shift_down[NR_SHIFT]; /* shift state counters.. */
		static int dead_key_next;
		static bool dead_key_next;
		static int npadch = -1; /* -1 or number assembled on pad */
		static unsigned int diacr;
		static char rep; /* flag telling character repeat */
		@@ -453,6 +453,7 @@ static void fn_enter(struct vc_data *vc)
		}
		diacr = 0;
		}

		put_queue(vc, 13);
		if (vc_kbd_mode(kbd, VC_CRLF))
		put_queue(vc, 10);
		@@ -462,6 +463,7 @@ static void fn_caps_toggle(struct vc_data *vc)
		{
		if (rep)
		return;

		chg_vc_kbd_led(kbd, VC_CAPSLOCK);
		}

		@@ -469,12 +471,14 @@ static void fn_caps_on(struct vc_data *vc)
		{
		if (rep)
		return;

		set_vc_kbd_led(kbd, VC_CAPSLOCK);
		}

		static void fn_show_ptregs(struct vc_data *vc)
		{
		struct pt_regs *regs = get_irq_regs();

		if (regs)
		show_regs(regs);
		}
		@@ -594,7 +598,7 @@ static void fn_boot_it(struct vc_data *vc)

		static void fn_compose(struct vc_data *vc)
		{
		dead_key_next = 1;
		dead_key_next = true;
		}

		static void fn_spawn_con(struct vc_data *vc)
		@@ -653,7 +657,7 @@ static void k_unicode(struct vc_data *vc, unsigned int value, char up_flag)
		value = handle_diacr(vc, value);

		if (dead_key_next) {
		dead_key_next = 0;
		dead_key_next = false;
		diacr = value;
		return;
		}
		@@ -675,6 +679,7 @@ static void k_deadunicode(struct vc_data *vc, unsigned int value, char up_flag)
		{
		if (up_flag)
		return;

		diacr = (diacr ? handle_diacr(vc, value) : value);
		}

		@@ -694,25 +699,24 @@ static void k_dead2(struct vc_data *vc, unsigned char value, char up_flag)
		static void k_dead(struct vc_data *vc, unsigned char value, char up_flag)
		{
		static const unsigned char ret_diacr[NR_DEAD] = {'`', '\'', '^', '~', '"', ',' };
		value = ret_diacr[value];
		k_deadunicode(vc, value, up_flag);

		k_deadunicode(vc, ret_diacr[value], up_flag);
		}

		static void k_cons(struct vc_data *vc, unsigned char value, char up_flag)
		{
		if (up_flag)
		return;

		set_console(value);
		}

		static void k_fn(struct vc_data *vc, unsigned char value, char up_flag)
		{
		unsigned v;

		if (up_flag)
		return;
		v = value;
		if (v < ARRAY_SIZE(func_table)) {

		if ((unsigned)value < ARRAY_SIZE(func_table)) {
		if (func_table[value])
		puts_queue(vc, func_table[value]);
		} else
		@@ -725,6 +729,7 @@ static void k_cur(struct vc_data *vc, unsigned char value, char up_flag)

		if (up_flag)
		return;

		applkey(vc, cur_chars[value], vc_kbd_mode(kbd, VC_CKMODE));
		}

		@@ -742,7 +747,8 @@ static void k_pad(struct vc_data *vc, unsigned char value, char up_flag)
		return;
		}

		if (!vc_kbd_led(kbd, VC_NUMLOCK))
		if (!vc_kbd_led(kbd, VC_NUMLOCK)) {

		switch (value) {
		case KVAL(K_PCOMMA):
		case KVAL(K_PDOT):
		@@ -779,6 +785,7 @@ static void k_pad(struct vc_data *vc, unsigned char value, char up_flag)
		applkey(vc, 'G', vc_kbd_mode(kbd, VC_APPLIC));
		return;
		}
		}

		put_queue(vc, pad_chars[value]);
		if (value == KVAL(K_PENTER) && vc_kbd_mode(kbd, VC_CRLF))
		@@ -864,6 +871,7 @@ static void k_lock(struct vc_data *vc, unsigned char value, char up_flag)
		{
		if (up_flag \|\| rep)
		return;

		chg_vc_kbd_lock(kbd, value);
		}

		@@ -872,6 +880,7 @@ static void k_slock(struct vc_data *vc, unsigned char value, char up_flag)
		k_shift(vc, value, up_flag);
		if (up_flag \|\| rep)
		return;

		chg_vc_kbd_slock(kbd, value);
		/* try to make Alt, oops, AltGr and such work */
		if (!key_maps[kbd->lockstate ^ kbd->slockstate]) {
		@@ -926,8 +935,11 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag)
		if (value > 8)
		return;

		if (up_flag) {
		if (brl_timeout) {
		if (!up_flag) {
		pressed \|= 1 << (value - 1);
		if (!brl_timeout)
		committing = pressed;
		} else if (brl_timeout) {
		if (!committing \|\|
		time_after(jiffies,
		releasestart + msecs_to_jiffies(brl_timeout))) {
		@@ -935,12 +947,10 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag)
		releasestart = jiffies;
		}
		pressed &= ~(1 << (value - 1));
		if (!pressed) {
		if (committing) {
		if (!pressed && committing) {
		k_brlcommit(vc, committing, 0);
		committing = 0;
		}
		}
		} else {
		if (committing) {
		k_brlcommit(vc, committing, 0);
		@@ -948,11 +958,6 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag)
		}
		pressed &= ~(1 << (value - 1));
		}
		} else {
		pressed \|= 1 << (value - 1);
		if (!brl_timeout)
		committing = pressed;
		}
		}

		/*
		@@ -972,6 +977,7 @@ void setledstate(struct kbd_struct *kbd, unsigned int led)
		kbd->ledmode = LED_SHOW_IOCTL;
		} else
		kbd->ledmode = LED_SHOW_FLAGS;

		set_leds();
		}

		@@ -1059,7 +1065,7 @@ static const unsigned short x86_keycodes[256] =
		332,340,365,342,343,344,345,346,356,270,341,368,369,370,371,372 };

		#ifdef CONFIG_SPARC
		static int sparc_l1_a_state = 0;
		static int sparc_l1_a_state;
		extern void sun_do_break(void);
		#endif

		@@ -1069,6 +1075,7 @@ static int emulate_raw(struct vc_data *vc, unsigned int keycode,
		int code;

		switch (keycode) {

		case KEY_PAUSE:
		put_queue(vc, 0xe1);
		put_queue(vc, 0x1d \| up_flag);
		@@ -1138,6 +1145,7 @@ static int emulate_raw(struct vc_data *vc, unsigned int keycode, unsigned char u
		static void kbd_rawcode(unsigned char data)
		{
		struct vc_data *vc = vc_cons[fg_console].d;

		kbd = kbd_table + vc->vc_num;
		if (kbd->kbdmode == VC_RAW)
		put_queue(vc, data);
		@@ -1147,10 +1155,12 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
		{
		struct vc_data *vc = vc_cons[fg_console].d;
		unsigned short keysym, *key_map;
		unsigned char type, raw_mode;
		unsigned char type;
		bool raw_mode;
		struct tty_struct *tty;
		int shift_final;
		struct keyboard_notifier_param param = { .vc = vc, .value = keycode, .down = down };
		int rc;

		tty = vc->vc_tty;

		@@ -1168,7 +1178,8 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)

		rep = (down == 2);

		if ((raw_mode = (kbd->kbdmode == VC_RAW)) && !hw_raw)
		raw_mode = (kbd->kbdmode == VC_RAW);
		if (raw_mode && !hw_raw)
		if (emulate_raw(vc, keycode, !down << 7))
		if (keycode < BTN_MISC && printk_ratelimit())
		pr_warning("can't emulate rawmode for keycode %d\n",
		@@ -1176,7 +1187,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)

		#ifdef CONFIG_SPARC
		if (keycode == KEY_A && sparc_l1_a_state) {
		sparc_l1_a_state = 0;
		sparc_l1_a_state = false;
		sun_do_break();
		}
		#endif
		@@ -1198,7 +1209,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
		put_queue(vc, (keycode >> 7) \| 0x80);
		put_queue(vc, keycode \| 0x80);
		}
		raw_mode = 1;
		raw_mode = true;
		}

		if (down)
		@@ -1221,27 +1232,30 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
		param.ledstate = kbd->ledflagstate;
		key_map = key_maps[shift_final];

		if (atomic_notifier_call_chain(&keyboard_notifier_list, KBD_KEYCODE, &param) == NOTIFY_STOP \|\| !key_map) {
		atomic_notifier_call_chain(&keyboard_notifier_list, KBD_UNBOUND_KEYCODE, &param);
		rc = atomic_notifier_call_chain(&keyboard_notifier_list,
		KBD_KEYCODE, &param);
		if (rc == NOTIFY_STOP \|\| !key_map) {
		atomic_notifier_call_chain(&keyboard_notifier_list,
		KBD_UNBOUND_KEYCODE, &param);
		compute_shiftstate();
		kbd->slockstate = 0;
		return;
		}

		if (keycode >= NR_KEYS)
		if (keycode >= KEY_BRL_DOT1 && keycode <= KEY_BRL_DOT8)
		if (keycode < NR_KEYS)
		keysym = key_map[keycode];
		else if (keycode >= KEY_BRL_DOT1 && keycode <= KEY_BRL_DOT8)
		keysym = U(K(KT_BRL, keycode - KEY_BRL_DOT1 + 1));
		else
		return;
		else
		keysym = key_map[keycode];

		type = KTYP(keysym);

		if (type < 0xf0) {
		param.value = keysym;
		if (atomic_notifier_call_chain(&keyboard_notifier_list, KBD_UNICODE, &param) == NOTIFY_STOP)
		return;
		rc = atomic_notifier_call_chain(&keyboard_notifier_list,
		KBD_UNICODE, &param);
		if (rc != NOTIFY_STOP)
		if (down && !raw_mode)
		to_utf8(vc, keysym);
		return;
		@@ -1257,9 +1271,11 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
		keysym = key_map[keycode];
		}
		}
		param.value = keysym;

		if (atomic_notifier_call_chain(&keyboard_notifier_list, KBD_KEYSYM, &param) == NOTIFY_STOP)
		param.value = keysym;
		rc = atomic_notifier_call_chain(&keyboard_notifier_list,
		KBD_KEYSYM, &param);
		if (rc == NOTIFY_STOP)
		return;

		if (raw_mode && type != KT_SPEC && type != KT_SHIFT)