This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
fixeria gerrit-no-reply at lists.osmocom.orgfixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/23678 ) Change subject: trx_toolkit: define TRXDv2 PDUs using declarative codec ...................................................................... trx_toolkit: define TRXDv2 PDUs using declarative codec Change-Id: If356d285006c0b9b57879d0499b8144eca820cab Related: OS#4006, SYS#4895 --- M src/target/trx_toolkit/trxd_proto.py 1 file changed, 85 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/78/23678/1 diff --git a/src/target/trx_toolkit/trxd_proto.py b/src/target/trx_toolkit/trxd_proto.py index aef3351..dbce2be 100644 --- a/src/target/trx_toolkit/trxd_proto.py +++ b/src/target/trx_toolkit/trxd_proto.py @@ -30,12 +30,20 @@ class Header(codec.BitFieldSet): ''' Header constructor for TRXD PDUs. ''' - def __init__(self, ver: int): - codec.BitFieldSet.__init__(self, len=1, set=( - codec.BitField('ver', bl=4, val=ver), - codec.BitField.Pad(bl=1), # RFU + def __init__(self, ver: int, batched: bool = False): + f = [ # Dynamically generated field list + codec.BitField('ver', bl=4, val=ver) if not batched + else codec.BitField.Spare(bl=4), # RFU + codec.BitField.Spare(bl=1), codec.BitField('tn', bl=3), - )) + ] + + if ver >= 2: # TRXDv2 and higher + f.append(codec.BitField('batch', bl=1)) + f.append(codec.BitField.Spare(bl=1)) + f.append(codec.BitField('trx', bl=6)) + + codec.BitFieldSet.__init__(self, set=tuple(f)) class MTS(codec.BitFieldSet): ''' Modulation and Training Sequence. ''' @@ -65,6 +73,35 @@ return 1 * GMSK_BURST_LEN raise ValueError('Unknown modulation type') +class Power(codec.Codec): + ''' SCPIR and Tx power reduction (TRXDv2 and higher). + + +-----------------+---------------------------------+ + | 7 6 5 4 3 2 1 0 | Description | + +-----------------+---------------------------------+ + | . . . . x x x x | Power REDuction (in 2 dB steps) | + +-----------------+---------------------------------+ + | . x x x . . . . | SCPIR value (in 2 dB steps) | + +-----------------+---------------------------------+ + | x . . . . . . . | SCPIR sign indicator | + +-----------------+---------------------------------+ + + ''' + + def from_bytes(self, vals: dict, data: bytes) -> int: + blob = ord(data) # Convert a byte to an int + vals['red'] = (blob & 0b1111) * 2 + vals['scpir'] = ((blob >> 4) & 0b111) * 2 + if blob & (1 << 7): # negative sign + vals['scpir'] *= -1 + return 1 + + def to_bytes(self, vals: dict) -> bytes: + blob = (vals['red'] & 0b1111) \ + | (abs(vals['scpir']) << 4) // 2 \ + | (0x80 if (vals['scpir'] < 0) else 0x00) + return bytes((blob,)) + class BurstBits(codec.Buf): ''' Soft-/hard-bits with variable length. ''' @@ -118,3 +155,46 @@ def __init__(self, *args, **kw): PDUv0Tx.__init__(self, *args, **kw) self.STRUCT[0]._fields[0].val = 1 + + +class PDUv2Rx(codec.Envelope): + class BPDU(codec.Envelope): + ''' Batched PDU part. ''' + STRUCT = ( + Header(ver=2, batched=True), + MTS(), + codec.Uint('rssi', mult=-1), + codec.Int16BE('toa256'), + codec.Int16BE('cir'), + BurstBits('soft-bits'), + ) + + STRUCT = ( + Header(ver=2), + MTS(), + codec.Uint('rssi', mult=-1), + codec.Int16BE('toa256'), + codec.Int16BE('cir'), + codec.Uint32BE('fn'), + BurstBits('soft-bits'), + codec.Sequence(item=BPDU()).f('bpdu'), + ) + +class PDUv2Tx(codec.Envelope): + class BPDU(codec.Envelope): + ''' Batched PDU part. ''' + STRUCT = ( + Header(ver=2, batched=True), + MTS(), + Power(), + BurstBits('soft-bits'), + ) + + STRUCT = ( + Header(ver=2), + MTS(), + Power(), + codec.Uint32BE('fn'), + BurstBits('hard-bits'), + codec.Sequence(item=BPDU()).f('bpdu'), + ) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/23678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If356d285006c0b9b57879d0499b8144eca820cab Gerrit-Change-Number: 23678 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210408/452c6b1d/attachment.htm>