diff options
-rw-r--r-- | common_features.mk | 6 | ||||
-rw-r--r-- | quantum/crc.c | 59 | ||||
-rw-r--r-- | quantum/crc.h | 44 | ||||
-rw-r--r-- | tmk_core/common/keyboard.c | 6 |
4 files changed, 115 insertions, 0 deletions
diff --git a/common_features.mk b/common_features.mk index b259af46c..1a079a8df 100644 --- a/common_features.mk +++ b/common_features.mk | |||
@@ -530,6 +530,7 @@ endif | |||
530 | ifeq ($(strip $(SPLIT_KEYBOARD)), yes) | 530 | ifeq ($(strip $(SPLIT_KEYBOARD)), yes) |
531 | POST_CONFIG_H += $(QUANTUM_DIR)/split_common/post_config.h | 531 | POST_CONFIG_H += $(QUANTUM_DIR)/split_common/post_config.h |
532 | OPT_DEFS += -DSPLIT_KEYBOARD | 532 | OPT_DEFS += -DSPLIT_KEYBOARD |
533 | CRC_ENABLE := yes | ||
533 | 534 | ||
534 | # Include files used by all split keyboards | 535 | # Include files used by all split keyboards |
535 | QUANTUM_SRC += $(QUANTUM_DIR)/split_common/split_util.c | 536 | QUANTUM_SRC += $(QUANTUM_DIR)/split_common/split_util.c |
@@ -557,6 +558,11 @@ ifeq ($(strip $(SPLIT_KEYBOARD)), yes) | |||
557 | COMMON_VPATH += $(QUANTUM_PATH)/split_common | 558 | COMMON_VPATH += $(QUANTUM_PATH)/split_common |
558 | endif | 559 | endif |
559 | 560 | ||
561 | ifeq ($(strip $(CRC_ENABLE)), yes) | ||
562 | OPT_DEFS += -DCRC_ENABLE | ||
563 | QUANTUM_LIB_SRC += crc.c | ||
564 | endif | ||
565 | |||
560 | HAPTIC_ENABLE ?= no | 566 | HAPTIC_ENABLE ?= no |
561 | ifneq ($(strip $(HAPTIC_ENABLE)),no) | 567 | ifneq ($(strip $(HAPTIC_ENABLE)),no) |
562 | COMMON_VPATH += $(DRIVER_PATH)/haptic | 568 | COMMON_VPATH += $(DRIVER_PATH)/haptic |
diff --git a/quantum/crc.c b/quantum/crc.c new file mode 100644 index 000000000..0d8b9d601 --- /dev/null +++ b/quantum/crc.c | |||
@@ -0,0 +1,59 @@ | |||
1 | /* Copyright 2021 QMK | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
17 | #include "crc.h" | ||
18 | |||
19 | __attribute__((weak)) void crc_init(void){ | ||
20 | /* Software implementation nothing todo here. */ | ||
21 | }; | ||
22 | |||
23 | #if defined(CRC8_USE_TABLE) | ||
24 | /** | ||
25 | * Static table used for the table_driven implementation. | ||
26 | */ | ||
27 | static const crc_t crc_table[256] = {0x00, 0x07, 0x0e, 0x09, 0x1c, 0x1b, 0x12, 0x15, 0x38, 0x3f, 0x36, 0x31, 0x24, 0x23, 0x2a, 0x2d, 0x70, 0x77, 0x7e, 0x79, 0x6c, 0x6b, 0x62, 0x65, 0x48, 0x4f, 0x46, 0x41, 0x54, 0x53, 0x5a, 0x5d, 0xe0, 0xe7, 0xee, 0xe9, 0xfc, 0xfb, 0xf2, 0xf5, 0xd8, 0xdf, 0xd6, 0xd1, 0xc4, 0xc3, 0xca, 0xcd, 0x90, 0x97, 0x9e, 0x99, 0x8c, 0x8b, 0x82, 0x85, 0xa8, 0xaf, 0xa6, 0xa1, 0xb4, 0xb3, 0xba, 0xbd, 0xc7, 0xc0, 0xc9, 0xce, 0xdb, 0xdc, 0xd5, 0xd2, 0xff, 0xf8, 0xf1, 0xf6, 0xe3, 0xe4, 0xed, 0xea, 0xb7, 0xb0, 0xb9, 0xbe, 0xab, 0xac, 0xa5, 0xa2, 0x8f, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9d, 0x9a, 0x27, 0x20, 0x29, 0x2e, 0x3b, 0x3c, 0x35, 0x32, 0x1f, 0x18, 0x11, 0x16, 0x03, 0x04, 0x0d, 0x0a, 0x57, 0x50, 0x59, 0x5e, 0x4b, 0x4c, 0x45, 0x42, 0x6f, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7d, 0x7a, | ||
28 | 0x89, 0x8e, 0x87, 0x80, 0x95, 0x92, 0x9b, 0x9c, 0xb1, 0xb6, 0xbf, 0xb8, 0xad, 0xaa, 0xa3, 0xa4, 0xf9, 0xfe, 0xf7, 0xf0, 0xe5, 0xe2, 0xeb, 0xec, 0xc1, 0xc6, 0xcf, 0xc8, 0xdd, 0xda, 0xd3, 0xd4, 0x69, 0x6e, 0x67, 0x60, 0x75, 0x72, 0x7b, 0x7c, 0x51, 0x56, 0x5f, 0x58, 0x4d, 0x4a, 0x43, 0x44, 0x19, 0x1e, 0x17, 0x10, 0x05, 0x02, 0x0b, 0x0c, 0x21, 0x26, 0x2f, 0x28, 0x3d, 0x3a, 0x33, 0x34, 0x4e, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5c, 0x5b, 0x76, 0x71, 0x78, 0x7f, 0x6a, 0x6d, 0x64, 0x63, 0x3e, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2c, 0x2b, 0x06, 0x01, 0x08, 0x0f, 0x1a, 0x1d, 0x14, 0x13, 0xae, 0xa9, 0xa0, 0xa7, 0xb2, 0xb5, 0xbc, 0xbb, 0x96, 0x91, 0x98, 0x9f, 0x8a, 0x8d, 0x84, 0x83, 0xde, 0xd9, 0xd0, 0xd7, 0xc2, 0xc5, 0xcc, 0xcb, 0xe6, 0xe1, 0xe8, 0xef, 0xfa, 0xfd, 0xf4, 0xf3}; | ||
29 | |||
30 | __attribute__((weak)) uint8_t crc8(const void *data, size_t data_len) { | ||
31 | const uint8_t *d = (const uint8_t *)data; | ||
32 | crc_t crc = 0xff; | ||
33 | size_t tbl_idx; | ||
34 | |||
35 | while (data_len--) { | ||
36 | tbl_idx = crc ^ *d; | ||
37 | crc = crc_table[tbl_idx] & 0xff; | ||
38 | d++; | ||
39 | } | ||
40 | return crc & 0xff; | ||
41 | } | ||
42 | #else | ||
43 | __attribute__((weak)) uint8_t crc8(const void *data, size_t data_len) { | ||
44 | const uint8_t *d = (const uint8_t *)data; | ||
45 | crc_t crc = 0xff; | ||
46 | size_t i, j; | ||
47 | |||
48 | for (i = 0; i < data_len; i++) { | ||
49 | crc ^= d[i]; | ||
50 | for (j = 0; j < 8; j++) { | ||
51 | if ((crc & 0x80) != 0) | ||
52 | crc = (crc_t)((crc << 1) ^ 0x31); | ||
53 | else | ||
54 | crc <<= 1; | ||
55 | } | ||
56 | } | ||
57 | return crc; | ||
58 | } | ||
59 | #endif \ No newline at end of file | ||
diff --git a/quantum/crc.h b/quantum/crc.h new file mode 100644 index 000000000..c17f5888e --- /dev/null +++ b/quantum/crc.h | |||
@@ -0,0 +1,44 @@ | |||
1 | /* Copyright 2021 QMK | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
17 | #pragma once | ||
18 | |||
19 | #include "quantum.h" | ||
20 | |||
21 | /** | ||
22 | * The type of the CRC values. | ||
23 | * | ||
24 | * This type must be big enough to contain at least 8 bits. | ||
25 | */ | ||
26 | #if defined(CRC8_OPTIMIZE_SPEED) | ||
27 | typedef uint_fast8_t crc_t; | ||
28 | #else | ||
29 | typedef uint_least8_t crc_t; | ||
30 | #endif | ||
31 | |||
32 | /** | ||
33 | * Initialize crc subsystem. | ||
34 | */ | ||
35 | __attribute__((weak)) void crc_init(void); | ||
36 | |||
37 | /** | ||
38 | * Generate CRC8 value from given data. | ||
39 | * | ||
40 | * \param[in] data Pointer to a buffer of \a data_len bytes. | ||
41 | * \param[in] data_len Number of bytes in the \a data buffer. | ||
42 | * \return The calculated crc value. | ||
43 | */ | ||
44 | __attribute__((weak)) uint8_t crc8(const void *data, size_t data_len); \ No newline at end of file | ||
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 249da85bd..28fa97bc8 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c | |||
@@ -103,6 +103,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
103 | #ifdef EEPROM_DRIVER | 103 | #ifdef EEPROM_DRIVER |
104 | # include "eeprom_driver.h" | 104 | # include "eeprom_driver.h" |
105 | #endif | 105 | #endif |
106 | #if defined(CRC_ENABLE) | ||
107 | # include "crc.h" | ||
108 | #endif | ||
106 | 109 | ||
107 | static uint32_t last_input_modification_time = 0; | 110 | static uint32_t last_input_modification_time = 0; |
108 | uint32_t last_input_activity_time(void) { return last_input_modification_time; } | 111 | uint32_t last_input_activity_time(void) { return last_input_modification_time; } |
@@ -300,6 +303,9 @@ void keyboard_init(void) { | |||
300 | timer_init(); | 303 | timer_init(); |
301 | sync_timer_init(); | 304 | sync_timer_init(); |
302 | matrix_init(); | 305 | matrix_init(); |
306 | #if defined(CRC_ENABLE) | ||
307 | crc_init(); | ||
308 | #endif | ||
303 | #ifdef VIA_ENABLE | 309 | #ifdef VIA_ENABLE |
304 | via_init(); | 310 | via_init(); |
305 | #endif | 311 | #endif |