20 files changed, 74 insertions, 19 deletions
diff --git a/grc/qa_utils/CMakeLists.txt b/grc/qa_utils/CMakeLists.txt
new file mode 100644
index 0000000..43398d4
--- /dev/null
+++ b/grc/qa_utils/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Copyright 2011,2012 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio 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.
+#
+# GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+install(FILES
+    gsm_burst_source_qa.xml
+    gsm_burst_sink_qa.xml
+    gsm_message_source.xml
+    gsm_message_sink.xml DESTINATION share/gnuradio/grc/blocks
+)
diff --git a/grc/misc_utils/gsm_burst_sink_qa.xml b/grc/qa_utils/gsm_burst_sink_qa.xml
index c028da3..c028da3 100644
--- a/grc/misc_utils/gsm_burst_sink_qa.xml
+++ b/grc/qa_utils/gsm_burst_sink_qa.xml
diff --git a/grc/misc_utils/gsm_burst_source_qa.xml b/grc/qa_utils/gsm_burst_source_qa.xml
index bb04cca..bb04cca 100644
--- a/grc/misc_utils/gsm_burst_source_qa.xml
+++ b/grc/qa_utils/gsm_burst_source_qa.xml
diff --git a/grc/misc_utils/gsm_message_sink.xml b/grc/qa_utils/gsm_message_sink.xml
index e0d6ac0..e0d6ac0 100644
--- a/grc/misc_utils/gsm_message_sink.xml
+++ b/grc/qa_utils/gsm_message_sink.xml
diff --git a/grc/misc_utils/gsm_message_source.xml b/grc/qa_utils/gsm_message_source.xml
index ab06f65..ab06f65 100644
--- a/grc/misc_utils/gsm_message_source.xml
+++ b/grc/qa_utils/gsm_message_source.xml
diff --git a/include/grgsm/qa_utils/CMakeLists.txt b/include/grgsm/qa_utils/CMakeLists.txt
new file mode 100644
index 0000000..e0b5579
--- /dev/null
+++ b/include/grgsm/qa_utils/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Copyright 2011,2012 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio 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.
+#
+# GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# Install public header files
+########################################################################
+install(FILES
+    burst_sink_qa.h
+    burst_source_qa.h
+    message_source.h
+    message_sink.h DESTINATION include/grgsm/qa_utils
+)
diff --git a/include/grgsm/misc_utils/burst_sink_qa.h b/include/grgsm/qa_utils/burst_sink_qa.h
index 3b5cac2..3b5cac2 100644
--- a/include/grgsm/misc_utils/burst_sink_qa.h
+++ b/include/grgsm/qa_utils/burst_sink_qa.h
diff --git a/include/grgsm/misc_utils/burst_source_qa.h b/include/grgsm/qa_utils/burst_source_qa.h
index c3c5713..c3c5713 100644
--- a/include/grgsm/misc_utils/burst_source_qa.h
+++ b/include/grgsm/qa_utils/burst_source_qa.h
diff --git a/include/grgsm/misc_utils/message_sink.h b/include/grgsm/qa_utils/message_sink.h
index 5cfe2f7..5cfe2f7 100644
--- a/include/grgsm/misc_utils/message_sink.h
+++ b/include/grgsm/qa_utils/message_sink.h
diff --git a/include/grgsm/misc_utils/message_source.h b/include/grgsm/qa_utils/message_source.h
index 5c3e8a1..5c3e8a1 100644
--- a/include/grgsm/misc_utils/message_source.h
+++ b/include/grgsm/qa_utils/message_source.h
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 07b616e..7cb05b8 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -52,11 +52,12 @@ list(APPEND grgsm_sources
     misc_utils/tmsi_dumper_impl.cc
     misc_utils/burst_sink_impl.cc
     misc_utils/burst_source_impl.cc
-    misc_utils/burst_sink_qa_impl.cc
-    misc_utils/burst_source_qa_impl.cc
-    misc_utils/message_source_impl.cc
-    misc_utils/message_sink_impl.cc
-    decryption/decryption_impl.cc)
+    qa_utils/burst_sink_qa_impl.cc
+    qa_utils/burst_source_qa_impl.cc
+    qa_utils/message_source_impl.cc
+    qa_utils/message_sink_impl.cc
+    decryption/decryption_impl.cc
+)
 
 add_library(gnuradio-grgsm SHARED ${grgsm_sources})
 target_link_libraries(gnuradio-grgsm ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_LIBRARIES} ${LIBOSMOCORE_LIBRARIES}
diff --git a/lib/misc_utils/burst_sink_qa_impl.cc b/lib/qa_utils/burst_sink_qa_impl.cc
index aa9df9d..aa9df9d 100644
--- a/lib/misc_utils/burst_sink_qa_impl.cc
+++ b/lib/qa_utils/burst_sink_qa_impl.cc
diff --git a/lib/misc_utils/burst_sink_qa_impl.h b/lib/qa_utils/burst_sink_qa_impl.h
index 412a0a1..4bd3825 100644
--- a/lib/misc_utils/burst_sink_qa_impl.h
+++ b/lib/qa_utils/burst_sink_qa_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_BURST_SINK_QA_IMPL_H
 #define INCLUDED_GSM_BURST_SINK_QA_IMPL_H
 
-#include <grgsm/misc_utils/burst_sink_qa.h>
+#include <grgsm/qa_utils/burst_sink_qa.h>
 #include <fstream>
 
 namespace gr {
diff --git a/lib/misc_utils/burst_source_qa_impl.cc b/lib/qa_utils/burst_source_qa_impl.cc
index 7b2d412..7b2d412 100644
--- a/lib/misc_utils/burst_source_qa_impl.cc
+++ b/lib/qa_utils/burst_source_qa_impl.cc
diff --git a/lib/misc_utils/burst_source_qa_impl.h b/lib/qa_utils/burst_source_qa_impl.h
index cb62571..3856a90 100644
--- a/lib/misc_utils/burst_source_qa_impl.h
+++ b/lib/qa_utils/burst_source_qa_impl.h
@@ -25,7 +25,7 @@
 
 #define BURST_SIZE  148
 
-#include <grgsm/misc_utils/burst_source_qa.h>
+#include <grgsm/qa_utils/burst_source_qa.h>
 #include <fstream>
 
 
diff --git a/lib/misc_utils/message_sink_impl.cc b/lib/qa_utils/message_sink_impl.cc
index 269cada..269cada 100644
--- a/lib/misc_utils/message_sink_impl.cc
+++ b/lib/qa_utils/message_sink_impl.cc
diff --git a/lib/misc_utils/message_sink_impl.h b/lib/qa_utils/message_sink_impl.h
index c1fa43c..dd11819 100644
--- a/lib/misc_utils/message_sink_impl.h
+++ b/lib/qa_utils/message_sink_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_MESSAGE_SINK_IMPL_H
 #define INCLUDED_GSM_MESSAGE_SINK_IMPL_H
 
-#include <grgsm/misc_utils/message_sink.h>
+#include <grgsm/qa_utils/message_sink.h>
 
 namespace gr {
   namespace gsm {
diff --git a/lib/misc_utils/message_source_impl.cc b/lib/qa_utils/message_source_impl.cc
index 2e71ba4..2e71ba4 100644
--- a/lib/misc_utils/message_source_impl.cc
+++ b/lib/qa_utils/message_source_impl.cc
diff --git a/lib/misc_utils/message_source_impl.h b/lib/qa_utils/message_source_impl.h
index 22a210e..9856f78 100644
--- a/lib/misc_utils/message_source_impl.h
+++ b/lib/qa_utils/message_source_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_MESSAGE_SOURCE_IMPL_H
 #define INCLUDED_GSM_MESSAGE_SOURCE_IMPL_H
 
-#include <grgsm/misc_utils/message_source.h>
+#include <grgsm/qa_utils/message_source.h>
 
 namespace gr {
   namespace gsm {
diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i
index 5b7f458..c067757 100644
--- a/swig/grgsm_swig.i
+++ b/swig/grgsm_swig.i
@@ -24,11 +24,11 @@
 #include "grgsm/misc_utils/message_printer.h"
 #include "grgsm/misc_utils/tmsi_dumper.h"
 #include "grgsm/misc_utils/burst_sink.h"
-#include "grgsm/misc_utils/burst_sink_qa.h"
 #include "grgsm/misc_utils/burst_source.h"
-#include "grgsm/misc_utils/burst_source_qa.h"
-#include "grgsm/misc_utils/message_source.h"
-#include "grgsm/misc_utils/message_sink.h"
+#include "grgsm/qa_utils/burst_sink_qa.h"
+#include "grgsm/qa_utils/burst_source_qa.h"
+#include "grgsm/qa_utils/message_source.h"
+#include "grgsm/qa_utils/message_sink.h"
 %}
 
 
@@ -58,10 +58,6 @@ GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer);
 GR_SWIG_BLOCK_MAGIC2(gsm, burst_sink);
 %include "grgsm/misc_utils/burst_source.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, burst_source);
-%include "grgsm/misc_utils/burst_sink_qa.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, burst_sink_qa);
-%include "grgsm/misc_utils/burst_source_qa.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, burst_source_qa);
 %include "grgsm/misc_utils/extract_system_info.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, extract_system_info);
 %include "grgsm/misc_utils/extract_immediate_assignment.h"
@@ -74,8 +70,13 @@ GR_SWIG_BLOCK_MAGIC2(gsm, controlled_const_source_f);
 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_source.h"
+
+%include "grgsm/qa_utils/burst_sink_qa.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, burst_sink_qa);
+%include "grgsm/qa_utils/burst_source_qa.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, burst_source_qa);
+%include "grgsm/qa_utils/message_source.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, message_source);
-%include "grgsm/misc_utils/message_sink.h"
+%include "grgsm/qa_utils/message_sink.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, message_sink);