Vadim Yanitskiy has uploaded this change for review. (
https://gerrit.osmocom.org/12545
Change subject: trx_toolkit/fake_trx.py: move init code to __init__()
......................................................................
trx_toolkit/fake_trx.py: move init code to __init__()
Change-Id: I84969630348a189d237cc98354e568421839a37b
---
M src/target/trx_toolkit/fake_trx.py
1 file changed, 26 insertions(+), 26 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/12545/1
diff --git a/src/target/trx_toolkit/fake_trx.py
b/src/target/trx_toolkit/fake_trx.py
index 0bf9266..a94f1de 100755
--- a/src/target/trx_toolkit/fake_trx.py
+++ b/src/target/trx_toolkit/fake_trx.py
@@ -275,6 +275,32 @@
# List of all transceivers
self.trx_list = TRXList()
+ # Init shared clock generator
+ self.clck_gen = CLCKGen([])
+
+ # Power measurement emulation
+ # Noise: -120 .. -105
+ # BTS: -75 .. -50
+ self.fake_pm = FakePM(-120, -105, -75, -50)
+ self.fake_pm.trx_list = self.trx_list
+
+ # Init TRX instance for BTS
+ self.append_trx(self.argv.bts_addr, self.argv.bts_base_port)
+
+ # Init TRX instance for BB
+ self.append_trx(self.argv.bb_addr, self.argv.bb_base_port)
+
+ # Additional transceivers (optional)
+ if self.argv.trx_list is not None:
+ for trx_def in self.argv.trx_list:
+ (addr, port, idx) = trx_def
+ self.append_child_trx(addr, port, idx)
+
+ # Burst forwarding between transceivers
+ self.burst_fwd = BurstForwarder(self.trx_list)
+
+ log.info("Init complete")
+
def append_trx(self, remote_addr, base_port):
trx = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port,
clck_gen = self.clck_gen, pwr_meas = self.fake_pm)
@@ -301,38 +327,12 @@
trx_parent.child_trx_list.add_trx(trx_child)
def run(self):
- # Init shared clock generator
- self.clck_gen = CLCKGen([])
-
- # Power measurement emulation
- # Noise: -120 .. -105
- # BTS: -75 .. -50
- self.fake_pm = FakePM(-120, -105, -75, -50)
- self.fake_pm.trx_list = self.trx_list
-
- # Init TRX instance for BTS
- self.append_trx(self.argv.bts_addr, self.argv.bts_base_port)
-
- # Init TRX instance for BB
- self.append_trx(self.argv.bb_addr, self.argv.bb_base_port)
-
- # Additional transceivers (optional)
- if self.argv.trx_list is not None:
- for trx_def in self.argv.trx_list:
- (addr, port, idx) = trx_def
- self.append_child_trx(addr, port, idx)
-
- # Burst forwarding between transceivers
- self.burst_fwd = BurstForwarder(self.trx_list)
-
# Compose list of to be monitored sockets
self.sock_list = []
for trx in self.trx_list:
self.sock_list.append(trx.ctrl_if.sock)
self.sock_list.append(trx.data_if.sock)
- log.info("Init complete")
-
# Enter main loop
while True:
# Wait until we get any data on any socket
--
To view, visit https://gerrit.osmocom.org/12545
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84969630348a189d237cc98354e568421839a37b
Gerrit-Change-Number: 12545
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <axilira...@gmail.com>
