From 0a3e1cc0e6c966c257d9ae9a61c369dd43485192 Mon Sep 17 00:00:00 2001 From: Matthew Lai Date: Sun, 5 May 2019 11:32:51 +0100 Subject: [PATCH] Renamed adc_common_v3 to adc_common_v1_multi --- .../stm32/common/{adc_common_v3.h => adc_common_v1_multi.h} | 0 include/libopencm3/stm32/f4/adc.h | 2 +- include/libopencm3/stm32/f7/adc.h | 2 +- lib/stm32/common/{adc_common_v3.c => adc_common_v1_multi.c} | 0 lib/stm32/f4/Makefile | 2 +- lib/stm32/f7/Makefile | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename include/libopencm3/stm32/common/{adc_common_v3.h => adc_common_v1_multi.h} (100%) rename lib/stm32/common/{adc_common_v3.c => adc_common_v1_multi.c} (100%) diff --git a/include/libopencm3/stm32/common/adc_common_v3.h b/include/libopencm3/stm32/common/adc_common_v1_multi.h similarity index 100% rename from include/libopencm3/stm32/common/adc_common_v3.h rename to include/libopencm3/stm32/common/adc_common_v1_multi.h diff --git a/include/libopencm3/stm32/f4/adc.h b/include/libopencm3/stm32/f4/adc.h index 639ad7cc..af13c75e 100644 --- a/include/libopencm3/stm32/f4/adc.h +++ b/include/libopencm3/stm32/f4/adc.h @@ -39,7 +39,7 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_ADC_H #define LIBOPENCM3_ADC_H -#include +#include /* --- Convenience macros -------------------------------------------------- */ /* EXTSEL[3:0]: External event selection for regular group. */ diff --git a/include/libopencm3/stm32/f7/adc.h b/include/libopencm3/stm32/f7/adc.h index 700ccf34..f84bbfc0 100644 --- a/include/libopencm3/stm32/f7/adc.h +++ b/include/libopencm3/stm32/f7/adc.h @@ -39,7 +39,7 @@ LGPL License Terms @ref lgpl_license #ifndef LIBOPENCM3_ADC_H #define LIBOPENCM3_ADC_H -#include +#include /* --- Convenience macros -------------------------------------------------- */ /* EXTSEL[3:0]: External event selection for regular group. */ diff --git a/lib/stm32/common/adc_common_v3.c b/lib/stm32/common/adc_common_v1_multi.c similarity index 100% rename from lib/stm32/common/adc_common_v3.c rename to lib/stm32/common/adc_common_v1_multi.c diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile index 45428ab7..68411e96 100644 --- a/lib/stm32/f4/Makefile +++ b/lib/stm32/f4/Makefile @@ -39,7 +39,7 @@ TGT_CFLAGS += $(STANDARD_FLAGS) # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = adc_common_v3.o adc_common_v1.o can.o desig.o gpio.o pwr.o rcc.o \ +OBJS = adc_common_v1_multi.o adc_common_v1.o can.o desig.o gpio.o pwr.o rcc.o \ rtc.o crypto.o OBJS += crc_common_all.o dac_common_all.o dma_common_f24.o \ diff --git a/lib/stm32/f7/Makefile b/lib/stm32/f7/Makefile index ce7ad334..a67e07e8 100644 --- a/lib/stm32/f7/Makefile +++ b/lib/stm32/f7/Makefile @@ -42,7 +42,7 @@ TGT_CFLAGS += $(STANDARD_FLAGS) ARFLAGS = rcs -OBJS += adc_common_v1.o adc_common_v3.o +OBJS += adc_common_v1.o adc_common_v1_multi.o OBJS += can.o OBJS += crc_common_all.o crc_v2.o OBJS += dac_common_all.o