Added preconfigured demapper blocks that wrap universal ctrl chans demapper

4 files changed, 139 insertions, 0 deletions

diff --git a/grc/demapping/CMakeLists.txt b/grc/demapping/CMakeLists.txt
index 609815b..84f4fee 100644
--- a/grc/demapping/CMakeLists.txt
+++ b/grc/demapping/CMakeLists.txt
@@ -19,5 +19,8 @@
 
 install(FILES
     gsm_universal_ctrl_chans_demapper.xml
+    gsm_bcch_ccch_demapper.xml
+    gsm_bcch_ccch_sdcch4_demapper.xml
+    gsm_sdcch8_demapper.xml
     gsm_tch_f_chans_demapper.xml DESTINATION share/gnuradio/grc/blocks
 )
diff --git a/grc/demapping/gsm_bcch_ccch_demapper.xml b/grc/demapping/gsm_bcch_ccch_demapper.xml
new file mode 100644
index 0000000..f027f8e
--- /dev/null
+++ b/grc/demapping/gsm_bcch_ccch_demapper.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<block>
+  <name>BCCH + CCCH demapper</name>
+  <key>gsm_bcch_ccch_demapper</key>
+  <import>import grgsm</import>
+  <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $starts_fn_mod51, $channel_types)</make>
+
+  <param>
+    <name>Timeslot</name>
+    <key>timeslot_nr</key>
+    <value>0</value>
+    <type>int</type>
+    <hide>none</hide>
+  </param>
+
+  <param>
+    <name>starts_fn_mod51</name>
+    <key>starts_fn_mod51</key>
+    <value>[2,6,12,16,22,26,32,36,42,46]</value>
+    <type>int_vector</type>
+    <hide>all</hide>
+  </param>
+
+  <param>
+    <name>channel_types</name>
+    <key>channel_types</key>
+    <value>[1,2,2,2,2,2,2,2,2,2]</value>
+    <type>int_vector</type>
+    <hide>all</hide>
+  </param>
+
+  <sink>
+    <name>bursts</name>
+    <type>message</type>
+  </sink>
+  <source>
+    <name>bursts</name>
+    <type>message</type>
+  </source>
+  
+  <doc>
+      Demapper for BCCH + CCCH control channels.
+      This corresponds to channel combination iv specified in GSM 05.02, section 6.4
+  </doc>
+</block> 
diff --git a/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml b/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml
new file mode 100644
index 0000000..80e67d5
--- /dev/null
+++ b/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<block>
+  <name>BCCH + CCCH + SDCCH/4 demapper</name>
+  <key>gsm_bcch_ccch_sdcch4_demapper</key>
+  <import>import grgsm</import>
+  <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $starts_fn_mod51, $channel_types)</make>
+
+  <param>
+    <name>Timeslot</name>
+    <key>timeslot_nr</key>
+    <value>0</value>
+    <type>int</type>
+    <hide>none</hide>
+  </param>
+
+  <param>
+    <name>starts_fn_mod51</name>
+    <key>starts_fn_mod51</key>
+    <value>[2,6,12,16,22,26,32,36,42,46]</value>
+    <type>int_vector</type>
+    <hide>all</hide>
+  </param>
+
+  <param>
+    <name>channel_types</name>
+    <key>channel_types</key>
+    <value>[1,2,2,2,7,7,7,7,135,135]</value>
+    <type>int_vector</type>
+    <hide>all</hide>
+  </param>
+
+  <sink>
+    <name>bursts</name>
+    <type>message</type>
+  </sink>
+  <source>
+    <name>bursts</name>
+    <type>message</type>
+  </source>
+  
+  <doc>
+      Demapper for BCCH + CCCH + SDCCH/4 + SACCH/C4 control channels.
+      This corresponds to channel combination v specified in GSM 05.02, section 6.4
+  </doc>
+</block> 
+ 
diff --git a/grc/demapping/gsm_sdcch8_demapper.xml b/grc/demapping/gsm_sdcch8_demapper.xml
new file mode 100644
index 0000000..38a8112
--- /dev/null
+++ b/grc/demapping/gsm_sdcch8_demapper.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<block>
+  <name>SDCCH/8 demapper</name>
+  <key>gsm_sdcch8_demapper</key>
+  <import>import grgsm</import>
+  <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $starts_fn_mod51, $channel_types)</make>
+
+  <param>
+    <name>Timeslot</name>
+    <key>timeslot_nr</key>
+    <value>1</value>
+    <type>int</type>
+    <hide>none</hide>
+  </param>
+
+  <param>
+    <name>starts_fn_mod51</name>
+    <key>starts_fn_mod51</key>
+    <value>[0,4,8,12,16,20,24,28,32,36,40,44]</value>
+    <type>int_vector</type>
+    <hide>all</hide>
+  </param>
+
+  <param>
+    <name>channel_types</name>
+    <key>channel_types</key>
+    <value>[8,8,8,8,8,8,8,8,136,136,136,136]</value>
+    <type>int_vector</type>
+    <hide>all</hide>
+  </param>
+
+  <sink>
+    <name>bursts</name>
+    <type>message</type>
+  </sink>
+  <source>
+    <name>bursts</name>
+    <type>message</type>
+  </source>
+  
+  <doc>
+      Demapper for SDCCH/8 + SACCH/C8 control channels.
+      This corresponds to channel combination vii specified in GSM 05.02, section 6.4
+  </doc>
+</block>
\ No newline at end of file