Build failure of network:osmocom:nightly/libosmocore in xUbuntu_16.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 249s] | [ 249s] | This file was extended by libosmocore config.status 0.9.6.20170730, which was [ 249s] | generated by GNU Autoconf 2.69. Invocation command line was [ 249s] | [ 249s] | CONFIG_FILES= [ 249s] | CONFIG_HEADERS = [ 249s] | CONFIG_LINKS= [ 249s] | CONFIG_COMMANDS = [ 249s] | $ ./config.status Doxyfile.core [ 249s] | [ 249s] | on build34 [ 249s] | [ 249s] | config.status:1171: creating Doxyfile.core [ 249s] [ 249s] debian/rules:26: recipe for target 'override_dh_auto_test' failed [ 249s] make[1]: *** [override_dh_auto_test] Error 1 [ 249s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 249s] debian/rules:15: recipe for target 'build' failed [ 249s] make: *** [build] Error 2 [ 249s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 249s] [ 249s] build34 failed "build libosmocore_0.9.6.20170730.dsc" at Sun Jul 30 19:54:05 UTC 2017. [ 249s] [ 249s] ### VM INTERACTION START ### [ 253s] [ 238.906811] reboot: Power down [ 254s] ### VM INTERACTION END ### [ 254s] [ 254s] build34 failed "build libosmocore_0.9.6.20170730.dsc" at Sun Jul 30 19:54:10 UTC 2017. [ 254s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
osmo-bts[master]: L1SAP: Use RSL_CHAN_OSMO_PDCH across L1SAP
Patch Set 2: this needs testing with osmo-bts-{sysmo,octphy,lc15}. -- To view, visit https://gerrit.osmocom.org/3393 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaaa833febe45b82166d3901f10cc5466a7591c19 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-bts[master]: L1SAP: Print chan_nr and link_id always as hex
Harald Welte has submitted this change and it was merged. Change subject: L1SAP: Print chan_nr and link_id always as hex .. L1SAP: Print chan_nr and link_id always as hex The RSL Channel ID is best read / interpreted as hex value, not as decimal, primarily due to the fact that it is a bit-mask of various fields. Change-Id: I9b72a67407870b485e7f7e8a72fa1ad30fc8ed4d --- M src/common/l1sap.c 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b6fcad3..7c69561 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -656,7 +656,7 @@ gsm_fn2gsmtime(_time, fn); - DEBUGP(DL1P, "Rx PH-RTS.ind %s chan_nr=%d link_id=%d\n", + DEBUGP(DL1P, "Rx PH-RTS.ind %s chan_nr=0x%02x link_id=0x%02xd\n", osmo_dump_gsmtime(_time), chan_nr, link_id); /* reuse PH-RTS.ind for PH-DATA.req */ @@ -750,7 +750,7 @@ memcpy(p, fill_frame, GSM_MACBLOCK_LEN); } - DEBUGP(DL1P, "Tx PH-DATA.req %02u/%02u/%02u chan_nr=%d link_id=%d\n", + DEBUGP(DL1P, "Tx PH-DATA.req %02u/%02u/%02u chan_nr=%02x link_id=0x%02x\n", g_time.t1, g_time.t2, g_time.t3, chan_nr, link_id); l1sap_down(trx, l1sap); @@ -798,7 +798,7 @@ gsm_fn2gsmtime(_time, fn); - DEBUGP(DL1P, "Rx TCH-RTS.ind %s chan_nr=%d\n", osmo_dump_gsmtime(_time), chan_nr); + DEBUGP(DL1P, "Rx TCH-RTS.ind %s chan_nr=0x%02x\n", osmo_dump_gsmtime(_time), chan_nr); lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) @@ -851,7 +851,7 @@ resp_l1sap->u.tch.fn = fn; resp_l1sap->u.tch.marker = marker; - DEBUGP(DL1P, "Tx TCH.req %02u/%02u/%02u chan_nr=%d\n", + DEBUGP(DL1P, "Tx TCH.req %02u/%02u/%02u chan_nr=0x%02x\n", g_time.t1, g_time.t2, g_time.t3, chan_nr); l1sap_down(trx, resp_l1sap); @@ -954,13 +954,13 @@ gsm_fn2gsmtime(_time, fn); - DEBUGP(DL1P, "Rx PH-DATA.ind %s chan_nr=%d link_id=%d\n", - osmo_dump_gsmtime(_time), chan_nr, link_id); + DEBUGP(DL1P, "Rx PH-DATA.ind %s chan_nr=0x%02x link_id=0x%02x len=%d\n", + osmo_dump_gsmtime(_time), chan_nr, link_id, len); if (ts_is_pdch(>ts[tn])) { lchan = get_lchan_by_chan_nr(trx, chan_nr); if (!lchan) - LOGP(DL1P, LOGL_ERROR, "No lchan for chan_nr=%d\n", chan_nr); + LOGP(DL1P, LOGL_ERROR, "No lchan for chan_nr=0x%02x\n", chan_nr); if (lchan && lchan->loopback && !L1SAP_IS_PTCCH(fn)) { /* we are in loopback mode (for BER testing) * mode and need to enqeue the frame to be @@ -1059,7 +1059,7 @@ gsm_fn2gsmtime(_time, fn); - DEBUGP(DL1P, "Rx TCH.ind %s chan_nr=%d\n", osmo_dump_gsmtime(_time), chan_nr); + DEBUGP(DL1P, "Rx TCH.ind %s chan_nr=0x%02x\n", osmo_dump_gsmtime(_time), chan_nr); lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) -- To view, visit https://gerrit.osmocom.org/3392 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b72a67407870b485e7f7e8a72fa1ad30fc8ed4d Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-bts[master]: TRX / VIRT-PHY: Make check for BCCH/CCCH more specific
Harald Welte has submitted this change and it was merged. Change subject: TRX / VIRT-PHY: Make check for BCCH/CCCH more specific .. TRX / VIRT-PHY: Make check for BCCH/CCCH more specific In bts_model_l1sap_down() we want to identify BCCH/CCCH channel numbers, but our check is a bit non-specific. Let's make the check more specific to only cover the BCCH, Uplink CCCH and Downlink CCCH C-bits as defined n 3GPP TS 08.58 Section 9.3.1 Change-Id: Ia20ab09b96c87c0dfbfaf98e5b2a8d36423fac67 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/l1_if.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 37a399f..f69e587 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -555,7 +555,7 @@ chan_nr = l1sap->u.info.u.act_req.chan_nr; lchan = get_lchan_by_chan_nr(trx, chan_nr); if (l1sap->u.info.type == PRIM_INFO_ACTIVATE) { - if ((chan_nr & 0x80)) { + if ((chan_nr & 0xE0) == 0x80) { LOGP(DL1C, LOGL_ERROR, "Cannot activate" " chan_nr 0x%02x\n", chan_nr); break; @@ -605,7 +605,7 @@ break; } /* here, type == PRIM_INFO_DEACTIVATE */ - if ((chan_nr & 0x80)) { + if ((chan_nr & 0xE0) == 0x80) { LOGP(DL1C, LOGL_ERROR, "Cannot deactivate " "chan_nr 0x%02x\n", chan_nr); break; diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index 4fe1ec8..bdbf2a7 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -370,7 +370,7 @@ /* we receive a channel activation request from the BSC, * e.g. as a response to a channel req on RACH */ if (l1sap->u.info.type == PRIM_INFO_ACTIVATE) { - if ((chan_nr & 0x80)) { + if ((chan_nr & 0xE0) == 0x80) { LOGP(DL1C, LOGL_ERROR, "Cannot activate" " chan_nr 0x%02x\n", chan_nr); break; @@ -419,7 +419,7 @@ 0); break; } - if ((chan_nr & 0x80)) { + if ((chan_nr & 0xE0) == 0x80) { LOGP(DL1C, LOGL_ERROR, "Cannot deactivate " "chan_nr 0x%02x\n", chan_nr); break; -- To view, visit https://gerrit.osmocom.org/3391 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia20ab09b96c87c0dfbfaf98e5b2a8d36423fac67 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-bts[master]: VIRT-PHY: Print NOTICE log message from unimplemented stubs
Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3370 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib607d192f90af7fb2d5a8747de5527f39e3cfefa Gerrit-PatchSet: 3 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[PATCH] osmo-bts[master]: VIRT-PHY: Print NOTICE log message from unimplemented stubs
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3370 to look at the new patch set (#3). VIRT-PHY: Print NOTICE log message from unimplemented stubs There are plenty of functions stubbed out in osmo-bts-virtual, let's print a NOTICE level log message to be able to correlate any kind of erroneous behavior with the fact that a given function has no actual implementation. Change-Id: Ib607d192f90af7fb2d5a8747de5527f39e3cfefa --- M src/osmo-bts-virtual/bts_model.c M src/osmo-bts-virtual/main.c 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/70/3370/3 diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c index 5293cc3..c82f1aa 100644 --- a/src/osmo-bts-virtual/bts_model.c +++ b/src/osmo-bts-virtual/bts_model.c @@ -38,6 +38,7 @@ /* TODO: check if dummy method is sufficient, else implement */ int bts_model_lchan_deactivate(struct gsm_lchan *lchan) { + LOGP(DL1C, LOGL_NOTICE, "Unimplemented %s\n", __func__); return -1; } @@ -45,16 +46,19 @@ int osmo_amr_rtp_dec(const uint8_t *rtppayload, int payload_len, uint8_t *cmr, int8_t *cmi, enum osmo_amr_type *ft, enum osmo_amr_quality *bfi, int8_t *sti) { + LOGP(DL1C, LOGL_NOTICE, "Unimplemented %s\n", __func__); return -1; } int bts_model_trx_close(struct gsm_bts_trx *trx) { + LOGP(DL1C, LOGL_NOTICE, "Unimplemented %s\n", __func__); return 0; } int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan) { + LOGP(DL1C, LOGL_NOTICE, "Unimplemented %s\n", __func__); return 0; } @@ -86,6 +90,7 @@ static uint8_t vbts_set_trx(struct gsm_bts_trx *trx) { + LOGP(DL1C, LOGL_NOTICE, "Unimplemented %s\n", __func__); return 0; } @@ -154,16 +159,19 @@ int bts_model_trx_deact_rf(struct gsm_bts_trx *trx) { + LOGP(DL1C, LOGL_NOTICE, "Unimplemented %s\n", __func__); return 0; } int bts_model_change_power(struct gsm_bts_trx *trx, int p_trxout_mdBm) { + LOGP(DL1C, LOGL_NOTICE, "Unimplemented %s\n", __func__); return 0; } int bts_model_ctrl_cmds_install(struct gsm_bts *bts) { + LOGP(DL1C, LOGL_NOTICE, "Unimplemented %s\n", __func__); return 0; } diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index f1dc293..937046b 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -51,6 +51,7 @@ /* dummy, since no direct dsp support */ uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx) { + LOGP(DSUM, LOGL_NOTICE, "Unimplemneted %s\n", __func__); return 0; } @@ -68,6 +69,7 @@ void bts_model_print_help() { + LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); } int bts_model_handle_options(int argc, char **argv) @@ -112,15 +114,18 @@ void bts_model_phy_instance_set_defaults(struct phy_instance *pinst) { + LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); } int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts) { + LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); return -ENOTSUP; } int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { + LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); return -ENOTSUP; } -- To view, visit https://gerrit.osmocom.org/3370 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib607d192f90af7fb2d5a8747de5527f39e3cfefa Gerrit-PatchSet: 3 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-bts[master]: VIRT-BTS: Support for GPRS
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3371 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id851578c53255866537a16a0be6c3e9268e6ccbc Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-bts[master]: L1SAP: Use RSL_CHAN_OSMO_PDCH across L1SAP
Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3393 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaaa833febe45b82166d3901f10cc5466a7591c19 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-HasComments: No
osmo-bts[master]: L1SAP: Print chan_nr and link_id always as hex
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3392 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9b72a67407870b485e7f7e8a72fa1ad30fc8ed4d Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-HasComments: No
osmo-bts[master]: TRX / VIRT-PHY: Make check for BCCH/CCCH more specific
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3391 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia20ab09b96c87c0dfbfaf98e5b2a8d36423fac67 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-HasComments: No
[PATCH] osmo-bts[master]: L1SAP: Print chan_nr and link_id always as hex
Review at https://gerrit.osmocom.org/3392 L1SAP: Print chan_nr and link_id always as hex The RSL Channel ID is best read / interpreted as hex value, not as decimal, primarily due to the fact that it is a bit-mask of various fields. Change-Id: I9b72a67407870b485e7f7e8a72fa1ad30fc8ed4d --- M src/common/l1sap.c 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/3392/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b6fcad3..7c69561 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -656,7 +656,7 @@ gsm_fn2gsmtime(_time, fn); - DEBUGP(DL1P, "Rx PH-RTS.ind %s chan_nr=%d link_id=%d\n", + DEBUGP(DL1P, "Rx PH-RTS.ind %s chan_nr=0x%02x link_id=0x%02xd\n", osmo_dump_gsmtime(_time), chan_nr, link_id); /* reuse PH-RTS.ind for PH-DATA.req */ @@ -750,7 +750,7 @@ memcpy(p, fill_frame, GSM_MACBLOCK_LEN); } - DEBUGP(DL1P, "Tx PH-DATA.req %02u/%02u/%02u chan_nr=%d link_id=%d\n", + DEBUGP(DL1P, "Tx PH-DATA.req %02u/%02u/%02u chan_nr=%02x link_id=0x%02x\n", g_time.t1, g_time.t2, g_time.t3, chan_nr, link_id); l1sap_down(trx, l1sap); @@ -798,7 +798,7 @@ gsm_fn2gsmtime(_time, fn); - DEBUGP(DL1P, "Rx TCH-RTS.ind %s chan_nr=%d\n", osmo_dump_gsmtime(_time), chan_nr); + DEBUGP(DL1P, "Rx TCH-RTS.ind %s chan_nr=0x%02x\n", osmo_dump_gsmtime(_time), chan_nr); lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) @@ -851,7 +851,7 @@ resp_l1sap->u.tch.fn = fn; resp_l1sap->u.tch.marker = marker; - DEBUGP(DL1P, "Tx TCH.req %02u/%02u/%02u chan_nr=%d\n", + DEBUGP(DL1P, "Tx TCH.req %02u/%02u/%02u chan_nr=0x%02x\n", g_time.t1, g_time.t2, g_time.t3, chan_nr); l1sap_down(trx, resp_l1sap); @@ -954,13 +954,13 @@ gsm_fn2gsmtime(_time, fn); - DEBUGP(DL1P, "Rx PH-DATA.ind %s chan_nr=%d link_id=%d\n", - osmo_dump_gsmtime(_time), chan_nr, link_id); + DEBUGP(DL1P, "Rx PH-DATA.ind %s chan_nr=0x%02x link_id=0x%02x len=%d\n", + osmo_dump_gsmtime(_time), chan_nr, link_id, len); if (ts_is_pdch(>ts[tn])) { lchan = get_lchan_by_chan_nr(trx, chan_nr); if (!lchan) - LOGP(DL1P, LOGL_ERROR, "No lchan for chan_nr=%d\n", chan_nr); + LOGP(DL1P, LOGL_ERROR, "No lchan for chan_nr=0x%02x\n", chan_nr); if (lchan && lchan->loopback && !L1SAP_IS_PTCCH(fn)) { /* we are in loopback mode (for BER testing) * mode and need to enqeue the frame to be @@ -1059,7 +1059,7 @@ gsm_fn2gsmtime(_time, fn); - DEBUGP(DL1P, "Rx TCH.ind %s chan_nr=%d\n", osmo_dump_gsmtime(_time), chan_nr); + DEBUGP(DL1P, "Rx TCH.ind %s chan_nr=0x%02x\n", osmo_dump_gsmtime(_time), chan_nr); lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) -- To view, visit https://gerrit.osmocom.org/3392 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b72a67407870b485e7f7e8a72fa1ad30fc8ed4d Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-bts[master]: VIRT-BTS: Support for GPRS
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3371 to look at the new patch set (#2). VIRT-BTS: Support for GPRS Change-Id: Id851578c53255866537a16a0be6c3e9268e6ccbc --- M src/osmo-bts-virtual/bts_model.c M src/osmo-bts-virtual/l1_if.c M src/osmo-bts-virtual/main.c 3 files changed, 7 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/71/3371/2 diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c index 424e27c..264bf4f 100644 --- a/src/osmo-bts-virtual/bts_model.c +++ b/src/osmo-bts-virtual/bts_model.c @@ -137,13 +137,12 @@ case NM_OC_SITE_MANAGER: case NM_OC_BASEB_TRANSC: case NM_OC_BTS: - oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); - rc = oml_mo_opstart_ack(mo); - break; - /* TODO: gprs support */ case NM_OC_GPRS_NSE: case NM_OC_GPRS_CELL: case NM_OC_GPRS_NSVC: + oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); + rc = oml_mo_opstart_ack(mo); + break; default: rc = oml_mo_opstart_nack(mo, NM_NACK_OBJCLASS_NOTSUPP); } diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index bdbf2a7..cb6d483 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -133,6 +133,9 @@ #endif case GSMTAP_CHANNEL_SDCCH4: case GSMTAP_CHANNEL_SDCCH8: + case GSMTAP_CHANNEL_PACCH: + case GSMTAP_CHANNEL_PDCH: + case GSMTAP_CHANNEL_PTCCH: osmo_prim_init(, SAP_GSM_PH, PRIM_PH_DATA, PRIM_OP_INDICATION, msg); l1sap.u.data.chan_nr = chan_nr; @@ -142,7 +145,7 @@ l1sap.u.data.ber10k = 0; /* Bit Error Rate in 0.01%. Best -> 0 */ l1sap.u.data.ta_offs_qbits = 0; /* Burst time of arrival in quarter bits. Probably used for Timing Advance calc. Best -> 0 */ l1sap.u.data.lqual_cb = 10 * signal_dbm; /* Link quality in centiBel = 10 * dB. */ - l1sap.u.data.pdch_presence_info = PRES_INFO_UNKNOWN; + l1sap.u.data.pdch_presence_info = PRES_INFO_BOTH; break; case GSMTAP_CHANNEL_AGCH: case GSMTAP_CHANNEL_PCH: @@ -151,9 +154,6 @@ goto nomessage; case GSMTAP_CHANNEL_SDCCH: case GSMTAP_CHANNEL_CCCH: - case GSMTAP_CHANNEL_PACCH: - case GSMTAP_CHANNEL_PDCH: - case GSMTAP_CHANNEL_PTCCH: case GSMTAP_CHANNEL_CBCH51: case GSMTAP_CHANNEL_CBCH52: LOGP(DL1P, LOGL_NOTICE, "Ignore incoming msg - channel type not supported!\n"); diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index bebbe2e..243adea 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -51,7 +51,6 @@ /* dummy, since no direct dsp support */ uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx) { - LOGP(DSUM, LOGL_NOTICE, "Unimplemneted %s\n", __func__); return 0; } -- To view, visit https://gerrit.osmocom.org/3371 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id851578c53255866537a16a0be6c3e9268e6ccbc Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-bts[master]: TRX / VIRT-PHY: Make check for BCCH/CCCH more specific
Review at https://gerrit.osmocom.org/3391 TRX / VIRT-PHY: Make check for BCCH/CCCH more specific In bts_model_l1sap_down() we want to identify BCCH/CCCH channel numbers, but our check is a bit non-specific. Let's make the check more specific to only cover the BCCH, Uplink CCCH and Downlink CCCH C-bits as defined n 3GPP TS 08.58 Section 9.3.1 Change-Id: Ia20ab09b96c87c0dfbfaf98e5b2a8d36423fac67 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/l1_if.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/3391/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 37a399f..f69e587 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -555,7 +555,7 @@ chan_nr = l1sap->u.info.u.act_req.chan_nr; lchan = get_lchan_by_chan_nr(trx, chan_nr); if (l1sap->u.info.type == PRIM_INFO_ACTIVATE) { - if ((chan_nr & 0x80)) { + if ((chan_nr & 0xE0) == 0x80) { LOGP(DL1C, LOGL_ERROR, "Cannot activate" " chan_nr 0x%02x\n", chan_nr); break; @@ -605,7 +605,7 @@ break; } /* here, type == PRIM_INFO_DEACTIVATE */ - if ((chan_nr & 0x80)) { + if ((chan_nr & 0xE0) == 0x80) { LOGP(DL1C, LOGL_ERROR, "Cannot deactivate " "chan_nr 0x%02x\n", chan_nr); break; diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index 4fe1ec8..bdbf2a7 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -370,7 +370,7 @@ /* we receive a channel activation request from the BSC, * e.g. as a response to a channel req on RACH */ if (l1sap->u.info.type == PRIM_INFO_ACTIVATE) { - if ((chan_nr & 0x80)) { + if ((chan_nr & 0xE0) == 0x80) { LOGP(DL1C, LOGL_ERROR, "Cannot activate" " chan_nr 0x%02x\n", chan_nr); break; @@ -419,7 +419,7 @@ 0); break; } - if ((chan_nr & 0x80)) { + if ((chan_nr & 0xE0) == 0x80) { LOGP(DL1C, LOGL_ERROR, "Cannot deactivate " "chan_nr 0x%02x\n", chan_nr); break; -- To view, visit https://gerrit.osmocom.org/3391 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia20ab09b96c87c0dfbfaf98e5b2a8d36423fac67 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-bts[master]: L1SAP: Use RSL_CHAN_OSMO_PDCH across L1SAP
Review at https://gerrit.osmocom.org/3393 L1SAP: Use RSL_CHAN_OSMO_PDCH across L1SAP So far, L1SAP code is hiding RSL_CHAN_OSMO_PDCH from the bts specific code below L1SAP. This is some kind of a hack/workaround, making code and debug output / logs more difficult to understand. So let's teach the lower layer how to treat RSL_CHAN_OSMO_PDCH and remove the "hiding" code from the common l1sap.c code. Change-Id: Iaaa833febe45b82166d3901f10cc5466a7591c19 --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/l1_if.c 6 files changed, 12 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/3393/1 diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 4e9c9e2..ad13145 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -22,6 +22,7 @@ #define L1SAP_IS_CHAN_BCCH(chan_nr) ((chan_nr & 0xf8) == 0x80) #define L1SAP_IS_CHAN_RACH(chan_nr) ((chan_nr & 0xf8) == 0x88) #define L1SAP_IS_CHAN_AGCH_PCH(chan_nr) ((chan_nr & 0xf8) == 0x90) +#define L1SAP_IS_CHAN_PDCH(chan_nr) ((chan_nr & 0xf8) == 0xc0) /* rach type from ra */ #define L1SAP_IS_PACKET_RACH(ra) ((ra & 0xf0) == 0x70 && (ra & 0x0f) != 0x0f) diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 7c69561..4bf24a5 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -263,6 +263,8 @@ *chan_type = GSMTAP_CHANNEL_PCH; else *chan_type = GSMTAP_CHANNEL_AGCH; + } else if (L1SAP_IS_CHAN_PDCH(chan_nr)) { + *chan_type = GSMTAP_CHANNEL_PDTCH; } if (L1SAP_IS_LINK_SACCH(link_id)) *chan_type |= GSMTAP_CHANNEL_ACCH; @@ -1218,7 +1220,7 @@ l1sap = msgb_l1sap_prim(msg); osmo_prim_init(>oph, SAP_GSM_PH, PRIM_PH_DATA, PRIM_OP_REQUEST, msg); - l1sap->u.data.chan_nr = 0x08 | ts->nr; + l1sap->u.data.chan_nr = RSL_CHAN_OSMO_PDCH | ts->nr; l1sap->u.data.link_id = 0x00; l1sap->u.data.fn = fn; msg->l2h = msgb_put(msg, len); @@ -1264,11 +1266,6 @@ enum osmo_mph_info_type type, uint8_t sacch_only) { struct osmo_phsap_prim l1sap; - - /* The caller may pass a non-standard RSL_CHAN_OSMO_PDCH, which the L1 -* doesn't understand. Use the normal TCH/F cbits instead. */ - if ((chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_OSMO_PDCH) - chan_nr = RSL_CHAN_Bm_ACCHs | (chan_nr & ~RSL_CHAN_NR_MASK); memset(, 0, sizeof(l1sap)); osmo_prim_init(, SAP_GSM_PH, PRIM_MPH_INFO, PRIM_OP_REQUEST, diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 08603d2..f6cb07e 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -152,8 +152,8 @@ {0, TRXC_SACCH8_5, 0x68, LID_SACCH, "SACCH/8(5)", rts_data_fn,tx_data_fn, rx_data_fn, 0 }, {0, TRXC_SACCH8_6, 0x70, LID_SACCH, "SACCH/8(6)", rts_data_fn,tx_data_fn, rx_data_fn, 0 }, {0, TRXC_SACCH8_7, 0x78, LID_SACCH, "SACCH/8(7)", rts_data_fn,tx_data_fn, rx_data_fn, 0 }, - {1, TRXC_PDTCH, 0x08, LID_DEDIC, "PDTCH", rts_data_fn,tx_pdtch_fn,rx_pdtch_fn,0 }, - {1, TRXC_PTCCH, 0x08, LID_DEDIC, "PTCCH", rts_data_fn,tx_data_fn, rx_data_fn, 0 }, + {1, TRXC_PDTCH, 0xc0, LID_DEDIC, "PDTCH", rts_data_fn,tx_pdtch_fn,rx_pdtch_fn,0 }, + {1, TRXC_PTCCH, 0xc0, LID_DEDIC, "PTCCH", rts_data_fn,tx_data_fn, rx_data_fn, 0 }, }; const struct value_string trx_chan_type_names[] = { diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index cb3efab..c568353 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -358,9 +358,9 @@ lchan = get_lchan_by_chan_nr(trx, chan_nr); if (L1SAP_IS_LINK_SACCH(link_id)) { sapi = GsmL1_Sapi_Sacch; - if (!L1SAP_IS_CHAN_TCHF(chan_nr)) + if (!L1SAP_IS_CHAN_TCHF(chan_nr) && !L1SAP_IS_CHAN_PDCH(chan_nr)) subCh = l1sap_chan2ss(chan_nr); - } else if (L1SAP_IS_CHAN_TCHF(chan_nr)) { + } else if (L1SAP_IS_CHAN_TCHF(chan_nr) || L1SAP_IS_CHAN_PDCH(chan_nr)) { if (ts_is_pdch(>ts[u8Tn])) { if (L1SAP_IS_PTCCH(u32Fn)) { sapi = GsmL1_Sapi_Ptcch; diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 20a84f8..cb792d7 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -473,9 +473,9 @@ subCh = 0xf1; if (L1SAP_IS_LINK_SACCH(link_id)) { sapi = cOCTVC1_GSM_SAPI_ENUM_SACCH; -
libosmocore[master]: gsm0480: expose the gsm0480_parse_ss_facility_ie()
Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3381 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I35d3360f36c48eb1295610ab96ff264c45af77eb Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Vadim YanitskiyGerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-bts[master]: VIRT-BTS: Enable uplink support for GPRS
Patch Set 1: Code-Review-1 let's merge this in the overall patch for full (UL and DL) GPRS support -- To view, visit https://gerrit.osmocom.org/3371 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id851578c53255866537a16a0be6c3e9268e6ccbc Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: RSL: Add support for RSL_CHAN_OSMO_PDCH to rsl_dec_chan_nr()
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3390 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icc772285636c06e1075a89809f0ac379d7a0002c Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] libosmocore[master]: RSL: Add support for RSL_CHAN_OSMO_PDCH to rsl_dec_chan_nr()
Harald Welte has submitted this change and it was merged. Change subject: RSL: Add support for RSL_CHAN_OSMO_PDCH to rsl_dec_chan_nr() .. RSL: Add support for RSL_CHAN_OSMO_PDCH to rsl_dec_chan_nr() Change-Id: Icc772285636c06e1075a89809f0ac379d7a0002c --- M src/gsm/rsl.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c index 83097fd..2a2af1f 100644 --- a/src/gsm/rsl.c +++ b/src/gsm/rsl.c @@ -202,6 +202,9 @@ } else if ((chan_nr & 0xf8) == RSL_CHAN_PCH_AGCH) { *type = RSL_CHAN_PCH_AGCH; *subch = 0; + } else if ((chan_nr & 0xf8) == RSL_CHAN_OSMO_PDCH) { + *type = RSL_CHAN_OSMO_PDCH; + *subch = 0; } else return -EINVAL; -- To view, visit https://gerrit.osmocom.org/3390 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icc772285636c06e1075a89809f0ac379d7a0002c Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-pcu[master]: README: Clarify that fixed allocations have been revmoved fr...
Harald Welte has submitted this change and it was merged. Change subject: README: Clarify that fixed allocations have been revmoved from 3GPP specs .. README: Clarify that fixed allocations have been revmoved from 3GPP specs In Release 5, Fixed Allocations were removed as part of a "GPRS simplification project" inside 3PGPP. This means that any MS compatible with Rel-5 or higher may not support it, which makes implementation in the PCU af historical interest only. See Tdoc GP-021277 for the actual removal, it happened at 5.0.0 time. Change-Id: I8138bc0a47d3468b67cec866447fd4b0fc69d4c5 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/README.md b/README.md index ed5ab17..65cf475 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ --- * No PFC support - * No fixed allocation support + * No fixed allocation support (was removed from 3GPP Rel >= 5 anyway) * No extended dynamic allocation support * No unacknowledged mode operation * Only single slot assignment on uplink direction -- To view, visit https://gerrit.osmocom.org/3389 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8138bc0a47d3468b67cec866447fd4b0fc69d4c5 Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-pcu[master]: README: Clarify that fixed allocations have been revmoved fr...
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3389 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8138bc0a47d3468b67cec866447fd4b0fc69d4c5 Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: gsm0480: handle USS_NOTIFY and USS_REQUEST with PROCESS_USS_REQ
Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3379 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If7cc6a966dfc17d37e22338ecc1f239f908a9f2e Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Vadim YanitskiyGerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: gsm0480: handle GSM0480_OP_CODE_PROCESS_USS_DATA
Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3380 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I470290c2b544555e53cedd849b1d6a961db7b5a4 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Vadim YanitskiyGerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: gsm0480: parse GSM0480_MTYPE_FACILITY separately
Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3377 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6e029c436a50fa8c2823ea39c5d123ee701becfa Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Vadim YanitskiyGerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: gsm0480: modify USSD structures to support external handling
Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/3374/2/include/osmocom/gsm/gsm0480.h File include/osmocom/gsm/gsm0480.h: Line 10: #define MAX_LEN_USSD_STRING182 Could we add a reference to the standard here to point at where this value is coming from? -- To view, visit https://gerrit.osmocom.org/3374 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5f8972b86cd4dcb54b643a24b5794a87c8758073 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Vadim YanitskiyGerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes
libosmocore[master]: gsm0480: handle UnstructuredSS request with DSC != 0x0F
Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3376 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I73d602f6f20b0afe7600d16bbd432069ae7be788 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Vadim YanitskiyGerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: gsm0480: refactor the parse_process_uss_req()
Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3375 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I467f75794c5ac9df75c001245b18bbdfcfaadd88 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Vadim YanitskiyGerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No