diff options
| author | ptrkrysik <ptrkrysik@gmail.com> | 2014-11-21 10:11:05 +0100 |
|---|---|---|
| committer | ptrkrysik <ptrkrysik@gmail.com> | 2014-11-21 10:11:05 +0100 |
| commit | 617ba03ffc3e50ddc96baaa99d74ed530aa4a0cb (patch) | |
| tree | 35e9dbd05e1c540fbe5adf9e2b7a54290b38cac2 /lib/demapping | |
| parent | 12fe7a024a934d08ff90ed9bbf40c85ce633486c (diff) | |
Changed format of messages containing bursts to PDU. Corrected types of bursts.
Diffstat (limited to 'lib/demapping')
| -rw-r--r-- | lib/demapping/get_bcch_or_ccch_bursts_impl.cc | 5 | ||||
| -rw-r--r-- | lib/demapping/universal_ctrl_chans_demapper_impl.cc | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lib/demapping/get_bcch_or_ccch_bursts_impl.cc b/lib/demapping/get_bcch_or_ccch_bursts_impl.cc index e9d3316..78d4280 100644 --- a/lib/demapping/get_bcch_or_ccch_bursts_impl.cc +++ b/lib/demapping/get_bcch_or_ccch_bursts_impl.cc @@ -59,9 +59,8 @@ namespace gr { void get_bcch_or_ccch_bursts_impl::filter_ccch(pmt::pmt_t msg) { - pmt::pmt_t header_blob = pmt::car(msg); - pmt::pmt_t content = pmt::cdr(msg); - gsmtap_hdr * header = (gsmtap_hdr *)pmt::blob_data(header_blob); + pmt::pmt_t header_plus_burst = pmt::cdr(msg); + gsmtap_hdr * header = (gsmtap_hdr *)pmt::blob_data(header_plus_burst); uint32_t frame_nr = be32toh(header->frame_number); uint32_t fn_mod51 = frame_nr % 51; diff --git a/lib/demapping/universal_ctrl_chans_demapper_impl.cc b/lib/demapping/universal_ctrl_chans_demapper_impl.cc index ea9a06e..75fa6f7 100644 --- a/lib/demapping/universal_ctrl_chans_demapper_impl.cc +++ b/lib/demapping/universal_ctrl_chans_demapper_impl.cc @@ -88,11 +88,10 @@ namespace gr { void universal_ctrl_chans_demapper_impl::filter_ctrl_chans(pmt::pmt_t msg) { - pmt::pmt_t header_blob = pmt::car(msg); - pmt::pmt_t content = pmt::cdr(msg); - gsmtap_hdr * header = (gsmtap_hdr *)pmt::blob_data(header_blob); - uint32_t frame_nr = be32toh(header->frame_number); + pmt::pmt_t header_plus_burst = pmt::cdr(msg); + gsmtap_hdr * header = (gsmtap_hdr *)pmt::blob_data(header_plus_burst); + uint32_t frame_nr = be32toh(header->frame_number); uint32_t fn_mod51 = frame_nr % 51; uint32_t fn51_start = d_starts_fn_mod51[fn_mod51]; uint32_t fn51_stop = fn51_start + 3; |