<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/23678">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit: define TRXDv2 PDUs using declarative codec<br><br>Change-Id: If356d285006c0b9b57879d0499b8144eca820cab<br>Related: OS#4006, SYS#4895<br>---<br>M src/target/trx_toolkit/trxd_proto.py<br>1 file changed, 85 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/78/23678/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/trxd_proto.py b/src/target/trx_toolkit/trxd_proto.py</span><br><span>index aef3351..dbce2be 100644</span><br><span>--- a/src/target/trx_toolkit/trxd_proto.py</span><br><span>+++ b/src/target/trx_toolkit/trxd_proto.py</span><br><span>@@ -30,12 +30,20 @@</span><br><span> class Header(codec.BitFieldSet):</span><br><span> ''' Header constructor for TRXD PDUs. '''</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, ver: int):</span><br><span style="color: hsl(0, 100%, 40%);">- codec.BitFieldSet.__init__(self, len=1, set=(</span><br><span style="color: hsl(0, 100%, 40%);">- codec.BitField('ver', bl=4, val=ver),</span><br><span style="color: hsl(0, 100%, 40%);">- codec.BitField.Pad(bl=1), # RFU</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, ver: int, batched: bool = False):</span><br><span style="color: hsl(120, 100%, 40%);">+ f = [ # Dynamically generated field list</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.BitField('ver', bl=4, val=ver) if not batched</span><br><span style="color: hsl(120, 100%, 40%);">+ else codec.BitField.Spare(bl=4), # RFU</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.BitField.Spare(bl=1),</span><br><span> codec.BitField('tn', bl=3),</span><br><span style="color: hsl(0, 100%, 40%);">- ))</span><br><span style="color: hsl(120, 100%, 40%);">+ ]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ver >= 2: # TRXDv2 and higher</span><br><span style="color: hsl(120, 100%, 40%);">+ f.append(codec.BitField('batch', bl=1))</span><br><span style="color: hsl(120, 100%, 40%);">+ f.append(codec.BitField.Spare(bl=1))</span><br><span style="color: hsl(120, 100%, 40%);">+ f.append(codec.BitField('trx', bl=6))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.BitFieldSet.__init__(self, set=tuple(f))</span><br><span> </span><br><span> class MTS(codec.BitFieldSet):</span><br><span> ''' Modulation and Training Sequence. '''</span><br><span>@@ -65,6 +73,35 @@</span><br><span> return 1 * GMSK_BURST_LEN</span><br><span> raise ValueError('Unknown modulation type')</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+class Power(codec.Codec):</span><br><span style="color: hsl(120, 100%, 40%);">+ ''' SCPIR and Tx power reduction (TRXDv2 and higher).</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ +-----------------+---------------------------------+</span><br><span style="color: hsl(120, 100%, 40%);">+ | 7 6 5 4 3 2 1 0 | Description |</span><br><span style="color: hsl(120, 100%, 40%);">+ +-----------------+---------------------------------+</span><br><span style="color: hsl(120, 100%, 40%);">+ | . . . . x x x x | Power REDuction (in 2 dB steps) |</span><br><span style="color: hsl(120, 100%, 40%);">+ +-----------------+---------------------------------+</span><br><span style="color: hsl(120, 100%, 40%);">+ | . x x x . . . . | SCPIR value (in 2 dB steps) |</span><br><span style="color: hsl(120, 100%, 40%);">+ +-----------------+---------------------------------+</span><br><span style="color: hsl(120, 100%, 40%);">+ | x . . . . . . . | SCPIR sign indicator |</span><br><span style="color: hsl(120, 100%, 40%);">+ +-----------------+---------------------------------+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ '''</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def from_bytes(self, vals: dict, data: bytes) -> int:</span><br><span style="color: hsl(120, 100%, 40%);">+ blob = ord(data) # Convert a byte to an int</span><br><span style="color: hsl(120, 100%, 40%);">+ vals['red'] = (blob & 0b1111) * 2</span><br><span style="color: hsl(120, 100%, 40%);">+ vals['scpir'] = ((blob >> 4) & 0b111) * 2</span><br><span style="color: hsl(120, 100%, 40%);">+ if blob & (1 << 7): # negative sign</span><br><span style="color: hsl(120, 100%, 40%);">+ vals['scpir'] *= -1</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def to_bytes(self, vals: dict) -> bytes:</span><br><span style="color: hsl(120, 100%, 40%);">+ blob = (vals['red'] & 0b1111) \</span><br><span style="color: hsl(120, 100%, 40%);">+ | (abs(vals['scpir']) << 4) // 2 \</span><br><span style="color: hsl(120, 100%, 40%);">+ | (0x80 if (vals['scpir'] < 0) else 0x00)</span><br><span style="color: hsl(120, 100%, 40%);">+ return bytes((blob,))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> class BurstBits(codec.Buf):</span><br><span> ''' Soft-/hard-bits with variable length. '''</span><br><span> </span><br><span>@@ -118,3 +155,46 @@</span><br><span> def __init__(self, *args, **kw):</span><br><span> PDUv0Tx.__init__(self, *args, **kw)</span><br><span> self.STRUCT[0]._fields[0].val = 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class PDUv2Rx(codec.Envelope):</span><br><span style="color: hsl(120, 100%, 40%);">+ class BPDU(codec.Envelope):</span><br><span style="color: hsl(120, 100%, 40%);">+ ''' Batched PDU part. '''</span><br><span style="color: hsl(120, 100%, 40%);">+ STRUCT = (</span><br><span style="color: hsl(120, 100%, 40%);">+ Header(ver=2, batched=True),</span><br><span style="color: hsl(120, 100%, 40%);">+ MTS(),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Uint('rssi', mult=-1),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Int16BE('toa256'),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Int16BE('cir'),</span><br><span style="color: hsl(120, 100%, 40%);">+ BurstBits('soft-bits'),</span><br><span style="color: hsl(120, 100%, 40%);">+ )</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ STRUCT = (</span><br><span style="color: hsl(120, 100%, 40%);">+ Header(ver=2),</span><br><span style="color: hsl(120, 100%, 40%);">+ MTS(),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Uint('rssi', mult=-1),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Int16BE('toa256'),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Int16BE('cir'),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Uint32BE('fn'),</span><br><span style="color: hsl(120, 100%, 40%);">+ BurstBits('soft-bits'),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Sequence(item=BPDU()).f('bpdu'),</span><br><span style="color: hsl(120, 100%, 40%);">+ )</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class PDUv2Tx(codec.Envelope):</span><br><span style="color: hsl(120, 100%, 40%);">+ class BPDU(codec.Envelope):</span><br><span style="color: hsl(120, 100%, 40%);">+ ''' Batched PDU part. '''</span><br><span style="color: hsl(120, 100%, 40%);">+ STRUCT = (</span><br><span style="color: hsl(120, 100%, 40%);">+ Header(ver=2, batched=True),</span><br><span style="color: hsl(120, 100%, 40%);">+ MTS(),</span><br><span style="color: hsl(120, 100%, 40%);">+ Power(),</span><br><span style="color: hsl(120, 100%, 40%);">+ BurstBits('soft-bits'),</span><br><span style="color: hsl(120, 100%, 40%);">+ )</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ STRUCT = (</span><br><span style="color: hsl(120, 100%, 40%);">+ Header(ver=2),</span><br><span style="color: hsl(120, 100%, 40%);">+ MTS(),</span><br><span style="color: hsl(120, 100%, 40%);">+ Power(),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Uint32BE('fn'),</span><br><span style="color: hsl(120, 100%, 40%);">+ BurstBits('hard-bits'),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Sequence(item=BPDU()).f('bpdu'),</span><br><span style="color: hsl(120, 100%, 40%);">+ )</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/23678">change 23678</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmocom-bb/+/23678"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If356d285006c0b9b57879d0499b8144eca820cab </div>
<div style="display:none"> Gerrit-Change-Number: 23678 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>