<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12120">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Vadim Yanitskiy: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add TRXCTRL log category<br><br>This log category is applied to messages related to TRX CTRL socket<br>interface, and it's printed in yellow, same color used in osmo-bts-trx<br>for TRX category (so same messages are printed with same color in both<br>sides).<br><br>Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983<br>---<br>M CommonLibs/debug.c<br>M CommonLibs/debug.h<br>M Transceiver52M/Transceiver.cpp<br>3 files changed, 14 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c</span><br><span>index c6de21a..294924d 100644</span><br><span>--- a/CommonLibs/debug.c</span><br><span>+++ b/CommonLibs/debug.c</span><br><span>@@ -10,6 +10,12 @@</span><br><span> .color = NULL,</span><br><span> .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DTRXCTRL] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DTRXCTRL",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "TRX CTRL interface",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;33m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> [DDEV] = {</span><br><span> .name = "DDEV",</span><br><span> .description = "Device/Driver specific code",</span><br><span>diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h</span><br><span>index f8f6239..a5b9271 100644</span><br><span>--- a/CommonLibs/debug.h</span><br><span>+++ b/CommonLibs/debug.h</span><br><span>@@ -5,6 +5,7 @@</span><br><span> /* Debug Areas of the code */</span><br><span> enum {</span><br><span> DMAIN,</span><br><span style="color: hsl(120, 100%, 40%);">+ DTRXCTRL,</span><br><span> DDEV,</span><br><span> DLMS,</span><br><span> };</span><br><span>diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp</span><br><span>index 8702fb6..8b950f7 100644</span><br><span>--- a/Transceiver52M/Transceiver.cpp</span><br><span>+++ b/Transceiver52M/Transceiver.cpp</span><br><span>@@ -715,13 +715,13 @@</span><br><span> </span><br><span> /* Verify a command signature */</span><br><span> if (strncmp(buffer, "CMD ", 4)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG(WARNING) << "bogus message on control interface";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DTRXCTRL, WARNING) << "bogus message on control interface";</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span> /* Set command pointer */</span><br><span> command = buffer + 4;</span><br><span style="color: hsl(0, 100%, 40%);">- LOG(INFO) << "chan " << chan << ": command is " << command;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DTRXCTRL, INFO) << "chan " << chan << ": command is " << command;</span><br><span> </span><br><span> if (match_cmd(command, "POWEROFF", NULL)) {</span><br><span> stop();</span><br><span>@@ -800,7 +800,7 @@</span><br><span> sscanf(params, "%d", &freqKhz);</span><br><span> mRxFreq = freqKhz * 1e3;</span><br><span> if (!mRadioInterface->tuneRx(mRxFreq, chan)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG(ALERT) << "RX failed to tune";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DTRXCTRL, ALERT) << "RX failed to tune";</span><br><span> sprintf(response,"RSP RXTUNE 1 %d",freqKhz);</span><br><span> }</span><br><span> else</span><br><span>@@ -811,7 +811,7 @@</span><br><span> sscanf(params, "%d", &freqKhz);</span><br><span> mTxFreq = freqKhz * 1e3;</span><br><span> if (!mRadioInterface->tuneTx(mTxFreq, chan)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG(ALERT) << "TX failed to tune";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DTRXCTRL, ALERT) << "TX failed to tune";</span><br><span> sprintf(response,"RSP TXTUNE 1 %d",freqKhz);</span><br><span> }</span><br><span> else</span><br><span>@@ -823,7 +823,7 @@</span><br><span> if (TSC > 7) {</span><br><span> sprintf(response, "RSP SETTSC 1 %d", TSC);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG(NOTICE) << "Changing TSC from " << mTSC << " to " << TSC;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DTRXCTRL, NOTICE) << "Changing TSC from " << mTSC << " to " << TSC;</span><br><span> mTSC = TSC;</span><br><span> sprintf(response,"RSP SETTSC 0 %d", TSC);</span><br><span> }</span><br><span>@@ -833,7 +833,7 @@</span><br><span> int timeslot;</span><br><span> sscanf(params, "%d %d", ×lot, &corrCode);</span><br><span> if ((timeslot < 0) || (timeslot > 7)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG(WARNING) << "bogus message on control interface";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DTRXCTRL, WARNING) << "bogus message on control interface";</span><br><span> sprintf(response,"RSP SETSLOT 1 %d %d",timeslot,corrCode);</span><br><span> return;</span><br><span> }</span><br><span>@@ -848,7 +848,7 @@</span><br><span> mWriteBurstToDiskMask = mask;</span><br><span> sprintf(response,"RSP _SETBURSTTODISKMASK 0 %d",mask);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG(WARNING) << "bogus command " << command << " on control interface.";</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DTRXCTRL, WARNING) << "bogus command " << command << " on control interface.";</span><br><span> sprintf(response,"RSP ERR 1");</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12120">change 12120</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/12120"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 </div>
<div style="display:none"> Gerrit-Change-Number: 12120 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Max <msuraev@sysmocom.de> </div>