rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor timerGetXXX functions for clarity under presence/absence of USE_TIMER_MGMT

This commit is contained in:
jflyper 2019-05-03 02:10:11 +09:00
parent bcac7f2e0b
commit 90141deda2
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/drivers/timer_common.c
View File

@ -38,41 +38,33 @@ timerIOConfig_t *timerIoConfigByTag(ioTag_t ioTag)
UNUSED(ioTag); UNUSED(ioTag);
return NULL; return NULL;
} }
#endif
static uint8_t timerIndexByTag(ioTag_t ioTag) static uint8_t timerIndexByTag(ioTag_t ioTag)
{ {
#ifdef USE_TIMER_MGMT
for (unsigned i = 0; i < MAX_TIMER_PINMAP_COUNT; i++) { for (unsigned i = 0; i < MAX_TIMER_PINMAP_COUNT; i++) {
if (timerIOConfig(i)->ioTag == ioTag) { if (timerIOConfig(i)->ioTag == ioTag) {
return timerIOConfig(i)->index; return timerIOConfig(i)->index;
} }
} }
#else
UNUSED(ioTag);
#endif
return 0; return 0;
} }
const timerHardware_t *timerGetByTagAndIndex(ioTag_t ioTag, unsigned timerIndex) const timerHardware_t *timerGetByTagAndIndex(ioTag_t ioTag, unsigned timerIndex)
{ {
if (!ioTag) {
if (!ioTag || !timerIndex) {
return NULL; return NULL;
} }
#if TIMER_CHANNEL_COUNT > 0
uint8_t index = 1; uint8_t index = 1;
for (unsigned i = 0; i < TIMER_CHANNEL_COUNT; i++) { for (unsigned i = 0; i < TIMER_CHANNEL_COUNT; i++) {
if (TIMER_HARDWARE[i].tag == ioTag) { if (TIMER_HARDWARE[i].tag == ioTag) {
if (index == timerIndex || timerIndex == 0) { if (index == timerIndex) {
return &TIMER_HARDWARE[i]; return &TIMER_HARDWARE[i];
} }
index++; ++index;
} }
} }
#else
UNUSED(timerIndex);
#endif
return NULL; return NULL;
} }
@ -81,13 +73,26 @@ const timerHardware_t *timerGetByTag(ioTag_t ioTag)
{ {
uint8_t timerIndex = timerIndexByTag(ioTag); uint8_t timerIndex = timerIndexByTag(ioTag);
if (timerIndex) { return timerGetByTagAndIndex(ioTag, timerIndex);
return timerGetByTagAndIndex(ioTag, timerIndex);
} else {
return NULL;
}
} }
#else
const timerHardware_t *timerGetByTag(ioTag_t ioTag)
{
#if TIMER_CHANNEL_COUNT > 0
for (unsigned i = 0; i < TIMER_CHANNEL_COUNT; i++) {
if (TIMER_HARDWARE[i].tag == ioTag) {
return &TIMER_HARDWARE[i];
}
}
#else
UNUSED(ioTag);
#endif
return NULL;
}
#endif
ioTag_t timerioTagGetByUsage(timerUsageFlag_e usageFlag, uint8_t index) ioTag_t timerioTagGetByUsage(timerUsageFlag_e usageFlag, uint8_t index)
{ {
#if !defined(USE_UNIFIED_TARGET) && USABLE_TIMER_CHANNEL_COUNT > 0 #if !defined(USE_UNIFIED_TARGET) && USABLE_TIMER_CHANNEL_COUNT > 0