diff options
| author | Jeremiah <barrar@users.noreply.github.com> | 2017-05-13 17:22:38 -0700 |
|---|---|---|
| committer | Jeremiah <barrar@users.noreply.github.com> | 2017-05-13 17:22:38 -0700 |
| commit | 7b7e285a984a5bf1f7f38f1b5846811dfcb3a185 (patch) | |
| tree | 905219e36a9f49efa6859e2a67f81dc10b45ad56 /tmk_core | |
| parent | acd3e97b83aac14961d1892b0b8333963f499505 (diff) | |
| download | qmk_firmware-7b7e285a984a5bf1f7f38f1b5846811dfcb3a185.tar.gz qmk_firmware-7b7e285a984a5bf1f7f38f1b5846811dfcb3a185.zip | |
should be using matrix_row_t
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/keyboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 0116053fb..24cc28892 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c | |||
| @@ -63,9 +63,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 63 | 63 | ||
| 64 | 64 | ||
| 65 | #ifdef MATRIX_HAS_GHOST | 65 | #ifdef MATRIX_HAS_GHOST |
| 66 | static uint16_t matrix_ghost_check[MATRIX_ROWS]; | 66 | static matrix_row_t matrix_ghost_check[MATRIX_ROWS]; |
| 67 | 67 | ||
| 68 | static inline bool countones(uint16_t data) | 68 | static inline bool countones(matrix_row_t data) |
| 69 | { | 69 | { |
| 70 | int count = 0; | 70 | int count = 0; |
| 71 | for (int col = 0; col < MATRIX_COLS; col++) { | 71 | for (int col = 0; col < MATRIX_COLS; col++) { |
| @@ -77,7 +77,7 @@ static inline bool countones(uint16_t data) | |||
| 77 | } | 77 | } |
| 78 | return false; | 78 | return false; |
| 79 | } | 79 | } |
| 80 | static inline bool has_ghost_in_row(uint8_t row, uint16_t rowdata) | 80 | static inline bool has_ghost_in_row(uint8_t row, matrix_row_t rowdata) |
| 81 | { | 81 | { |
| 82 | rowdata &= matrix_ghost_check[row]; | 82 | rowdata &= matrix_ghost_check[row]; |
| 83 | if (((rowdata - 1) & rowdata) == 0){ | 83 | if (((rowdata - 1) & rowdata) == 0){ |