From 95c5c11d0b909f14696c9c0b2dd30b3bfd406273 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 2 Apr 2020 01:49:45 +1100 Subject: Miscellaneous cleanups (#8639) * Miscellaneous cleanups * Cast NO_PIN --- quantum/config_common.h | 2 +- quantum/quantum.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'quantum') diff --git a/quantum/config_common.h b/quantum/config_common.h index f981f3f8cb..4cfd74b0fe 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 c857e5f7a1..03b5704eb4 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -144,10 +144,6 @@ void reset_keyboard(void) { #endif #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(); } -- cgit v1.2.3