From e71a1a8675f16b177920d1f6b2413288c914d8f9 Mon Sep 17 00:00:00 2001 From: Piotr Krysik Date: Thu, 18 Jun 2009 14:10:17 +0200 Subject: added new burst type - dummy_or_normal for situations in which you don't know what type is used when --- src/lib/gsm_constants.h | 2 +- src/lib/gsm_receiver_cf.cc | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/gsm_constants.h b/src/lib/gsm_constants.h index e4e2461..74d2e2e 100644 --- a/src/lib/gsm_constants.h +++ b/src/lib/gsm_constants.h @@ -35,7 +35,7 @@ #define MAX_SCH_ERRORS 5 //maximum number of subsequent sch errors after which gsm receiver goes to find_next_fcch state -typedef enum {empty, fcch_burst, sch_burst, normal_burst, rach_burst, dummy} burst_type; +typedef enum {empty, fcch_burst, sch_burst, normal_burst, rach_burst, dummy, dummy_or_normal} burst_type; typedef enum {unknown, multiframe_26, multiframe_51} multiframe_type; static const unsigned char SYNC_BITS[] = { diff --git a/src/lib/gsm_receiver_cf.cc b/src/lib/gsm_receiver_cf.cc index ceea6a1..39571dc 100644 --- a/src/lib/gsm_receiver_cf.cc +++ b/src/lib/gsm_receiver_cf.cc @@ -59,8 +59,8 @@ void gsm_receiver_cf::configure_receiver() d_channel_conf.set_burst_types(TSC0, TEST_CCH_FRAMES, sizeof(TEST_CCH_FRAMES) / sizeof(unsigned), normal_burst); d_channel_conf.set_burst_types(TSC0, FCCH_FRAMES, sizeof(FCCH_FRAMES) / sizeof(unsigned), fcch_burst); -// d_channel_conf.set_multiframe_type(TIMESLOT6, multiframe_26); -// d_channel_conf.set_burst_types(TIMESLOT6, TRAFFIC_CHANNEL_F, sizeof(TRAFFIC_CHANNEL_F) / sizeof(unsigned), normal_burst); +// d_channel_conf.set_multiframe_type(TIMESLOT7, multiframe_26); +// d_channel_conf.set_burst_types(TIMESLOT7, TRAFFIC_CHANNEL_F, sizeof(TRAFFIC_CHANNEL_F) / sizeof(unsigned), dummy_or_normal); } @@ -239,6 +239,23 @@ gsm_receiver_cf::general_work(int noutput_items, process_normal_burst(d_burst_nr, output_binary); //TODO: this shouldn't be here - remove it when gsm receiver's interface will be ready break; + case dummy_or_normal: { + burst_start = get_norm_chan_imp_resp(input, &channel_imp_resp[0], TRAIN_SEARCH_RANGE, TS_DUMMY); + detect_burst(input, &channel_imp_resp[0], burst_start, output_binary); + + std::vector v(20); + std::vector::iterator it; + it = std::set_difference(output_binary + TRAIN_POS, output_binary + TRAIN_POS + 16, &train_seq[TS_DUMMY][5], &train_seq[TS_DUMMY][21], v.begin()); + int different_bits = (it - v.begin()); + + if (different_bits > 2) { + burst_start = get_norm_chan_imp_resp(input, &channel_imp_resp[0], TRAIN_SEARCH_RANGE, d_bcc); + detect_burst(input, &channel_imp_resp[0], burst_start, output_binary); + if (!output_binary[0] && !output_binary[1] && !output_binary[2]) { + process_normal_burst(d_burst_nr, output_binary); //TODO: this shouldn't be here - remove it when gsm receiver's interface will be ready + } + } + } case rach_burst: //implementation of this channel isn't possible in current gsm_receiver //it would take some realtime processing, counter of samples from USRP to -- cgit v1.2.3