summaryrefslogtreecommitdiff
path: root/keyboards/converter
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 /keyboards/converter
parent99918945149f98cf73f9365b0ad49a2fc07d1152 (diff)
Remove matrix_init_quantum/matrix_scan_quantum (#19806)
Diffstat (limited to 'keyboards/converter')
-rw-r--r--keyboards/converter/adb_usb/matrix.c4
-rw-r--r--keyboards/converter/hp_46010a/matrix.c14
-rw-r--r--keyboards/converter/m0110_usb/matrix.c4
-rw-r--r--keyboards/converter/palm_usb/matrix.c4
-rw-r--r--keyboards/converter/siemens_tastatur/matrix.c4
-rw-r--r--keyboards/converter/sun_usb/matrix.c4
-rw-r--r--keyboards/converter/usb_usb/custom_matrix.cpp4
-rw-r--r--keyboards/converter/xt_usb/matrix.c4
8 files changed, 16 insertions, 26 deletions
diff --git a/keyboards/converter/adb_usb/matrix.c b/keyboards/converter/adb_usb/matrix.c
index e6a4921960..20479eb466 100644
--- a/keyboards/converter/adb_usb/matrix.c
+++ b/keyboards/converter/adb_usb/matrix.c
@@ -76,7 +76,7 @@ void matrix_init(void)
// debug_mouse = true;
// print("debug enabled.\n");
- matrix_init_quantum();
+ matrix_init_kb();
}
#ifdef ADB_MOUSE_ENABLE
@@ -241,7 +241,7 @@ uint8_t matrix_scan(void)
extra_key = key1<<8 | 0xFF; // process in a separate call
}
- matrix_scan_quantum();
+ matrix_scan_kb();
return 1;
}
diff --git a/keyboards/converter/hp_46010a/matrix.c b/keyboards/converter/hp_46010a/matrix.c
index eafe320a3d..7f4e11ab27 100644
--- a/keyboards/converter/hp_46010a/matrix.c
+++ b/keyboards/converter/hp_46010a/matrix.c
@@ -51,16 +51,6 @@ static uint8_t matrix_debounce_new [MATRIX_ROWS] = {0};
#endif
__attribute__ ((weak))
-void matrix_init_quantum(void) {
- matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
- matrix_scan_kb();
-}
-
-__attribute__ ((weak))
void matrix_init_kb(void) {
matrix_init_user();
}
@@ -161,7 +151,7 @@ void matrix_init (void) {
DDRD |= LED ;
PORTD &= ~LED ;
- matrix_init_quantum();
+ matrix_init_kb();
//toggle reset, to put the keyboard logic into a known state
Matrix_Reset() ;
@@ -206,7 +196,7 @@ uint8_t matrix_scan(void) {
#endif
Matrix_Reset() ;
- matrix_scan_quantum() ;
+ matrix_scan_kb() ;
return 1;
}
diff --git a/keyboards/converter/m0110_usb/matrix.c b/keyboards/converter/m0110_usb/matrix.c
index daba7a138a..6c39d4b6b0 100644
--- a/keyboards/converter/m0110_usb/matrix.c
+++ b/keyboards/converter/m0110_usb/matrix.c
@@ -72,7 +72,7 @@ void matrix_init(void)
for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
matrix = _matrix0;
- matrix_init_quantum();
+ matrix_init_kb();
return;
}
@@ -96,7 +96,7 @@ uint8_t matrix_scan(void)
print("["); print_hex8(key); print("]\n");
}
- matrix_scan_quantum();
+ matrix_scan_kb();
return 1;
}
diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c
index 28d4b87d83..4226dfa52c 100644
--- a/keyboards/converter/palm_usb/matrix.c
+++ b/keyboards/converter/palm_usb/matrix.c
@@ -280,7 +280,7 @@ void matrix_init(void)
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
- matrix_init_quantum();
+ matrix_init_kb();
return;
@@ -348,7 +348,7 @@ uint8_t matrix_scan(void)
}
}
- matrix_scan_quantum();
+ matrix_scan_kb();
return code;
}
diff --git a/keyboards/converter/siemens_tastatur/matrix.c b/keyboards/converter/siemens_tastatur/matrix.c
index 2da4e33d3d..ea1aa2287e 100644
--- a/keyboards/converter/siemens_tastatur/matrix.c
+++ b/keyboards/converter/siemens_tastatur/matrix.c
@@ -109,7 +109,7 @@ void matrix_init(void) {
memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
memset(matrix_debouncing, 0, MATRIX_ROWS * sizeof(matrix_row_t));
- matrix_init_quantum();
+ matrix_init_kb();
osalSysLock();
enable_input_events();
@@ -215,7 +215,7 @@ uint8_t matrix_scan(void) {
porta_buffer = 65535;
portb_buffer = 65535;
- matrix_scan_quantum();
+ matrix_scan_kb();
return 1;
}
diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c
index 35ec391024..9f22eca1eb 100644
--- a/keyboards/converter/sun_usb/matrix.c
+++ b/keyboards/converter/sun_usb/matrix.c
@@ -97,7 +97,7 @@ void matrix_init(void)
/* PORTD &= ~(1<<6); */
- matrix_init_quantum();
+ matrix_init_kb();
return;
}
@@ -148,7 +148,7 @@ uint8_t matrix_scan(void)
}
}
- matrix_scan_quantum();
+ matrix_scan_kb();
return code;
}
diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp
index 8b5fd4451a..f5f751da14 100644
--- a/keyboards/converter/usb_usb/custom_matrix.cpp
+++ b/keyboards/converter/usb_usb/custom_matrix.cpp
@@ -93,7 +93,7 @@ extern "C" {
kbd2.SetReportParser(0, (HIDReportParser*)&kbd_parser2);
kbd3.SetReportParser(0, (HIDReportParser*)&kbd_parser3);
kbd4.SetReportParser(0, (HIDReportParser*)&kbd_parser4);
- matrix_init_quantum();
+ matrix_init_kb();
}
static void or_report(report_keyboard_t report) {
@@ -182,7 +182,7 @@ extern "C" {
led_set(host_keyboard_leds());
}
}
- matrix_scan_quantum();
+ matrix_scan_kb();
return changed;
}
diff --git a/keyboards/converter/xt_usb/matrix.c b/keyboards/converter/xt_usb/matrix.c
index 7a16750432..71211cbc03 100644
--- a/keyboards/converter/xt_usb/matrix.c
+++ b/keyboards/converter/xt_usb/matrix.c
@@ -59,7 +59,7 @@ void matrix_init(void) {
matrix[i] = 0x00;
}
- matrix_init_quantum();
+ matrix_init_kb();
}
// convert E0-escaped codes into unused area
@@ -188,7 +188,7 @@ uint8_t matrix_scan(void) {
state = XT_STATE_INIT;
}
- matrix_scan_quantum();
+ matrix_scan_kb();
return 1;
}