Changeset 5019

Timestamp:

09/11/07 16:17:09 (6 years ago)

Author:

jgaeddert

Message:

moving header file, build directory as not to clash with C++ SigProc?

Location:

SigProc/branches/SigProc-c

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• documentation.txt (modified) (2 diffs)
• src/filters.c (modified) (2 diffs)
• src/modem.c (modified) (1 diff)
• src/sigprocc.h (moved) (moved from SigProc/branches/SigProc-c/src/sigproc.h) (2 diffs)
• src/utility.c (modified) (1 diff)
• tests/design_rrc_filter_testsuite.h (modified) (1 diff)
• tests/dot_product_testsuite.h (modified) (1 diff)
• tests/modem_testsuite.h (modified) (1 diff)

SigProc/branches/SigProc-c/Makefile.am

@@ -5 +5 @@
     src/modem.c  
 
-pkginclude_HEADERS = src/sigproc.h
+pkginclude_HEADERS = src/sigprocc.h
 
 libsigprocc_la_LDFLAGS = -version-info 0:7:0

SigProc/branches/SigProc-c/configure.ac

@@ -1 @@
-AC_INIT(sigproc, 0.7.0)
+AC_INIT(sigprocc, 0.7.0)
 AC_PREREQ(2.59)
 
@@ -8 +8 @@
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
+
+AC_LANG_PUSH([C])
+AC_CHECK_LIB([m], [main], [], [AC_MSG_ERROR([cannot find m (math) library])])
+AC_LANG_POP
 
 AC_ARG_ENABLE(fpm, AC_HELP_STRING([--enable-fpm=ARCH],

SigProc/branches/SigProc-c/documentation.txt

@@ -39 +39 @@
 
 \verbatim
-AC_CHECK_LIB([sigproc], [main], [], [AC_MSG_ERROR([cannot find sigproc library])])
-AC_CHECK_HEADERS([sigproc/SigProc.h], [], [AC_MSG_ERROR([cannot find sigproc library header files])])
+AC_CHECK_LIB([sigprocc], [main], [], [AC_MSG_ERROR([cannot find sigprocc library])])
+AC_CHECK_HEADERS([sigprocc/sigprocc.h], [], [AC_MSG_ERROR([cannot find sigprocc library header files])])
 \endverbatim
 
@@ -50 +50 @@
 Add the following to your class header file:
 \code
-#include "sigproc/SigProc.h"
+#include "sigprocc/sigprocc.h"
 \endcode
 
 \subsection ExampleRRCFilter Example: design a root raised-cosine filter
 \code
-// A simple SigProc example: examplerrcfilter.cpp
+// A simple sigprocc example: examplerrcfilter.c
 
-#include "sigproc/SigProc.h"
+#include <stdlib.h>
+#include "sigprocc/sigprocc.h"
 
 int main() {
-    unsigned int k(4);              // samples per symbol
-    unsigned int m(3);              // filter delay (symbols)
-    float beta(0.3);                // excess bandwidth factor
-    
-    unsigned int h_len(2*k*m+1);    // filter length
-    float * h = new float[h_len];   // array for filter coefficients
+    unsigned int k = 4;             // samples per symbol
+    unsigned int m = 3;             // filter delay (symbols)
+    float beta = 0.3;               // excess bandwidth factor
+
+    unsigned int h_len = 2*k*m+1;   // filter length
+    float * h;                      // array for filter coefficients
+
+    // Allocate memory for filter coefficients
+    h = (float*) malloc(sizeof(float)*h_len);
 
     // Calculate filter coefficients
-    DesignRRCFilter(k, m, beta, h);
+    design_rrc_filter(k, m, beta, h);
 
     // Print filter coefficients to the screen
-    for (unsigned int i=0; i<h_len; i++) 
+    unsigned int i;
+    for (i=0; i<h_len; i++)
         printf("h[%d] = %f\n", i, h[i]);
-    
+
     // Clean up memory
-    delete [] h;
-    
+    free(h);
+
     return 0;
-}   
+}
 \endcode
 
 Compile and run
 \verbatim
-$ g++ -lsigproc examplerrcfilter.cpp -o ExampleRRCFilter
-$ ./ExampleRRCFilter
+$ gcc examplerrcfilter.c -lsigprocc -o example
+$ ./example
 \endverbatim
 

SigProc/branches/SigProc-c/src/filters.c

@@ -21 +21 @@
 ****************************************************************************/
 
-#include "sigproc.h"
-#include <math.h>
+#include "sigprocc.h"
 
 //-----------------------------------------------------------------------------
@@ -132 +131 @@
             if ( g < 1e-3 ) {
                 float g1, g2, g3, g4;
-                g1 = -(1+beta)*pi*sin((1+beta)*pi/(4*beta));
-                g2 = cos((1-beta)*pi/(4*beta))*(1-beta)*pi;
-                g3 = -sin((1-beta)*pi/(4*beta))*4*beta;
+                g1 = -(1+beta)*pi*sinf((1+beta)*pi/(4*beta));
+                g2 = cosf((1-beta)*pi/(4*beta))*(1-beta)*pi;
+                g3 = -sinf((1-beta)*pi/(4*beta))*4*beta;
                 g4 = -2*pi;
 

SigProc/branches/SigProc-c/src/modem.c

@@ -21 +21 @@
 ****************************************************************************/
 
-#include "sigproc.h"
+#include "sigprocc.h"
 
 //

SigProc/branches/SigProc-c/src/sigprocc.h

@@ -26 +26 @@
 
 #include <stdio.h>
+#include <math.h>
 
 #ifdef __cplusplus
@@ -41 +42 @@
 int abs( int n );
 float atanf( float x );
+float sinf( float x );
 
 //-----------------------------------------------------------------------------

SigProc/branches/SigProc-c/src/utility.c

@@ -21 +21 @@
 ****************************************************************************/
 
-#include "sigproc.h"
+#include "sigprocc.h"
 
 //-----------------------------------------------------------------------------

SigProc/branches/SigProc-c/tests/design_rrc_filter_testsuite.h

@@ -4 +4 @@
 #include <cxxtest/TestSuite.h>
 extern "C" {
-#include "../src/sigproc.h"
+#include "../src/sigprocc.h"
 }
 

SigProc/branches/SigProc-c/tests/dot_product_testsuite.h

@@ -3 +3 @@
 
 #include <cxxtest/TestSuite.h>
-#include "../src/sigproc.h"
+#include "../src/sigprocc.h"
 
 //

SigProc/branches/SigProc-c/tests/modem_testsuite.h

@@ -3 +3 @@
 
 #include <cxxtest/TestSuite.h>
-#include "../src/sigproc.h"
+#include "../src/sigprocc.h"
 
 //