diff options
author | xyzz <1065521+xyzz@users.noreply.github.com> | 2020-12-29 16:45:04 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-29 21:45:04 +0000 |
commit | 2573ed8c6bc3ce5dcccbd3fddc2e8fe5a0377eac (patch) | |
tree | 95c494e0005de4c970bef4d838c5f0dbf27acc06 /keyboards/massdrop | |
parent | 25d9cdc88fa990251c5528d07027448c7c801f58 (diff) |
Remove MATRIX_IS_ON macro (#11330)
* Remove MATRIX_IS_ON macro
this macro is both incorrect and excessive given that macro_is_on()
exists
* Remove massdrop matrix.h
Diffstat (limited to 'keyboards/massdrop')
-rw-r--r-- | keyboards/massdrop/alt/matrix.h | 77 | ||||
-rw-r--r-- | keyboards/massdrop/ctrl/matrix.h | 77 |
2 files changed, 0 insertions, 154 deletions
diff --git a/keyboards/massdrop/alt/matrix.h b/keyboards/massdrop/alt/matrix.h deleted file mode 100644 index 3eab6dece1..0000000000 --- a/keyboards/massdrop/alt/matrix.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#ifndef MATRIX_H -#define MATRIX_H - -#include <stdint.h> -#include <stdbool.h> -#include "keyboard.h" - -#if (MATRIX_COLS <= 8) -typedef uint8_t matrix_row_t; -#elif (MATRIX_COLS <= 16) -typedef uint16_t matrix_row_t; -#elif (MATRIX_COLS <= 32) -typedef uint32_t matrix_row_t; -#else -#error "MATRIX_COLS: invalid value" -#endif - -#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1<<col)) - -#ifdef __cplusplus -extern "C" { -#endif - -/* number of matrix rows */ -uint8_t matrix_rows(void); -/* number of matrix columns */ -uint8_t matrix_cols(void); -/* should be called at early stage of startup before matrix_init.(optional) */ -void matrix_setup(void); -/* intialize matrix for scaning. */ -void matrix_init(void); -/* scan all key states on matrix */ -uint8_t matrix_scan(void); -/* whether modified from previous scan. used after matrix_scan. */ -bool matrix_is_modified(void) __attribute__ ((deprecated)); -/* whether a switch is on */ -bool matrix_is_on(uint8_t row, uint8_t col); -/* matrix state on row */ -matrix_row_t matrix_get_row(uint8_t row); -/* print matrix for debug */ -void matrix_print(void); - -/* power control */ -void matrix_power_up(void); -void matrix_power_down(void); - -/* executes code for Quantum */ -void matrix_init_quantum(void); -void matrix_scan_quantum(void); - -void matrix_init_kb(void); -void matrix_scan_kb(void); - -void matrix_init_user(void); -void matrix_scan_user(void); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/keyboards/massdrop/ctrl/matrix.h b/keyboards/massdrop/ctrl/matrix.h deleted file mode 100644 index 3eab6dece1..0000000000 --- a/keyboards/massdrop/ctrl/matrix.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#ifndef MATRIX_H -#define MATRIX_H - -#include <stdint.h> -#include <stdbool.h> -#include "keyboard.h" - -#if (MATRIX_COLS <= 8) -typedef uint8_t matrix_row_t; -#elif (MATRIX_COLS <= 16) -typedef uint16_t matrix_row_t; -#elif (MATRIX_COLS <= 32) -typedef uint32_t matrix_row_t; -#else -#error "MATRIX_COLS: invalid value" -#endif - -#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1<<col)) - -#ifdef __cplusplus -extern "C" { -#endif - -/* number of matrix rows */ -uint8_t matrix_rows(void); -/* number of matrix columns */ -uint8_t matrix_cols(void); -/* should be called at early stage of startup before matrix_init.(optional) */ -void matrix_setup(void); -/* intialize matrix for scaning. */ -void matrix_init(void); -/* scan all key states on matrix */ -uint8_t matrix_scan(void); -/* whether modified from previous scan. used after matrix_scan. */ -bool matrix_is_modified(void) __attribute__ ((deprecated)); -/* whether a switch is on */ -bool matrix_is_on(uint8_t row, uint8_t col); -/* matrix state on row */ -matrix_row_t matrix_get_row(uint8_t row); -/* print matrix for debug */ -void matrix_print(void); - -/* power control */ -void matrix_power_up(void); -void matrix_power_down(void); - -/* executes code for Quantum */ -void matrix_init_quantum(void); -void matrix_scan_quantum(void); - -void matrix_init_kb(void); -void matrix_scan_kb(void); - -void matrix_init_user(void); -void matrix_scan_user(void); - -#ifdef __cplusplus -} -#endif - -#endif |