fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32301 ) Change subject: trxcon/l1sched: rename l1sched[_lchan]_prim_drop() ...................................................................... trxcon/l1sched: rename l1sched[_lchan]_prim_drop() Make it clear that this function operates on a logical channel. Also take a chance to remove redundant comments and ws. Change-Id: I0517bba2be5403d437d3879b2332196d872e11f2 Related: OS#5500 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_lchan_pdtch.c M src/host/trxcon/src/sched_lchan_rach.c M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c M src/host/trxcon/src/sched_lchan_xcch.c M src/host/trxcon/src/sched_prim.c M src/host/trxcon/src/sched_trx.c 8 files changed, 34 insertions(+), 41 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 350294d..f9894a1 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -480,7 +480,7 @@ struct l1sched_ts_prim *l1sched_prim_dequeue(struct llist_head *queue, uint32_t fn, struct l1sched_lchan_state *lchan); int l1sched_prim_dummy(struct l1sched_lchan_state *lchan); -void l1sched_prim_drop(struct l1sched_lchan_state *lchan); +void l1sched_lchan_prim_drop(struct l1sched_lchan_state *lchan); void l1sched_prim_flush_queue(struct llist_head *list); int l1sched_handle_rx_burst(struct l1sched_state *sched, diff --git a/src/host/trxcon/src/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c index a518d72..722800f 100644 --- a/src/host/trxcon/src/sched_lchan_pdtch.c +++ b/src/host/trxcon/src/sched_lchan_pdtch.c @@ -129,10 +129,7 @@ LOGP_LCHAND(lchan, LOGL_ERROR, "Failed to encode L2 payload (len=%zu): %s\n", lchan->prim->payload_len, osmo_hexdump(lchan->prim->payload, lchan->prim->payload_len)); - - /* Forget this primitive */ - l1sched_prim_drop(lchan); - + l1sched_lchan_prim_drop(lchan); return -EINVAL; } @@ -162,7 +159,7 @@ l1sched_handle_data_cnf(lchan, br->fn, L1SCHED_DT_PACKET_DATA); /* Forget processed primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); /* Reset mask */ *mask = 0x00; diff --git a/src/host/trxcon/src/sched_lchan_rach.c b/src/host/trxcon/src/sched_lchan_rach.c index e59c97d..7448d83 100644 --- a/src/host/trxcon/src/sched_lchan_rach.c +++ b/src/host/trxcon/src/sched_lchan_rach.c @@ -90,9 +90,7 @@ LOGP_LCHAND(lchan, LOGL_ERROR, "Unknown RACH synch. sequence=0x%02x\n", rach->synch_seq); - - /* Forget this primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); return -ENOTSUP; } @@ -102,9 +100,7 @@ LOGP_LCHAND(lchan, LOGL_ERROR, "Could not encode 11-bit RACH burst (ra=%u bsic=%u)\n", rach->ra, bsic); - - /* Forget this primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); return rc; } } else if (L1SCHED_PRIM_IS_RACH8(lchan->prim)) { @@ -116,16 +112,14 @@ LOGP_LCHAND(lchan, LOGL_ERROR, "Could not encode RACH burst (ra=%u bsic=%u)\n", rach->ra, bsic); - - /* Forget this primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); return rc; } } else { LOGP_LCHAND(lchan, LOGL_ERROR, "Primitive has unexpected type=0x%02x\n", lchan->prim->type); - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); return -EINVAL; } @@ -154,7 +148,7 @@ l1sched_handle_data_cnf(lchan, br->fn, L1SCHED_DT_OTHER); /* Forget processed primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); return 0; } diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index af7695b..8cb996b 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -309,16 +309,14 @@ LOGP_LCHAND(lchan, LOGL_ERROR, "Invalid TCH mode: %u, dropping frame...\n", lchan->tch_mode); - /* Forget this primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); return -EINVAL; } if (lchan->prim->payload_len != l2_len) { LOGP_LCHAND(lchan, LOGL_ERROR, "Primitive has odd length %zu " "(expected %zu for TCH or %u for FACCH), so dropping...\n", lchan->prim->payload_len, l2_len, GSM_MACBLOCK_LEN); - - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); return -EINVAL; } rc = gsm0503_tch_fr_encode(buffer, lchan->prim->payload, l2_len, 1); @@ -329,8 +327,7 @@ lchan->prim->payload_len, osmo_hexdump(lchan->prim->payload, lchan->prim->payload_len)); free_bad_msg: - /* Forget this primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); return -EINVAL; } @@ -362,7 +359,7 @@ l1sched_handle_data_cnf(lchan, br->fn, dt); /* Forget processed primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); /* Reset mask */ *mask = 0x00; diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index bebd6e3..7302351 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -529,16 +529,14 @@ LOGP_LCHAND(lchan, LOGL_ERROR, "Invalid TCH mode: %u, dropping frame...\n", lchan->tch_mode); - /* Forget this primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); return -EINVAL; } if (lchan->prim->payload_len != l2_len) { LOGP_LCHAND(lchan, LOGL_ERROR, "Primitive has odd length %zu " "(expected %zu for TCH or %u for FACCH), so dropping...\n", lchan->prim->payload_len, l2_len, GSM_MACBLOCK_LEN); - /* Forget this primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); return -EINVAL; } rc = gsm0503_tch_hr_encode(buffer, lchan->prim->payload, l2_len); @@ -549,8 +547,7 @@ lchan->prim->payload_len, osmo_hexdump(lchan->prim->payload, lchan->prim->payload_len)); free_bad_msg: - /* Forget this primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); return -EINVAL; } @@ -590,7 +587,7 @@ } /* Forget processed primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); } return 0; diff --git a/src/host/trxcon/src/sched_lchan_xcch.c b/src/host/trxcon/src/sched_lchan_xcch.c index 0f47ffe..936a899 100644 --- a/src/host/trxcon/src/sched_lchan_xcch.c +++ b/src/host/trxcon/src/sched_lchan_xcch.c @@ -124,8 +124,7 @@ LOGP_LCHAND(lchan, LOGL_ERROR, "Primitive has odd length %zu (expected %u), so dropping...\n", lchan->prim->payload_len, GSM_MACBLOCK_LEN); - - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); return -EINVAL; } @@ -135,10 +134,7 @@ LOGP_LCHAND(lchan, LOGL_ERROR, "Failed to encode L2 payload (len=%zu): %s\n", lchan->prim->payload_len, osmo_hexdump(lchan->prim->payload, lchan->prim->payload_len)); - - /* Forget this primitive */ - l1sched_prim_drop(lchan); - + l1sched_lchan_prim_drop(lchan); return -EINVAL; } @@ -168,7 +164,7 @@ l1sched_handle_data_cnf(lchan, br->fn, L1SCHED_DT_SIGNALING); /* Forget processed primitive */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); /* Reset mask */ *mask = 0x00; diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index 99c4d82..b7ebdeb 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -466,9 +466,8 @@ * * @param lchan a logical channel to drop prim from */ -void l1sched_prim_drop(struct l1sched_lchan_state *lchan) +void l1sched_lchan_prim_drop(struct l1sched_lchan_state *lchan) { - /* Forget this primitive */ talloc_free(lchan->prim); lchan->prim = NULL; } diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index ac55f92..be4331b 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -544,7 +544,7 @@ lchan->tx_bursts = NULL; /* Forget the current prim */ - l1sched_prim_drop(lchan); + l1sched_lchan_prim_drop(lchan); /* Channel specific stuff */ if (L1SCHED_CHAN_IS_TCH(lchan->type)) { -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0517bba2be5403d437d3879b2332196d872e11f2 Gerrit-Change-Number: 32301 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: msuraev <msuraev@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged