jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Miscellaneous cleanups (#8639)

Browse Source 
* Miscellaneous cleanups

* Cast NO_PIN
This commit is contained in:
Ryan
2020-04-02 01:49:45 +11:00
committed by Florian Didron
parent 09aa3b15f4
commit ee1860315d
5 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/config_common.h
View File

@@ -22,7 +22,7 @@
#define CUSTOM_MATRIX 2 /* Disables built-in matrix scanning code */ #define CUSTOM_MATRIX 2 /* Disables built-in matrix scanning code */
// useful for direct pin mapping // useful for direct pin mapping
#define NO_PIN (~0) #define NO_PIN (pin_t)(~0)
#ifdef __AVR__ #ifdef __AVR__
# ifndef __ASSEMBLER__ # ifndef __ASSEMBLER__

4
quantum/quantum.c
View File

@@ -141,10 +141,6 @@ void reset_keyboard(void) {
#endif #endif
#ifdef HAPTIC_ENABLE #ifdef HAPTIC_ENABLE
haptic_shutdown(); 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 #endif
bootloader_jump(); bootloader_jump();
} }

6
tmk_core/protocol/lufa/lufa.h
View File

@@ -69,14 +69,8 @@ extern host_driver_t lufa_driver;
# define MIDI_SYSEX_BUFFER (API_SYSEX_MAX_SIZE + API_SYSEX_MAX_SIZE / 7 + (API_SYSEX_MAX_SIZE % 7 ? 1 : 0)) # define MIDI_SYSEX_BUFFER (API_SYSEX_MAX_SIZE + API_SYSEX_MAX_SIZE / 7 + (API_SYSEX_MAX_SIZE % 7 ? 1 : 0))
#endif #endif
// #if LUFA_VERSION_INTEGER < 0x120730
// /* old API 120219 */
// #define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint(epnum, eptype, epdir, epsize, epbank)
// #else
/* new API >= 120730 */
#define ENDPOINT_BANK_SINGLE 1 #define ENDPOINT_BANK_SINGLE 1
#define ENDPOINT_BANK_DOUBLE 2 #define ENDPOINT_BANK_DOUBLE 2
#define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint((epdir) | (epnum), eptype, epsize, epbank) #define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint((epdir) | (epnum), eptype, epsize, epbank)
// #endif
#endif #endif

5
util/activate_msys2.sh
View File

@@ -9,11 +9,6 @@ function export_variables {
export PATH=$PATH:$util_dir/flip/bin export PATH=$PATH:$util_dir/flip/bin
export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin
export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin
export PATH=$PATH:/mingw64/bin
} }
export_variables export_variables

4
util/activate_wsl.sh
View File

@@ -12,7 +12,3 @@ function export_variables {
} }
export_variables export_variables