From 9df4a4910d9dac548245b64d9478532e9af7d439 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Wed, 11 Jan 2017 15:56:20 +0100
Subject: [PATCH] fix warnings in openair1/PHY/MODULATION/compute_bf_weights.c
Several various fixes are included. Not sure what component of
the system uses this file.
There is one 'abort' added in case a fscanf fails. It may be a
bit too brutal.
---
openair1/PHY/MODULATION/compute_bf_weights.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/openair1/PHY/MODULATION/compute_bf_weights.c b/openair1/PHY/MODULATION/compute_bf_weights.c
index 32a91c11f50..4ef8e88ca66 100644
--- a/openair1/PHY/MODULATION/compute_bf_weights.c
+++ b/openair1/PHY/MODULATION/compute_bf_weights.c
@@ -1,11 +1,12 @@
#include <stdio.h>
#include <stdint.h>
+#include <stdlib.h>
#include "PHY/impl_defs_lte.h"
int f_read(char *calibF_fname, int nb_ant, int nb_freq, int32_t **tdd_calib_coeffs){
FILE *calibF_fd;
- int i,j,l,calibF_e;
+ int i,j,calibF_e;
calibF_fd = fopen(calibF_fname,"r");
@@ -14,7 +15,7 @@ int f_read(char *calibF_fname, int nb_ant, int nb_freq, int32_t **tdd_calib_coef
for(i=0;i<nb_ant;i++){
for(j=0;j<nb_freq*2;j++){
- fscanf(calibF_fd, "%d", &calibF_e);
+ if (fscanf(calibF_fd, "%d", &calibF_e) != 1) abort();
tdd_calib_coeffs[i][j] = (int16_t)calibF_e;
}
}
@@ -22,11 +23,15 @@ int f_read(char *calibF_fname, int nb_ant, int nb_freq, int32_t **tdd_calib_coef
printf("%d\n",(int)tdd_calib_coeffs[1][599]);
} else
printf("%s not found, running with defaults\n",calibF_fname);
+ /* TODO: what to return? is this code used at all? */
+ return 0;
}
int estimate_DLCSI_from_ULCSI(int32_t **calib_dl_ch_estimates, int32_t **ul_ch_estimates, int32_t **tdd_calib_coeffs, int nb_ant, int nb_freq) {
+ /* TODO: what to return? is this code used at all? */
+ return 0;
}
@@ -44,6 +49,8 @@ int compute_BF_weights(int32_t **beam_weights, int32_t **calib_dl_ch_estimates,
default :
break;
}
+ /* TODO: what to return? is this code used at all? */
+ return 0;
}
// temporal test function
--
GitLab