diff options
author | Piotr Krysik <ptrkrysik@gmail.com> | 2016-05-20 12:45:54 +0200 |
---|---|---|
committer | Piotr Krysik <ptrkrysik@gmail.com> | 2016-05-20 12:45:54 +0200 |
commit | 773a194c327c89161b3d11e5246dfea04d9b45dc (patch) | |
tree | d81ba89769c7a807a4b155b84e8d4bfb3e2bae16 /grc | |
parent | bac8284599e137981f178e8998d6426f011d9dab (diff) |
Big change of the universal control channels demapper:
-simplification of the universal demapper,
-addition of hierarhical blocks for each of the demappers - so they also look well and readable in python,
-addition of helper script for compilation of the demappers.
Diffstat (limited to 'grc')
-rw-r--r-- | grc/demapping/gsm_bcch_ccch_demapper.xml | 59 | ||||
-rw-r--r-- | grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml | 60 | ||||
-rw-r--r-- | grc/demapping/gsm_sdcch8_demapper.xml | 57 | ||||
-rw-r--r-- | grc/demapping/gsm_universal_ctrl_chans_demapper.xml | 27 |
4 files changed, 63 insertions, 140 deletions
diff --git a/grc/demapping/gsm_bcch_ccch_demapper.xml b/grc/demapping/gsm_bcch_ccch_demapper.xml index b295ce1..ff392f1 100644 --- a/grc/demapping/gsm_bcch_ccch_demapper.xml +++ b/grc/demapping/gsm_bcch_ccch_demapper.xml @@ -1,61 +1,30 @@ -<?xml version="1.0"?> <block> <name>BCCH + CCCH demapper</name> <key>gsm_bcch_ccch_demapper</key> + <category></category> <import>import grgsm</import> - <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $downlink_starts_fn_mod51, $downlink_channel_types, $uplink_starts_fn_mod51, $uplink_channel_types)</make> - + <make>grgsm.gsm_bcch_ccch_demapper( + timeslot_nr=$timeslot_nr, +)</make> + <callback>set_timeslot_nr($timeslot_nr)</callback> <param> - <name>Timeslot</name> + <name>timeslot_nr</name> <key>timeslot_nr</key> <value>0</value> - <type>int</type> - <hide>none</hide> + <type>raw</type> </param> - - <param> - <name>downlink_starts_fn_mod51</name> - <key>downlink_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>downlink_channel_types</name> - <key>downlink_channel_types</key> - <value>[1,2,2,2,2,2,2,2,2,2]</value> - <type>int_vector</type> - <hide>all</hide> - </param> - - <param> - <name>uplink_starts_fn_mod51</name> - <key>uplink_starts_fn_mod51</key> - <value>[]</value> - <type>int_vector</type> - <hide>all</hide> - </param> - - <param> - <name>uplink_channel_types</name> - <key>uplink_channel_types</key> - <value>[]</value> - <type>int_vector</type> - <hide>all</hide> - </param> - <sink> <name>bursts</name> <type>message</type> + <optional>1</optional> </sink> <source> <name>bursts</name> <type>message</type> + <optional>1</optional> </source> - - <doc> - Demapper for BCCH + CCCH control channels. - This corresponds to channel combination iv specified in GSM 05.02, section 6.4 - </doc> -</block> + <doc>Piotr Krysik +Demapper for BCCH + CCCH control channels. This corresponds to channel combination iv specified in GSM 05.02, section 6.4 +</doc> + <grc_source>gr-gsm/hier_blocks/demapping/gsm_bcch_ccch_demapper.grc</grc_source> +</block> diff --git a/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml b/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml index 90b33ce..94a433e 100644 --- a/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml +++ b/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml @@ -1,62 +1,30 @@ -<?xml version="1.0"?> <block> <name>BCCH + CCCH + SDCCH/4 demapper</name> <key>gsm_bcch_ccch_sdcch4_demapper</key> + <category></category> <import>import grgsm</import> - <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $downlink_starts_fn_mod51, $downlink_channel_types, $uplink_starts_fn_mod51, $uplink_channel_types)</make> - + <make>grgsm.gsm_bcch_ccch_sdcch4_demapper( + timeslot_nr=$timeslot_nr, +)</make> + <callback>set_timeslot_nr($timeslot_nr)</callback> <param> - <name>Timeslot</name> + <name>timeslot_nr</name> <key>timeslot_nr</key> <value>0</value> - <type>int</type> - <hide>none</hide> + <type>raw</type> </param> - - <param> - <name>downlink_starts_fn_mod51</name> - <key>downlink_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>downlink_channel_types</name> - <key>downlink_channel_types</key> - <value>[1,2,2,2,7,7,7,7,135,135]</value> - <type>int_vector</type> - <hide>all</hide> - </param> - - <param> - <name>uplink_starts_fn_mod51</name> - <key>uplink_starts_fn_mod51</key> - <value>[0,6,10,37,41,47]</value> - <type>int_vector</type> - <hide>all</hide> - </param> - - <param> - <name>uplink_channel_types</name> - <key>uplink_channel_types</key> - <value>[7,135,135,7,7,7]</value> - <type>int_vector</type> - <hide>all</hide> - </param> - <sink> <name>bursts</name> <type>message</type> + <optional>1</optional> </sink> <source> <name>bursts</name> <type>message</type> + <optional>1</optional> </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> - + <doc>Piotr Krysik +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> + <grc_source>gr-gsm/hier_blocks/demapping/gsm_bcch_ccch_sdcch4_demapper.grc</grc_source> +</block> diff --git a/grc/demapping/gsm_sdcch8_demapper.xml b/grc/demapping/gsm_sdcch8_demapper.xml index c81032a..7507065 100644 --- a/grc/demapping/gsm_sdcch8_demapper.xml +++ b/grc/demapping/gsm_sdcch8_demapper.xml @@ -1,61 +1,30 @@ -<?xml version="1.0"?> <block> <name>SDCCH/8 demapper</name> <key>gsm_sdcch8_demapper</key> + <category></category> <import>import grgsm</import> - <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $downlink_starts_fn_mod51, $downlink_channel_types, $uplink_starts_fn_mod51, $uplink_channel_types)</make> - + <make>grgsm.gsm_sdcch8_demapper( + timeslot_nr=$timeslot_nr, +)</make> + <callback>set_timeslot_nr($timeslot_nr)</callback> <param> - <name>Timeslot</name> + <name>timeslot_nr</name> <key>timeslot_nr</key> <value>1</value> - <type>int</type> - <hide>none</hide> + <type>raw</type> </param> - - <param> - <name>downlink_starts_fn_mod51</name> - <key>downlink_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>downlink_channel_types</name> - <key>downlink_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> - - <param> - <name>uplink_starts_fn_mod51</name> - <key>uplink_starts_fn_mod51</key> - <value>[15,19,23,27,31,35,39,43,47,0,4,8]</value> - <type>int_vector</type> - <hide>all</hide> - </param> - - <param> - <name>uplink_channel_types</name> - <key>uplink_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> + <optional>1</optional> </sink> <source> <name>bursts</name> <type>message</type> + <optional>1</optional> </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> + <doc>Piotr Krysik +Demapper for SDCCH/8 + SACCH/C8 control channels. This corresponds to channel combination vii specified in GSM 05.02, section 6.4 +</doc> + <grc_source>gr-gsm/hier_blocks/demapping/gsm_sdcch8_demapper.grc</grc_source> </block> diff --git a/grc/demapping/gsm_universal_ctrl_chans_demapper.xml b/grc/demapping/gsm_universal_ctrl_chans_demapper.xml index 3b522be..f173752 100644 --- a/grc/demapping/gsm_universal_ctrl_chans_demapper.xml +++ b/grc/demapping/gsm_universal_ctrl_chans_demapper.xml @@ -3,7 +3,7 @@ <name>Universal ctrl chans demapper</name> <key>gsm_universal_ctrl_chans_demapper</key> <import>import grgsm</import> - <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $downlink_starts_fn_mod51, $downlink_channel_types, $uplink_starts_fn_mod51, $uplink_channel_types)</make> + <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $downlink_starts_fn_mod51, $downlink_channel_types, $downlink_subslots, $uplink_starts_fn_mod51, $uplink_channel_types, $uplink_subslots)</make> <param> <name>timeslot_nr</name> @@ -16,7 +16,7 @@ <param> <name>downlink_starts_fn_mod51</name> <key>downlink_starts_fn_mod51</key> - <value>[2,6,12,16,22,26,32,36,42,46]</value> + <value>[0,0,2,2,2,2,6,6,6,6,0,0,12,12,12,12,16,16,16,16,0,0,22,22,22,22,26,26,26,26,0,0,32,32,32,32,36,36,36,36,0,0,42,42,42,42,46,46,46,46,0,]</value> <type>int_vector</type> <hide>part</hide> </param> @@ -24,7 +24,15 @@ <param> <name>downlink_channel_types</name> <key>downlink_channel_types</key> - <value>[1,2,2,2,2,2,2,2,2,2]</value> + <value>[0,0,1,1,1,1,2,2,2,2,0,0,2,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,0,]</value> + <type>int_vector</type> + <hide>part</hide> + </param> + + <param> + <name>downlink_subslots</name> + <key>downlink_subslots</key> + <value>[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,]</value> <type>int_vector</type> <hide>part</hide> </param> @@ -32,7 +40,7 @@ <param> <name>uplink_starts_fn_mod51</name> <key>uplink_starts_fn_mod51</key> - <value>[0,6,10,37,41,47]</value> + <value>[0,0,0,0,0,0,6,6,6,6,10,10,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,37,37,41,41,41,41,0,0,47,47,47,47]</value> <type>int_vector</type> <hide>part</hide> </param> @@ -40,10 +48,18 @@ <param> <name>uplink_channel_types</name> <key>uplink_channel_types</key> - <value>[2,2,2,2,2,2]</value> + <value>[2,2,2,2,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,2,2,2,2,]</value> <type>int_vector</type> <hide>part</hide> </param> + + <param> + <name>uplink_subslots</name> + <key>uplink_subslots</key> + <value>[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,]</value> + <type>int_vector</type> + <hide>part</hide> + </param> <sink> <name>bursts</name> @@ -55,5 +71,6 @@ </source> <doc> Universal demapper for control channels. + Author: Piotr Krysik </doc> </block> |