summaryrefslogtreecommitdiff
path: root/chip/stm32/adc-stm32f3.c
diff options
context:
space:
mode:
authorNick Sanders <nsanders@chromium.org>2016-04-26 19:00:17 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-05-26 16:17:26 -0700
commit5cc3cac589d3e869266c18ed7e538a769496478f (patch)
treea95d179a6dbde223775a2a39c1482589c8b751a7 /chip/stm32/adc-stm32f3.c
parent4fa3b1e80c0ec46710e701da636da23ac1edefce (diff)
downloadchrome-ec-5cc3cac589d3e869266c18ed7e538a769496478f.tar.gz
servo_v4: Fix ADC console command
The console adc command prints adc values in the order they appear in hardware, however they are lableled in the order they are enumerated in board.h, which is not necessarily the same. This prints the correct name and value pairs, and removes the adc_read_all_channels function which is not otherwise used. BUG=chromium:571476 BRANCH=None TEST="adc" command associates correct values with names now. Change-Id: I688641953d20082224b4120eaefe0d634ad4c74c Signed-off-by: Nick Sanders <nsanders@google.com> Reviewed-on: https://chromium-review.googlesource.com/340892 Commit-Ready: Nick Sanders <nsanders@chromium.org> Tested-by: Nick Sanders <nsanders@chromium.org> Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'chip/stm32/adc-stm32f3.c')
-rw-r--r--chip/stm32/adc-stm32f3.c47
1 files changed, 0 insertions, 47 deletions
diff --git a/chip/stm32/adc-stm32f3.c b/chip/stm32/adc-stm32f3.c
index 94212b2155..a8203bae24 100644
--- a/chip/stm32/adc-stm32f3.c
+++ b/chip/stm32/adc-stm32f3.c
@@ -220,53 +220,6 @@ int adc_read_channel(enum adc_channel ch)
value * adc->factor_mul / adc->factor_div + adc->shift;
}
-int adc_read_all_channels(int *data)
-{
- int i;
- int16_t raw_data[ADC_CH_COUNT];
- const struct adc_t *adc;
- int restore_watchdog = 0;
- int ret = EC_SUCCESS;
-
- if (!adc_powered())
- return EC_ERROR_UNKNOWN;
-
- mutex_lock(&adc_lock);
-
- if (adc_watchdog_enabled()) {
- restore_watchdog = 1;
- adc_disable_watchdog_no_lock();
- }
-
- adc_configure_all();
-
- dma_clear_isr(STM32_DMAC_ADC);
- dma_start_rx(&dma_adc_option, ADC_CH_COUNT, raw_data);
-
- /* Start conversion */
- STM32_ADC_CR2 |= (1 << 0); /* ADON */
-
- if (dma_wait(STM32_DMAC_ADC)) {
- ret = EC_ERROR_UNKNOWN;
- goto exit_all_channels;
- }
-
- for (i = 0; i < ADC_CH_COUNT; ++i) {
- adc = adc_channels + i;
- data[i] = raw_data[i] * adc->factor_mul / adc->factor_div +
- adc->shift;
- }
-
-exit_all_channels:
- dma_disable(STM32_DMAC_ADC);
-
- if (restore_watchdog)
- adc_enable_watchdog_no_lock();
-
- mutex_unlock(&adc_lock);
- return ret;
-}
-
static void adc_init(void)
{
/*