diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2016-04-03 11:34:34 +1000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2016-04-03 11:34:34 +1000 |
| commit | 9cca7a594f23f46d56ded6ab806235e3fc62055d (patch) | |
| tree | 5204ce2d3c0f53112430a411b34f85cb670bee1c /LUFA/Drivers/Board/Buttons.h | |
| parent | 9864c02eb4a33b260cc016b7108a12412b9264b5 (diff) | |
| parent | 9669a00c34dc7545b2ca538b5aa0fde745483824 (diff) | |
| download | lufa-9cca7a594f23f46d56ded6ab806235e3fc62055d.tar.gz lufa-9cca7a594f23f46d56ded6ab806235e3fc62055d.tar.bz2 lufa-9cca7a594f23f46d56ded6ab806235e3fc62055d.zip | |
Merge branch 'master' into dmbs
Diffstat (limited to 'LUFA/Drivers/Board/Buttons.h')
| -rw-r--r-- | LUFA/Drivers/Board/Buttons.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h index 6f3bf15f0..61ee38a8d 100644 --- a/LUFA/Drivers/Board/Buttons.h +++ b/LUFA/Drivers/Board/Buttons.h @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2015. + Copyright (C) Dean Camera, 2016. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2015 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2016 Dean Camera (dean [at] fourwalledcubicle [dot] com) Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted @@ -93,8 +93,9 @@ #if (BOARD == BOARD_NONE) #define BUTTONS_BUTTON1 0 - static inline void Buttons_Init(void) {}; - static inline uint_reg_t Buttons_GetStatus(void) { return 0; }; + static inline void Buttons_Init(void) {} + static inline void Buttons_Disable(void) {} + static inline uint_reg_t Buttons_GetStatus(void) { return 0; } #elif (BOARD == BOARD_USBKEY) #include "AVR8/USBKEY/Buttons.h" #elif (BOARD == BOARD_STK525) |