Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change include guards in tmk_core/ and drivers/ to pragma once #11240

Merged
merged 2 commits into from
Dec 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions drivers/avr/hd44780.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#ifndef LCD_H
#define LCD_H
/*************************************************************************
Title : C include file for the HD44780U LCD library (lcd.c)
Author: Peter Fleury <[email protected]> http://tinyurl.com/peterfleury
Expand Down Expand Up @@ -43,6 +41,8 @@

*/

#pragma once

#include <inttypes.h>
#include <avr/pgmspace.h>

Expand Down Expand Up @@ -346,5 +346,3 @@ extern void lcd_data(uint8_t data);
#define lcd_puts_P(__s) lcd_puts_p(PSTR(__s))

/**@}*/

#endif // LCD_H
5 changes: 1 addition & 4 deletions drivers/avr/i2c_master.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
* GitHub repository: https://github.com/g4lvanix/I2C-master-lib
*/

#ifndef I2C_MASTER_H
#define I2C_MASTER_H
#pragma once

#define I2C_READ 0x01
#define I2C_WRITE 0x00
Expand All @@ -42,5 +41,3 @@ i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16
i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout);
i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);
void i2c_stop(void);

#endif // I2C_MASTER_H
5 changes: 1 addition & 4 deletions drivers/avr/i2c_slave.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,11 @@
Read or write to the necessary buffer according to the opperation.
*/

#ifndef I2C_SLAVE_H
#define I2C_SLAVE_H
#pragma once

#define I2C_SLAVE_REG_COUNT 30

extern volatile uint8_t i2c_slave_reg[I2C_SLAVE_REG_COUNT];

void i2c_slave_init(uint8_t address);
void i2c_slave_stop(void);

#endif // I2C_SLAVE_H
5 changes: 1 addition & 4 deletions drivers/avr/ssd1306.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#ifndef SSD1306_H
#define SSD1306_H
#pragma once

#include <stdbool.h>
#include <stdio.h>
Expand Down Expand Up @@ -86,5 +85,3 @@ void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c);
void matrix_write(struct CharacterMatrix *matrix, const char *data);
void matrix_write_P(struct CharacterMatrix *matrix, const char *data);
void matrix_render(struct CharacterMatrix *matrix);

#endif
6 changes: 2 additions & 4 deletions tmk_core/common/action.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_H
#define ACTION_H

#pragma once

#include <stdint.h>
#include <stdbool.h>
Expand Down Expand Up @@ -124,5 +124,3 @@ void debug_action(action_t action);
#ifdef __cplusplus
}
#endif

#endif /* ACTION_H */
6 changes: 2 additions & 4 deletions tmk_core/common/action_code.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_CODE_H
#define ACTION_CODE_H

#pragma once

/** \brief Action codes
*
Expand Down Expand Up @@ -306,5 +306,3 @@ enum swap_hands_param_tap_op {
#define ACTION_SWAP_HANDS_OFF_ON() ACTION(ACT_SWAP_HANDS, OP_SH_OFF_ON)
#define ACTION_SWAP_HANDS_ON() ACTION(ACT_SWAP_HANDS, OP_SH_ON)
#define ACTION_SWAP_HANDS_OFF() ACTION(ACT_SWAP_HANDS, OP_SH_OFF)

#endif /* ACTION_CODE_H */
6 changes: 2 additions & 4 deletions tmk_core/common/action_layer.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_LAYER_H
#define ACTION_LAYER_H

#pragma once

#include <stdint.h>
#include "keyboard.h"
Expand Down Expand Up @@ -120,5 +120,3 @@ uint8_t layer_switch_get_layer(keypos_t key);

/* return action depending on current layer status */
action_t layer_switch_get_action(keypos_t key);

#endif
7 changes: 3 additions & 4 deletions tmk_core/common/action_macro.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_MACRO_H
#define ACTION_MACRO_H

#pragma once

#include <stdint.h>
#include "progmem.h"

Expand Down Expand Up @@ -120,5 +121,3 @@ enum macro_command_id {
/* for backward comaptibility */
#define MD(key) DOWN(KC_##key)
#define MU(key) UP(KC_##key)

#endif /* ACTION_MACRO_H */
6 changes: 2 additions & 4 deletions tmk_core/common/action_tapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_TAPPING_H
#define ACTION_TAPPING_H

#pragma once

/* period of tapping(ms) */
#ifndef TAPPING_TERM
Expand All @@ -36,5 +36,3 @@ uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache);
uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record);
void action_tapping_process(keyrecord_t record);
#endif

#endif
6 changes: 2 additions & 4 deletions tmk_core/common/action_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_UTIL_H
#define ACTION_UTIL_H

#pragma once

#include <stdint.h>
#include "report.h"
Expand Down Expand Up @@ -98,5 +98,3 @@ void clear_oneshot_swaphands(void);
#ifdef __cplusplus
}
#endif

#endif
5 changes: 1 addition & 4 deletions tmk_core/common/arm_atsam/printf.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#ifndef _PRINTF_H_
#define _PRINTF_H_
#pragma once

#define CONSOLE_PRINTBUF_SIZE 512

void console_printf(char *fmt, ...);

#define __xprintf console_printf

#endif //_PRINTF_H_
5 changes: 1 addition & 4 deletions tmk_core/common/avr/suspend_avr.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#ifndef SUSPEND_AVR_H
#define SUSPEND_AVR_H
#pragma once

#include <stdint.h>
#include <stdbool.h>
Expand All @@ -24,5 +23,3 @@ __asm__ __volatile__ ( \
: "r0" \
)
// clang-format on

#endif
5 changes: 1 addition & 4 deletions tmk_core/common/avr/timer_avr.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef TIMER_AVR_H
#define TIMER_AVR_H 1
#pragma once

#include <stdint.h>

Expand All @@ -38,5 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#if (TIMER_RAW_TOP > 255)
# error "Timer0 can't count 1ms at this clock freq. Use larger prescaler."
#endif

#endif
5 changes: 1 addition & 4 deletions tmk_core/common/avr/xprintf.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
Extended itoa, puts and printf (C)ChaN, 2011
-----------------------------------------------------------------------------*/

#ifndef XPRINTF_H
#define XPRINTF_H
#pragma once

#include <inttypes.h>
#include <avr/pgmspace.h>
Expand Down Expand Up @@ -102,5 +101,3 @@ char xatoi(char **str, long *ret);
#ifdef __cplusplus
}
#endif

#endif
5 changes: 1 addition & 4 deletions tmk_core/common/bootloader.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef BOOTLOADER_H
#define BOOTLOADER_H
#pragma once

/* give code for your bootloader to come up if needed */
void bootloader_jump(void);

#endif
5 changes: 1 addition & 4 deletions tmk_core/common/bootmagic.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#ifndef BOOTMAGIC_H
#define BOOTMAGIC_H
#pragma once

/* FIXME: Add special doxygen comments for defines here. */

Expand Down Expand Up @@ -101,5 +100,3 @@

void bootmagic(void);
bool bootmagic_scan_keycode(uint8_t keycode);

#endif
5 changes: 1 addition & 4 deletions tmk_core/common/chibios/eeprom_stm32.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
* This library also assumes that the pages are not used by the firmware.
*/

#ifndef __EEPROM_H
#define __EEPROM_H
#pragma once

#include <ch.h>
#include <hal.h>
Expand Down Expand Up @@ -83,5 +82,3 @@ uint16_t EEPROM_Init(void);
void EEPROM_Erase(void);
uint16_t EEPROM_WriteDataByte(uint16_t Address, uint8_t DataByte);
uint8_t EEPROM_ReadDataByte(uint16_t Address);

#endif /* __EEPROM_H */
5 changes: 1 addition & 4 deletions tmk_core/common/chibios/flash_stm32.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
* Modifications for QMK and STM32F303 by Yiancar
*/

#ifndef __FLASH_STM32_H
#define __FLASH_STM32_H
#pragma once

#ifdef __cplusplus
extern "C" {
Expand All @@ -41,5 +40,3 @@ void FLASH_ClearFlag(uint32_t FLASH_FLAG);
#ifdef __cplusplus
}
#endif

#endif /* __FLASH_STM32_H */
5 changes: 1 addition & 4 deletions tmk_core/common/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef DEBUG_H
#define DEBUG_H 1
#pragma once

#include <stdbool.h>
#include "print.h"
Expand Down Expand Up @@ -168,5 +167,3 @@ extern debug_config_t debug_config;
# define debug_bin_reverse(data)

#endif /* NO_DEBUG */

#endif
5 changes: 1 addition & 4 deletions tmk_core/common/eeconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef EECONFIG_H
#define EECONFIG_H
#pragma once

#include <stdint.h>
#include <stdbool.h>
Expand Down Expand Up @@ -111,5 +110,3 @@ void eeconfig_update_haptic(uint32_t val);

bool eeconfig_read_handedness(void);
void eeconfig_update_handedness(bool val);

#endif
5 changes: 1 addition & 4 deletions tmk_core/common/eeprom.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#ifndef TMK_CORE_COMMON_EEPROM_H_
#define TMK_CORE_COMMON_EEPROM_H_
#pragma once

#if defined(__AVR__) && !defined(EEPROM_DRIVER)
# include <avr/eeprom.h>
Expand All @@ -20,5 +19,3 @@ void eeprom_update_word(uint16_t *__p, uint16_t __value);
void eeprom_update_dword(uint32_t *__p, uint32_t __value);
void eeprom_update_block(const void *__src, void *__dst, size_t __n);
#endif

#endif /* TMK_CORE_COMMON_EEPROM_H_ */
5 changes: 1 addition & 4 deletions tmk_core/common/host_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef HOST_DRIVER_H
#define HOST_DRIVER_H
#pragma once

#include <stdint.h>
#include "report.h"
Expand All @@ -31,5 +30,3 @@ typedef struct {
void (*send_system)(uint16_t);
void (*send_consumer)(uint16_t);
} host_driver_t;

#endif
5 changes: 1 addition & 4 deletions tmk_core/common/keyboard.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef KEYBOARD_H
#define KEYBOARD_H
#pragma once

#include <stdbool.h>
#include <stdint.h>
Expand Down Expand Up @@ -77,5 +76,3 @@ void housekeeping_task_user(void);
#ifdef __cplusplus
}
#endif

#endif
5 changes: 2 additions & 3 deletions tmk_core/common/keycode.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* See https://web.archive.org/web/20060218214400/http://www.usb.org/developers/devclass_docs/Hut1_12.pdf
* or http://www.usb.org/developers/hidpage/Hut1_12v2.pdf (older)
*/
#ifndef KEYCODE_H
#define KEYCODE_H

#pragma once

/* FIXME: Add doxygen comments here */

Expand Down Expand Up @@ -542,4 +542,3 @@ enum mouse_keys {
KC_MS_ACCEL1,
KC_MS_ACCEL2
};
#endif
5 changes: 1 addition & 4 deletions tmk_core/common/magic.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#ifndef MAGIC_H
#define MAGIC_H
#pragma once

void magic(void);

#endif
Loading