diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-18 01:29:25 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-18 01:29:25 +0000 |
| commit | af5c10ef0c71d41446b8fb27b942fb2bc92e49d8 (patch) | |
| tree | 7969930d20053bc02622ce3e901a26e40315cd86 /tmk_core | |
| parent | 4aa57e9e46b8d0ed1814131bf2944b2b45ee077c (diff) | |
| parent | 9807225f90523d51eaf518b20e4d524dc0bb3ec6 (diff) | |
| download | qmk_firmware-af5c10ef0c71d41446b8fb27b942fb2bc92e49d8.tar.gz qmk_firmware-af5c10ef0c71d41446b8fb27b942fb2bc92e49d8.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/protocol/xt.h | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/xt_interrupt.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/protocol/xt.h b/tmk_core/protocol/xt.h index cc55b7dbca..538ff0e459 100644 --- a/tmk_core/protocol/xt.h +++ b/tmk_core/protocol/xt.h @@ -68,6 +68,6 @@ POSSIBILITY OF SUCH DAMAGE. setPinOutput(XT_CLOCK_PIN); \ } while (0) -void xt_host_init(void); +void xt_host_init(void); uint8_t xt_host_recv(void); diff --git a/tmk_core/protocol/xt_interrupt.c b/tmk_core/protocol/xt_interrupt.c index 3dd7e6177b..ba9d71848f 100644 --- a/tmk_core/protocol/xt_interrupt.c +++ b/tmk_core/protocol/xt_interrupt.c @@ -119,9 +119,9 @@ ISR(XT_INT_VECT) { * Ring buffer to store scan codes from keyboard *------------------------------------------------------------------*/ #define PBUF_SIZE 32 -static uint8_t pbuf[PBUF_SIZE]; -static uint8_t pbuf_head = 0; -static uint8_t pbuf_tail = 0; +static uint8_t pbuf[PBUF_SIZE]; +static uint8_t pbuf_head = 0; +static uint8_t pbuf_tail = 0; static inline void pbuf_enqueue(uint8_t data) { uint8_t sreg = SREG; |