t/gr-ieee802-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mapper: make scrambler init a class variable

Browse Source
This commit is contained in:
Bastian Bloessl
2017-08-09 22:37:24 +01:00
parent 6dc42c7f43
commit d90b28c55b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/mapper.cc
+5 -4
View File
@@ -33,6 +33,7 @@ mapper_impl(Encoding e, bool debug) :
d_symbols_offset(0), d_symbols_offset(0),
d_symbols(NULL), d_symbols(NULL),
d_debug(debug), d_debug(debug),
d_scrambler(1),
d_ofdm(e) { d_ofdm(e) {
message_port_register_in(pmt::mp("in")); message_port_register_in(pmt::mp("in"));
@@ -98,10 +99,9 @@ int general_work(int noutput, gr_vector_int& ninput_items,
generate_bits(psdu, data_bits, frame); generate_bits(psdu, data_bits, frame);
// scrambling // scrambling
static uint8_t scrambler = 1; scramble(data_bits, scrambled_data, frame, d_scrambler++);
scramble(data_bits, scrambled_data, frame, scrambler++); if(d_scrambler > 127) {
if(scrambler > 127) { d_scrambler = 1;
scrambler = 1;
} }
// reset tail bits // reset tail bits
@@ -172,6 +172,7 @@ void set_encoding(Encoding encoding) {
} }
private: private:
uint8_t d_scrambler;
bool d_debug; bool d_debug;
char* d_symbols; char* d_symbols;
int d_symbols_offset; int d_symbols_offset;