diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-27 12:48:52 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-27 12:48:52 -0400 |
| commit | 2d76452d8cca3e7d9bba402e55e3e9e256808565 (patch) | |
| tree | 3d2dc77b6fbd734632c9a912bfeed575833be46a | |
| parent | 09ba248d3fc6afbebb784edfaf5e61413cd05255 (diff) | |
| parent | 488f24f0771cd6876b212e43d80f858936563f98 (diff) | |
Merge remote-tracking branch 'bistromath/hdlc' into maint
| -rw-r--r-- | gr-digital/lib/hdlc_deframer_bp_impl.cc | 24 | ||||
| -rw-r--r-- | gr-digital/lib/hdlc_deframer_bp_impl.h | 1 |
2 files changed, 9 insertions, 16 deletions
diff --git a/gr-digital/lib/hdlc_deframer_bp_impl.cc b/gr-digital/lib/hdlc_deframer_bp_impl.cc index 0723ad473e..976d14784d 100644 --- a/gr-digital/lib/hdlc_deframer_bp_impl.cc +++ b/gr-digital/lib/hdlc_deframer_bp_impl.cc @@ -56,7 +56,6 @@ namespace gr { d_bitctr=0; d_ones=0; d_pktbuf = new unsigned char[length_max+2]; - d_in_frame=false; } /* @@ -106,28 +105,23 @@ namespace gr { } else { } - d_in_frame=false; } else { - d_in_frame=true; } d_bitctr=0; d_bytectr=0; } else { //unstuff } } else { //not 5+ continuous ones - if(d_in_frame) { - if(d_bytectr > d_length_max) { - d_bytectr=0; + if(d_bytectr > d_length_max) { + d_bytectr=0; + d_bitctr=0; + } else { + d_pktbuf[d_bytectr]>>=1; + if (bit) d_pktbuf[d_bytectr] |= 0x80; + d_bitctr++; + if (d_bitctr==8) { d_bitctr=0; - d_in_frame=false; - } else { - d_pktbuf[d_bytectr]>>=1; - if (bit) d_pktbuf[d_bytectr] |= 0x80; - d_bitctr++; - if (d_bitctr==8) { - d_bitctr=0; - d_bytectr++; - } + d_bytectr++; } } } diff --git a/gr-digital/lib/hdlc_deframer_bp_impl.h b/gr-digital/lib/hdlc_deframer_bp_impl.h index f7c4253b3d..d29d9fcc3e 100644 --- a/gr-digital/lib/hdlc_deframer_bp_impl.h +++ b/gr-digital/lib/hdlc_deframer_bp_impl.h @@ -36,7 +36,6 @@ namespace gr { size_t d_ones; size_t d_bytectr; size_t d_bitctr; - bool d_in_frame; unsigned char *d_pktbuf; unsigned int crc_ccitt(unsigned char *data, size_t len); |