From 8574bf20d35b21c7b44ba8550fa11b4d100fdbbd Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 Sep 2021 02:09:30 +1000 Subject: [PATCH] Remove more cruft in keyboard files (#14288) --- keyboards/cu75/cu75.c | 8 ++++---- keyboards/cu75/cu75.h | 16 ---------------- keyboards/ergotaco/ergotaco.h | 2 -- keyboards/georgi/georgi.h | 2 -- keyboards/gergo/gergo.h | 2 -- keyboards/handwired/dactyl/dactyl.h | 3 --- keyboards/handwired/frenchdev/frenchdev.h | 3 --- keyboards/hotdox/hotdox.h | 3 --- keyboards/ktec/ergodone/ergodone.h | 3 --- keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h | 15 --------------- keyboards/lfkeyboards/lfk87/lfk87.c | 4 ++-- keyboards/lfkeyboards/lfk87/lfk87.h | 14 -------------- keyboards/lfkeyboards/mini1800/mini1800.c | 4 ++-- keyboards/lfkeyboards/mini1800/mini1800.h | 14 -------------- keyboards/lfkeyboards/smk65/revb/revb.c | 8 ++++---- keyboards/lfkeyboards/smk65/revb/revb.h | 16 ---------------- keyboards/sx60/sx60.h | 3 --- 17 files changed, 12 insertions(+), 108 deletions(-) diff --git a/keyboards/cu75/cu75.c b/keyboards/cu75/cu75.c index 80941df39..43600efad 100644 --- a/keyboards/cu75/cu75.c +++ b/keyboards/cu75/cu75.c @@ -28,12 +28,12 @@ void matrix_init_kb(void) audio_init(); PLAY_SONG(test_sound); // Fix port B5 - cbi(DDRB, 5); - sbi(PORTB, 5); + setPinInput(B5); + writePinHigh(B5); #else // If we're not using the audio pin, drive it low - sbi(DDRC, 6); - cbi(PORTC, 6); + setPinOutput(C6); + writePinLow(C6); #endif #ifdef ISSI_ENABLE issi_init(); diff --git a/keyboards/cu75/cu75.h b/keyboards/cu75/cu75.h index 5abce8fcd..7774187b4 100644 --- a/keyboards/cu75/cu75.h +++ b/keyboards/cu75/cu75.h @@ -1,26 +1,10 @@ #ifndef CU75_H #define CU75_H -/* if the kb.h file exists (because we're running from qmkbuilder) include it */ -#ifdef __has_include -#if __has_include("kb.h") -#include "kb.h" -#endif -#endif - #include "quantum.h" #include "matrix.h" #include -#ifndef cbi -#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) -#endif - -#ifndef sbi -#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) -#endif - - typedef struct RGB_Color { uint16_t red; uint16_t green; diff --git a/keyboards/ergotaco/ergotaco.h b/keyboards/ergotaco/ergotaco.h index 6bc5ce36f..5a0cd5e8f 100644 --- a/keyboards/ergotaco/ergotaco.h +++ b/keyboards/ergotaco/ergotaco.h @@ -9,8 +9,6 @@ extern i2c_status_t mcp23018_status; #define ERGODOX_EZ_I2C_TIMEOUT 1000 -#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) -#define CPU_16MHz 0x00 // I2C aliases and register addresses (see "mcp23018.md") //#define I2C_ADDR 0b0100000 diff --git a/keyboards/georgi/georgi.h b/keyboards/georgi/georgi.h index df6bb6ea9..e5a52c585 100644 --- a/keyboards/georgi/georgi.h +++ b/keyboards/georgi/georgi.h @@ -9,8 +9,6 @@ extern i2c_status_t mcp23018_status; #define ERGODOX_EZ_I2C_TIMEOUT 1000 -#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) -#define CPU_16MHz 0x00 // I2C aliases and register addresses (see "mcp23018.md") //#define I2C_ADDR 0b0100000 diff --git a/keyboards/gergo/gergo.h b/keyboards/gergo/gergo.h index 1370325f2..517454266 100644 --- a/keyboards/gergo/gergo.h +++ b/keyboards/gergo/gergo.h @@ -9,8 +9,6 @@ extern i2c_status_t mcp23018_status; #define I2C_TIMEOUT 1000 -#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) -#define CPU_16MHz 0x00 // I2C aliases and register addresses (see "mcp23018.md") //#define I2C_ADDR 0b0100000 diff --git a/keyboards/handwired/dactyl/dactyl.h b/keyboards/handwired/dactyl/dactyl.h index d4c38dcfb..3589e1d3c 100644 --- a/keyboards/handwired/dactyl/dactyl.h +++ b/keyboards/handwired/dactyl/dactyl.h @@ -7,9 +7,6 @@ #include "i2cmaster.h" #include -#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) -#define CPU_16MHz 0x00 - #define I2C_ADDR 0b0100000 #define I2C_ADDR_WRITE ( (I2C_ADDR<<1) | I2C_WRITE ) #define I2C_ADDR_READ ( (I2C_ADDR<<1) | I2C_READ ) diff --git a/keyboards/handwired/frenchdev/frenchdev.h b/keyboards/handwired/frenchdev/frenchdev.h index 1df399088..d608fe9f0 100644 --- a/keyboards/handwired/frenchdev/frenchdev.h +++ b/keyboards/handwired/frenchdev/frenchdev.h @@ -6,9 +6,6 @@ #include "i2c_master.h" #include -#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) -#define CPU_16MHz 0x00 - // I2C aliases and register addresses (see "mcp23018.md" on tmk repository) #define I2C_ADDR 0b0100000 #define I2C_ADDR_WRITE ( (I2C_ADDR<<1) | I2C_WRITE ) diff --git a/keyboards/hotdox/hotdox.h b/keyboards/hotdox/hotdox.h index 0eef4ea79..348ec6b29 100644 --- a/keyboards/hotdox/hotdox.h +++ b/keyboards/hotdox/hotdox.h @@ -4,9 +4,6 @@ #include #include -#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) -#define CPU_16MHz 0x00 - void init_ergodox(void); inline void ergodox_board_led_on(void) { DDRB |= (1< #include -#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) -#define CPU_16MHz 0x00 - void init_ergodox(void); inline void ergodox_right_led_1_off(void) { DDRB &= ~(1< #include -#ifndef cbi -#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) -#endif - -#ifndef sbi -#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) -#endif - void reset_keyboard_kb(void); // readability diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c index 4b34fcef7..10fc14a8a 100644 --- a/keyboards/lfkeyboards/lfk87/lfk87.c +++ b/keyboards/lfkeyboards/lfk87/lfk87.c @@ -32,8 +32,8 @@ void matrix_init_kb(void) set_rgb(32, 0xFF, 0x00, 0x00); // Layer indicator, start red #ifndef AUDIO_ENABLE // If we're not using the audio pin, drive it low - sbi(DDRC, 6); - cbi(PORTC, 6); + setPinOutput(C6); + writePinLow(C6); #endif #ifdef ISSI_ENABLE issi_init(); diff --git a/keyboards/lfkeyboards/lfk87/lfk87.h b/keyboards/lfkeyboards/lfk87/lfk87.h index 1a2f9fbaf..5c1fba6ba 100644 --- a/keyboards/lfkeyboards/lfk87/lfk87.h +++ b/keyboards/lfkeyboards/lfk87/lfk87.h @@ -1,24 +1,10 @@ #ifndef LFK87_H #define LFK87_H -/* if the kb.h file exists (because we're running from qmkbuilder) include it */ -#if __has_include("kb.h") -#include "kb.h" -#endif - #include "quantum.h" #include "matrix.h" #include -#ifndef cbi -#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) -#endif - -#ifndef sbi -#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) -#endif - - typedef struct RGB_Color { uint16_t red; uint16_t green; diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c index d5f4193c1..4c897ac69 100644 --- a/keyboards/lfkeyboards/mini1800/mini1800.c +++ b/keyboards/lfkeyboards/mini1800/mini1800.c @@ -37,8 +37,8 @@ void matrix_init_kb(void) set_rgb(32, 0xFF, 0x00, 0x00); // Layer indicator, start red #ifndef AUDIO_ENABLE // If we're not using the audio pin, drive it low - sbi(DDRC, 6); - cbi(PORTC, 6); + setPinOutput(C6); + writePinLow(C6); #endif _delay_ms(500); #ifdef ISSI_ENABLE diff --git a/keyboards/lfkeyboards/mini1800/mini1800.h b/keyboards/lfkeyboards/mini1800/mini1800.h index 17f7da348..c007d7f76 100644 --- a/keyboards/lfkeyboards/mini1800/mini1800.h +++ b/keyboards/lfkeyboards/mini1800/mini1800.h @@ -1,24 +1,10 @@ #ifndef LFK87_H #define LFK87_H -/* if the kb.h file exists (because we're running from qmkbuilder) include it */ -#if __has_include("kb.h") -#include "kb.h" -#endif - #include "quantum.h" #include "matrix.h" #include -#ifndef cbi -#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) -#endif - -#ifndef sbi -#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) -#endif - - typedef struct RGB_Color { uint16_t red; uint16_t green; diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c index 7498febeb..01c339f06 100644 --- a/keyboards/lfkeyboards/smk65/revb/revb.c +++ b/keyboards/lfkeyboards/smk65/revb/revb.c @@ -34,12 +34,12 @@ void matrix_init_kb(void) #ifdef AUDIO_ENABLE // audio_init() sets PB5 to output and drives it low, which breaks our matrix // so reset PB5 to input - cbi(DDRB, 5); - sbi(PORTB, 5); + setPinInput(B5); + writePinHigh(B5); #else // If we're not using the audio pin, drive it low - sbi(DDRC, 6); - cbi(PORTC, 6); + setPinOutput(C6); + writePinLow(C6); #endif #ifdef ISSI_ENABLE diff --git a/keyboards/lfkeyboards/smk65/revb/revb.h b/keyboards/lfkeyboards/smk65/revb/revb.h index 3d3e5181f..dbb25b869 100644 --- a/keyboards/lfkeyboards/smk65/revb/revb.h +++ b/keyboards/lfkeyboards/smk65/revb/revb.h @@ -14,26 +14,10 @@ along with this program. If not, see . #pragma once -/* if the kb.h file exists (because we're running from qmkbuilder) include it */ -#ifdef __has_include -#if __has_include("kb.h") -#include "kb.h" -#endif -#endif - #include "quantum.h" #include "matrix.h" #include -#ifndef cbi -#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) -#endif - -#ifndef sbi -#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) -#endif - - typedef struct RGB_Color { uint16_t red; uint16_t green; diff --git a/keyboards/sx60/sx60.h b/keyboards/sx60/sx60.h index e5a68ef2f..8ead53ee0 100755 --- a/keyboards/sx60/sx60.h +++ b/keyboards/sx60/sx60.h @@ -7,9 +7,6 @@ #include "i2cmaster.h" #include -#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) -#define CPU_16MHz 0x00 - /* I2C aliases and register addresses (see "mcp23018.md") */ #define I2C_ADDR 0b0100000 #define I2C_ADDR_WRITE ( (I2C_ADDR<<1) | I2C_WRITE )