aboutsummaryrefslogtreecommitdiff
path: root/common/timer.h
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2012-09-04 13:29:21 +0900
committertmk <nobody@nowhere>2012-09-04 13:29:21 +0900
commit232ab308e358e41f3253d66fa009c1ebca0951a2 (patch)
tree737827112555c00a7f2ebbb88e61079c460be71a /common/timer.h
parentc77c5043a121f195b3a552feb8283424a0652ce2 (diff)
downloadqmk_firmware-232ab308e358e41f3253d66fa009c1ebca0951a2.tar.gz
qmk_firmware-232ab308e358e41f3253d66fa009c1ebca0951a2.zip
usb_hid: workaround for compile on Windows.
Diffstat (limited to 'common/timer.h')
-rw-r--r--common/timer.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/timer.h b/common/timer.h
index 70b008e6c..6437473ff 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -43,11 +43,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
43#define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX) 43#define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX)
44#define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX) 44#define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX)
45#define TIMER_DIFF_32(a, b) TIMER_DIFF(a, b, UINT32_MAX) 45#define TIMER_DIFF_32(a, b) TIMER_DIFF(a, b, UINT32_MAX)
46#define TIMER_DIFF_RAW(a, b) TIMER_DIFF_8(a, b)
46 47
47 48
48#ifdef __cplusplus 49#ifdef __cplusplus
49extern "C" { 50extern "C" {
50#endif 51#endif
52
51extern volatile uint32_t timer_count; 53extern volatile uint32_t timer_count;
52 54
53 55
@@ -57,6 +59,7 @@ uint16_t timer_read(void);
57uint32_t timer_read32(void); 59uint32_t timer_read32(void);
58uint16_t timer_elapsed(uint16_t last); 60uint16_t timer_elapsed(uint16_t last);
59uint32_t timer_elapsed32(uint32_t last); 61uint32_t timer_elapsed32(uint32_t last);
62
60#ifdef __cplusplus 63#ifdef __cplusplus
61} 64}
62#endif 65#endif