Merge pull request #381 from FrameworkComputer/fix_kb_scancode

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

Author: kiram9

board/hx20/keyboard_customization.c

@@ -235,6 +235,9 @@ void board_kblight_init(void)
 #define FN_PRESSED BIT(0)
 #define FN_LOCKED BIT(1)
 static uint8_t Fn_key;
+static uint8_t keep_fn_key_F1F12;
+static uint8_t keep_fn_key_special;
+static uint8_t keep_fn_key_functional;
 
 void fnkey_shutdown(void) {
 	uint8_t current_kb = 0;
@@ -263,13 +266,34 @@ void fnkey_startup(void) {
 }
 DECLARE_HOOK(HOOK_CHIPSET_STARTUP, fnkey_startup, HOOK_PRIO_DEFAULT);
 
+static void fn_keep_check_F1F12(int8_t pressed)
+{
+	if (pressed)
+		keep_fn_key_F1F12 = 1;
+	else
+		keep_fn_key_F1F12 = 0;
+}
+
+static void fn_keep_check_special(int8_t pressed)
+{
+	if (pressed)
+		keep_fn_key_special = 1;
+	else
+		keep_fn_key_special = 0;
+}
+
 int hotkey_F1_F12(uint16_t *key_code, uint16_t lock, int8_t pressed)
 {
 	const uint16_t prss_key = *key_code;
 
-	if (!(Fn_key & FN_LOCKED) && lock & FN_PRESSED)
+	if (!(Fn_key & FN_LOCKED) &&
+		(lock & FN_PRESSED) &&
+		!keep_fn_key_F1F12)
 		return EC_SUCCESS;
-	else if (Fn_key & FN_LOCKED && !(Fn_key & FN_PRESSED))
+	else if (Fn_key & FN_LOCKED &&
+		!(lock & FN_PRESSED))
+		return EC_SUCCESS;
+	else if (!pressed && !keep_fn_key_F1F12)
 		return EC_SUCCESS;
 
 	switch (prss_key) {
@@ -278,33 +302,28 @@ int hotkey_F1_F12(uint16_t *key_code, uint16_t lock, int8_t pressed)
 		break;
 	case SCANCODE_F2:  /* VOLUME_DOWN */
 		*key_code = SCANCODE_VOLUME_DOWN;
-
 		break;
 	case SCANCODE_F3:  /* VOLUME_UP */
 		*key_code = SCANCODE_VOLUME_UP;
-
 		break;
 	case SCANCODE_F4:  /* PREVIOUS_TRACK */
 		*key_code = SCANCODE_PREV_TRACK;
-
 		break;
 	case SCANCODE_F5:  /* PLAY_PAUSE */
 		*key_code = 0xe034;
-
 		break;
 	case SCANCODE_F6:  /* NEXT_TRACK */
 		*key_code = SCANCODE_NEXT_TRACK;
-
 		break;
 	case SCANCODE_F7:  /* TODO: DIM_SCREEN */
 		update_hid_key(HID_KEY_DISPLAY_BRIGHTNESS_DN, pressed);
+		fn_keep_check_F1F12(pressed);
 		return EC_ERROR_UNIMPLEMENTED;
-
 		break;
 	case SCANCODE_F8:  /* TODO: BRIGHTEN_SCREEN */
 		update_hid_key(HID_KEY_DISPLAY_BRIGHTNESS_UP, pressed);
+		fn_keep_check_F1F12(pressed);
 		return EC_ERROR_UNIMPLEMENTED;
-
 		break;
 	case SCANCODE_F9:  /* EXTERNAL_DISPLAY */
 		if (pressed) {
@@ -314,12 +333,13 @@ int hotkey_F1_F12(uint16_t *key_code, uint16_t lock, int8_t pressed)
 			simulate_keyboard(SCANCODE_P, 0);
 			simulate_keyboard(SCANCODE_LEFT_WIN, 0);
 		}
+		fn_keep_check_F1F12(pressed);
 		return EC_ERROR_UNIMPLEMENTED;
 		break;
 	case SCANCODE_F10:  /* FLIGHT_MODE */
 		update_hid_key(HID_KEY_AIRPLANE_MODE, pressed);
+		fn_keep_check_F1F12(pressed);
 		return EC_ERROR_UNIMPLEMENTED;
-
 		break;
 	case SCANCODE_F11:
 			/*
@@ -333,14 +353,16 @@ int hotkey_F1_F12(uint16_t *key_code, uint16_t lock, int8_t pressed)
 	case SCANCODE_F12:  /* TODO: FRAMEWORK */
 		/* Media Select scan code */
 		*key_code = 0xE050;
-
 		break;
+	default:
+		return EC_SUCCESS;
 	}
+	fn_keep_check_F1F12(pressed);
 	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;
 
@@ -366,29 +388,36 @@ int hotkey_special_key(uint16_t *key_code)
 	case SCANCODE_DOWN:  /* PAGE_DOWN */
 		*key_code = 0xe07a;
 		break;
+	default:
+		return EC_SUCCESS;
 	}
+	fn_keep_check_special(pressed);
 	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;
 
+	/* don't send break key if last time doesn't send make key */
+	if (!pressed && keep_fn_key_functional) {
+		keep_fn_key_functional = 0;
+		return EC_ERROR_UNKNOWN;
+	}
+
 	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;
 		break;
 	case SCANCODE_B:
 		/* BREAK_KEY */
 		simulate_keyboard(0xe07e, 1);
 		simulate_keyboard(0xe0, 1);
 		simulate_keyboard(0x7e, 0);
-		return EC_ERROR_UNIMPLEMENTED;
 		break;
 	case SCANCODE_P:
 		/* PAUSE_KEY */
@@ -397,7 +426,6 @@ int functional_hotkey(uint16_t *key_code)
 		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();
@@ -420,10 +448,12 @@ int functional_hotkey(uint16_t *key_code)
 		}
 		kblight_set(bl_brightness);
 		/* we dont want to pass the space key event to the OS */
-		return EC_ERROR_UNKNOWN;
 		break;
+	default:
+		return EC_SUCCESS;
 	}
-	return EC_SUCCESS;
+	keep_fn_key_functional = 1;
+	return EC_ERROR_UNIMPLEMENTED;
 }
 
 enum ec_error_list keyboard_scancode_callback(uint16_t *make_code,
@@ -456,21 +486,23 @@ 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)
+	if (!Fn_key && !keep_fn_key_special && !keep_fn_key_functional)
 		return EC_SUCCESS;
 
 	if (Fn_key & FN_LOCKED && !(Fn_key & FN_PRESSED))
 		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)
+	if ((!pressed && !keep_fn_key_functional) ||
+		pressed_key != *make_code)
 		return EC_SUCCESS;
 
-	r = functional_hotkey(make_code);
+	r = functional_hotkey(make_code, pressed);
 	if (r != EC_SUCCESS)
 		return r;