From e90f00aaf11c6da18ab623b3fdcf2cfd1e678526 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Tue, 3 Feb 2015 13:49:32 +0100 Subject: STM32 drivers: move to 0 based index --- src/drivers/stm32/adc/adc.cpp | 4 ++-- src/drivers/stm32/tone_alarm/tone_alarm.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/drivers/stm32/adc/adc.cpp b/src/drivers/stm32/adc/adc.cpp index aa0dca60c..ca2c9fc73 100644 --- a/src/drivers/stm32/adc/adc.cpp +++ b/src/drivers/stm32/adc/adc.cpp @@ -144,7 +144,7 @@ private: }; ADC::ADC(uint32_t channels) : - CDev("adc", ADC_DEVICE_PATH), + CDev("adc", ADC0_DEVICE_PATH), _sample_perf(perf_alloc(PC_ELAPSED, "adc_samples")), _channel_count(0), _samples(nullptr), @@ -381,7 +381,7 @@ void test(void) { - int fd = open(ADC_DEVICE_PATH, O_RDONLY); + int fd = open(ADC0_DEVICE_PATH, O_RDONLY); if (fd < 0) err(1, "can't open ADC device"); diff --git a/src/drivers/stm32/tone_alarm/tone_alarm.cpp b/src/drivers/stm32/tone_alarm/tone_alarm.cpp index 8f523b390..ae533e811 100644 --- a/src/drivers/stm32/tone_alarm/tone_alarm.cpp +++ b/src/drivers/stm32/tone_alarm/tone_alarm.cpp @@ -317,7 +317,7 @@ extern "C" __EXPORT int tone_alarm_main(int argc, char *argv[]); ToneAlarm::ToneAlarm() : - CDev("tone_alarm", TONEALARM_DEVICE_PATH), + CDev("tone_alarm", TONEALARM0_DEVICE_PATH), _default_tune_number(0), _user_tune(nullptr), _tune(nullptr), @@ -830,10 +830,10 @@ play_tune(unsigned tune) { int fd, ret; - fd = open(TONEALARM_DEVICE_PATH, 0); + fd = open(TONEALARM0_DEVICE_PATH, 0); if (fd < 0) - err(1, TONEALARM_DEVICE_PATH); + err(1, TONEALARM0_DEVICE_PATH); ret = ioctl(fd, TONE_SET_ALARM, tune); close(fd); @@ -849,10 +849,10 @@ play_string(const char *str, bool free_buffer) { int fd, ret; - fd = open(TONEALARM_DEVICE_PATH, O_WRONLY); + fd = open(TONEALARM0_DEVICE_PATH, O_WRONLY); if (fd < 0) - err(1, TONEALARM_DEVICE_PATH); + err(1, TONEALARM0_DEVICE_PATH); ret = write(fd, str, strlen(str) + 1); close(fd); -- cgit v1.2.3