diff options
| author | tmk <nobody@nowhere> | 2012-08-25 15:49:08 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2012-08-28 21:56:15 +0900 |
| commit | c5060ea81942b0e3f8577536ff78402a19abe3d3 (patch) | |
| tree | bcdd4cd269be3064982014b0afdc0aea628d7048 /common/timer.h | |
| parent | 9382bf2f765cfbb8f7a9a48157391cac2bb71780 (diff) | |
test build of 'Host shield' in minimal env.
Diffstat (limited to 'common/timer.h')
| -rw-r--r-- | common/timer.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/common/timer.h b/common/timer.h index f9e8181e6f..d24d3eab62 100644 --- a/common/timer.h +++ b/common/timer.h @@ -23,10 +23,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 <http://www.gnu.org/licenses/>. #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 |