From 9e9a85c1426650148d0d83c900e432003ff174fb Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 5 Mar 2013 19:18:01 +0900 Subject: Fix ghost block and remove matrix_has_ghost() --- keyboard/hbkb/matrix.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'keyboard/hbkb/matrix.c') diff --git a/keyboard/hbkb/matrix.c b/keyboard/hbkb/matrix.c index d7c0663642..f3a0cde5f3 100644 --- a/keyboard/hbkb/matrix.c +++ b/keyboard/hbkb/matrix.c @@ -147,18 +147,6 @@ bool matrix_is_modified(void) return false; } -inline -bool matrix_has_ghost(void) -{ -#ifdef MATRIX_HAS_GHOST - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - if (matrix_has_ghost_in_row(i)) - return true; - } -#endif - return false; -} - inline bool matrix_is_on(uint8_t row, uint8_t col) { @@ -217,7 +205,8 @@ static bool matrix_has_ghost_in_row(uint8_t row) // ghost exists in case same state as other row for (uint8_t i=0; i < MATRIX_ROWS; i++) { - if (i != row && (matrix[i] & matrix[row]) == matrix[row]) + //if (i != row && (matrix[i] & matrix[row]) == matrix[row]) + if (i != row && (matrix[i] & matrix[row])) return true; } return false; -- cgit v1.2.3