summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-02-11 03:47:17 +0000
committerGitHub <noreply@github.com>2023-02-11 03:47:17 +0000
commit11d49d00e74618500e5c51e4c7f858eb906ccea8 (patch)
treeee827f3ed92a56861f6f5bf1d5f33d6068458d2c /quantum
parent99918945149f98cf73f9365b0ad49a2fc07d1152 (diff)
Remove matrix_init_quantum/matrix_scan_quantum (#19806)
Diffstat (limited to 'quantum')
-rw-r--r--quantum/matrix.c4
-rw-r--r--quantum/matrix.h4
-rw-r--r--quantum/matrix_common.c6
-rw-r--r--quantum/quantum.c8
4 files changed, 5 insertions, 17 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c
index 0de65c6cdd..97d41caedd 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -308,7 +308,7 @@ void matrix_init(void) {
debounce_init(ROWS_PER_HAND);
- matrix_init_quantum();
+ matrix_init_kb();
}
#ifdef SPLIT_KEYBOARD
@@ -342,7 +342,7 @@ uint8_t matrix_scan(void) {
changed = debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed) | matrix_post_scan();
#else
changed = debounce(raw_matrix, matrix, ROWS_PER_HAND, changed);
- matrix_scan_quantum();
+ matrix_scan_kb();
#endif
return (uint8_t)changed;
}
diff --git a/quantum/matrix.h b/quantum/matrix.h
index 4b4210cb0f..760d21e0c1 100644
--- a/quantum/matrix.h
+++ b/quantum/matrix.h
@@ -67,10 +67,6 @@ void matrix_io_delay(void);
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);
diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c
index f2b9d58937..3173351888 100644
--- a/quantum/matrix_common.c
+++ b/quantum/matrix_common.c
@@ -111,7 +111,7 @@ bool matrix_post_scan(void) {
if (changed) memcpy(matrix + thatHand, slave_matrix, sizeof(slave_matrix));
- matrix_scan_quantum();
+ matrix_scan_kb();
} else {
transport_slave(matrix + thatHand, matrix + thisHand);
@@ -162,7 +162,7 @@ __attribute__((weak)) void matrix_init(void) {
debounce_init(ROWS_PER_HAND);
- matrix_init_quantum();
+ matrix_init_kb();
}
__attribute__((weak)) uint8_t matrix_scan(void) {
@@ -172,7 +172,7 @@ __attribute__((weak)) uint8_t matrix_scan(void) {
changed = debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed) | matrix_post_scan();
#else
changed = debounce(raw_matrix, matrix, ROWS_PER_HAND, changed);
- matrix_scan_quantum();
+ matrix_scan_kb();
#endif
return changed;
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 653f553f60..5554ecab32 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -453,14 +453,6 @@ void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3));
}
-// TODO: remove legacy api
-void matrix_init_quantum(void) {
- matrix_init_kb();
-}
-void matrix_scan_quantum(void) {
- matrix_scan_kb();
-}
-
//------------------------------------------------------------------------------
// Override these functions in your keymap file to play different tunes on
// different events such as startup and bootloader jump