<p>fixeria <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14574">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, but someone else must approve
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/data_msg.py: inline both gen_fn() and parse_fn()<br><br>Both functions are never used outside of both gen_msg() and parse_msg().<br>AFAIR, they were more complicated until we started to use struct, but<br>now they can be easily inlined.<br><br>Change-Id: Ie64b271cf502f3df23b32f4b14a1e2b551a0f794<br>---<br>M src/target/trx_toolkit/data_msg.py<br>1 file changed, 3 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py</span><br><span>index f14c295..6d6b76c 100644</span><br><span>--- a/src/target/trx_toolkit/data_msg.py</span><br><span>+++ b/src/target/trx_toolkit/data_msg.py</span><br><span>@@ -136,16 +136,6 @@</span><br><span> </span><br><span>               return True</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Generates frame number to bytes</span><br><span style="color: hsl(0, 100%, 40%);">-       def gen_fn(self, fn):</span><br><span style="color: hsl(0, 100%, 40%);">-           # Big endian, 4 bytes</span><br><span style="color: hsl(0, 100%, 40%);">-           return struct.pack(">L", fn)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       # Parses frame number from bytes</span><br><span style="color: hsl(0, 100%, 40%);">-        def parse_fn(self, buf):</span><br><span style="color: hsl(0, 100%, 40%);">-                # Big endian, 4 bytes</span><br><span style="color: hsl(0, 100%, 40%);">-           return struct.unpack(">L", buf)[0]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>      # Generates a TRX DATA message</span><br><span>       def gen_msg(self, legacy = False):</span><br><span>           # Validate all the fields</span><br><span>@@ -158,9 +148,8 @@</span><br><span>              # Put timeslot index</span><br><span>                 buf.append(self.tn)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-         # Put frame number</span><br><span style="color: hsl(0, 100%, 40%);">-              fn = self.gen_fn(self.fn)</span><br><span style="color: hsl(0, 100%, 40%);">-               buf += fn</span><br><span style="color: hsl(120, 100%, 40%);">+             # Put frame number (4 octets, BE)</span><br><span style="color: hsl(120, 100%, 40%);">+             buf += struct.pack(">L", self.fn)</span><br><span> </span><br><span>           # Generate message specific header part</span><br><span>              hdr = self.gen_hdr()</span><br><span>@@ -186,7 +175,7 @@</span><br><span>                   raise ValueError("Message is to short")</span><br><span> </span><br><span>                # Parse both fn and tn</span><br><span style="color: hsl(0, 100%, 40%);">-          self.fn = self.parse_fn(msg[1:5])</span><br><span style="color: hsl(120, 100%, 40%);">+             self.fn = struct.unpack(">L", msg[1:5])[0]</span><br><span>              self.tn = msg[0]</span><br><span> </span><br><span>                 # Specific message part</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14574">change 14574</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/+/14574"/><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: Ie64b271cf502f3df23b32f4b14a1e2b551a0f794 </div>
<div style="display:none"> Gerrit-Change-Number: 14574 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>