diff options
Diffstat (limited to 'tmk_core')
-rw-r--r-- | tmk_core/common/avr/xprintf.S | 4 | ||||
-rw-r--r-- | tmk_core/common/chibios/sleep_led.c | 2 | ||||
-rw-r--r-- | tmk_core/common/test/timer.c | 2 | ||||
-rw-r--r-- | tmk_core/protocol/chibios.mk | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/tmk_core/common/avr/xprintf.S b/tmk_core/common/avr/xprintf.S index 06434b98d..c5a414c35 100644 --- a/tmk_core/common/avr/xprintf.S +++ b/tmk_core/common/avr/xprintf.S | |||
@@ -450,7 +450,7 @@ xatoi: | |||
450 | brcs 70f ;/ | 450 | brcs 70f ;/ |
451 | cpi r22, 10 ;if(r22 >= 10) { | 451 | cpi r22, 10 ;if(r22 >= 10) { |
452 | brcs 53f ; r22 -= 7; | 452 | brcs 53f ; r22 -= 7; |
453 | subi r22, 7 ; if(r22 < 10) | 453 | subi r22, 7 ; if(r22 < 10) |
454 | cpi r22, 10 ; | 454 | cpi r22, 10 ; |
455 | brcs 70f ;} | 455 | brcs 70f ;} |
456 | 53: cp r22, r25 ;if(r22 >= r25) error; | 456 | 53: cp r22, r25 ;if(r22 >= r25) error; |
@@ -496,5 +496,3 @@ xatoi: | |||
496 | ret | 496 | ret |
497 | .endfunc | 497 | .endfunc |
498 | #endif | 498 | #endif |
499 | |||
500 | |||
diff --git a/tmk_core/common/chibios/sleep_led.c b/tmk_core/common/chibios/sleep_led.c index 18c6d6e17..5595eec0e 100644 --- a/tmk_core/common/chibios/sleep_led.c +++ b/tmk_core/common/chibios/sleep_led.c | |||
@@ -211,4 +211,4 @@ void sleep_led_toggle(void) { | |||
211 | // not implemented | 211 | // not implemented |
212 | } | 212 | } |
213 | 213 | ||
214 | #endif /* platform selection */ \ No newline at end of file | 214 | #endif /* platform selection */ |
diff --git a/tmk_core/common/test/timer.c b/tmk_core/common/test/timer.c index 3c786ae29..61c3a0020 100644 --- a/tmk_core/common/test/timer.c +++ b/tmk_core/common/test/timer.c | |||
@@ -30,4 +30,4 @@ uint32_t timer_elapsed32(uint32_t last) { return TIMER_DIFF_32(timer_read32(), l | |||
30 | void set_time(uint32_t t) { current_time = t; } | 30 | void set_time(uint32_t t) { current_time = t; } |
31 | void advance_time(uint32_t ms) { current_time += ms; } | 31 | void advance_time(uint32_t ms) { current_time += ms; } |
32 | 32 | ||
33 | void wait_ms(uint32_t ms) { advance_time(ms); } \ No newline at end of file | 33 | void wait_ms(uint32_t ms) { advance_time(ms); } |
diff --git a/tmk_core/protocol/chibios.mk b/tmk_core/protocol/chibios.mk index 2070420f5..80554abb3 100644 --- a/tmk_core/protocol/chibios.mk +++ b/tmk_core/protocol/chibios.mk | |||
@@ -18,4 +18,3 @@ OPT_DEFS += -DFIXED_NUM_CONFIGURATIONS=1 | |||
18 | ifeq ($(strip $(MIDI_ENABLE)), yes) | 18 | ifeq ($(strip $(MIDI_ENABLE)), yes) |
19 | include $(TMK_PATH)/protocol/midi.mk | 19 | include $(TMK_PATH)/protocol/midi.mk |
20 | endif | 20 | endif |
21 | |||