October 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: BSC: reset handover related vty cfg after ho tests

by fixeria

Attention is currently required from: osmith, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29890 ) Change subject: BSC: reset handover related vty cfg after ho tests ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8ca6909dec633f0c1f26b5e72a7cfc1931c0ec54 Gerrit-Change-Number: 29890 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Oct 2022 13:51:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-ci[master]: obs: check_builders: change expected to 17

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29897 ) Change subject: obs: check_builders: change expected to 17 ...................................................................... obs: check_builders: change expected to 17 After epyc1-obsbuild1 and epyc1-obsworker1 connected again, we have 17 workers. Related: https://obs.osmocom.org/monitor Change-Id: Iedd506601a5450550e21bf701309b4ea79a3d897 --- M scripts/obs/check_builders.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/97/29897/1 diff --git a/scripts/obs/check_builders.sh b/scripts/obs/check_builders.sh index 609c467..f5ed945 100755 --- a/scripts/obs/check_builders.sh +++ b/scripts/obs/check_builders.sh @@ -1,5 +1,5 @@ #!/bin/sh -ex -count=14 +count=17 wget -q https://obs.osmocom.org -O index.html if ! grep -q " of $count build hosts" index.html; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iedd506601a5450550e21bf701309b4ea79a3d897 Gerrit-Change-Number: 29897 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ci[master]: obs: check_builders: actually fail on error

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29898 ) Change subject: obs: check_builders: actually fail on error ...................................................................... obs: check_builders: actually fail on error Change-Id: I820bd22dcff8d8b216197b7461c1c810e09cf01d --- M scripts/obs/check_builders.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/98/29898/1 diff --git a/scripts/obs/check_builders.sh b/scripts/obs/check_builders.sh index f5ed945..07907a9 100755 --- a/scripts/obs/check_builders.sh +++ b/scripts/obs/check_builders.sh @@ -8,4 +8,5 @@ echo echo "ERROR: expected $count builders to be connected to OBS!" echo + exit 1 fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I820bd22dcff8d8b216197b7461c1c810e09cf01d Gerrit-Change-Number: 29898 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-bts[master]: pcuif_proto: cosmetic: add constant PCU_IF_NUM_NSVC and replace magic...

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/29896 ) Change subject: pcuif_proto: cosmetic: add constant PCU_IF_NUM_NSVC and replace magic numbers ...................................................................... pcuif_proto: cosmetic: add constant PCU_IF_NUM_NSVC and replace magic numbers The number of NSVCs is fixed but lets not use magic numbers to define the sizes of the arrays that hold the config values. In osmo-pcu there is already a define constant, so lets use a define here as well. Change-Id: If7fa44abb86c18900110d7ee81fe6140c8c4635b --- M include/osmo-bts/pcuif_proto.h 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/29896/1 diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index 3e6f651..a5f03e3 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -58,6 +58,8 @@ #define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ #define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ +#define PCU_IF_NUM_NSVC 2 + enum gsm_pcu_if_text_type { PCU_VERSION, PCU_OML_ALERT, @@ -169,14 +171,14 @@ uint8_t initial_cs; uint8_t initial_mcs; /* NSVC */ - uint16_t nsvci[2]; - uint16_t local_port[2]; - uint16_t remote_port[2]; - uint8_t address_type[2]; + uint16_t nsvci[PCU_IF_NUM_NSVC]; + uint16_t local_port[PCU_IF_NUM_NSVC]; + uint16_t remote_port[PCU_IF_NUM_NSVC]; + uint8_t address_type[PCU_IF_NUM_NSVC]; union { struct in_addr v4; struct in6_addr v6; - } remote_ip[2]; + } remote_ip[PCU_IF_NUM_NSVC]; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7fa44abb86c18900110d7ee81fe6140c8c4635b Gerrit-Change-Number: 29896 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-pcu[master]: Fix mess with struct tbf types passed to LOGPTBF macro

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29894 ) Change subject: Fix mess with struct tbf types passed to LOGPTBF macro ...................................................................... Fix mess with struct tbf types passed to LOGPTBF macro It is quite common in all osmo-pcu code to have to convert between parent class "tbf" and children "dl_tbf"/"ul_tbf", or other way around. This commit adds new helper static inline functions to cast between those while doing type checks. This is used by new LOGPTBFDL and LOGPTBFUL macros to now expect the proper subclass and cast securely inside the macro itself, hence sparing all code calling those macros to have to cast explicitly the pointer to the parent "tbf" class. Change-Id: I7e4489ad4b93c9c8442213947e53c10b61fdc5e9 --- M src/gprs_ms.c M src/nacc_fsm.c M src/tbf.cpp M src/tbf_dl.h M src/tbf_dl_ass_fsm.c M src/tbf_ul.h M src/tbf_ul_ack_fsm.c M src/tbf_ul_ass_fsm.c 8 files changed, 35 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/94/29894/1 diff --git a/src/gprs_ms.c b/src/gprs_ms.c index f552d93..df1c9be 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -96,7 +96,7 @@ if (tbf_state((const struct gprs_rlcmac_tbf *)dl_tbf) != TBF_ST_FLOW) return; - LOGPTBFDL((const struct gprs_rlcmac_tbf *)dl_tbf, LOGL_DEBUG, "LLC receive timeout, requesting DL ACK\n"); + LOGPTBFDL(dl_tbf, LOGL_DEBUG, "LLC receive timeout, requesting DL ACK\n"); tbf_dl_request_dl_ack(dl_tbf); } @@ -1042,7 +1042,7 @@ dl_tbf = ms_dl_tbf(ms); if (dl_tbf && tbf_state((const struct gprs_rlcmac_tbf *)dl_tbf) == TBF_ST_WAIT_RELEASE) { - LOGPTBFDL((const struct gprs_rlcmac_tbf *)dl_tbf, LOGL_DEBUG, "in WAIT RELEASE state (T3193), so reuse TBF\n"); + LOGPTBFDL(dl_tbf, LOGL_DEBUG, "in WAIT RELEASE state (T3193), so reuse TBF\n"); tbf_establish_dl_tbf_on_pacch((struct gprs_rlcmac_tbf *)dl_tbf); } diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index 2c321c7..25e7cd8 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -203,8 +203,9 @@ rate_ctr_inc(rate_ctr_group_get_ctr(bts_rate_counters(ms->bts), CTR_PKT_CELL_CHG_CONTINUE)); talloc_free(mac_control_block); tbf_set_polling(tbf, *new_poll_fn, data->ts, PDCH_ULC_POLL_CELL_CHG_CONTINUE); - LOGPTBFDL(tbf, LOGL_DEBUG, "Scheduled 'Packet Cell Change Continue' polling on PACCH (FN=%d, TS=%d)\n", - *new_poll_fn, data->ts); + LOGPTBF(tbf, LOGL_DEBUG, + "Scheduled 'Packet Cell Change Continue' polling on PACCH (FN=%d, TS=%d)\n", + *new_poll_fn, data->ts); return msg; free_ret: diff --git a/src/tbf.cpp b/src/tbf.cpp index 6598067..7094d40 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -535,7 +535,7 @@ { /* schedule polling */ if (pdch_ulc_reserve_tbf_poll(trx->pdch[ts].ulc, new_poll_fn, this, reason) < 0) - LOGPTBFDL(this, LOGL_ERROR, "Failed scheduling poll on PACCH (FN=%d, TS=%d)\n", + LOGPTBF(this, LOGL_ERROR, "Failed scheduling poll on PACCH (FN=%d, TS=%d)\n", new_poll_fn, ts); } diff --git a/src/tbf_dl.h b/src/tbf_dl.h index 620cccf..8160cf3 100644 --- a/src/tbf_dl.h +++ b/src/tbf_dl.h @@ -141,7 +141,17 @@ void tbf_dl_trigger_ass(struct gprs_rlcmac_dl_tbf *tbf, struct gprs_rlcmac_tbf *old_tbf); void tbf_dl_request_dl_ack(struct gprs_rlcmac_dl_tbf *tbf); -#define LOGPTBFDL(tbf, level, fmt, args...) LOGP(DTBFDL, level, "%s " fmt, tbf_name(tbf), ## args) +static inline struct gprs_rlcmac_tbf *dl_tbf_as_tbf(struct gprs_rlcmac_dl_tbf *dl_tbf) +{ + return (struct gprs_rlcmac_tbf *)dl_tbf; +} + +static inline const struct gprs_rlcmac_tbf *dl_tbf_as_tbf_const(const struct gprs_rlcmac_dl_tbf *dl_tbf) +{ + return (const struct gprs_rlcmac_tbf *)dl_tbf; +} + +#define LOGPTBFDL(dl_tbf, level, fmt, args...) LOGP(DTBFDL, level, "%s " fmt, tbf_name(dl_tbf_as_tbf_const(dl_tbf)), ## args) #ifdef __cplusplus } #endif diff --git a/src/tbf_dl_ass_fsm.c b/src/tbf_dl_ass_fsm.c index 9ea216c..37c5a1b 100644 --- a/src/tbf_dl_ass_fsm.c +++ b/src/tbf_dl_ass_fsm.c @@ -114,7 +114,7 @@ bts_do_rate_ctr_inc(ms->bts, CTR_PKT_DL_ASSIGNMENT); tbf_set_polling(ctx->tbf, new_poll_fn, d->ts, PDCH_ULC_POLL_DL_ASS); - LOGPTBFDL(ctx->tbf, LOGL_INFO, "Scheduled DL Assignment polling on PACCH (FN=%d, TS=%d)\n", + LOGPTBF(ctx->tbf, LOGL_INFO, "Scheduled DL Assignment polling on PACCH (FN=%d, TS=%d)\n", new_poll_fn, d->ts); talloc_free(mac_control_block); diff --git a/src/tbf_ul.h b/src/tbf_ul.h index 62b9456..d69220d 100644 --- a/src/tbf_ul.h +++ b/src/tbf_ul.h @@ -143,7 +143,17 @@ struct osmo_fsm_inst *tbf_ul_ack_fi(const struct gprs_rlcmac_ul_tbf *tbf); void ul_tbf_contention_resolution_success(struct gprs_rlcmac_ul_tbf *tbf); -#define LOGPTBFUL(tbf, level, fmt, args...) LOGP(DTBFUL, level, "%s " fmt, tbf_name(tbf), ## args) +static inline struct gprs_rlcmac_tbf *ul_tbf_as_tbf(struct gprs_rlcmac_ul_tbf *ul_tbf) +{ + return (struct gprs_rlcmac_tbf *)ul_tbf; +} + +static inline const struct gprs_rlcmac_tbf *ul_tbf_as_tbf_const(const struct gprs_rlcmac_ul_tbf *ul_tbf) +{ + return (const struct gprs_rlcmac_tbf *)ul_tbf; +} + +#define LOGPTBFUL(ul_tbf, level, fmt, args...) LOGP(DTBFUL, level, "%s " fmt, tbf_name(ul_tbf_as_tbf_const(ul_tbf)), ## args) #ifdef __cplusplus } #endif diff --git a/src/tbf_ul_ack_fsm.c b/src/tbf_ul_ack_fsm.c index 2ccc493..0faf21e 100644 --- a/src/tbf_ul_ack_fsm.c +++ b/src/tbf_ul_ack_fsm.c @@ -89,9 +89,9 @@ if (final) { tbf_set_polling(tbf, new_poll_fn, d->ts, PDCH_ULC_POLL_UL_ACK); - LOGPTBFUL(tbf, LOGL_DEBUG, - "Scheduled UL Acknowledgement polling on PACCH (FN=%d, TS=%d)\n", - new_poll_fn, d->ts); + LOGPTBF(tbf, LOGL_DEBUG, + "Scheduled UL Acknowledgement polling on PACCH (FN=%d, TS=%d)\n", + new_poll_fn, d->ts); } return msg; @@ -111,7 +111,7 @@ static void st_sched_ul_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct tbf_ul_ack_fsm_ctx *ctx = (struct tbf_ul_ack_fsm_ctx *)fi->priv; - struct gprs_rlcmac_tbf *tbf = (struct gprs_rlcmac_tbf *)ctx->tbf; + struct gprs_rlcmac_ul_tbf *tbf = ctx->tbf; struct tbf_ul_ack_ev_create_rlcmac_msg_ctx *data_ctx; bool final; @@ -122,7 +122,7 @@ break; case TBF_UL_ACK_EV_CREATE_RLCMAC_MSG: data_ctx = (struct tbf_ul_ack_ev_create_rlcmac_msg_ctx *)data; - final = tbf_state(tbf) == TBF_ST_FINISHED; + final = tbf_state(ul_tbf_as_tbf(tbf)) == TBF_ST_FINISHED; data_ctx->msg = create_ul_ack_nack(ctx, data_ctx, final); if (!data_ctx->msg) return; diff --git a/src/tbf_ul_ass_fsm.c b/src/tbf_ul_ass_fsm.c index b443e4f..ee5f681 100644 --- a/src/tbf_ul_ass_fsm.c +++ b/src/tbf_ul_ass_fsm.c @@ -129,7 +129,7 @@ bts_do_rate_ctr_inc(ms->bts, CTR_PKT_UL_ASSIGNMENT); tbf_set_polling(ctx->tbf, new_poll_fn, d->ts, PDCH_ULC_POLL_UL_ASS); - LOGPTBFUL(ctx->tbf, LOGL_INFO, "Scheduled UL Assignment polling on PACCH (FN=%d, TS=%d)\n", + LOGPTBF(ctx->tbf, LOGL_INFO, "Scheduled UL Assignment polling on PACCH (FN=%d, TS=%d)\n", new_poll_fn, d->ts); talloc_free(mac_control_block); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7e4489ad4b93c9c8442213947e53c10b61fdc5e9 Gerrit-Change-Number: 29894 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-pcu[master]: Rename as_{dl,ul}_tbf -> tbf_as_{dl,ul}_tbf

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29895 ) Change subject: Rename as_{dl,ul}_tbf -> tbf_as_{dl,ul}_tbf ...................................................................... Rename as_{dl,ul}_tbf -> tbf_as_{dl,ul}_tbf Prefix the function accordingly to specify the input object. Change-Id: I225568fe2cb5236817cdd9609354c24c66723606 --- M src/bts.cpp M src/encoding.cpp M src/gprs_ms.c M src/gprs_rlcmac_sched.cpp M src/gprs_rlcmac_ts_alloc.cpp M src/pcu_vty_functions.cpp M src/pdch.cpp M src/tbf.cpp M src/tbf_dl.cpp M src/tbf_dl.h M src/tbf_fsm.c M src/tbf_ul.cpp M src/tbf_ul.h 13 files changed, 37 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/95/29895/1 diff --git a/src/bts.cpp b/src/bts.cpp index e72f4c7..ae63a12 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -1234,7 +1234,7 @@ poll->tbf_poll.poll_tbf->direction != GPRS_RLCMAC_UL_TBF) goto no_tbf; - tbf = as_ul_tbf(poll->tbf_poll.poll_tbf); + tbf = tbf_as_ul_tbf(poll->tbf_poll.poll_tbf); /* we need to distinguish TA information provided by L1 * from PH-DATA-IND and PHY-RA-IND so that we can properly * update TA for given TBF diff --git a/src/encoding.cpp b/src/encoding.cpp index 67defec..278da72 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -506,9 +506,9 @@ /* 3GPP TS 44.018 §10.5.2.16 IA Rest Octets */ dest->cur_bit = wp; if (downlink) { - OSMO_ASSERT(as_dl_tbf(tbf) != NULL); + OSMO_ASSERT(tbf_as_dl_tbf(tbf) != NULL); - rc = write_ia_rest_downlink(as_dl_tbf(tbf), dest, polling, gsm48_ta_is_valid(ta), fn, alpha, gamma, + rc = write_ia_rest_downlink(tbf_as_dl_tbf(tbf), dest, polling, gsm48_ta_is_valid(ta), fn, alpha, gamma, ta_idx); } else if (((burst_type == GSM_L1_BURST_TYPE_ACCESS_1) || (burst_type == GSM_L1_BURST_TYPE_ACCESS_2))) { SET_L(dest); SET_H(dest); // "LH" @@ -518,8 +518,8 @@ SET_0(dest); // No < Access Technologies Request struct > - if (as_ul_tbf(tbf) != NULL) - rc = write_ia_rest_egprs_uplink_sba(as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx); + if (tbf_as_ul_tbf(tbf) != NULL) + rc = write_ia_rest_egprs_uplink_sba(tbf_as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx); else rc = write_ia_rest_egprs_uplink_mba(dest, fn, alpha, gamma); } else { @@ -528,8 +528,8 @@ SET_H(dest); SET_H(dest); // "HH" SET_0(dest); SET_0(dest); // "00" < Packet Uplink Assignment > - if (as_ul_tbf(tbf) != NULL) - rc = write_ia_rest_uplink_mba(as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx); + if (tbf_as_ul_tbf(tbf) != NULL) + rc = write_ia_rest_uplink_mba(tbf_as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx); else rc = write_ia_rest_uplink_sba(dest, fn, alpha, gamma); } diff --git a/src/gprs_ms.c b/src/gprs_ms.c index df1c9be..0ccedb3 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -344,9 +344,9 @@ void ms_attach_tbf(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf) { if (tbf_direction(tbf) == GPRS_RLCMAC_DL_TBF) - ms_attach_dl_tbf(ms, as_dl_tbf(tbf)); + ms_attach_dl_tbf(ms, tbf_as_dl_tbf(tbf)); else - ms_attach_ul_tbf(ms, as_ul_tbf(tbf)); + ms_attach_ul_tbf(ms, tbf_as_ul_tbf(tbf)); } void ms_detach_tbf(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf) diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index f5a01e9..20b4f8e 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -45,7 +45,7 @@ struct llist_item *pos; llist_for_each_entry(pos, &pdch->trx->ul_tbfs, list) { - ul_tbf = as_ul_tbf((struct gprs_rlcmac_tbf *)pos->entry); + ul_tbf = tbf_as_ul_tbf((struct gprs_rlcmac_tbf *)pos->entry); OSMO_ASSERT(ul_tbf); /* this trx, this ts */ if (!ul_tbf->is_control_ts(pdch->ts_no)) @@ -63,7 +63,7 @@ states? */ } llist_for_each_entry(pos, &pdch->trx->dl_tbfs, list) { - dl_tbf = as_dl_tbf((struct gprs_rlcmac_tbf *)pos->entry); + dl_tbf = tbf_as_dl_tbf((struct gprs_rlcmac_tbf *)pos->entry); OSMO_ASSERT(dl_tbf); /* this trx, this ts */ if (!dl_tbf->is_control_ts(pdch->ts_no)) @@ -456,8 +456,8 @@ * let's set its USF in the DL msg. This is not really needed, * but it helps understand better the flow when looking at * pcaps. */ - if (poll_tbf->direction == GPRS_RLCMAC_UL_TBF && as_ul_tbf(poll_tbf)->m_usf[ts] != USF_INVALID) - usf_tbf = as_ul_tbf(poll_tbf); + if (poll_tbf->direction == GPRS_RLCMAC_UL_TBF && tbf_as_ul_tbf(poll_tbf)->m_usf[ts] != USF_INVALID) + usf_tbf = tbf_as_ul_tbf(poll_tbf); /* else, search for uplink tbf */ } else if ((usf_tbf = sched_select_uplink(pdch, require_gprs_only))) { LOGPDCH(pdch, DRLCMACSCHED, LOGL_DEBUG, "Received RTS for PDCH: FN=%d " diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 3a60839..b5757a7 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -400,11 +400,11 @@ /* The allocation will be successful, so the system state and tbf/ms * may be modified from now on. */ if (tbf->direction == GPRS_RLCMAC_UL_TBF) { - struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf); + struct gprs_rlcmac_ul_tbf *ul_tbf = tbf_as_ul_tbf(tbf); LOGPSL(tbf, LOGL_DEBUG, "Assign uplink TS=%d TFI=%d USF=%d\n", ts, tfi, usf); assign_uplink_tbf_usf(pdch, ul_tbf, tfi, usf); } else { - struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf); + struct gprs_rlcmac_dl_tbf *dl_tbf = tbf_as_dl_tbf(tbf); LOGPSL(tbf, LOGL_DEBUG, "Assign downlink TS=%d TFI=%d\n", ts, tfi); assign_dlink_tbf(pdch, dl_tbf, tfi); } @@ -951,9 +951,9 @@ tbf->first_ts = first_ts; if (tbf->direction == GPRS_RLCMAC_DL_TBF) - assign_dl_tbf_slots(as_dl_tbf(tbf), trx, dl_slots, tfi); + assign_dl_tbf_slots(tbf_as_dl_tbf(tbf), trx, dl_slots, tfi); else - assign_ul_tbf_slots(as_ul_tbf(tbf), trx, ul_slots, tfi, usf); + assign_ul_tbf_slots(tbf_as_ul_tbf(tbf), trx, ul_slots, tfi, usf); bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_ALGO_B); diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp index 28ecebf..91f2068 100644 --- a/src/pcu_vty_functions.cpp +++ b/src/pcu_vty_functions.cpp @@ -42,8 +42,8 @@ static void tbf_print_vty_info(struct vty *vty, struct gprs_rlcmac_tbf *tbf) { - gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf); - gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf); + gprs_rlcmac_ul_tbf *ul_tbf = tbf_as_ul_tbf(tbf); + gprs_rlcmac_dl_tbf *dl_tbf = tbf_as_dl_tbf(tbf); vty_out(vty, "TBF: TFI=%d TLLI=0x%08x (%s) TA=%u DIR=%s IMSI=%s%s", tbf->tfi(), tbf->tlli(), tbf->is_tlli_valid() ? "valid" : "invalid", diff --git a/src/pdch.cpp b/src/pdch.cpp index a5eb080..4d6d8f6 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -376,7 +376,7 @@ switch (reason) { case PDCH_ULC_POLL_UL_ACK: - ul_tbf = as_ul_tbf(tbf); + ul_tbf = tbf_as_ul_tbf(tbf); OSMO_ASSERT(ul_tbf); if (!tbf_ul_ack_exp_ctrl_ack(ul_tbf, fn, ts_no)) { LOGPTBF(tbf, LOGL_NOTICE, "FN=%d, TS=%d (curr FN %d): POLL_UL_ACK not expected!\n", @@ -497,7 +497,7 @@ return; } OSMO_ASSERT(poll->tbf_poll.poll_tbf); - tbf = as_dl_tbf(poll->tbf_poll.poll_tbf); + tbf = tbf_as_dl_tbf(poll->tbf_poll.poll_tbf); if (tbf->tfi() != tfi) { LOGPTBFDL(tbf, LOGL_NOTICE, "PACKET DOWNLINK ACK with wrong TFI=%d, ignoring!\n", tfi); @@ -567,7 +567,7 @@ return; } OSMO_ASSERT(poll->tbf_poll.poll_tbf); - tbf = as_dl_tbf(poll->tbf_poll.poll_tbf); + tbf = tbf_as_dl_tbf(poll->tbf_poll.poll_tbf); if (tbf->tfi() != tfi) { LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "EGPRS PACKET DOWNLINK ACK with " "wrong TFI=%d, ignoring!\n", tfi); @@ -1099,12 +1099,12 @@ gprs_rlcmac_ul_tbf *gprs_rlcmac_pdch::ul_tbf_by_tfi(uint8_t tfi) { - return as_ul_tbf(tbf_by_tfi(tfi, GPRS_RLCMAC_UL_TBF)); + return tbf_as_ul_tbf(tbf_by_tfi(tfi, GPRS_RLCMAC_UL_TBF)); } gprs_rlcmac_dl_tbf *gprs_rlcmac_pdch::dl_tbf_by_tfi(uint8_t tfi) { - return as_dl_tbf(tbf_by_tfi(tfi, GPRS_RLCMAC_DL_TBF)); + return tbf_as_dl_tbf(tbf_by_tfi(tfi, GPRS_RLCMAC_DL_TBF)); } /* lookup TBF Entity (by TFI) */ @@ -1159,7 +1159,7 @@ num_tbfs_update(tbf, true); if (tbf->direction == GPRS_RLCMAC_UL_TBF) { - ul_tbf = as_ul_tbf(tbf); + ul_tbf = tbf_as_ul_tbf(tbf); m_assigned_usf |= 1 << ul_tbf->m_usf[ts_no]; } m_assigned_tfi[tbf->direction] |= 1UL << tbf->tfi(); @@ -1188,7 +1188,7 @@ num_tbfs_update(tbf, false); if (tbf->direction == GPRS_RLCMAC_UL_TBF) { - ul_tbf = as_ul_tbf(tbf); + ul_tbf = tbf_as_ul_tbf(tbf); m_assigned_usf &= ~(1 << ul_tbf->m_usf[ts_no]); } m_assigned_tfi[tbf->direction] &= ~(1UL << tbf->tfi()); @@ -1271,7 +1271,7 @@ * PDCH, since they have no TFI assigned (see handle_tbf_reject()). * Get rid of them too: */ llist_for_each_entry_safe(pos, pos2, &pdch->trx->ul_tbfs, list) { - struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf((struct gprs_rlcmac_tbf *)pos->entry); + struct gprs_rlcmac_ul_tbf *ul_tbf = tbf_as_ul_tbf((struct gprs_rlcmac_tbf *)pos->entry); if (ul_tbf->control_ts == pdch->ts_no) tbf_free(ul_tbf); } diff --git a/src/tbf.cpp b/src/tbf.cpp index 7094d40..4f0162e 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -268,7 +268,7 @@ if (tbf->state_is(TBF_ST_FLOW)) bts_do_rate_ctr_inc(tbf->bts, CTR_TBF_UL_ABORTED); } else { - gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf); + gprs_rlcmac_dl_tbf *dl_tbf = tbf_as_dl_tbf(tbf); gprs_rlc_dl_window *win = static_cast<gprs_rlc_dl_window *>(dl_tbf->window()); bts_do_rate_ctr_inc(tbf->bts, CTR_TBF_DL_FREED); @@ -324,7 +324,7 @@ } if (is_egprs_enabled()) { - gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(this); + gprs_rlcmac_dl_tbf *dl_tbf = tbf_as_dl_tbf(this); if (dl_tbf) dl_tbf->set_window_size(); } @@ -549,7 +549,7 @@ switch (reason) { case PDCH_ULC_POLL_UL_ACK: - ul_tbf = as_ul_tbf(this); + ul_tbf = tbf_as_ul_tbf(this); OSMO_ASSERT(ul_tbf); if (!tbf_ul_ack_exp_ctrl_ack(ul_tbf, poll_fn, pdch->ts_no)) { LOGPTBF(this, LOGL_NOTICE, "FN=%d, TS=%d (curr FN %d): POLL_UL_ACK not expected!\n", @@ -617,7 +617,7 @@ break; case PDCH_ULC_POLL_DL_ACK: - dl_tbf = as_dl_tbf(this); + dl_tbf = tbf_as_dl_tbf(this); /* POLL Timeout expecting DL ACK/NACK: implies direction == GPRS_RLCMAC_DL_TBF */ OSMO_ASSERT(dl_tbf); if (!(dl_tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK))) { @@ -741,7 +741,7 @@ osmo_fsm_inst_update_id(tbf->dl_ass_fsm.fi, buf); if (tbf_direction(tbf) == GPRS_RLCMAC_UL_TBF) { - struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf); + struct gprs_rlcmac_ul_tbf *ul_tbf = tbf_as_ul_tbf(tbf); osmo_fsm_inst_update_id(ul_tbf->ul_ack_fsm.fi, buf); } diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 9fe1bd8..a8fb6fc 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -1318,7 +1318,7 @@ } } -struct gprs_rlcmac_dl_tbf *as_dl_tbf(struct gprs_rlcmac_tbf *tbf) +struct gprs_rlcmac_dl_tbf *tbf_as_dl_tbf(struct gprs_rlcmac_tbf *tbf) { if (tbf && tbf->direction == GPRS_RLCMAC_DL_TBF) return static_cast<gprs_rlcmac_dl_tbf *>(tbf); diff --git a/src/tbf_dl.h b/src/tbf_dl.h index 8160cf3..e0daf57 100644 --- a/src/tbf_dl.h +++ b/src/tbf_dl.h @@ -130,7 +130,7 @@ struct gprs_rlcmac_dl_tbf *dl_tbf_alloc(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, int8_t use_trx, bool single_slot); -struct gprs_rlcmac_dl_tbf *as_dl_tbf(struct gprs_rlcmac_tbf *tbf); +struct gprs_rlcmac_dl_tbf *tbf_as_dl_tbf(struct gprs_rlcmac_tbf *tbf); /* dispatch Unitdata.DL messages */ int dl_tbf_handle(struct gprs_rlcmac_bts *bts, const uint32_t tlli, const uint32_t old_tlli, diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index 2189747..2b712e7 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -342,7 +342,7 @@ static void handle_timeout_X2002(struct tbf_fsm_ctx *ctx) { - struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(ctx->tbf); + struct gprs_rlcmac_dl_tbf *dl_tbf = tbf_as_dl_tbf(ctx->tbf); /* X2002 is used only for DL TBF */ OSMO_ASSERT(dl_tbf); diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index 21a7a76..3988176 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -758,7 +758,7 @@ osmo_fsm_inst_dispatch(this->state_fsm.fi, TBF_EV_MAX_N3101, NULL); } -struct gprs_rlcmac_ul_tbf *as_ul_tbf(struct gprs_rlcmac_tbf *tbf) +struct gprs_rlcmac_ul_tbf *tbf_as_ul_tbf(struct gprs_rlcmac_tbf *tbf) { if (tbf && tbf->direction == GPRS_RLCMAC_UL_TBF) return static_cast<gprs_rlcmac_ul_tbf *>(tbf); diff --git a/src/tbf_ul.h b/src/tbf_ul.h index d69220d..301c52a 100644 --- a/src/tbf_ul.h +++ b/src/tbf_ul.h @@ -137,7 +137,7 @@ #endif void update_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, int8_t ta_delta); void set_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, uint8_t ta); -struct gprs_rlcmac_ul_tbf *as_ul_tbf(struct gprs_rlcmac_tbf *tbf); +struct gprs_rlcmac_ul_tbf *tbf_as_ul_tbf(struct gprs_rlcmac_tbf *tbf); void tbf_usf_timeout(struct gprs_rlcmac_ul_tbf *tbf); bool ul_tbf_contention_resolution_done(const struct gprs_rlcmac_ul_tbf *tbf); struct osmo_fsm_inst *tbf_ul_ack_fi(const struct gprs_rlcmac_ul_tbf *tbf); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I225568fe2cb5236817cdd9609354c24c66723606 Gerrit-Change-Number: 29895 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-pcu[master]: pcuif_proto: cosmetic: rename struct member "h" to "hopping"

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29892 ) Change subject: pcuif_proto: cosmetic: rename struct member "h" to "hopping" ...................................................................... pcuif_proto: cosmetic: rename struct member "h" to "hopping" struct gsm_pcu_if_info_ts has a struct member "h", which controls frequency hopping. This struct member is named "hopping" in osmo-bts, so lets rename it here as well to be consistent. Change-Id: I3156b39cc91da07ee3f97e8c8be60fc989cf112b --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/92/29892/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index 8e40a27..bb1f834 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -128,7 +128,7 @@ struct gsm_pcu_if_info_ts { uint8_t tsc; - uint8_t h; + uint8_t hopping; uint8_t hsn; uint8_t maio; uint8_t ma_bit_len; diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index f964b78..c1271a4 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -880,7 +880,7 @@ pdch->tsc = its->tsc; /* (Optional) frequency hopping parameters */ - if (its->h) { + if (its->hopping) { pdch->fh.enabled = true; pdch->fh.maio = its->maio; pdch->fh.hsn = its->hsn; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3156b39cc91da07ee3f97e8c8be60fc989cf112b Gerrit-Change-Number: 29892 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-pcu[master]: pcuif_proto: cosmetic: rename gsm_pcu_if_info_ts to gsm_pcu_if_info_t...

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29893 ) Change subject: pcuif_proto: cosmetic: rename gsm_pcu_if_info_ts to gsm_pcu_if_info_trx_ts ...................................................................... pcuif_proto: cosmetic: rename gsm_pcu_if_info_ts to gsm_pcu_if_info_trx_ts The struct gsm_pcu_if_info_ts is named "gsm_pcu_if_info_trx_ts" in osmo-bts. Lets rename it since the definition in osmo-bts is newer. Change-Id: If8b50181d3b609612aa8433b635052aadddd3484 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/93/29893/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index bb1f834..5084cb8 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -126,7 +126,7 @@ uint8_t ts_nr; } __attribute__ ((packed)); -struct gsm_pcu_if_info_ts { +struct gsm_pcu_if_info_trx_ts { uint8_t tsc; uint8_t hopping; uint8_t hsn; @@ -140,7 +140,7 @@ uint8_t pdch_mask; /* PDCH timeslot mask */ uint8_t spare; uint32_t hlayer1; - struct gsm_pcu_if_info_ts ts[8]; /* timeslots per TRX */ + struct gsm_pcu_if_info_trx_ts ts[8]; } __attribute__ ((packed)); struct gsm_pcu_if_info_ind { diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index c1271a4..810ce85 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -862,7 +862,7 @@ } for (ts_nr = 0; ts_nr < ARRAY_SIZE(bts->trx[0].pdch); ts_nr++) { - const struct gsm_pcu_if_info_ts *its = &info_ind->trx[trx_nr].ts[ts_nr]; + const struct gsm_pcu_if_info_trx_ts *its = &info_ind->trx[trx_nr].ts[ts_nr]; struct gprs_rlcmac_pdch *pdch = &bts->trx[trx_nr].pdch[ts_nr]; if ((info_ind->trx[trx_nr].pdch_mask & (1 << ts_nr))) { /* FIXME: activate dynamically at RLCMAC */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If8b50181d3b609612aa8433b635052aadddd3484 Gerrit-Change-Number: 29893 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC: increase BSSMAP RESET-ACK timeout

by osmith

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29891 ) Change subject: BSC: increase BSSMAP RESET-ACK timeout ...................................................................... Abandoned should look into why this happens instead, see Harald's comment -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I76fa91280472b87235cf985af68bc2a6183d5e4a Gerrit-Change-Number: 29891 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: abandon

2 years, 8 months

1
0
0 0

Change in osmo-pcu[master]: tbf_dl: Make dl_tbf_alloc API available in C code

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29889 ) Change subject: tbf_dl: Make dl_tbf_alloc API available in C code ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib586894bc5834c33d38d23b7194f6dfadf9bc375 Gerrit-Change-Number: 29889 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Oct 2022 13:13:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022