kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/40067?usp=email )
Change subject: trx_toolkit: Bring FakeTRX and Transceiver .handle_data_msg signatures in sync ......................................................................
trx_toolkit: Bring FakeTRX and Transceiver .handle_data_msg signatures in sync
Currently .handle_data_msg has the following signature in those classes:
FakeTRX.handle_data_msg(self, src_trx, src_msg, msg) Transceiver.handle_data_msg(self, msg)
It works in Python but when we will switch both FakeTRX and Transceiver to cdef class Cython will complain about that.
-> Bring .handle_data_msg signature to be the same for both those classes.
Change-Id: Ic4a642b2e78a1c87450d0d866eb7e6511193b0d5 --- M src/target/trx_toolkit/_fake_trx.pyx M src/target/trx_toolkit/transceiver.pxd M src/target/trx_toolkit/transceiver.pyx 3 files changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/40067/1
diff --git a/src/target/trx_toolkit/_fake_trx.pyx b/src/target/trx_toolkit/_fake_trx.pyx index 8135913..e49d056 100644 --- a/src/target/trx_toolkit/_fake_trx.pyx +++ b/src/target/trx_toolkit/_fake_trx.pyx @@ -244,7 +244,7 @@ if src_trx.ta != 0: msg.toa256 -= src_trx.ta * 256
- Transceiver.handle_data_msg(self, msg) + Transceiver.send_data_msg(self, msg)
# Simulation specific CTRL command handler def ctrl_cmd_handler(self, request): diff --git a/src/target/trx_toolkit/transceiver.pxd b/src/target/trx_toolkit/transceiver.pxd index 5fd6bc6..b76fa24 100644 --- a/src/target/trx_toolkit/transceiver.pxd +++ b/src/target/trx_toolkit/transceiver.pxd @@ -48,4 +48,6 @@ cpdef get_tx_freq(self, fn)
cdef recv_data_msg(self) + cdef send_data_msg(self, msg) + cpdef handle_data_msg(self, Transceiver src_trx, src_msg, msg) cdef clck_tick(self, BurstForwarder fwd, fn) diff --git a/src/target/trx_toolkit/transceiver.pyx b/src/target/trx_toolkit/transceiver.pyx index cf67879..8f8c9c6 100644 --- a/src/target/trx_toolkit/transceiver.pyx +++ b/src/target/trx_toolkit/transceiver.pyx @@ -290,10 +290,13 @@ self._tx_queue.append(msg) return msg
- def handle_data_msg(self, msg): + cdef send_data_msg(self, msg): # TODO: make legacy mode configurable (via argv?) self.data_if.send_msg(msg, legacy = True)
+ cpdef handle_data_msg(self, Transceiver src_trx, src_msg, msg): + self.send_data_msg(msg) + cdef clck_tick(self, BurstForwarder fwd, fn): if not self.running: return