<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/14786">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">driveTxPriorityQueue(): use trxd_hdr_common for message parsing<br><br>Change-Id: If6a93e2b7fc9ada55edbdd16352cd4f7040e3d2a<br>---<br>M Transceiver52M/Transceiver.cpp<br>1 file changed, 8 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/86/14786/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp</span><br><span>index 1e0339b..4cd8637 100644</span><br><span>--- a/Transceiver52M/Transceiver.cpp</span><br><span>+++ b/Transceiver52M/Transceiver.cpp</span><br><span>@@ -914,6 +914,7 @@</span><br><span>   int msgLen;</span><br><span>   int burstLen;</span><br><span>   char buffer[EDGE_BURST_NBITS + 50];</span><br><span style="color: hsl(120, 100%, 40%);">+  struct trxd_hdr_common *chdr;</span><br><span> </span><br><span>   // check data socket</span><br><span>   msgLen = read(mDataSockets[chan], buffer, sizeof(buffer));</span><br><span>@@ -934,12 +935,13 @@</span><br><span>     return false;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  int timeSlot = (int) buffer[0];</span><br><span style="color: hsl(0, 100%, 40%);">-  uint32_t frameNum = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-  for (int i = 0; i < 4; i++)</span><br><span style="color: hsl(0, 100%, 40%);">-    frameNum = (frameNum << 8) | (0x0ff & buffer[i+1]);</span><br><span style="color: hsl(120, 100%, 40%);">+  /* Common header part: HDR version, TDMA TN & FN */</span><br><span style="color: hsl(120, 100%, 40%);">+  chdr = (struct trxd_hdr_common *) buffer;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  LOG(DEBUG) << "rcvd. burst at: " << GSM::Time(frameNum,timeSlot);</span><br><span style="color: hsl(120, 100%, 40%);">+  /* Convert TDMA FN to the host endianness */</span><br><span style="color: hsl(120, 100%, 40%);">+  chdr->fn = ntohl(chdr->fn);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  LOG(DEBUG) << "rcvd. burst at: " << GSM::Time(chdr->fn, chdr->tn);</span><br><span> </span><br><span>   int RSSI = (int) buffer[5];</span><br><span>   BitVector newBurst(burstLen);</span><br><span>@@ -948,7 +950,7 @@</span><br><span>   while (itr < newBurst.end())</span><br><span>     *itr++ = *bufferItr++;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  GSM::Time currTime = GSM::Time(frameNum,timeSlot);</span><br><span style="color: hsl(120, 100%, 40%);">+  GSM::Time currTime = GSM::Time(chdr->fn, chdr->tn);</span><br><span> </span><br><span>   addRadioVector(chan, newBurst, RSSI, currTime);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/14786">change 14786</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/osmo-trx/+/14786"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If6a93e2b7fc9ada55edbdd16352cd4f7040e3d2a </div>
<div style="display:none"> Gerrit-Change-Number: 14786 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>