diff --git a/src/apps/leandvbtx.cc b/src/apps/leandvbtx.cc index 18ec124..e31bca6 100644 --- a/src/apps/leandvbtx.cc +++ b/src/apps/leandvbtx.cc @@ -91,7 +91,7 @@ void run(config &cfg) { // CONVOLUTIONAL CODER cstln_lut<256> *cstln = make_dvbs2_constellation(cfg.constellation, cfg.fec); - int bits_per_symbol = log2(cstln->nsymbols); + int bits_per_symbol = log2i(cstln->nsymbols); if ( cfg.fec==FEC23 && (cstln->nsymbols==4 || cstln->nsymbols==64) ) { diff --git a/src/leansdr/dvb.h b/src/leansdr/dvb.h index f04d210..897c277 100644 --- a/src/leansdr/dvb.h +++ b/src/leansdr/dvb.h @@ -1212,7 +1212,7 @@ namespace leansdr { resync_phase(0), resync_period(32) // 1/32 = 9% synchronization overhead TBD { - bits_per_symbol = log2(cstln->nsymbols); + bits_per_symbol = log2i(cstln->nsymbols); fec = &fec_specs[cr]; { // Sanity check: FEC block size must be a multiple of label size. int symbols_per_block = fec->bits_out / bits_per_symbol; diff --git a/src/leansdr/math.h b/src/leansdr/math.h index 67f2006..7fc0434 100644 --- a/src/leansdr/math.h +++ b/src/leansdr/math.h @@ -67,7 +67,7 @@ namespace leansdr { return parity((uint32_t)(x^(x>>32))); } - int log2(uint64_t x) { + int log2i(uint64_t x) { int n = -1; for ( ; x; ++n,x>>=1 ) ; return n; diff --git a/src/leansdr/viterbi.h b/src/leansdr/viterbi.h index 96cefe9..5712d3c 100644 --- a/src/leansdr/viterbi.h +++ b/src/leansdr/viterbi.h @@ -47,7 +47,7 @@ namespace leansdr { exit(1); } // Derive number of polynomials from NCS. - int nG = log2(NCS); + int nG = log2i(NCS); for ( TS s=0; s