diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-15 22:29:45 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-16 01:17:21 -0500 |
| commit | 2764748208816043a3149eae3a433d02325a1a36 (patch) | |
| tree | cc5afb0af0c6f1d2282db08d3dad1dae9b4d33e6 /libmaple/systick.h | |
| parent | 1fb0e0d727089e23d4b30e1efba5410dc4b4da14 (diff) | |
| parent | 620740bf1986311041a40bd2992d1b549f84b2ba (diff) | |
| download | librambutan-2764748208816043a3149eae3a433d02325a1a36.tar.gz librambutan-2764748208816043a3149eae3a433d02325a1a36.zip | |
Merge branch 'nzmichaelh-master' into master.
This provides DMA, IWDG, PWR, and BKP support, and fixes several bugs.
Conflicts:
libmaple/adc.h
libmaple/libmaple.h
libmaple/ring_buffer.h
Diffstat (limited to 'libmaple/systick.h')
| -rw-r--r-- | libmaple/systick.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libmaple/systick.h b/libmaple/systick.h index 7ec8497..33a3cf8 100644 --- a/libmaple/systick.h +++ b/libmaple/systick.h @@ -33,14 +33,17 @@ #include "libmaple.h" +#ifdef __cplusplus +extern "C"{ +#endif + #define SYSTICK_CSR 0xE000E010 // Control and status register #define SYSTICK_CNT 0xE000E018 // Current value register #define SYSTICK_CSR_COUNTFLAG BIT(16) -#ifdef __cplusplus -extern "C"{ -#endif +/** System elapsed time in milliseconds */ +extern volatile uint32 systick_timer_millis; void systick_init(uint32 reload_val); void systick_disable(); |