[modify] make sure F1-12 key scancode is consistent

test step: Press Fn -> Press F2 -> release FN -> release F2
is normal FN + F2 scancode.

Signed-off-by: Leo_Tsai <LeoCX_Tsai@compal.com>

Author: LeoCX-Tsai

board/hx30/keyboard_customization.c

@@ -220,6 +220,34 @@ void board_kblight_init(void)
 #define FN_PRESSED BIT(0)
 #define FN_LOCKED BIT(1)
 static uint8_t Fn_key;
+static uint32_t fn_key_table_media;
+static uint32_t fn_key_table;
+
+int fn_table_media_set(int8_t pressed, uint32_t fn_bit)
+{
+	if (pressed) {
+		fn_key_table_media |= fn_bit;
+		return true;
+	} else if (!pressed && (fn_key_table_media & fn_bit)) {
+		fn_key_table_media &= ~fn_bit;
+		return true;
+	}
+
+	return false;
+}
+
+int fn_table_set(int8_t pressed, uint32_t fn_bit)
+{
+	if (pressed && (Fn_key & FN_PRESSED)) {
+		fn_key_table |= fn_bit;
+		return true;
+	} else if (!pressed && (fn_key_table & fn_bit)) {
+		fn_key_table &= ~fn_bit;
+		return true;
+	}
+
+	return false;
+}
 
 void fnkey_shutdown(void) {
 	uint8_t current_kb = 0;
@@ -248,63 +276,74 @@ void fnkey_startup(void) {
 }
 DECLARE_HOOK(HOOK_CHIPSET_STARTUP, fnkey_startup, HOOK_PRIO_DEFAULT);
 
-int hotkey_F1_F12(uint16_t *key_code, uint16_t lock, int8_t pressed)
+int hotkey_F1_F12(uint16_t *key_code, uint16_t fn, int8_t pressed)
 {
 	const uint16_t prss_key = *key_code;
 
-	if (!(Fn_key & FN_LOCKED) && lock & FN_PRESSED)
+	if (!(Fn_key & FN_LOCKED) &&
+		(fn & FN_PRESSED))
+		return EC_SUCCESS;
+	else if (Fn_key & FN_LOCKED &&
+		!(fn & FN_PRESSED) &&
+		!fn_key_table_media)
 		return EC_SUCCESS;
-	else if (Fn_key & FN_LOCKED && !(Fn_key & FN_PRESSED))
+	else if (!fn_key_table_media && !pressed)
 		return EC_SUCCESS;
 
 	switch (prss_key) {
 	case SCANCODE_F1:  /* SPEAKER_MUTE */
-		*key_code = SCANCODE_VOLUME_MUTE;
+		if (fn_table_media_set(pressed, KB_FN_F1))
+			*key_code = SCANCODE_VOLUME_MUTE;
 		break;
 	case SCANCODE_F2:  /* VOLUME_DOWN */
-		*key_code = SCANCODE_VOLUME_DOWN;
-
+		if (fn_table_media_set(pressed, KB_FN_F2))
+			*key_code = SCANCODE_VOLUME_DOWN;
 		break;
 	case SCANCODE_F3:  /* VOLUME_UP */
-		*key_code = SCANCODE_VOLUME_UP;
-
+		if (fn_table_media_set(pressed, KB_FN_F3))
+			*key_code = SCANCODE_VOLUME_UP;
 		break;
 	case SCANCODE_F4:  /* PREVIOUS_TRACK */
-		*key_code = SCANCODE_PREV_TRACK;
-
+		if (fn_table_media_set(pressed, KB_FN_F4))
+			*key_code = SCANCODE_PREV_TRACK;
 		break;
 	case SCANCODE_F5:  /* PLAY_PAUSE */
-		*key_code = 0xe034;
-
+		if (fn_table_media_set(pressed, KB_FN_F5))
+			*key_code = 0xe034;
 		break;
 	case SCANCODE_F6:  /* NEXT_TRACK */
-		*key_code = SCANCODE_NEXT_TRACK;
-
+		if (fn_table_media_set(pressed, KB_FN_F6))
+			*key_code = SCANCODE_NEXT_TRACK;
 		break;
 	case SCANCODE_F7:  /* TODO: DIM_SCREEN */
-		update_hid_key(HID_KEY_DISPLAY_BRIGHTNESS_DN, pressed);
-		return EC_ERROR_UNIMPLEMENTED;
-
+		if (fn_table_media_set(pressed, KB_FN_F7)) {
+			update_hid_key(HID_KEY_DISPLAY_BRIGHTNESS_DN, pressed);
+			return EC_ERROR_UNIMPLEMENTED;
+		}
 		break;
 	case SCANCODE_F8:  /* TODO: BRIGHTEN_SCREEN */
-		update_hid_key(HID_KEY_DISPLAY_BRIGHTNESS_UP, pressed);
-		return EC_ERROR_UNIMPLEMENTED;
-
+		if (fn_table_media_set(pressed, KB_FN_F8)) {
+			update_hid_key(HID_KEY_DISPLAY_BRIGHTNESS_UP, pressed);
+			return EC_ERROR_UNIMPLEMENTED;
+		}
 		break;
 	case SCANCODE_F9:  /* EXTERNAL_DISPLAY */
-		if (pressed) {
-			simulate_keyboard(SCANCODE_LEFT_WIN, 1);
-			simulate_keyboard(SCANCODE_P, 1);
-		} else {
-			simulate_keyboard(SCANCODE_P, 0);
-			simulate_keyboard(SCANCODE_LEFT_WIN, 0);
+		if (fn_table_media_set(pressed, KB_FN_F9)) {
+			if (pressed) {
+				simulate_keyboard(SCANCODE_LEFT_WIN, 1);
+				simulate_keyboard(SCANCODE_P, 1);
+			} else {
+				simulate_keyboard(SCANCODE_P, 0);
+				simulate_keyboard(SCANCODE_LEFT_WIN, 0);
+			}
+			return EC_ERROR_UNIMPLEMENTED;
 		}
-		return EC_ERROR_UNIMPLEMENTED;
 		break;
 	case SCANCODE_F10:  /* FLIGHT_MODE */
-		update_hid_key(HID_KEY_AIRPLANE_MODE, pressed);
-		return EC_ERROR_UNIMPLEMENTED;
-
+		if (fn_table_media_set(pressed, KB_FN_F10)) {
+			update_hid_key(HID_KEY_AIRPLANE_MODE, pressed);
+			return EC_ERROR_UNIMPLEMENTED;
+		}
 		break;
 	case SCANCODE_F11:
 			/*
@@ -313,99 +352,128 @@ int hotkey_F1_F12(uint16_t *key_code, uint16_t lock, int8_t pressed)
 			 * 0xE012 0xE07C to simulate
 			 * PRINT_SCREEN
 			 */
-		*key_code = 0xE07C;
+		if (fn_table_media_set(pressed, KB_FN_F11))
+			*key_code = 0xE07C;
 		break;
 	case SCANCODE_F12:  /* TODO: FRAMEWORK */
 		/* Media Select scan code */
-		*key_code = 0xE050;
-
+		if (fn_table_media_set(pressed, KB_FN_F12))
+			*key_code = 0xE050;
 		break;
+	default:
+		return EC_SUCCESS;
 	}
 	return EC_SUCCESS;
 }
 
 
-int hotkey_special_key(uint16_t *key_code)
+int hotkey_special_key(uint16_t *key_code, int8_t pressed)
 {
 	const uint16_t prss_key = *key_code;
 
 	switch (prss_key) {
 	case SCANCODE_DELETE:  /* TODO: INSERT */
-		*key_code = 0xe070;
+		if (fn_table_set(pressed, KB_FN_DELETE))
+			*key_code = 0xe070;
 		break;
 	case SCANCODE_K:  /* TODO: SCROLL_LOCK */
-		*key_code = SCANCODE_SCROLL_LOCK;
+		if (fn_table_set(pressed, KB_FN_K))
+			*key_code = SCANCODE_SCROLL_LOCK;
 		break;
 	case SCANCODE_S:  /* TODO: SYSRQ */
+		/*if (!fn_table_set(pressed, KB_FN_S))*/
 
 		break;
 	case SCANCODE_LEFT:  /* HOME */
-		*key_code = 0xe06c;
+		if (fn_table_set(pressed, KB_FN_LEFT))
+			*key_code = 0xe06c;
 		break;
 	case SCANCODE_RIGHT:  /* END */
-		*key_code = 0xe069;
+		if (fn_table_set(pressed, KB_FN_RIGHT))
+			*key_code = 0xe069;
 		break;
 	case SCANCODE_UP:  /* PAGE_UP */
-		*key_code = 0xe07d;
+		if (fn_table_set(pressed, KB_FN_UP))
+			*key_code = 0xe07d;
 		break;
 	case SCANCODE_DOWN:  /* PAGE_DOWN */
-		*key_code = 0xe07a;
+		if (fn_table_set(pressed, KB_FN_DOWN))
+			*key_code = 0xe07a;
 		break;
+	default:
+		return EC_SUCCESS;
 	}
+
 	return EC_SUCCESS;
 }
 
-int functional_hotkey(uint16_t *key_code)
+int functional_hotkey(uint16_t *key_code, int8_t pressed)
 {
 	const uint16_t prss_key = *key_code;
 	uint8_t bl_brightness = 0;
 
 	switch (prss_key) {
 	case SCANCODE_ESC: /* TODO: FUNCTION_LOCK */
-		if (Fn_key & FN_LOCKED)
-			Fn_key &= ~FN_LOCKED;
-		else
-			Fn_key |= FN_LOCKED;
-		return EC_ERROR_UNIMPLEMENTED;
+		if (fn_table_set(pressed, KB_FN_ESC)) {
+			if (pressed) {
+				if (Fn_key & FN_LOCKED)
+					Fn_key &= ~FN_LOCKED;
+				else
+					Fn_key |= FN_LOCKED;
+			}
+			return EC_ERROR_UNIMPLEMENTED;
+		}
 		break;
 	case SCANCODE_B:
 		/* BREAK_KEY */
-		simulate_keyboard(0xe07e, 1);
-		simulate_keyboard(0xe0, 1);
-		simulate_keyboard(0x7e, 0);
-		return EC_ERROR_UNIMPLEMENTED;
+		if (fn_table_set(pressed, KB_FN_B)) {
+			if (pressed) {
+				simulate_keyboard(0xe07e, 1);
+				simulate_keyboard(0xe0, 1);
+				simulate_keyboard(0x7e, 0);
+			}
+			return EC_ERROR_UNIMPLEMENTED;
+		}
 		break;
 	case SCANCODE_P:
 		/* PAUSE_KEY */
-		simulate_keyboard(0xe114, 1);
-		simulate_keyboard(0x77, 1);
-		simulate_keyboard(0xe1, 1);
-		simulate_keyboard(0x14, 0);
-		simulate_keyboard(0x77, 0);
-		return EC_ERROR_UNIMPLEMENTED;
+		if (fn_table_set(pressed, KB_FN_P)) {
+			if (pressed) {
+				simulate_keyboard(0xe114, 1);
+				simulate_keyboard(0x77, 1);
+				simulate_keyboard(0xe1, 1);
+				simulate_keyboard(0x14, 0);
+				simulate_keyboard(0x77, 0);
+			}
+			return EC_ERROR_UNIMPLEMENTED;
+		}
 		break;
 	case SCANCODE_SPACE:	/* TODO: TOGGLE_KEYBOARD_BACKLIGHT */
-		bl_brightness = kblight_get();
-		switch (bl_brightness) {
-		case KEYBOARD_BL_BRIGHTNESS_LOW:
-			bl_brightness = KEYBOARD_BL_BRIGHTNESS_MED;
-			break;
-		case KEYBOARD_BL_BRIGHTNESS_MED:
-			bl_brightness = KEYBOARD_BL_BRIGHTNESS_HIGH;
-			break;
-		case KEYBOARD_BL_BRIGHTNESS_HIGH:
-			hx20_kblight_enable(0);
-			bl_brightness = KEYBOARD_BL_BRIGHTNESS_OFF;
-			break;
-		default:
-		case KEYBOARD_BL_BRIGHTNESS_OFF:
-			hx20_kblight_enable(1);
-			bl_brightness = KEYBOARD_BL_BRIGHTNESS_LOW;
-			break;
+		if (fn_table_set(pressed, KB_FN_SPACE)) {
+			if (pressed) {
+				bl_brightness = kblight_get();
+				switch (bl_brightness) {
+				case KEYBOARD_BL_BRIGHTNESS_LOW:
+					bl_brightness = KEYBOARD_BL_BRIGHTNESS_MED;
+					break;
+				case KEYBOARD_BL_BRIGHTNESS_MED:
+					bl_brightness = KEYBOARD_BL_BRIGHTNESS_HIGH;
+					break;
+				case KEYBOARD_BL_BRIGHTNESS_HIGH:
+					hx20_kblight_enable(0);
+					bl_brightness = KEYBOARD_BL_BRIGHTNESS_OFF;
+					break;
+				default:
+				case KEYBOARD_BL_BRIGHTNESS_OFF:
+					hx20_kblight_enable(1);
+					bl_brightness = KEYBOARD_BL_BRIGHTNESS_LOW;
+					break;
+				}
+				kblight_set(bl_brightness);
+			}
+			/* we dont want to pass the space key event to the OS */
+			return EC_ERROR_UNIMPLEMENTED;
 		}
-		kblight_set(bl_brightness);
-		/* we dont want to pass the space key event to the OS */
-		return EC_ERROR_UNKNOWN;
 		break;
 	}
 	return EC_SUCCESS;
@@ -441,21 +509,16 @@ enum ec_error_list keyboard_scancode_callback(uint16_t *make_code,
 	/*
 	 * If the function key is not held then
 	 * we pass through all events without modifying them
+	 * but if last time have press FN still need keep that
 	 */
-	if (!Fn_key)
-		return EC_SUCCESS;
-
-	if (Fn_key & FN_LOCKED && !(Fn_key & FN_PRESSED))
+	if (!(Fn_key & FN_PRESSED) && !fn_key_table)
 		return EC_SUCCESS;
 
-	r = hotkey_special_key(make_code);
+	r = hotkey_special_key(make_code, pressed);
 	if (r != EC_SUCCESS)
 		return r;
 
-	if (!pressed || pressed_key != *make_code)
-		return EC_SUCCESS;
-
-	r = functional_hotkey(make_code);
+	r = functional_hotkey(make_code, pressed);
 	if (r != EC_SUCCESS)
 		return r;
 

board/hx30/keyboard_customization.h

@@ -72,6 +72,32 @@ extern uint8_t keyboard_cols;
 #define KEYBOARD_ROW_LEFT_SHIFT 5
 #define KEYBOARD_MASK_LEFT_SHIFT KEYBOARD_ROW_TO_MASK(KEYBOARD_ROW_LEFT_SHIFT)
 
+enum kb_fn_table {
+	KB_FN_F1 = BIT(0),
+	KB_FN_F2 = BIT(1),
+	KB_FN_F3 = BIT(2),
+	KB_FN_F4 = BIT(3),
+	KB_FN_F5 =  BIT(4),
+	KB_FN_F6 = BIT(5),
+	KB_FN_F7 = BIT(6),
+	KB_FN_F8 = BIT(7),
+	KB_FN_F9 = BIT(8),
+	KB_FN_F10 = BIT(9),
+	KB_FN_F11 = BIT(10),
+	KB_FN_F12 = BIT(11),
+	KB_FN_DELETE = BIT(12),
+	KB_FN_K = BIT(13),
+    KB_FN_S = BIT(14),
+    KB_FN_LEFT = BIT(15),
+    KB_FN_RIGHT = BIT(16),
+    KB_FN_UP = BIT(17),
+    KB_FN_DOWN = BIT(18),
+    KB_FN_ESC = BIT(19),
+    KB_FN_B = BIT(20),
+    KB_FN_P = BIT(21),
+    KB_FN_SPACE = BIT(22),
+};
+
 #ifdef CONFIG_KEYBOARD_BACKLIGHT
 int hx20_kblight_enable(int enable);
 #endif