summaryrefslogtreecommitdiff
path: root/common/timer.h
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2012-09-02 23:47:18 +0900
committertmk <nobody@nowhere>2012-09-02 23:47:18 +0900
commitc77c5043a121f195b3a552feb8283424a0652ce2 (patch)
tree5b20b8c5cb7702408ffc10af0c259d71e6ce4ce9 /common/timer.h
parentb17f52ebe188b612d0cb063bd2386434a952aaf4 (diff)
usb_hid: Fix timer size uint16_t to uint32_t;
Diffstat (limited to 'common/timer.h')
-rw-r--r--common/timer.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/common/timer.h b/common/timer.h
index d24d3eab62..70b008e6c9 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/>.
#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