Changeset 4528

Timestamp:

08/02/07 14:36:03 (6 years ago)

Author:

jgaeddert

Message:

Fixing license headers

Location:

SigProc/trunk/SigProc

Files:

• . (modified) (1 prop)
• .ignore (modified) (1 diff)
• Doxyfile (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• SigProc.h (modified) (3 diffs)
• fec_conv.cpp (modified) (1 diff)
• filters.cpp (modified) (9 diffs)
• modem.cpp (modified) (1 diff)
• pll.cpp (modified) (1 diff)
• scaling.cpp (modified) (1 diff)
• sources.cpp (modified) (1 diff)
• utility.cpp (modified) (1 diff)

SigProc/trunk/SigProc

@@ -3 +3 @@
 autotest
 autotest.cpp
-docs
+documentation
 html
 latex

@@ -3 +3 @@
 autotest
 autotest.cpp
-docs
+documentation
 html
 latex

SigProc/trunk/SigProc/.ignore

@@ -3 +3 @@
 autotest
 autotest.cpp
-docs
+documentation
 html
 latex

SigProc/trunk/SigProc/Doxyfile

@@ -31 +31 @@
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       = documentation
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 

SigProc/trunk/SigProc/Makefile.am

@@ -46 +46 @@
 
 # --- documentation ---
+.PHONY: docs documentation
 
 docs :

SigProc/trunk/SigProc/SigProc.h

@@ -3 +3 @@
 Copyright 2005,2006 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE Decimator.
-
-OSSIE Decimator is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-OSSIE Decimator is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+This file is part of the OSSIE Signal Processing Library.
+
+OSSIE Signal Processing Library is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OSSIE Signal Processing Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with OSSIE Decimator; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+You should have received a copy of the GNU General Public License along
+with OSSIE Signal Processing Library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
@@ -871 +871 @@
 }
 
-
-enum DemodScheme {
-    HARD = 0,
-    SOFT_TRUE = 1,
-    SOFT_STANDARD = 2,
-    SOFT_HIGHSNR = 3
-};
-
-void DemodQAM(unsigned int M, signed short X, signed short Y, DemodScheme scheme, signed char *bitsOut);
-
-void DemodPSK(unsigned int M, signed short X, signed short Y, DemodScheme scheme, signed char *bitsOut);
-
-
-
-#define BPSK_LEVEL 10000        ///< BPSK amplitude (RMS=10000)
-
-#define QPSK_LEVEL 7071         ///< QPSK amplitude (RMS=10000)
-
-#define PSK8_LEVEL_1 7071       ///< Low 8-PSK amplitude (RMS=10000)
-#define PSK8_LEVEL_2 10000      ///< High 8-PSK amplitude (RMS=10000)
-
-#define QAM16_LEVEL_1 3162      ///< Low 16-QAM amplitude (RMS=10000)
-#define QAM16_LEVEL_2 9487      ///< High 16-QAM amplitude (RMS=10000)
-
-#define PAM4_LEVEL_1 4472       ///< Low 4-PAM amplitude (RMS=10000)
-#define PAM4_LEVEL_2 13416      ///< High 4-PAM amplitude (RMS=10000)
+// enum DemodScheme {
+//     HARD = 0,
+//     SOFT_TRUE = 1,
+//     SOFT_STANDARD = 2,
+//     SOFT_HIGHSNR = 3
+// };
+
+// void DemodQAM(unsigned int M, signed short X, signed short Y, DemodScheme scheme, signed char *bitsOut);
+
+// void DemodPSK(unsigned int M, signed short X, signed short Y, DemodScheme scheme, signed char *bitsOut);
+
+
+#define BPSK_LEVEL      10000   ///< BPSK amplitude (RMS=10000)
+#define QPSK_LEVEL      7071    ///< QPSK amplitude (RMS=10000)
+#define PSK8_LEVEL_1    7071    ///< Low 8-PSK amplitude (RMS=10000)
+#define PSK8_LEVEL_2    10000   ///< High 8-PSK amplitude (RMS=10000)
+#define QAM16_LEVEL_1   3162    ///< Low 16-QAM amplitude (RMS=10000)
+#define QAM16_LEVEL_2   9487    ///< High 16-QAM amplitude (RMS=10000)
+#define PAM4_LEVEL_1    4472    ///< Low 4-PAM amplitude (RMS=10000)
+#define PAM4_LEVEL_2    13416   ///< High 4-PAM amplitude (RMS=10000)
 
 /// Modulates a symbol into an I/Q pair for binary phase shift keying
@@ -935 +929 @@
 
 #define QAM16_THRESHOLD 6324    ///< 16-QAM threshold for RMS=10000 signal
-#define PAM4_THRESHOLD 8944     ///< 4-PAM threshold for RMS=10000 signal
+#define PAM4_THRESHOLD  8944    ///< 4-PAM threshold for RMS=10000 signal
 
 ///

SigProc/trunk/SigProc/fec_conv.cpp

@@ -1 @@
-/****************************************************************************
-
-Copyright 2007, Virginia Polytechnic Institute and State University
+/**************************************************************************** 
+Copyright 2005,2006 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE Signal Processing Library.
 
-OSSIE Core Framework is free software; you can redistribute it and/or modify
-it under the terms of the Lesser GNU General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-The OSSIE Signal Processing library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+OSSIE Signal Processing Library is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OSSIE Signal Processing Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Lesser GNU General Public License for more details.
-
-You should have received a copy of the Lesser GNU General Public License
-along with OSSIE Core Framework; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with OSSIE Signal Processing Library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
 
 ****************************************************************************/

SigProc/trunk/SigProc/filters.cpp

@@ -1 @@
-/****************************************************************************
-
-Copyright 2006, Virginia Polytechnic Institute and State University
+/**************************************************************************** 
+Copyright 2005,2006 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE Signal Processing Library.
 
-OSSIE Core Framework is free software; you can redistribute it and/or modify
-it under the terms of the Lesser GNU General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-The OSSIE Signal Processing library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+OSSIE Signal Processing Library is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OSSIE Signal Processing Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Lesser GNU General Public License for more details.
-
-You should have received a copy of the Lesser GNU General Public License
-along with OSSIE Core Framework; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with OSSIE Signal Processing Library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
 
 ****************************************************************************/
@@ -486 +486 @@
 
     for (unsigned int i = 0; i < len_a; ++i)
-        A[i] = a_coeff[i];
+        A[i] = a_coeff[i];
 
     for (unsigned int i = 0; i < len_b; ++i)
-        B[i] = b_coeff[i];
+        B[i] = b_coeff[i];
 
     if (len_A > len_B)
-        len_v = len_A;
+        len_v = len_A;
     else
-        len_v = len_B;
+        len_v = len_B;
 
     v = new float[len_v];
 
-    for (unsigned int i = 0; i < len_v; ++i)
-        v[i] = 0;
-
-}
-
-void iir_filter::ResetBuffer()
-{
     for (unsigned int i = 0; i < len_v; ++i)
         v[i] = 0;
+
+}
+
+void iir_filter::ResetBuffer()
+{
+    for (unsigned int i = 0; i < len_v; ++i)
+        v[i] = 0;
 }
 
@@ -518 +518 @@
     for (unsigned int i = 1; i < len_A; ++i) {
 
-        --v_idx;
-        if (v_idx < 0)
-            v_idx += len_v;
-
-        v[next_v] -= (short) (A[i] * v[v_idx]);
-          
+        --v_idx;
+        if (v_idx < 0)
+            v_idx += len_v;
+
+        v[next_v] -= (short) (A[i] * v[v_idx]);
+          
     }
 
@@ -531 +531 @@
 
     for (unsigned int i = 0; i < len_B; ++i) {
-        out += (B[i] * v[v_idx]);
-
-        --v_idx;
-        if (v_idx < 0)
-            v_idx += len_v;
+        out += (B[i] * v[v_idx]);
+
+        --v_idx;
+        if (v_idx < 0)
+            v_idx += len_v;
     }
 
@@ -541 +541 @@
 
     if (out < SHRT_MIN)
-        y = SHRT_MIN;
+        y = SHRT_MIN;
     else if (out > SHRT_MAX)
-        y = SHRT_MAX;
+        y = SHRT_MAX;
     else
-        y = (short) out;
+        y = (short) out;
 }
 
@@ -561 +561 @@
     for (unsigned int i = 0; i < len_a; ++i)
 #ifdef FPM
-        A[i] = mad_f_tofixed(a_coeff[i]);
+        A[i] = mad_f_tofixed(a_coeff[i]);
 #else
-        A[i] = a_coeff[i];
+        A[i] = a_coeff[i];
 #endif
 
 
     for (unsigned int i = 0; i < len_v; ++i)
-        v[i] = 0;
+        v[i] = 0;
 
 
@@ -582 +582 @@
 
     if (!run_filter) { // Do not create an output value
-        y = 0;
-        return;
+        y = 0;
+        return;
     }
 
@@ -594 +594 @@
 
     for (unsigned int i = 0; i < len_A; ++i) {
-        if (v[v_idx]) {
+        if (v[v_idx]) {
 #ifdef FPM
-            out = mad_f_add(out, mad_f_mul(A[i], v[v_idx]));
+            out = mad_f_add(out, mad_f_mul(A[i], v[v_idx]));
 #else
-            out += (A[i] * v[v_idx]);
+            out += (A[i] * v[v_idx]);
 #endif
-        }
-
-        --v_idx;
-        if (v_idx < 0)
-            v_idx += len_v;
+        }
+
+        --v_idx;
+        if (v_idx < 0)
+            v_idx += len_v;
     }
 
 #ifdef FPM
-        y = (short) out;
+        y = (short) out;
 #else
     if (out < SHRT_MIN)
-        y = SHRT_MIN;
+        y = SHRT_MIN;
     else if (out > SHRT_MAX)
-        y = SHRT_MAX;
+        y = SHRT_MAX;
     else
-        y = (short) out;
+        y = (short) out;
 #endif
 }
@@ -623 +623 @@
 
     for (unsigned int i = 0; i < len_v; ++i)
-        v[i] = 0;
+        v[i] = 0;
 
     next_v = 0;

SigProc/trunk/SigProc/modem.cpp

@@ -1 @@
-/****************************************************************************
-
-Copyright 2007, Virginia Polytechnic Institute and State University
+/**************************************************************************** 
+Copyright 2005,2006 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE Signal Processing Library.
 
-OSSIE Core Framework is free software; you can redistribute it and/or modify
-it under the terms of the Lesser GNU General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-The OSSIE Signal Processing library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+OSSIE Signal Processing Library is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OSSIE Signal Processing Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Lesser GNU General Public License for more details.
-
-You should have received a copy of the Lesser GNU General Public License
-along with OSSIE Core Framework; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with OSSIE Signal Processing Library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
 
 ****************************************************************************/

SigProc/trunk/SigProc/pll.cpp

@@ -1 @@
-/****************************************************************************
-
-Copyright 2006, Virginia Polytechnic Institute and State University
+/**************************************************************************** 
+Copyright 2005,2006 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE Signal Processing Library.
 
-OSSIE Core Framework is free software; you can redistribute it and/or modify
-it under the terms of the Lesser GNU General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
+OSSIE Signal Processing Library is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
 
-The OSSIE Signal Processing library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+OSSIE Signal Processing Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Lesser GNU General Public License for more details.
+GNU General Public License for more details.
 
-You should have received a copy of the Lesser GNU General Public License
-along with OSSIE Core Framework; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+You should have received a copy of the GNU General Public License along
+with OSSIE Signal Processing Library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
 
 ****************************************************************************/

SigProc/trunk/SigProc/scaling.cpp

@@ -1 @@
-/****************************************************************************
-
-Copyright 2006, Virginia Polytechnic Institute and State University
+/**************************************************************************** 
+Copyright 2005,2006 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE Signal Processing Library.
 
-OSSIE Core Framework is free software; you can redistribute it and/or modify
-it under the terms of the Lesser GNU General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-The OSSIE Signal Processing library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+OSSIE Signal Processing Library is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OSSIE Signal Processing Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Lesser GNU General Public License for more details.
-
-You should have received a copy of the Lesser GNU General Public License
-along with OSSIE Core Framework; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with OSSIE Signal Processing Library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
 
 ****************************************************************************/

SigProc/trunk/SigProc/sources.cpp

@@ -1 @@
-/****************************************************************************
-
-Copyright 2006, Virginia Polytechnic Institute and State University
+/**************************************************************************** 
+Copyright 2005,2006 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE Signal Processing Library.
 
-OSSIE Core Framework is free software; you can redistribute it and/or modify
-it under the terms of the Lesser GNU General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
+OSSIE Signal Processing Library is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
 
-The OSSIE Signal Processing library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+OSSIE Signal Processing Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Lesser GNU General Public License for more details.
+GNU General Public License for more details.
 
-You should have received a copy of the Lesser GNU General Public License
-along with OSSIE Core Framework; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+You should have received a copy of the GNU General Public License along
+with OSSIE Signal Processing Library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
 
 ****************************************************************************/

SigProc/trunk/SigProc/utility.cpp

@@ -1 @@
-/****************************************************************************
-
-Copyright 2006, Virginia Polytechnic Institute and State University
+/**************************************************************************** 
+Copyright 2005,2006 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE Signal Processing Library.
 
-OSSIE Core Framework is free software; you can redistribute it and/or modify
-it under the terms of the Lesser GNU General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
+OSSIE Signal Processing Library is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
 
-The OSSIE Signal Processing library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+OSSIE Signal Processing Library is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Lesser GNU General Public License for more details.
+GNU General Public License for more details.
 
-You should have received a copy of the Lesser GNU General Public License
-along with OSSIE Core Framework; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+You should have received a copy of the GNU General Public License along
+with OSSIE Signal Processing Library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
 
 ****************************************************************************/

@@ -3 +3 @@
 autotest
 autotest.cpp
-docs
+documentation
 html
 latex