From 277075b3978987b4387dc134244346a14ad2b452 Mon Sep 17 00:00:00 2001
From: ha7ilm <retzlerandras@gmail.com>
Date: Sun, 14 Feb 2016 11:19:36 +0100
Subject: [PATCH] Renamed convert_f_i16 -> convert_f_s16 and convert_i16_f ->
 convert_s16_f. (csdr also triggers for the original functions, but they are
 deprecated.

---
 csdr.c    | 10 +++++-----
 libcsdr.c | 11 +++++++----
 libcsdr.h |  2 ++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/csdr.c b/csdr.c
index 616e140..eb1a083 100644
--- a/csdr.c
+++ b/csdr.c
@@ -58,8 +58,8 @@ char usage[]=
 "    convert_f_u8\n"
 "    convert_s8_f\n"
 "    convert_f_s8\n"
-"    convert_f_i16\n"
-"    convert_i16_f\n"
+"    convert_f_s16\n"
+"    convert_s16_f\n"
 "    realpart_cf\n"
 "    clipdetect_ff\n"
 "    limit_ff [max_amplitude]\n"
@@ -372,7 +372,7 @@ int main(int argc, char *argv[])
 			TRY_YIELD;
 		}
 	}
-	if(!strcmp(argv[1],"convert_f_i16"))
+	if((!strcmp(argv[1],"convert_f_i16")) || (!strcmp(argv[1],"convert_f_s16")))
 	{
 		if(!sendbufsize(initialize_buffers())) return -2;
 		for(;;)
@@ -384,7 +384,7 @@ int main(int argc, char *argv[])
 			TRY_YIELD;
 		}
 	}
-	if(!strcmp(argv[1],"convert_i16_f")) //not tested
+	if((!strcmp(argv[1],"convert_i16_f")) || (!strcmp(argv[1],"convert_s16_f"))) //not tested
 	{
 		if(!sendbufsize(initialize_buffers())) return -2;
 		for(;;)
@@ -1426,7 +1426,7 @@ int main(int argc, char *argv[])
 		}
 	}*/
 
-
+	
 	if(!strcmp(argv[1],"flowcontrol"))
 	{
 		if(argc<=3) return badsyntax("need required parameters (data_rate, reads_per_seconds)"); 
diff --git a/libcsdr.c b/libcsdr.c
index b771697..81474db 100644
--- a/libcsdr.c
+++ b/libcsdr.c
@@ -949,9 +949,9 @@ void convert_s8_f(signed char* input, float* output, int input_size)
 	for(int i=0;i<input_size;i++) output[i]=((float)input[i])/SCHAR_MAX; //@convert_s8_f
 }
 
-void convert_i16_f(short* input, float* output, int input_size)
+void convert_s16_f(short* input, float* output, int input_size)
 {
-	for(int i=0;i<input_size;i++) output[i]=(float)input[i]/SHRT_MAX; //@convert_i16_f
+	for(int i=0;i<input_size;i++) output[i]=(float)input[i]/SHRT_MAX; //@convert_s16_f
 }
 
 void convert_f_u8(float* input, unsigned char* output, int input_size)
@@ -966,16 +966,19 @@ void convert_f_s8(float* input, signed char* output, int input_size)
 	for(int i=0;i<input_size;i++) output[i]=input[i]*SCHAR_MAX; //@convert_f_s8
 }
 
-void convert_f_i16(float* input, short* output, int input_size)
+void convert_f_s16(float* input, short* output, int input_size)
 {
 	/*for(int i=0;i<input_size;i++) 
 	{
 		if(input[i]>1.0) input[i]=1.0;
 		if(input[i]<-1.0) input[i]=-1.0;
 	}*/
-	for(int i=0;i<input_size;i++) output[i]=input[i]*SHRT_MAX; //@convert_f_i16
+	for(int i=0;i<input_size;i++) output[i]=input[i]*SHRT_MAX; //@convert_f_s16
 }
 
+void convert_i16_f(short* input, float* output, int input_size) { convert_s16_f(input, output, input_size); }
+void convert_f_i16(float* input, short* output, int input_size) { convert_f_s16(input, output, input_size); }
+
 int trivial_vectorize()
 {
 	//this function is trivial to vectorize and should pass on both NEON and SSE
diff --git a/libcsdr.h b/libcsdr.h
index 502e238..79696b3 100644
--- a/libcsdr.h
+++ b/libcsdr.h
@@ -170,6 +170,8 @@ void convert_u8_f(unsigned char* input, float* output, int input_size);
 void convert_f_u8(float* input, unsigned char* output, int input_size);
 void convert_s8_f(signed char* input, float* output, int input_size);
 void convert_f_s8(float* input, signed char* output, int input_size);
+void convert_f_s16(float* input, short* output, int input_size);
+void convert_s16_f(short* input, float* output, int input_size);
 void convert_f_i16(float* input, short* output, int input_size);
 void convert_i16_f(short* input, float* output, int input_size);