From c5060ea81942b0e3f8577536ff78402a19abe3d3 Mon Sep 17 00:00:00 2001 From: tmk Date: Sat, 25 Aug 2012 15:49:08 +0900 Subject: test build of 'Host shield' in minimal env. --- common/timer.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'common/timer.h') diff --git a/common/timer.h b/common/timer.h index f9e8181e6..d24d3eab6 100644 --- a/common/timer.h +++ b/common/timer.h @@ -23,10 +23,12 @@ along with this program. If not, see . #ifndef TIMER_PRESCALER # if F_CPU > 16000000 # define TIMER_PRESCALER 256 -# elif F_CPU >= 4000000 +# elif F_CPU > 2000000 # define TIMER_PRESCALER 64 -# else +# elif F_CPU > 250000 # define TIMER_PRESCALER 8 +# else +# define TIMER_PRESCALER 1 # endif #endif #define TIMER_RAW_FREQ (F_CPU/TIMER_PRESCALER) @@ -42,6 +44,9 @@ along with this program. If not, see . #define TIMER_DIFF_MS(a, b) TIMER_DIFF(a, b, UINT16_MAX) +#ifdef __cplusplus +extern "C" { +#endif extern volatile uint16_t timer_count; @@ -49,5 +54,8 @@ void timer_init(void); void timer_clear(void); uint16_t timer_read(void); uint16_t timer_elapsed(uint16_t last); +#ifdef __cplusplus +} +#endif #endif -- cgit v1.2.3 From c77c5043a121f195b3a552feb8283424a0652ce2 Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 2 Sep 2012 23:47:18 +0900 Subject: usb_hid: Fix timer size uint16_t to uint32_t; --- common/timer.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'common/timer.h') diff --git a/common/timer.h b/common/timer.h index d24d3eab6..70b008e6c 100644 --- a/common/timer.h +++ b/common/timer.h @@ -40,20 +40,23 @@ along with this program. If not, see . #endif #define TIMER_DIFF(a, b, max) ((a) >= (b) ? (a) - (b) : (max) - (b) + (a)) -#define TIMER_DIFF_RAW(a, b) TIMER_DIFF(a, b, UINT8_MAX) -#define TIMER_DIFF_MS(a, b) TIMER_DIFF(a, b, UINT16_MAX) +#define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX) +#define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX) +#define TIMER_DIFF_32(a, b) TIMER_DIFF(a, b, UINT32_MAX) #ifdef __cplusplus extern "C" { #endif -extern volatile uint16_t timer_count; +extern volatile uint32_t timer_count; void timer_init(void); void timer_clear(void); uint16_t timer_read(void); +uint32_t timer_read32(void); uint16_t timer_elapsed(uint16_t last); +uint32_t timer_elapsed32(uint32_t last); #ifdef __cplusplus } #endif -- cgit v1.2.3 From 232ab308e358e41f3253d66fa009c1ebca0951a2 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 4 Sep 2012 13:29:21 +0900 Subject: usb_hid: workaround for compile on Windows. --- common/timer.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'common/timer.h') 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 . #define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX) #define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX) #define TIMER_DIFF_32(a, b) TIMER_DIFF(a, b, UINT32_MAX) +#define TIMER_DIFF_RAW(a, b) TIMER_DIFF_8(a, b) #ifdef __cplusplus extern "C" { #endif + extern volatile uint32_t timer_count; @@ -57,6 +59,7 @@ uint16_t timer_read(void); uint32_t timer_read32(void); uint16_t timer_elapsed(uint16_t last); uint32_t timer_elapsed32(uint32_t last); + #ifdef __cplusplus } #endif -- cgit v1.2.3