bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix name collision. timer_t => hal_timer_t

Browse Source
This commit is contained in:
Scott Lahteine
2017-11-05 19:31:07 -06:00
parent c8dfa26bc8
commit 2246316605
7 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/HAL/HAL_LPC1768/HAL_timers.h
View File

@ -40,7 +40,7 @@
#define FORCE_INLINE __attribute__((always_inline)) inline
typedef uint32_t timer_t;
typedef uint32_t hal_timer_t;
#define HAL_TIMER_TYPE_MAX 0xFFFFFFFF
#define STEP_TIMER_NUM 0 // index of timer to use for stepper
@ -77,7 +77,7 @@ typedef uint32_t timer_t;
void HAL_timer_init(void);
void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);
static FORCE_INLINE void HAL_timer_set_count(const uint8_t timer_num, const timer_t count) {
static FORCE_INLINE void HAL_timer_set_count(const uint8_t timer_num, const hal_timer_t count) {
switch (timer_num) {
case 0:
LPC_TIM0->MR0 = count;
@ -92,7 +92,7 @@ static FORCE_INLINE void HAL_timer_set_count(const uint8_t timer_num, const time
}
}
static FORCE_INLINE timer_t HAL_timer_get_count(const uint8_t timer_num) {
static FORCE_INLINE hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
switch (timer_num) {
case 0: return LPC_TIM0->MR0;
case 1: return LPC_TIM1->MR0;
@ -100,7 +100,7 @@ static FORCE_INLINE timer_t HAL_timer_get_count(const uint8_t timer_num) {
return 0;
}
static FORCE_INLINE timer_t HAL_timer_get_current_count(const uint8_t timer_num) {
static FORCE_INLINE hal_timer_t HAL_timer_get_current_count(const uint8_t timer_num) {
switch (timer_num) {
case 0: return LPC_TIM0->TC;
case 1: return LPC_TIM1->TC;