From b33f36b9fb68c93135ed063e7b389203548e5764 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Thu, 26 Nov 2020 21:59:53 +0100 Subject: [PATCH] gnuradio_zmq_broker_remote: fix eNB port mapping for carrier aggregation the mapping of ports didn't consider when a eNB had two ports for different EARFCNs Change-Id: I5548f67a3b37b03482e4b6172828fcd891e704a5 --- .../external/gnuradio_zmq_broker_remote.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osmo_gsm_tester/external/gnuradio_zmq_broker_remote.py b/src/osmo_gsm_tester/external/gnuradio_zmq_broker_remote.py index fa69efd2..98942f3a 100755 --- a/src/osmo_gsm_tester/external/gnuradio_zmq_broker_remote.py +++ b/src/osmo_gsm_tester/external/gnuradio_zmq_broker_remote.py @@ -22,7 +22,7 @@ from signal import * class GrBroker(gr.top_block): def __init__(self, args, cfg): - gr.top_block.__init__(self, "Intra Handover Flowgraph") + gr.top_block.__init__(self, "InterENB Handover Flowgraph") ################################################## # Variables @@ -83,10 +83,10 @@ class GrBroker(gr.top_block): idx = 0 for enb in self.cfg['enb']: for it in enb: - print('Connecting ENB port %u to Adder[%u] for earfcn %u' % (it['bind_port'], blocks_add_next_avail_port[earfcn], it['earfcn'])) - self.connect((it['gr_block_multiply'], 0), (self.blocks_add[it['earfcn']], blocks_add_next_avail_port[earfcn])) + print('Connecting ENB port %u to Adder[%u] for earfcn %u' % (it['bind_port'], blocks_add_next_avail_port[it['earfcn']], it['earfcn'])) + self.connect((it['gr_block_multiply'], 0), (self.blocks_add[it['earfcn']], blocks_add_next_avail_port[it['earfcn']])) # TODO: if it['use_mimo'], connect it['gr_block_multiply2'] to some adder... - blocks_add_next_avail_port[earfcn] += 1 + blocks_add_next_avail_port[it['earfcn']] += 1 # Connect the Adder to the UE-side (Dl): for earfcn, bl_add in self.blocks_add.items():