diff options
author | Piotr Krysik <ptrkrysik@gmail.com> | 2015-08-06 10:23:52 +0200 |
---|---|---|
committer | Piotr Krysik <ptrkrysik@gmail.com> | 2015-08-06 10:23:52 +0200 |
commit | 9f723fd77151aaf13d1c87b33e153776f6b49804 (patch) | |
tree | 3315bfe8efca327533304781ead5f9b08928e8ce /grc/demapping | |
parent | 7a85170a6342187fa462017c51317ffa7004cb42 (diff) |
Changed control channels demappers in order to support uplink. Values of parameters for uplink are incorrect at this stage.
Diffstat (limited to 'grc/demapping')
-rw-r--r-- | grc/demapping/gsm_bcch_ccch_demapper.xml | 22 | ||||
-rw-r--r-- | grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml | 22 | ||||
-rw-r--r-- | grc/demapping/gsm_sdcch8_demapper.xml | 24 | ||||
-rw-r--r-- | grc/demapping/gsm_universal_ctrl_chans_demapper.xml | 29 |
4 files changed, 82 insertions, 15 deletions
diff --git a/grc/demapping/gsm_bcch_ccch_demapper.xml b/grc/demapping/gsm_bcch_ccch_demapper.xml index f027f8e..b030563 100644 --- a/grc/demapping/gsm_bcch_ccch_demapper.xml +++ b/grc/demapping/gsm_bcch_ccch_demapper.xml @@ -3,7 +3,7 @@ <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> + <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $downlink_starts_fn_mod51, $downlink_channel_types, $uplink_starts_fn_mod51, $uplink_channel_types)</make> <param> <name>Timeslot</name> @@ -14,7 +14,7 @@ </param> <param> - <name>starts_fn_mod51</name> + <name>downlink_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> @@ -22,7 +22,23 @@ </param> <param> - <name>channel_types</name> + <name>downlink_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> + + <param> + <name>uplink_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>uplink_channel_types</name> <key>channel_types</key> <value>[1,2,2,2,2,2,2,2,2,2]</value> <type>int_vector</type> diff --git a/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml b/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml index 80e67d5..f611040 100644 --- a/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml +++ b/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml @@ -3,7 +3,7 @@ <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> + <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $downlink_starts_fn_mod51, $downlink_channel_types, $uplink_starts_fn_mod51, $uplink_channel_types)</make> <param> <name>Timeslot</name> @@ -14,7 +14,7 @@ </param> <param> - <name>starts_fn_mod51</name> + <name>downlink_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> @@ -22,7 +22,23 @@ </param> <param> - <name>channel_types</name> + <name>downlink_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> + + <param> + <name>uplink_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>uplink_channel_types</name> <key>channel_types</key> <value>[1,2,2,2,7,7,7,7,135,135]</value> <type>int_vector</type> diff --git a/grc/demapping/gsm_sdcch8_demapper.xml b/grc/demapping/gsm_sdcch8_demapper.xml index 38a8112..ab11d64 100644 --- a/grc/demapping/gsm_sdcch8_demapper.xml +++ b/grc/demapping/gsm_sdcch8_demapper.xml @@ -3,7 +3,7 @@ <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> + <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $downlink_starts_fn_mod51, $downlink_channel_types, $uplink_starts_fn_mod51, $uplink_channel_types)</make> <param> <name>Timeslot</name> @@ -14,7 +14,7 @@ </param> <param> - <name>starts_fn_mod51</name> + <name>downlink_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> @@ -22,7 +22,23 @@ </param> <param> - <name>channel_types</name> + <name>downlink_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> + + <param> + <name>uplink_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>uplink_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> @@ -42,4 +58,4 @@ 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 +</block> diff --git a/grc/demapping/gsm_universal_ctrl_chans_demapper.xml b/grc/demapping/gsm_universal_ctrl_chans_demapper.xml index 1d8d202..a5e9272 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, $starts_fn_mod51, $channel_types)</make> + <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $downlink_starts_fn_mod51, $downlink_channel_types, $uplink_starts_fn_mod51, $uplink_channel_types)</make> <param> <name>timeslot_nr</name> @@ -14,16 +14,32 @@ </param> <param> - <name>starts_fn_mod51</name> - <key>starts_fn_mod51</key> + <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>part</hide> </param> <param> - <name>channel_types</name> - <key>channel_types</key> + <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>part</hide> + </param> + + <param> + <name>uplink_starts_fn_mod51</name> + <key>uplink_starts_fn_mod51</key> + <value>[2,6,12,16,22,26,32,36,42,46]</value> + <type>int_vector</type> + <hide>part</hide> + </param> + + <param> + <name>uplink_channel_types</name> + <key>uplink_channel_types</key> <value>[1,2,2,2,2,2,2,2,2,2]</value> <type>int_vector</type> <hide>part</hide> @@ -37,4 +53,7 @@ <name>bursts</name> <type>message</type> </source> + <doc> + Universal demapper for control channels. + </doc> </block> |