aboutsummaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-04-02 01:49:45 +1100
committerGitHub <noreply@github.com>2020-04-01 15:49:45 +0100
commit95c5c11d0b909f14696c9c0b2dd30b3bfd406273 (patch)
treed4b8a91d15cc824efd96f7ce63c47222cb665bd3 /quantum
parentb6a09502c626c3a94a859ab0a61d41a41835d611 (diff)
downloadqmk_firmware-95c5c11d0b909f14696c9c0b2dd30b3bfd406273.tar.gz
qmk_firmware-95c5c11d0b909f14696c9c0b2dd30b3bfd406273.zip
Miscellaneous cleanups (#8639)
* Miscellaneous cleanups * Cast NO_PIN
Diffstat (limited to 'quantum')
-rw-r--r--quantum/config_common.h2
-rw-r--r--quantum/quantum.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/quantum/config_common.h b/quantum/config_common.h
index f981f3f8c..4cfd74b0f 100644
--- a/quantum/config_common.h
+++ b/quantum/config_common.h
@@ -21,7 +21,7 @@
21#define ROW2COL 1 21#define ROW2COL 1
22 22
23// useful for direct pin mapping 23// useful for direct pin mapping
24#define NO_PIN (~0) 24#define NO_PIN (pin_t)(~0)
25 25
26#ifdef __AVR__ 26#ifdef __AVR__
27# ifndef __ASSEMBLER__ 27# ifndef __ASSEMBLER__
diff --git a/quantum/quantum.c b/quantum/quantum.c
index c857e5f7a..03b5704eb 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -145,10 +145,6 @@ void reset_keyboard(void) {
145#ifdef HAPTIC_ENABLE 145#ifdef HAPTIC_ENABLE
146 haptic_shutdown(); 146 haptic_shutdown();
147#endif 147#endif
148// this is also done later in bootloader.c - not sure if it's neccesary here
149#ifdef BOOTLOADER_CATERINA
150 *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific
151#endif
152 bootloader_jump(); 148 bootloader_jump();
153} 149}
154 150