diff options
| author | tmk <nobody@nowhere> | 2012-09-02 23:47:18 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2012-09-02 23:47:18 +0900 |
| commit | c77c5043a121f195b3a552feb8283424a0652ce2 (patch) | |
| tree | 5b20b8c5cb7702408ffc10af0c259d71e6ce4ce9 /common/timer.h | |
| parent | b17f52ebe188b612d0cb063bd2386434a952aaf4 (diff) | |
| download | qmk_firmware-c77c5043a121f195b3a552feb8283424a0652ce2.tar.gz qmk_firmware-c77c5043a121f195b3a552feb8283424a0652ce2.zip | |
usb_hid: Fix timer size uint16_t to uint32_t;
Diffstat (limited to 'common/timer.h')
| -rw-r--r-- | common/timer.h | 9 |
1 files changed, 6 insertions, 3 deletions
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 <http://www.gnu.org/licenses/>. | |||
| 40 | #endif | 40 | #endif |
| 41 | 41 | ||
| 42 | #define TIMER_DIFF(a, b, max) ((a) >= (b) ? (a) - (b) : (max) - (b) + (a)) | 42 | #define TIMER_DIFF(a, b, max) ((a) >= (b) ? (a) - (b) : (max) - (b) + (a)) |
| 43 | #define TIMER_DIFF_RAW(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_MS(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 | 46 | ||
| 46 | 47 | ||
| 47 | #ifdef __cplusplus | 48 | #ifdef __cplusplus |
| 48 | extern "C" { | 49 | extern "C" { |
| 49 | #endif | 50 | #endif |
| 50 | extern volatile uint16_t timer_count; | 51 | extern volatile uint32_t timer_count; |
| 51 | 52 | ||
| 52 | 53 | ||
| 53 | void timer_init(void); | 54 | void timer_init(void); |
| 54 | void timer_clear(void); | 55 | void timer_clear(void); |
| 55 | uint16_t timer_read(void); | 56 | uint16_t timer_read(void); |
| 57 | uint32_t timer_read32(void); | ||
| 56 | uint16_t timer_elapsed(uint16_t last); | 58 | uint16_t timer_elapsed(uint16_t last); |
| 59 | uint32_t timer_elapsed32(uint32_t last); | ||
| 57 | #ifdef __cplusplus | 60 | #ifdef __cplusplus |
| 58 | } | 61 | } |
| 59 | #endif | 62 | #endif |
