another great patch from Danilo to clean up warning in the smt32 code

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

diff --git a/codec2-dev/stm32/Makefile b/codec2-dev/stm32/Makefile
index 2911a298bb2c69c9e394e19d510f44c581031699..63f2428d2f9bb5bf8b71718d0819dbdfd759fe65 100644 (file)
--- a/codec2-dev/stm32/Makefile
+++ b/codec2-dev/stm32/Makefile
@@ -19,7 +19,7 @@ SUDO ?= sudo
 ###################################################
 
 CFLAGS  = -std=gnu11 -O0 -g -Wall -Tstm32_flash.ld -DSTM32F40_41xxx -DCORTEX_M4
-CFLAGS += -mlittle-endian -mthumb -mthumb-interwork -nostartfiles -mcpu=cortex-m4
+CFLAGS += -mlittle-endian -mthumb -mthumb-interwork -nostartfiles -mcpu=cortex-m4 -Wno-unused-function
 
 ifeq ($(FLOAT_TYPE), hard)
 CFLAGS += -fsingle-precision-constant -Wdouble-promotion

diff --git a/codec2-dev/stm32/src/fast_dac_ut.c b/codec2-dev/stm32/src/fast_dac_ut.c
index e9b50f8f6409a2e76e057ab0a7494a668a5ec550..cce4edbcfca13101a9c32dcc5baf89853f208490 100644 (file)
--- a/codec2-dev/stm32/src/fast_dac_ut.c
+++ b/codec2-dev/stm32/src/fast_dac_ut.c
@@ -35,6 +35,7 @@
 #include <stm32f4xx_rcc.h>
 #include "gdb_stdio.h"
 #include "comp.h"
+#include <string.h> 
 //#include "gmsk_test_dat_m4.h"
 #define SINE_SAMPLES  32
 
@@ -59,7 +60,8 @@ float f4sine[] = {1,0,-1,0,1,0,-1,0,1,0,-1,0,1,0,-1,0,1,0,-1,0,1,0,-1,0,1,0,-1,0
 int tx_imm[DUC_N];
 
 //Complex input to chain
-COMP comp_in[DUC_N/10];
+#define COMP_IN_SZ (DUC_48N)
+COMP comp_in[COMP_IN_SZ];
 
 unsigned short outbuf[DAC_DUC_BUF_SZ];
 
@@ -85,7 +87,7 @@ int main(void) {
     fast_dac_open(2*DAC_DUC_BUF_SZ,2*DAC_BUF_SZ);
     tstart=tend=tup=cyc=0;
     //Initalize complex input with signal at zero
-    for(i=0;i<DUC_48N;i++){
+    for(i=0;i<COMP_IN_SZ;i++){
         comp_in[i].real=1;
         comp_in[i].imag=0;
     }

diff --git a/codec2-dev/stm32/src/iir_tuner.c b/codec2-dev/stm32/src/iir_tuner.c
index 2baae590f756678c033191352afec1489e32ab39..84219955096bf5ccdbd66b94236981937b07436b 100644 (file)
--- a/codec2-dev/stm32/src/iir_tuner.c
+++ b/codec2-dev/stm32/src/iir_tuner.c
@@ -73,7 +73,9 @@ void iir_tuner(
 ) 
 {
     int i, j, k;
+#ifndef FIXED_IIR
     float x, y, z;
+#endif
     int n, m, o;
 
     for(i=0, j=0; i<ADC_TUNER_BUF_SZ/2; j++) {

diff --git a/codec2-dev/stm32/src/si5351_ut.c b/codec2-dev/stm32/src/si5351_ut.c
index cd07d49da44022d8851b1119385ca850c2f3c9c1..d79a4da2b8e98bb52b28f70ba860563a347c84a3 100644 (file)
--- a/codec2-dev/stm32/src/si5351_ut.c
+++ b/codec2-dev/stm32/src/si5351_ut.c
@@ -33,12 +33,12 @@
 //#define printf gdb_stdio_printf
 
 int main(void) {
-    int ret;
 
     //printf("starting\n");
     I2C_Setup();
     si5351_init(0, SI5351_CRYSTAL_LOAD_6PF, 0);
-    ret = si5351_set_freq(1000000000ULL, 0, SI5351_CLK0);
+    si5351_set_freq(1000000000ULL, 0, SI5351_CLK0);
+    // int ret = si5351_set_freq(1000000000ULL, 0, SI5351_CLK0);
     //printf(" ret = %d\n", ret);
 
     while(1);

diff --git a/codec2-dev/stm32/src/si53xx.c b/codec2-dev/stm32/src/si53xx.c
index a39557b49cb9a6f4dc9604d1de7965f5c2caee96..48576a3b7c6e9a63ef315224f79d78da35587d80 100644 (file)
--- a/codec2-dev/stm32/src/si53xx.c
+++ b/codec2-dev/stm32/src/si53xx.c
@@ -645,6 +645,8 @@ void si5351_ms_div(enum si5351_clock clk, uint8_t r_div, uint8_t div_by_4) {
                 return;
         case SI5351_CLKNONE:
                 return;
+       default:
+               return;
     }
 
     reg_val = si5351_read(reg_addr);
@@ -761,7 +763,7 @@ uint64_t si5351_multisynth_calc(uint64_t freq, uint64_t pll_freq, struct Si5351R
 uint64_t si5351_pll_calc(uint64_t freq, struct Si5351RegSet *reg, int32_t correction) {
     uint64_t ref_freq = Si5351_Config.xtal_freq * SI5351_FREQ_MULT;
     uint32_t a, b, c, p1, p2, p3;
-    uint64_t lltmp, rfrac, denom;
+    uint64_t lltmp, denom;
 
 
     // Factor calibration value into nominal crystal frequency
@@ -792,7 +794,6 @@ uint64_t si5351_pll_calc(uint64_t freq, struct Si5351RegSet *reg, int32_t correc
     lltmp = freq % ref_freq;
     lltmp *= denom;
     do_div(lltmp, ref_freq);
-    rfrac = lltmp;
 
     b = (((uint64_t)(freq % ref_freq)) * RFRAC_DENOM) / ref_freq;
     c = b ? RFRAC_DENOM : 1;

diff --git a/codec2-dev/stm32/src/sm2000_adc_dump.c b/codec2-dev/stm32/src/sm2000_adc_dump.c
index 87472f70ca539a4a1e09663e6cf92dcfa8623041..353f7d9ac0c52b041c3ecb958e64e661faa40545 100644 (file)
--- a/codec2-dev/stm32/src/sm2000_adc_dump.c
+++ b/codec2-dev/stm32/src/sm2000_adc_dump.c
@@ -49,7 +49,7 @@ short aSine[] = {
 short zeros[SINE_SAMPLES];
 
 int main(void) {
-    int ret, ptt, i;
+    int ptt, i;
     uint64_t freq_in_Hz_times_100;
 
     for(i=0; i<SINE_SAMPLES; i++)
@@ -65,7 +65,8 @@ int main(void) {
     I2C_Setup();
     si5351_init(0, SI5351_CRYSTAL_LOAD_6PF, 0);
     freq_in_Hz_times_100 = 1070000000ULL - 3200000ULL;
-    ret = si5351_set_freq(freq_in_Hz_times_100, 0, SI5351_CLK0);
+    // int ret = si5351_set_freq(freq_in_Hz_times_100, 0, SI5351_CLK0);
+    si5351_set_freq(freq_in_Hz_times_100, 0, SI5351_CLK0);
 
     //dac_open(DAC_FS_96KHZ, 4*DAC_BUF_SZ);
     adc_open(ADC_FS_96KHZ, 10*ADC_BUF_SZ);
@@ -91,16 +92,16 @@ int main(void) {
 
         int n = adc1_samps();
         if (n) {
-            uint16_t  s, buf[n];
+            uint16_t  buf[n];
             uint8_t   b;
-            adc1_read(buf,n);
+            adc1_read((short*)buf,n);
             for(i=0; i<n; i++) {
                                b = (uint8_t)(buf[i]&0xFF);
                                VCP_put_char(b);
                                b = (uint8_t)((buf[i]>>8)&0xFF);
                                VCP_put_char(b);
                 //VCP_get_char(&b);
-                //s = b << 8;
+                //uint16_t s = b << 8;
                 //VCP_get_char(&b);
                 //s += b;
                 //buf[i] = s;

diff --git a/codec2-dev/stm32/src/sm2000_rxdemo.c b/codec2-dev/stm32/src/sm2000_rxdemo.c
index bc5b7c530eda46f24ce84f040d4abd65ea901554..048b014a3b0e2c512acc4e1fbdd0a41f94e7a4b1 100644 (file)
--- a/codec2-dev/stm32/src/sm2000_rxdemo.c
+++ b/codec2-dev/stm32/src/sm2000_rxdemo.c
@@ -55,7 +55,7 @@ size_t stack_size(){
 //short speechbuf[320];
 
 int main(void) {
-    int ret, ptt, i;
+    int ptt;
     uint64_t freq_in_Hz_times_100;
     struct freedv * fdv;
     struct FSK * fsk;
@@ -73,7 +73,8 @@ int main(void) {
     I2C_Setup();
     si5351_init(0, SI5351_CRYSTAL_LOAD_6PF, 0);
     freq_in_Hz_times_100 = 1070000000ULL - 3200000ULL;
-    ret = si5351_set_freq(freq_in_Hz_times_100, 0, SI5351_CLK0);
+    // int ret = si5351_set_freq(freq_in_Hz_times_100, 0, SI5351_CLK0);
+    si5351_set_freq(freq_in_Hz_times_100, 0, SI5351_CLK0);
     
     /* Open up the FreeDV thing */
        fdv = freedv_open(FREEDV_MODE_2400A);
@@ -89,10 +90,8 @@ int main(void) {
     //short buf[ADC_BUF_SZ*4];
     dac_open(DAC_FS_16KHZ*2, DAC_BUF_SZ*4);
     adc_open(ADC_FS_96KHZ, ADC_BUF_SZ*11);
-    size_t lss;
     //usb_vcp_init();
     int mbptr = 0;
-       int k;
        int spstate;
        ptt = 0;
        int nin = freedv_nin(fdv);

diff --git a/codec2-dev/stm32/src/sm2000_stw.c b/codec2-dev/stm32/src/sm2000_stw.c
index 868a513e5bcfd028fa911f3320ac358fde2b98ae..448644fb22c8037501bb7ab8996264e8a4090372 100644 (file)
--- a/codec2-dev/stm32/src/sm2000_stw.c
+++ b/codec2-dev/stm32/src/sm2000_stw.c
@@ -66,11 +66,10 @@ uint8_t bit_buf[] = { 1,0,1,1,0,0,0,1,
                   1,0,0,0,0,0,1,1, };
                   
 int main(void) {
-    int ret, ptt, i;
+    int ptt, i;
     uint64_t freq_in_Hz_times_100;
     struct FSK * fsk;
     struct freedv_vhf_deframer * deframer;
-    char chbuf[100];
     float * mod_buf;
     
     sm1000_leds_switches_init();
@@ -90,7 +89,7 @@ int main(void) {
     I2C_Setup();
     si5351_init(0, SI5351_CRYSTAL_LOAD_6PF, 0);
     freq_in_Hz_times_100 = 1070000000ULL - 3200000ULL;
-    ret = si5351_set_freq(freq_in_Hz_times_100, 0, SI5351_CLK0);
+    si5351_set_freq(freq_in_Hz_times_100, 0, SI5351_CLK0);
 
     dac_open(DAC_FS_96KHZ, 2000);
     adc_open(ADC_FS_96KHZ, 2000);

diff --git a/codec2-dev/stm32/src/stm32f4_pwm.c b/codec2-dev/stm32/src/stm32f4_pwm.c
index acbaab98f07d6da523cef31a605d5b831a1fb26d..3bc3ea74028af27f75275cd9b57c8f35f62ec72a 100644 (file)
--- a/codec2-dev/stm32/src/stm32f4_pwm.c
+++ b/codec2-dev/stm32/src/stm32f4_pwm.c
@@ -77,7 +77,6 @@ int main(void){
 static void TIM_Config(void)
 {
   GPIO_InitTypeDef GPIO_InitStructure;
-  DMA_InitTypeDef DMA_InitStructure;
 
   /* GPIOA and GPIOB clock enable */
   RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB, ENABLE);
@@ -124,8 +123,6 @@ static void TIM_Config(void)
 }
 
 void Timer1Config() {
-    int i;
-
     /* TIM Configuration */
 
     TIM_Config();

diff --git a/codec2-dev/stm32/usb_lib/cdc/usbd_cdc_core.c b/codec2-dev/stm32/usb_lib/cdc/usbd_cdc_core.c
index 41b5fef8a7fcff3dc20a1ee53510995072e7b3f8..d587d86313ced6e63bcdd0e9e84c646eb32a8a71 100644 (file)
--- a/codec2-dev/stm32/usb_lib/cdc/usbd_cdc_core.c
+++ b/codec2-dev/stm32/usb_lib/cdc/usbd_cdc_core.c
@@ -497,7 +497,7 @@ static uint8_t  usbd_cdc_DeInit (void  *pdev,
 static uint8_t  usbd_cdc_Setup (void  *pdev,
                                 USB_SETUP_REQ *req)
 {
-  uint16_t len;
+  uint16_t len = 0;
   uint8_t  *pbuf;
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)

diff --git a/codec2-dev/stm32/usb_lib/otg/usb_core.c b/codec2-dev/stm32/usb_lib/otg/usb_core.c
index 723d95866061b55cace77ad0f5794176c72693e3..1832106faefc527019c60361c21148af5ded31d4 100644 (file)
--- a/codec2-dev/stm32/usb_lib/otg/usb_core.c
+++ b/codec2-dev/stm32/usb_lib/otg/usb_core.c
@@ -1986,7 +1986,7 @@ void USB_OTG_ActiveRemoteWakeup(USB_OTG_CORE_HANDLE *pdev)
       if(pdev->cfg.low_power)
       {
         /* un-gate USB Core clock */
-        power.d32 = USB_OTG_READ_REG32(&pdev->regs.PCGCCTL);
+        power.d32 = USB_OTG_READ_REG32(pdev->regs.PCGCCTL);
         power.b.gatehclk = 0;
         power.b.stoppclk = 0;
         USB_OTG_WRITE_REG32(pdev->regs.PCGCCTL, power.d32);
@@ -2020,7 +2020,7 @@ void USB_OTG_UngateClock(USB_OTG_CORE_HANDLE *pdev)
     if(dsts.b.suspsts == 1)
     {
       /* un-gate USB Core clock */
-      power.d32 = USB_OTG_READ_REG32(&pdev->regs.PCGCCTL);
+      power.d32 = USB_OTG_READ_REG32(pdev->regs.PCGCCTL);
       power.b.gatehclk = 0;
       power.b.stoppclk = 0;
       USB_OTG_WRITE_REG32(pdev->regs.PCGCCTL, power.d32);

diff --git a/codec2-dev/stm32/usb_lib/otg/usb_dcd_int.c b/codec2-dev/stm32/usb_lib/otg/usb_dcd_int.c
index 59627830088cf1478498ec17eb6cf896fa382233..82567ebea1286652ab8cd536b8a188536b380905 100644 (file)
--- a/codec2-dev/stm32/usb_lib/otg/usb_dcd_int.c
+++ b/codec2-dev/stm32/usb_lib/otg/usb_dcd_int.c
@@ -360,7 +360,7 @@ static uint32_t DCD_HandleResume_ISR(USB_OTG_CORE_HANDLE *pdev)
   if(pdev->cfg.low_power)
   {
     /* un-gate USB Core clock */
-    power.d32 = USB_OTG_READ_REG32(&pdev->regs.PCGCCTL);
+    power.d32 = USB_OTG_READ_REG32(pdev->regs.PCGCCTL);
     power.b.gatehclk = 0;
     power.b.stoppclk = 0;
     USB_OTG_WRITE_REG32(pdev->regs.PCGCCTL, power.d32);