July 2022 - gerrit-log - lists.osmocom.org

Change in pysim[master]: apdu/ts_102_221: SELECT: allow select of SELF

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28770 ) Change subject: apdu/ts_102_221: SELECT: allow select of SELF ...................................................................... apdu/ts_102_221: SELECT: allow select of SELF While in the pySim-shell, it's useful to filter the currently selected file from the choice of available files for select, this doesn't apply for the tracing case: It's perfectly valid for the UE to SELECT the file that's already selected right now. The operation basically becomes equivalent to a STATUS. Change-Id: I1a20fb3ba70426333ac34448c6cb782c51363965 --- M pySim/apdu/ts_102_221.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/70/28770/1 diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py index 769c38e..fb2f375 100644 --- a/pySim/apdu/ts_102_221.py +++ b/pySim/apdu/ts_102_221.py @@ -66,7 +66,7 @@ # iterate to next element in path continue else: - sels = lchan.selected_file.get_selectables(['FIDS','MF','PARENT']) + sels = lchan.selected_file.get_selectables(['FIDS','MF','PARENT','SELF']) if file_hex in sels: if self.successful: #print("\tSELECT %s" % sels[file_hex]) @@ -80,7 +80,7 @@ elif mode == 'df_ef_or_mf_by_file_id': if len(self.cmd_data) != 2: raise ValueError('Expecting a 2-byte FID') - sels = lchan.selected_file.get_selectables(['FIDS','MF','PARENT']) + sels = lchan.selected_file.get_selectables(['FIDS','MF','PARENT','SELF']) file_hex = b2h(self.cmd_data) if file_hex in sels: if self.successful: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1a20fb3ba70426333ac34448c6cb782c51363965 Gerrit-Change-Number: 28770 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in pysim[master]: apdu/ts_102_221: Implement SELECT case "df_ef_or_mf_by_file_id"

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28766 ) Change subject: apdu/ts_102_221: Implement SELECT case "df_ef_or_mf_by_file_id" ...................................................................... apdu/ts_102_221: Implement SELECT case "df_ef_or_mf_by_file_id" This was [sadly] simply missing from the implementation so far. Change-Id: I7bbd13ce29f5adc1ca3ca01bffabbe02dd17db20 --- M pySim/apdu/ts_102_221.py 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/66/28766/1 diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py index e5455d0..0ca6702 100644 --- a/pySim/apdu/ts_102_221.py +++ b/pySim/apdu/ts_102_221.py @@ -78,6 +78,17 @@ elif mode == 'df_ef_or_mf_by_file_id': if len(self.cmd_data) != 2: raise ValueError('Expecting a 2-byte FID') + sels = lchan.selected_file.get_selectables(['FIDS']) + file_hex = b2h(self.cmd_data) + if file_hex in sels: + if self.successful: + #print("\tSELECT %s" % sels[file_hex]) + lchan.selected_file = sels[file_hex] + else: + #print("\tSELECT %s FAILED" % sels[file_hex]) + pass + else: + logger.warning('SELECT UNKNOWN FID %s' % (file_hex)) elif mode == 'df_name': # Select by AID (can be sub-string!) aid = self.cmd_dict['body'] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7bbd13ce29f5adc1ca3ca01bffabbe02dd17db20 Gerrit-Change-Number: 28766 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in pysim[master]: apdu/ts_102_221: Fix SELECT of 3f00

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28767 ) Change subject: apdu/ts_102_221: Fix SELECT of 3f00 ...................................................................... apdu/ts_102_221: Fix SELECT of 3f00 In order to be able to explicitly select the MF via 3f00, we need to pass the 'MF' to get_selectables(), so the record is included in the list of selectable files from the current working directory. Change-Id: I27085896142fe547a6e93e01e63e59bbc65c8b8a --- M pySim/apdu/ts_102_221.py 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/67/28767/1 diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py index 0ca6702..3597db8 100644 --- a/pySim/apdu/ts_102_221.py +++ b/pySim/apdu/ts_102_221.py @@ -63,9 +63,10 @@ lchan.selected_adf = sels['ADF.USIM'] lchan.selected_file = lchan.selected_adf #print("\tSELECT CUR_ADF %s" % lchan.selected_file) + # iterate to next element in path continue else: - sels = lchan.selected_file.get_selectables(['FIDS']) + sels = lchan.selected_file.get_selectables(['FIDS','MF']) if file_hex in sels: if self.successful: #print("\tSELECT %s" % sels[file_hex]) @@ -73,12 +74,13 @@ else: #print("\tSELECT %s FAILED" % sels[file_hex]) pass + # iterate to next element in path continue logger.warning('SELECT UNKNOWN FID %s (%s)' % (file_hex, '/'.join([b2h(x) for x in path]))) elif mode == 'df_ef_or_mf_by_file_id': if len(self.cmd_data) != 2: raise ValueError('Expecting a 2-byte FID') - sels = lchan.selected_file.get_selectables(['FIDS']) + sels = lchan.selected_file.get_selectables(['FIDS','MF']) file_hex = b2h(self.cmd_data) if file_hex in sels: if self.successful: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I27085896142fe547a6e93e01e63e59bbc65c8b8a Gerrit-Change-Number: 28767 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in pysim[master]: pySim-trace: Don't print argparse object at start-up

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28764 ) Change subject: pySim-trace: Don't print argparse object at start-up ...................................................................... pySim-trace: Don't print argparse object at start-up Change-Id: I881471d026457d8ffcfdbd412c7aae0d0bff9344 --- M pySim-trace.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/28764/1 diff --git a/pySim-trace.py b/pySim-trace.py index c480168..33cb75a 100755 --- a/pySim-trace.py +++ b/pySim-trace.py @@ -145,7 +145,6 @@ if __name__ == '__main__': opts = option_parser.parse_args() - pp(opts) logger.info('Opening source %s...' % opts.source) if opts.source == 'gsmtap-udp': -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I881471d026457d8ffcfdbd412c7aae0d0bff9344 Gerrit-Change-Number: 28764 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in pysim[master]: filesystem.py: Make CardDF.get_selectables() respect the flags

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28765 ) Change subject: filesystem.py: Make CardDF.get_selectables() respect the flags ...................................................................... filesystem.py: Make CardDF.get_selectables() respect the flags All other get_selectables() understand a flag like 'FIDS' to request only the hexadecimal FIDs and not the file names. However, the CardEF.get_selectables() ignored those flags and unconditionally returned the names. Change-Id: Icdc37cae3eecd36d167da76c30224b9d48c844fd --- M pySim/filesystem.py 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/65/28765/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 598121b..886a48d 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -541,8 +541,10 @@ """ # global selectable names + those of the parent DF sels = super().get_selectables(flags) - sels.update( - {x.name: x for x in self.parent.children.values() if x != self}) + if flags == [] or 'FIDS' in flags: + sels.update({x.fid: x for x in self.parent.children.values() if x.fid and x != self}) + if flags == [] or 'FNAMES' in flags: + sels.update({x.name: x for x in self.parent.children.values() if x.name and x != self}) return sels -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icdc37cae3eecd36d167da76c30224b9d48c844fd Gerrit-Change-Number: 28765 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in pysim[master]: pySim-trace: Fix --no-suppress-{select.status} command line arguments

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28763 ) Change subject: pySim-trace: Fix --no-suppress-{select.status} command line arguments ...................................................................... pySim-trace: Fix --no-suppress-{select.status} command line arguments The Tracer implemented those options and the argparser handled it, but we didn't ever connect the two. Change-Id: I7d7d5fc475a8d09efdb63d3d6f1cc1de1996687b --- M pySim-trace.py 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/28763/1 diff --git a/pySim-trace.py b/pySim-trace.py index 8ee82f3..c480168 100755 --- a/pySim-trace.py +++ b/pySim-trace.py @@ -117,8 +117,10 @@ formatter_class=argparse.ArgumentDefaultsHelpFormatter) global_group = option_parser.add_argument_group('General Options') -global_group.add_argument('--no-suppress-select', help="Don't suppress displaying SELECT APDUs") -global_group.add_argument('--no-suppress-status', help="Don't suppress displaying STATUS APDUs") +global_group.add_argument('--no-suppress-select', action='store_false', dest='suppress_select', + help="Don't suppress displaying SELECT APDUs") +global_group.add_argument('--no-suppress-status', action='store_false', dest='suppress_status', + help="Don't suppress displaying STATUS APDUs") subparsers = option_parser.add_subparsers(help='APDU Source', dest='source', required=True) @@ -153,7 +155,7 @@ elif opts.source == 'rspro-pyshark-live': s = PysharkRsproLive(opts.interface) - tracer = Tracer(source=s) + tracer = Tracer(source=s, suppress_status=opts.suppress_status, suppress_select=opts.suppress_select) logger.info('Entering main loop...') tracer.main() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7d7d5fc475a8d09efdb63d3d6f1cc1de1996687b Gerrit-Change-Number: 28763 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in pysim[master]: pySim-trace: Support SELECT with empty response body

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28762 ) Change subject: pySim-trace: Support SELECT with empty response body ...................................................................... pySim-trace: Support SELECT with empty response body If the modem/UE doesn't ask for the FCP to be returned, a SELECT can exit with 9000 and no response body. Don't crash in that case. Change-Id: I66788717bec921bc54575e60f3f81adc80584dbc --- M pySim/apdu/ts_102_221.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/62/28762/1 diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py index 9ecc2c9..e5455d0 100644 --- a/pySim/apdu/ts_102_221.py +++ b/pySim/apdu/ts_102_221.py @@ -95,7 +95,9 @@ # decode the SELECT response if self.successful: self.file = lchan.selected_file - return lchan.selected_file.decode_select_response(self.rsp_dict['body']) + if 'body' in self.rsp_dict: + # not every SELECT is asking for the FCP in response... + return lchan.selected_file.decode_select_response(self.rsp_dict['body']) return None -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I66788717bec921bc54575e60f3f81adc80584dbc Gerrit-Change-Number: 28762 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trx_toolkit: do not auto power on/off child MS Transceivers

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28761 ) Change subject: trx_toolkit: do not auto power on/off child MS Transceivers ...................................................................... trx_toolkit: do not auto power on/off child MS Transceivers By default, powering on/off a parent transceiver (child_idx=0) will automatically power on/off its child transceivers (if any). This behavior is desirable for the BTS, but not for the MS Transceivers. Additional MS Transceivers are going to be used by ttcn3-bts-test for spawning multiple DCCH components in parallel. We don't want situations when one component powers off transceivers of the other DCCH components - they must be independent. Change-Id: I0cd6bac616273bed0e246ad48edc44fff484c589 --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/61/28761/1 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 5bfc956..0daecb4 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -409,7 +409,7 @@ self.append_trx(self.argv.bts_addr, self.argv.bts_base_port, name = "BTS") # Init TRX instance for BB - self.append_trx(self.argv.bb_addr, self.argv.bb_base_port, name = "MS") + self.append_trx(self.argv.bb_addr, self.argv.bb_base_port, name = "MS", child_mgt = False) # Additional transceivers (optional) if self.argv.trx_list is not None: diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 168d3db..385c38d 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -65,8 +65,9 @@ (trx_2) ctrl=5705, data=5706. ... - As soon as the first transceiver is powered on / off, - all child transceivers are also powered on / off. + By default, powering on/off a parent transceiver (child_idx=0) will + automatically power on/off its child transceivers (if any). This + behavior can be disabled by setting "child_mgt" param to False. == Clock distribution (optional) @@ -126,6 +127,7 @@ self.bind_addr = bind_addr self.base_port = base_port self.child_idx = kwargs.get("child_idx", 0) + self.child_mgt = kwargs.get("child_mgt", True) # Meta info self.name = kwargs.get("name", None) @@ -222,8 +224,13 @@ return None def power_event_handler(self, poweron: bool) -> None: - # Update self and child transceivers - for trx in [self, *self.child_trx_list.trx_list]: + # If self.child_mgt is True, automatically power on/off children + if self.child_mgt and self.child_idx == 0: + trx_list = [self, *self.child_trx_list.trx_list] + else: + trx_list = [self] + # Update self and optionally child transceivers + for trx in trx_list: trx.running = poweron if not poweron: trx.disable_fh() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0cd6bac616273bed0e246ad48edc44fff484c589 Gerrit-Change-Number: 28761 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trx_toolkit: simplify Transceiver.power_event_handler()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28759 ) Change subject: trx_toolkit: simplify Transceiver.power_event_handler() ...................................................................... trx_toolkit: simplify Transceiver.power_event_handler() Change-Id: I283f7ced0309bf823ad78c90e8006b9e9474dee7 --- M src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 7 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/59/28759/1 diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py index 46a55c5..2871f37 100644 --- a/src/target/trx_toolkit/ctrl_if_trx.py +++ b/src/target/trx_toolkit/ctrl_if_trx.py @@ -107,10 +107,7 @@ return -1 log.info("(%s) Starting transceiver..." % self.trx) - self.trx.running = True - - # Notify transceiver about that - self.trx.power_event_handler("POWERON") + self.trx.power_event_handler(poweron=True) return 0 @@ -118,10 +115,7 @@ log.debug("(%s) Recv POWEROFF cmd" % self.trx) log.info("(%s) Stopping transceiver..." % self.trx) - self.trx.running = False - - # Notify transceiver about that - self.trx.power_event_handler("POWEROFF") + self.trx.power_event_handler(poweron=False) return 0 diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 3390907..8241001 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -222,19 +222,13 @@ def ctrl_cmd_handler(self, request): return None - def power_event_handler(self, event): - # Update child transceivers - for trx in self.child_trx_list.trx_list: - if event == "POWERON": - trx.running = True - elif event == "POWEROFF": - trx.running = False + def power_event_handler(self, poweron: bool) -> None: + # Update self and child transceivers + for trx in [self, *self.child_trx_list.trx_list]: + trx.running = poweron + if not poweron: trx.disable_fh() - # Reset frequency hopping parameters - if event == "POWEROFF": - self.disable_fh() - # Trigger clock generator if required if self.clck_gen is not None: clck_links = self.clck_gen.clck_links -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I283f7ced0309bf823ad78c90e8006b9e9474dee7 Gerrit-Change-Number: 28759 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trx_toolkit: use **kwargs in Transceiver.__init__()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28760 ) Change subject: trx_toolkit: use **kwargs in Transceiver.__init__() ...................................................................... trx_toolkit: use **kwargs in Transceiver.__init__() Change-Id: I65e85a2dc99e81e96d1b31b6bda5010b044b041d --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 21 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/28760/1 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index a8ad9df..5bfc956 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -406,34 +406,31 @@ 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, name = "BTS") + self.append_trx(self.argv.bts_addr, self.argv.bts_base_port, name = "BTS") # Init TRX instance for BB - self.append_trx(self.argv.bb_addr, - self.argv.bb_base_port, name = "MS") + self.append_trx(self.argv.bb_addr, self.argv.bb_base_port, name = "MS") # Additional transceivers (optional) if self.argv.trx_list is not None: for trx_def in self.argv.trx_list: (name, addr, port, idx) = trx_def - self.append_child_trx(addr, port, idx, name) + self.append_child_trx(addr, port, name = name, child_idx = idx) # Burst forwarding between transceivers self.burst_fwd = BurstForwarder(self.trx_list.trx_list) log.info("Init complete") - def append_trx(self, remote_addr, base_port, name = None): + def append_trx(self, remote_addr, base_port, **kwargs): trx = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port, - clck_gen = self.clck_gen, pwr_meas = self.fake_pm, - name = name) + clck_gen = self.clck_gen, pwr_meas = self.fake_pm, **kwargs) self.trx_list.add_trx(trx) - def append_child_trx(self, remote_addr, base_port, child_idx, name = None): - # Index 0 corresponds to the first transceiver - if child_idx == 0: - self.append_trx(remote_addr, base_port, name) + def append_child_trx(self, remote_addr, base_port, **kwargs): + child_idx = kwargs.get("child_idx", 0) + if child_idx == 0: # Index 0 indicates parent transceiver + self.append_trx(remote_addr, base_port, **kwargs) return # Find 'parent' transceiver for a new child @@ -444,7 +441,7 @@ # Allocate a new child trx_child = FakeTRX(self.argv.trx_bind_addr, remote_addr, base_port, - child_idx = child_idx, pwr_meas = self.fake_pm, name = name) + pwr_meas = self.fake_pm, **kwargs) self.trx_list.add_trx(trx_child) # Link a new 'child' with its 'parent' diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 8241001..168d3db 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -120,42 +120,41 @@ """ - def __init__(self, bind_addr, remote_addr, base_port, name = None, - child_idx = 0, clck_gen = None, pwr_meas = None): + def __init__(self, bind_addr, remote_addr, base_port, **kwargs): # Connection info self.remote_addr = remote_addr self.bind_addr = bind_addr self.base_port = base_port - self.child_idx = child_idx + self.child_idx = kwargs.get("child_idx", 0) # Meta info - self.name = name + self.name = kwargs.get("name", None) log.info("Init transceiver '%s'" % self) # Child transceiver cannot have its own clock - if clck_gen is not None and child_idx > 0: + self.clck_gen = kwargs.get("clck_gen", None) + if self.clck_gen is not None and self.child_idx > 0: raise TypeError("Child transceiver cannot have its own clock") # Init DATA interface self.data_if = DATAInterface( - remote_addr, base_port + child_idx * 2 + 102, - bind_addr, base_port + child_idx * 2 + 2) + remote_addr, base_port + self.child_idx * 2 + 102, + bind_addr, base_port + self.child_idx * 2 + 2) # Init CTRL interface self.ctrl_if = CTRLInterfaceTRX(self, - remote_addr, base_port + child_idx * 2 + 101, - bind_addr, base_port + child_idx * 2 + 1) + remote_addr, base_port + self.child_idx * 2 + 101, + bind_addr, base_port + self.child_idx * 2 + 1) # Init optional CLCK interface - self.clck_gen = clck_gen - if clck_gen is not None: + if self.clck_gen is not None: self.clck_if = UDPLink( remote_addr, base_port + 100, bind_addr, base_port) # Optional Power Measurement interface - self.pwr_meas = pwr_meas + self.pwr_meas = kwargs.get("pwr_meas", None) # Internal state self.running = False -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I65e85a2dc99e81e96d1b31b6bda5010b044b041d Gerrit-Change-Number: 28760 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022