andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AVR: Update ICU low level driver functions names. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10819 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Theodore Ateba 2017-10-13 19:31:42 +00:00
parent 491e3756b8
commit 1f865bb946
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os/hal/ports/AVR/MEGA/LLD/TIMv1/hal_icu_lld.c
View File

@ -112,7 +112,7 @@ static inline void handle_capture_isr(ICUDriver *icup,
} }
} }
static uint8_t index(ICUDriver *icup) { static uint8_t tmrIndex(ICUDriver *icup) {
uint8_t index = 0; uint8_t index = 0;
#if AVR_ICU_USE_TIM1 || defined(__DOXYGEN__) #if AVR_ICU_USE_TIM1 || defined(__DOXYGEN__)
@ -131,6 +131,7 @@ static uint8_t index(ICUDriver *icup) {
if (icup == &ICUD5) return index; if (icup == &ICUD5) return index;
else index++; else index++;
#endif #endif
return 255;
} }
/*===========================================================================*/ /*===========================================================================*/
@ -236,7 +237,7 @@ void icu_lld_init(void) {
void icu_lld_start(ICUDriver *icup) { void icu_lld_start(ICUDriver *icup) {
if (icup->state == ICU_STOP) { if (icup->state == ICU_STOP) {
uint8_t i = index(icup); uint8_t i = tmrIndex(icup);
/* Normal waveform generation (counts from 0 to 0xFFFF) */ /* Normal waveform generation (counts from 0 to 0xFFFF) */
*regs_table[i].tccra &= ~((1 << WGM11) | (1 << WGM10)); *regs_table[i].tccra &= ~((1 << WGM11) | (1 << WGM10));
*regs_table[i].tccrb &= ~((1 << WGM13) | (1 << WGM12)); *regs_table[i].tccrb &= ~((1 << WGM13) | (1 << WGM12));
@ -277,9 +278,9 @@ void icu_lld_stop(ICUDriver *icup) {
* *
* @notapi * @notapi
*/ */
void icu_lld_enable(ICUDriver *icup) { void icu_lld_start_capture(ICUDriver *icup) {
uint8_t i = index(icup); uint8_t i = tmrIndex(icup);
icup->width = icup->period = 0; icup->width = icup->period = 0;
*regs_table[i].tcnt = 0; *regs_table[i].tcnt = 0;
*regs_table[i].timsk |= (1 << ICIE1); *regs_table[i].timsk |= (1 << ICIE1);
@ -294,9 +295,9 @@ void icu_lld_enable(ICUDriver *icup) {
* *
* @notapi * @notapi
*/ */
void icu_lld_disable(ICUDriver *icup) { void icu_lld_stop_capture(ICUDriver *icup) {
uint8_t i = index(icup); uint8_t i = tmrIndex(icup);
*regs_table[i].timsk &= ~((1 << ICIE1) | (1 << TOIE1)); *regs_table[i].timsk &= ~((1 << ICIE1) | (1 << TOIE1));
} }