Corrected namespaces from grgsm to gsm

2 files changed, 3 insertions, 153 deletions

diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i
index b4fecf6..64c1024 100644
--- a/swig/grgsm_swig.i
+++ b/swig/grgsm_swig.i
@@ -109,7 +109,7 @@ GR_SWIG_BLOCK_MAGIC2(gsm, burst_fnr_filter);
 %include "grgsm/flow_control/dummy_burst_filter.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, dummy_burst_filter);
 %include "grgsm/flow_control/uplink_downlink_splitter.h"
-GR_SWIG_BLOCK_MAGIC2(grgsm, uplink_downlink_splitter);
+GR_SWIG_BLOCK_MAGIC2(gsm, uplink_downlink_splitter);
 
 
 %include "grgsm/misc_utils/bursts_printer.h"
@@ -151,7 +151,7 @@ GR_SWIG_BLOCK_MAGIC2(gsm, message_source);
 %include "grgsm/qa_utils/message_sink.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, message_sink);
 %include "grgsm/trx_interface/trx.h"
-GR_SWIG_BLOCK_MAGIC2(grgsm, trx);
+GR_SWIG_BLOCK_MAGIC2(gsm, trx);
 
 //#pragma SWIG nowarn=319
 //%include "grgsm/misc_utils/time_spec.h"
@@ -176,5 +176,6 @@ GR_SWIG_BLOCK_MAGIC2(grgsm, trx);
 //};
 
 %include "grgsm/misc_utils/fn_time.h"
+
 %include "grgsm/transmitter/txtime_setter.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, txtime_setter);
diff --git a/swig/grgsm_swig.i.orig b/swig/grgsm_swig.i.orig
deleted file mode 100644
index 888f07a..0000000
--- a/swig/grgsm_swig.i.orig
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- c++ -*- */
-/*
- * @file
- * @author (C) 2014 by Piotr Krysik <ptrkrysik@gmail.com>
- * @section LICENSE
- *
- * Gr-gsm is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * Gr-gsm is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with gr-gsm; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#define GRGSM_API
-
-%include "gnuradio.i"			// the common stuff
-
-//load generated python docstrings
-%include "grgsm_swig_doc.i"
-
-%{
-#include "grgsm/constants.h"
-#include "grgsm/receiver/receiver.h"
-#include "grgsm/receiver/clock_offset_control.h"
-#include "grgsm/receiver/cx_channel_hopper.h"
-#include "grgsm/decoding/control_channels_decoder.h"
-#include "grgsm/decoding/tch_f_decoder.h"
-#include "grgsm/decryption/decryption.h"
-#include "grgsm/demapping/universal_ctrl_chans_demapper.h"
-#include "grgsm/demapping/tch_f_chans_demapper.h"
-#include "grgsm/flow_control/common.h"
-#include "grgsm/flow_control/burst_timeslot_splitter.h"
-#include "grgsm/flow_control/burst_sdcch_subslot_splitter.h"
-#include "grgsm/flow_control/burst_timeslot_filter.h"
-#include "grgsm/flow_control/burst_sdcch_subslot_filter.h"
-#include "grgsm/flow_control/burst_fnr_filter.h"
-#include "grgsm/flow_control/dummy_burst_filter.h"
-#include "grgsm/flow_control/uplink_downlink_splitter.h"
-#include "grgsm/misc_utils/bursts_printer.h"
-#include "grgsm/misc_utils/controlled_rotator_cc.h"
-#include "grgsm/misc_utils/extract_system_info.h"
-#include "grgsm/misc_utils/extract_immediate_assignment.h"
-#include "grgsm/misc_utils/message_printer.h"
-#include "grgsm/misc_utils/tmsi_dumper.h"
-#include "grgsm/misc_utils/burst_file_sink.h"
-#include "grgsm/misc_utils/burst_file_source.h"
-#include "grgsm/misc_utils/collect_system_info.h"
-#include "grgsm/misc_utils/extract_cmc.h"
-#include "grgsm/qa_utils/burst_sink.h"
-#include "grgsm/qa_utils/burst_source.h"
-#include "grgsm/qa_utils/message_source.h"
-#include "grgsm/qa_utils/message_sink.h"
-#include "grgsm/misc_utils/message_file_sink.h"
-#include "grgsm/misc_utils/message_file_source.h"
-#include "grgsm/misc_utils/msg_to_tag.h"
-#include "grgsm/misc_utils/controlled_fractional_resampler_cc.h"
-#include "grgsm/trx_interface/trx.h"
-%}
-
-%include "constants.i"
-
-%include "grgsm/receiver/receiver.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, receiver);
-%include "grgsm/receiver/clock_offset_control.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, clock_offset_control);
-%include "grgsm/receiver/cx_channel_hopper.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, cx_channel_hopper);
-
-%include "grgsm/decoding/control_channels_decoder.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, control_channels_decoder);
-%include "grgsm/decoding/tch_f_decoder.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, tch_f_decoder);
-
-%include "grgsm/decryption/decryption.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, decryption);
-
-%include "grgsm/demapping/universal_ctrl_chans_demapper.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, universal_ctrl_chans_demapper);
-%include "grgsm/demapping/tch_f_chans_demapper.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, tch_f_chans_demapper);
-
-%include "grgsm/flow_control/common.h"
-%include "grgsm/flow_control/burst_timeslot_splitter.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, burst_timeslot_splitter);
-%include "grgsm/flow_control/burst_sdcch_subslot_splitter.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, burst_sdcch_subslot_splitter);
-%include "grgsm/flow_control/burst_timeslot_filter.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, burst_timeslot_filter);
-%include "grgsm/flow_control/burst_sdcch_subslot_filter.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, burst_sdcch_subslot_filter);
-%include "grgsm/flow_control/burst_fnr_filter.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, burst_fnr_filter);
-%include "grgsm/flow_control/dummy_burst_filter.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, dummy_burst_filter);
-%include "grgsm/flow_control/uplink_downlink_splitter.h"
-GR_SWIG_BLOCK_MAGIC2(grgsm, uplink_downlink_splitter);
-
-
-%include "grgsm/misc_utils/bursts_printer.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer);
-%include "grgsm/misc_utils/burst_file_sink.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, burst_file_sink);
-%include "grgsm/misc_utils/burst_file_source.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, burst_file_source);
-%include "grgsm/misc_utils/collect_system_info.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, collect_system_info);
-%include "grgsm/misc_utils/extract_system_info.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, extract_system_info);
-%include "grgsm/misc_utils/extract_immediate_assignment.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, extract_immediate_assignment);
-%include "grgsm/misc_utils/controlled_rotator_cc.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, controlled_rotator_cc);
-%include "grgsm/misc_utils/message_printer.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, message_printer);
-%include "grgsm/misc_utils/tmsi_dumper.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, tmsi_dumper);
-%include "grgsm/misc_utils/message_file_sink.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, message_file_sink);
-%include "grgsm/misc_utils/message_file_source.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, message_file_source);
-%include "grgsm/misc_utils/msg_to_tag.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, msg_to_tag);
-%include "grgsm/misc_utils/controlled_fractional_resampler_cc.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, controlled_fractional_resampler_cc);
-%include "grgsm/misc_utils/extract_cmc.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, extract_cmc);
-
-
-%include "grgsm/qa_utils/burst_sink.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, burst_sink);
-%include "grgsm/qa_utils/burst_source.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, burst_source);
-%include "grgsm/qa_utils/message_source.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, message_source);
-%include "grgsm/qa_utils/message_sink.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, message_sink);
-<<<<<<< HEAD
-%include "grgsm/trx_interface/trx.h"
-GR_SWIG_BLOCK_MAGIC2(grgsm, trx);
-=======
->>>>>>> development