<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10849">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[sysmo,lc15]: Consider CBCH channel combinations in chan_nr_by_sapi()<br><br>Whenever a CBCH is used, this results in a new physical channel<br>combination on the relevant timeslot.  The chan_nr_by_sapi() function<br>must handle those cbch-enabled PCHAN types.<br><br>Change-Id: I963909bcec8392ec445d0bcf53a2a8d7d9535444<br>---<br>M src/osmo-bts-litecell15/l1_if.c<br>M src/osmo-bts-sysmo/l1_if.c<br>2 files changed, 8 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c</span><br><span>index e6cdfd4..f582bf2 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_if.c</span><br><span>+++ b/src/osmo-bts-litecell15/l1_if.c</span><br><span>@@ -709,9 +709,11 @@</span><br><span>                        cbits = 0x02 + subCh;</span><br><span>                        break;</span><br><span>               case GSM_PCHAN_CCCH_SDCCH4:</span><br><span style="color: hsl(120, 100%, 40%);">+           case GSM_PCHAN_CCCH_SDCCH4_CBCH:</span><br><span>                     cbits = 0x04 + subCh;</span><br><span>                        break;</span><br><span>               case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span style="color: hsl(120, 100%, 40%);">+                case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span>                  cbits = 0x08 + subCh;</span><br><span>                        break;</span><br><span>               default:</span><br><span>@@ -723,9 +725,11 @@</span><br><span>      case GsmL1_Sapi_Sdcch:</span><br><span>               switch(pchan) {</span><br><span>              case GSM_PCHAN_CCCH_SDCCH4:</span><br><span style="color: hsl(120, 100%, 40%);">+           case GSM_PCHAN_CCCH_SDCCH4_CBCH:</span><br><span>                     cbits = 0x04 + subCh;</span><br><span>                        break;</span><br><span>               case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span style="color: hsl(120, 100%, 40%);">+                case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span>                  cbits = 0x08 + subCh;</span><br><span>                        break;</span><br><span>               default:</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c</span><br><span>index 3adb442..1321fe6 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_if.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_if.c</span><br><span>@@ -706,9 +706,11 @@</span><br><span>                         cbits = 0x02 + subCh;</span><br><span>                        break;</span><br><span>               case GSM_PCHAN_CCCH_SDCCH4:</span><br><span style="color: hsl(120, 100%, 40%);">+           case GSM_PCHAN_CCCH_SDCCH4_CBCH:</span><br><span>                     cbits = 0x04 + subCh;</span><br><span>                        break;</span><br><span>               case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span style="color: hsl(120, 100%, 40%);">+                case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span>                  cbits = 0x08 + subCh;</span><br><span>                        break;</span><br><span>               default:</span><br><span>@@ -720,9 +722,11 @@</span><br><span>      case GsmL1_Sapi_Sdcch:</span><br><span>               switch(pchan) {</span><br><span>              case GSM_PCHAN_CCCH_SDCCH4:</span><br><span style="color: hsl(120, 100%, 40%);">+           case GSM_PCHAN_CCCH_SDCCH4_CBCH:</span><br><span>                     cbits = 0x04 + subCh;</span><br><span>                        break;</span><br><span>               case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span style="color: hsl(120, 100%, 40%);">+                case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span>                  cbits = 0x08 + subCh;</span><br><span>                        break;</span><br><span>               default:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10849">change 10849</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/10849"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I963909bcec8392ec445d0bcf53a2a8d7d9535444 </div>
<div style="display:none"> Gerrit-Change-Number: 10849 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>