diff options
| author | Ryan <fauxpark@gmail.com> | 2020-04-02 01:49:45 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-01 15:49:45 +0100 |
| commit | 95c5c11d0b909f14696c9c0b2dd30b3bfd406273 (patch) | |
| tree | d4b8a91d15cc824efd96f7ce63c47222cb665bd3 /quantum | |
| parent | b6a09502c626c3a94a859ab0a61d41a41835d611 (diff) | |
| download | firmware-95c5c11d0b909f14696c9c0b2dd30b3bfd406273.tar.gz firmware-95c5c11d0b909f14696c9c0b2dd30b3bfd406273.tar.bz2 firmware-95c5c11d0b909f14696c9c0b2dd30b3bfd406273.zip | |
Miscellaneous cleanups (#8639)
* Miscellaneous cleanups
* Cast NO_PIN
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/config_common.h | 2 | ||||
| -rw-r--r-- | quantum/quantum.c | 4 |
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 @@ #define ROW2COL 1 // useful for direct pin mapping -#define NO_PIN (~0) +#define NO_PIN (pin_t)(~0) #ifdef __AVR__ # 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) { #ifdef HAPTIC_ENABLE haptic_shutdown(); #endif -// this is also done later in bootloader.c - not sure if it's neccesary here -#ifdef BOOTLOADER_CATERINA - *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific -#endif bootloader_jump(); } |