diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2020-07-11 18:45:21 +0700 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2020-07-13 08:51:19 +0000 |
| commit | bb0155d0e75ce847edb10d37f9ea9ce373323c6d (patch) | |
| tree | 79c35e3c12de332e91627b5cce2348a57eb47c3b | |
| parent | 9d24c54f82b9a4c29ebf647040abc8f35f46a6d5 (diff) | |
trx_toolkit/burst_fwd.py: inherit trx list API from TRXList
Change-Id: I1c589888991add435d88517094c7b4a7db93cbae
| -rw-r--r-- | src/target/trx_toolkit/burst_fwd.py | 25 | ||||
| -rw-r--r-- | src/target/trx_toolkit/trx_list.py | 4 |
2 files changed, 5 insertions, 24 deletions
diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 9fb308f9..574c97e2 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -25,7 +25,9 @@ import logging as log -class BurstForwarder: +from trx_list import TRXList + +class BurstForwarder(TRXList): """ Performs burst forwarding between transceivers. BurstForwarder distributes bursts between the list of given @@ -44,27 +46,6 @@ class BurstForwarder: """ - def __init__(self, trx_list = None): - # List of Transceiver instances - if trx_list is not None: - self.trx_list = trx_list - else: - self.trx_list = [] - - def add_trx(self, trx): - if trx in self.trx_list: - log.error("TRX is already in the list") - return - - self.trx_list.append(trx) - - def del_trx(self, trx): - if trx not in self.trx_list: - log.error("TRX is not in the list") - return - - self.trx_list.remove(trx) - def forward_msg(self, src_trx, rx_msg): # Originating Transceiver may use frequency hopping, # so let's precalculate its Tx frequency in advance diff --git a/src/target/trx_toolkit/trx_list.py b/src/target/trx_toolkit/trx_list.py index 8b4013dd..4f9eff23 100644 --- a/src/target/trx_toolkit/trx_list.py +++ b/src/target/trx_toolkit/trx_list.py @@ -31,8 +31,8 @@ class TRXList: """ - def __init__(self): - self.trx_list = [] + def __init__(self, trx_list = None): + self.trx_list = trx_list or [] def __getitem__(self, i): return self.trx_list[i] |