From 085852622cb2641fbc1fa88c85494c7951914ebd Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Wed, 24 Nov 2010 22:23:52 +0100
Subject: gsm_receive_usrp2: port to dieters a5 / config chaanges

---
 gsm-receiver/src/python/gsm_receive_usrp2.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'gsm-receiver')

diff --git a/gsm-receiver/src/python/gsm_receive_usrp2.py b/gsm-receiver/src/python/gsm_receive_usrp2.py
index a5ca75e..9fb5b24 100755
--- a/gsm-receiver/src/python/gsm_receive_usrp2.py
+++ b/gsm-receiver/src/python/gsm_receive_usrp2.py
@@ -106,7 +106,7 @@ class gsm_receiver_first_blood(gr.top_block):
         return interpolator
     
     def _set_receiver(self):
-        receiver = gsm.receiver_cf(self.tuner_callback, self.synchronizer_callback, self.options.osr, "0000000000000000")
+        receiver = gsm.receiver_cf(self.tuner_callback, self.synchronizer_callback, self.options.osr, self.options.key.replace(' ', '').lower(), self.options.configuration.upper())
         return receiver
     
     def _process_options(self):
@@ -117,16 +117,21 @@ class gsm_receiver_first_blood(gr.top_block):
 			  help="select USRP by MAC address, default is auto-select")
         parser.add_option("-d", "--decim", type="int", default=112,
                                     help="Set USRP decimation rate to DECIM [default=%default]")
+        parser.add_option("-r", "--osr", type="int", default=4,
+                          help="Oversampling ratio [default=%default]")
         parser.add_option("-I", "--inputfile", type="string", default="cfile",
                                     help="Input filename")
         parser.add_option("-O", "--outputfile", type="string", default="cfile2.out",
                                     help="Output filename")
-        parser.add_option("-r", "--osr", type="int", default=4,
-                          help="Oversampling ratio [default=%default]")
         parser.add_option("-f", "--freq", type="eng_float", default="950.4M",
                                     help="set frequency to FREQ", metavar="FREQ")
         parser.add_option("-g", "--gain", type="eng_float", default=None,
                                     help="Set gain in dB (default is midpoint)")
+        parser.add_option("-k", "--key", type="string", default="AD 6A 3E C2 B4 42 E4 00",
+                          help="KC session key")
+        parser.add_option("-c", "--configuration", type="string", default="",
+                          help="Decoder configuration")
+
         (options, args) = parser.parse_args ()
         return (options, args)
     
-- 
cgit v1.2.3