building in stm32 works again

git-svn-id: https://svn.code.sf.net/p/freetel/code@2482 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/stm32/Makefile b/codec2-dev/stm32/Makefile
index 537fccd0e960c1ae6ec4c4d99fdebd779382b0e4..f1e664f9b8b14b25a9580370fa5837b0f7cb2676 100644 (file)
--- a/codec2-dev/stm32/Makefile
+++ b/codec2-dev/stm32/Makefile
@@ -34,7 +34,7 @@ endif
 
 PERIPHLIBURL    = http://www.st.com/st-web-ui/static/active/en/st_prod_software_internet/resource/technical/software/firmware/
 PERIPHLIBZIP    = stm32f4_dsp_stdperiph_lib.zip
-PERIPHLIBVER   = V1.6.0
+PERIPHLIBVER   = V1.6.1
 PERIPHLIBNAME  = STM32F4xx_DSP_StdPeriph_Lib
 PERIPHLIBDIR   = $(PERIPHLIBNAME)
 CMSIS          = $(PERIPHLIBDIR)/Libraries/CMSIS
@@ -436,7 +436,7 @@ SRCS += src/startup_stm32f4xx.s src/init.c
 
 OBJS = $(SRCS:.c=.o)
 
-all: codec2_profile.bin fft_test.bin dac_ut.bin dac_play.bin adc_rec.bin pwm_ut.bin fdmdv_profile.bin sm1000_leds_switches_ut.bin sm1000.bin adcdac_ut.bin freedv_tx_profile.bin freedv_rx_profile.bin adc_sd.bin usb_vcp_ut.bin tuner_ut.bin fast_dac_ut.bin adc_sfdr_ut.bin
+all: codec2_profile.bin fft_test.bin dac_ut.bin dac_play.bin adc_rec.bin pwm_ut.bin fdmdv_profile.bin sm1000_leds_switches_ut.bin sm1000.bin adcdac_ut.bin freedv_tx_profile.bin freedv_rx_profile.bin adc_sd.bin usb_vcp_ut.bin tuner_ut.bin fast_dac_ut.bin adc_sfdr_ut.bin adc_rec_usb.bin
 
 # Rule for making directories automatically.
 # Note we don't use -p as it's a GNU extension.
@@ -636,6 +636,23 @@ CFLAGS += -DUSE_USB_OTG_FS -DUSE_ULPI_PHY -Iusb_conf -Iusb_lib/cdc -Iusb_lib/cor
 usb_vcp_ut.elf: $(USB_VCP_UT:.c=.o) libstm32f4.a
        $(CC) $(CFLAGS) $^ -o $@ $(LIBPATHS) $(LIBS)
 
+ADC_REC_USB_SRCS=\
+src/adc_rec_usb.c \
+../src/fifo.c \
+src/stm32f4_adc.c \
+src/stm32f4_usb_vcp.c \
+src/sm1000_leds_switches.c \
+src/debugblinky.c \
+src/system_stm32f4xx.c \
+src/startup_stm32f4xx.s \
+src/init.c
+
+ADC_REC_USB_SRCS+=$(USB_VCP)
+
+adc_rec_usb.elf: $(ADC_REC_USB_SRCS:.c=.o) libstm32f4.a
+       $(CC) $(CFLAGS) $^ -o $@ $(LIBPATHS) $(LIBS)
+
+
 FDMDV_PROFILE_SRCS=\
 src/fdmdv_profile.c \
 gdb_stdio.c \

diff --git a/codec2-dev/stm32/src/adc_sfdr_ut.c b/codec2-dev/stm32/src/adc_sfdr_ut.c
index 952ecef073d607febcb0ff1571d5cd1062d5ffb4..d09003490030dd232acbe5064161440443b364b1 100644 (file)
--- a/codec2-dev/stm32/src/adc_sfdr_ut.c
+++ b/codec2-dev/stm32/src/adc_sfdr_ut.c
@@ -87,5 +87,3 @@ int main(void) {
 
     printf("Finished!\n");
 }
-
->>>>>>> .r2480\r

diff --git a/codec2-dev/stm32/src/dac_ut.c b/codec2-dev/stm32/src/dac_ut.c
index f38d72de9cea55330bb8c6b36b370743b3c7a779..c4f0f326cb1e3e3c0e8778d94f1f3a8ab0f48340 100644 (file)
--- a/codec2-dev/stm32/src/dac_ut.c
+++ b/codec2-dev/stm32/src/dac_ut.c
@@ -56,5 +56,3 @@ int main(void) {
     }
 
 }
-
->>>>>>> .r2480\r