This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
fixeria gerrit-no-reply at lists.osmocom.orgfixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17708 ) Change subject: l1if: fix pcu_rx_rach_ind(): also send PTCCH/U to GSMTAP ...................................................................... l1if: fix pcu_rx_rach_ind(): also send PTCCH/U to GSMTAP Change-Id: I5cc4c3d2522215a31924121f83fcc2ac9ac6fe9c --- M src/bts.cpp M src/bts.h M src/pcu_l1_if.cpp M src/pcu_vty.c 4 files changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/08/17708/1 diff --git a/src/bts.cpp b/src/bts.cpp index 5e1725c..2e7fec2 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -752,9 +752,6 @@ /* Determine full frame number */ Fn = rfn_to_fn(Fn); - send_gsmtap(PCU_GSMTAP_C_UL_RACH, true, 0, ts_no, GSMTAP_CHANNEL_RACH, - Fn, (uint8_t*)&ra, is_11bit ? 2 : 1); - LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF on RACH, " "so we provide one: ra=0x%02x Fn=%u qta=%d is_11bit=%d:\n", ra, Fn, qta, is_11bit); diff --git a/src/bts.h b/src/bts.h index 4fddc0b..2c2d24e 100644 --- a/src/bts.h +++ b/src/bts.h @@ -67,6 +67,7 @@ PCU_GSMTAP_C_UL_DATA_GPRS = 18, /* uplink GPRS data blocks */ PCU_GSMTAP_C_UL_DATA_EGPRS = 19, /* uplink EGPRS data blocks */ PCU_GSMTAP_C_UL_RACH = 20, /* uplink RACH bursts */ + PCU_GSMTAP_C_UL_PTCCH = 21, /* uplink PTCCH bursts */ }; struct BTS; diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 37a0705..a5d5662 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -437,22 +437,31 @@ static int pcu_rx_rach_ind(struct gsm_pcu_if_rach_ind *rach_ind) { + BTS *bts = BTS::main_bts(); /* FIXME: resolve BTS by number */ + int current_fn = bts->current_frame_number(); int rc = 0; - int current_fn = get_current_fn(); LOGP(DL1IF, LOGL_INFO, "RACH request received: sapi=%d " "qta=%d, ra=0x%02x, fn=%u, cur_fn=%d, is_11bit=%d\n", rach_ind->sapi, rach_ind->qta, rach_ind->ra, rach_ind->fn, current_fn, rach_ind->is_11bit); +#define send_gsmtap_ra(category, chan) do { \ + bts->send_gsmtap(category, true, rach_ind->trx_nr, rach_ind->ts_nr, \ + chan, bts->rfn_to_fn(rach_ind->fn), \ + (uint8_t*)&rach_ind->ra, rach_ind->is_11bit ? 2 : 1); \ +} while (0) + switch (rach_ind->sapi) { case PCU_IF_SAPI_RACH: - rc = BTS::main_bts()->rcv_rach( + send_gsmtap_ra(PCU_GSMTAP_C_UL_RACH, GSMTAP_CHANNEL_RACH); + rc = bts->rcv_rach( rach_ind->ra, rach_ind->fn, rach_ind->qta, rach_ind->is_11bit, (ph_burst_type)rach_ind->burst_type); break; case PCU_IF_SAPI_PTCCH: - rc = BTS::main_bts()->rcv_ptcch_rach( + send_gsmtap_ra(PCU_GSMTAP_C_UL_PTCCH, GSMTAP_CHANNEL_PTCCH); + rc = bts->rcv_ptcch_rach( rach_ind->trx_nr, rach_ind->ts_nr, rach_ind->fn, rach_ind->qta); break; diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 9cae777..99c92b7 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -38,6 +38,7 @@ { PCU_GSMTAP_C_UL_DATA_GPRS, "ul-data-gprs" }, { PCU_GSMTAP_C_UL_DATA_EGPRS, "ul-data-egprs" }, { PCU_GSMTAP_C_UL_RACH, "ul-rach" }, + { PCU_GSMTAP_C_UL_PTCCH, "ul-ptcch" }, { 0, NULL } }; @@ -58,6 +59,7 @@ { PCU_GSMTAP_C_UL_DATA_GPRS, "Uplink Data Blocks (GPRS)" }, { PCU_GSMTAP_C_UL_DATA_EGPRS, "Uplink Data Blocks (EGPRS)" }, { PCU_GSMTAP_C_UL_RACH, "Uplink RACH Bursts" }, + { PCU_GSMTAP_C_UL_PTCCH, "Uplink PTCCH Bursts" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5cc4c3d2522215a31924121f83fcc2ac9ac6fe9c Gerrit-Change-Number: 17708 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <axilirator at gmail.com> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200402/d9f11808/attachment.htm>