From c782abf208511b1c37e88178567788ca1db366a2 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 4 Oct 2012 12:35:20 -0700 Subject: stm32: Drop key scan masks The masks were intended to be used to ignore certain keys in the matrix to help with de-ghosting of keys. Since this is done on the AP anyway, there really isn't any need for them. Punt. BUG=chrome-os-partner:12179 BRANCH=snow TEST=manual Build and boot into kernel, see that keyboard still works. Change-Id: I00d1b761d24ab503c66439b095a8336fff5d5db6 Signed-off-by: Simon Glass Reviewed-on: https://gerrit.chromium.org/gerrit/34657 --- chip/stm32/keyboard_scan.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/chip/stm32/keyboard_scan.c b/chip/stm32/keyboard_scan.c index 47e3dac039..8ebb88848d 100644 --- a/chip/stm32/keyboard_scan.c +++ b/chip/stm32/keyboard_scan.c @@ -44,20 +44,6 @@ static struct mutex scanning_enabled; /* The keyboard state from the last read */ static uint8_t raw_state[KB_OUTPUTS]; -/* Mask with 1 bits only for keys that actually exist */ -static const uint8_t *actual_key_mask; - -/* All actual key masks (todo: move to keyboard matrix definition) */ -/* TODO: (crosbug.com/p/7485) fill in real key mask with 0-bits for coords that - aren't keys */ -static const uint8_t actual_key_masks[4][KB_OUTPUTS] = { - {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, - {0}, - {0}, - {0}, - }; - /* Key masks for special boot keys */ #define MASK_INDEX_ESC 1 #define MASK_VALUE_ESC 0x02 @@ -279,9 +265,6 @@ static int check_keys_changed(void) /* Invert it so 0=not pressed, 1=pressed */ r ^= 0xff; - /* Mask off keys that don't exist so they never show - * as pressed */ - r &= actual_key_mask[c]; #ifdef OR_WITH_CURRENT_STATE_FOR_TESTING /* KLUDGE - or current state in, so we can make sure @@ -373,10 +356,6 @@ int keyboard_scan_init(void) /* Tri-state (put into Hi-Z) the outputs */ select_column(COL_TRI_STATE_ALL); - /* TODO: method to set which keyboard we have, so we set the actual - * key mask properly */ - actual_key_mask = actual_key_masks[0]; - /* Initialize raw state */ check_keys_changed(); -- cgit v1.2.1