aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo-bts-litecell15
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2018-08-24 23:37:45 +0200
committerHarald Welte <laforge@gnumonks.org>2018-09-09 15:40:58 +0000
commit02d99db08b13589e1417c3448a07747f8805ba88 (patch)
treea54221a2e25add9a0d15df940aba855d5bad6827 /src/osmo-bts-litecell15
parent4280829dfae0620c2326ba44caa31f5205d52a91 (diff)
CBCH: Move processing via L1SAP
for some historical reason, CBCH handling was not using the normal L1SAP boundary. Let's change that and traverse L1SAP just like for e.g. BCCH which is quite similar to CBCH handling. This also has the added benefit of logging CBCH via GSMTAP. Change-Id: Ibdba4c5e808330f8406f441a97fe0e81170fce97 Closes: OS#3534
Diffstat (limited to 'src/osmo-bts-litecell15')
-rw-r--r--src/osmo-bts-litecell15/l1_if.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index f582bf2..82299ff 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -50,7 +50,6 @@
#include <osmo-bts/measurement.h>
#include <osmo-bts/pcu_if.h>
#include <osmo-bts/handover.h>
-#include <osmo-bts/cbch.h>
#include <osmo-bts/bts_model.h>
#include <osmo-bts/l1sap.h>
#include <osmo-bts/msg_utils.h>
@@ -700,6 +699,9 @@ static uint8_t chan_nr_by_sapi(struct gsm_bts_trx_ts *ts,
case GsmL1_Sapi_Bcch:
cbits = 0x10;
break;
+ case GsmL1_Sapi_Cbch:
+ cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */
+ break;
case GsmL1_Sapi_Sacch:
switch(pchan) {
case GSM_PCHAN_TCH_F:
@@ -867,10 +869,6 @@ static int handle_ph_readytosend_ind(struct lc15l1_hdl *fl1,
case GsmL1_Sapi_Prach:
goto empty_frame;
break;
- case GsmL1_Sapi_Cbch:
- /* get them from bts->si_buf[] */
- bts_cbch_get(bts, msu_param->u8Buffer, &g_time);
- break;
default:
memcpy(msu_param->u8Buffer, fill_frame, GSM_MACBLOCK_LEN);
break;