[Commit-gnuradio] gr-error-correcting-codes/src/lib/libecc Makefi...

[Michael Dickens]

CVSROOT:        /sources/gnuradio
Module name:    gr-error-correcting-codes
Changes by:     Michael Dickens <michaelld>     06/07/09 18:40:42

Modified files:
        src/lib/libecc : Makefile.am encoder_convolutional.cc 
                         encoder_convolutional_ic1_ic1.cc 

Log message:
        Corrections to allow for compilation ... but block's won't stream yet.
        A work in progress.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gr-error-correcting-codes/src/lib/libecc/Makefile.am?cvsroot=gnuradio&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gr-error-correcting-codes/src/lib/libecc/encoder_convolutional.cc?cvsroot=gnuradio&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gr-error-correcting-codes/src/lib/libecc/encoder_convolutional_ic1_ic1.cc?cvsroot=gnuradio&r1=1.2&r2=1.3

Patches:
Index: Makefile.am
===================================================================
RCS file: 
/sources/gnuradio/gr-error-correcting-codes/src/lib/libecc/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Makefile.am 9 Jul 2006 16:15:17 -0000       1.5
+++ Makefile.am 9 Jul 2006 18:40:42 -0000       1.6
@@ -33,8 +33,8 @@
        encoder_convolutional_ic1_ic1.cc        \
        encoder_turbo.cc                        \
        decoder.cc decoder_viterbi.cc           \
-       decoder_viterbi_block_full.cc           \
-       decoder_viterbi_block_full_i1_ic1.cc
+       decoder_viterbi_full_block.cc           \
+       decoder_viterbi_full_block_i1_ic1.cc
 
 noinst_HEADERS =                               \
        encoder.h code_metrics.h                \
@@ -42,8 +42,8 @@
        encoder_convolutional_ic1_ic1.h         \
        encoder_turbo.h                         \
        decoder.h decoder_viterbi.h             \
-       decoder_viterbi_block_full.h            \
-       decoder_viterbi_block_full_i1_ic1.h
+       decoder_viterbi_full_block.h            \
+       decoder_viterbi_full_block_i1_ic1.h
 
 # link the library against the c++ standard library
 libecc_la_LIBADD =             \

Index: encoder_convolutional.cc
===================================================================
RCS file: 
/sources/gnuradio/gr-error-correcting-codes/src/lib/libecc/encoder_convolutional.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- encoder_convolutional.cc    9 Jul 2006 16:15:17 -0000       1.4
+++ encoder_convolutional.cc    9 Jul 2006 18:40:42 -0000       1.5
@@ -151,7 +151,7 @@
     memory_t t_OR_all_feedback = 0;
     for (size_t n = 0; n < d_n_code_outputs; n++) {
       for (size_t m = 0; m < d_n_code_inputs; m++) {
-       memory_t t_in_code = (*d_code_feedback)[maoi(m,n)];
+       memory_t t_in_code = (*code_feedback)[maoi(m,n)];
 
        // OR this feedback with the overall,
        // to check for any delays used at all
@@ -265,6 +265,7 @@
     }
   }
 
+#if 0
 I GOT TO HERE!
 
   // single output, all inputs (SOAI) realization check
@@ -588,7 +589,7 @@
       n2bs (d_max_mem_mask, d_max_delay+2) <<
       "\n  Max_Mem = " << d_max_delay << "\n.";
   }
-
+#endif
 }
 
 void

Index: encoder_convolutional_ic1_ic1.cc
===================================================================
RCS file: 
/sources/gnuradio/gr-error-correcting-codes/src/lib/libecc/encoder_convolutional_ic1_ic1.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- encoder_convolutional_ic1_ic1.cc    9 Jul 2006 16:15:17 -0000       1.2
+++ encoder_convolutional_ic1_ic1.cc    9 Jul 2006 18:40:42 -0000       1.3
@@ -77,7 +77,7 @@
 
     size_t n_extra = 0;
     if (d_fsm_state == fsm_enc_conv_doing_term) {
-      n_extra = d_max_memory - d_n_enc_bits;
+      n_extra = d_max_delay - d_n_enc_bits;
     }
 
     // check to see if this is enough; return 0 if it is.
@@ -91,7 +91,7 @@
 
     // find the number of blocks of data which could be processed
 
-    size_t t_n_output_bits_per_block = d_block_size_bits + d_max_memory;
+    size_t t_n_output_bits_per_block = d_block_size_bits + d_max_delay;
 
     // get the base number of input items required for the given
     // number of blocks to be generated