- gerrit-log - lists.osmocom.org

[M] Change in osmocom-bb[master]: l1gprs: implement UL BLOCK.cnf (L1CTL_GPRS_UL_BLOCK_CNF)
by pespin 02 Feb '24

02 Feb '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35777?usp=email ) Change subject: l1gprs: implement UL BLOCK.cnf (L1CTL_GPRS_UL_BLOCK_CNF) ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/shared/l1gprs.c: https://gerrit.osmocom.org/c/osmocom-bb/+/35777/comment/87c36d10_b4f465eb PS1, Line 690: /* TODO: include the block data? */ yeah that would be great. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35777?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I56e0b5631c7446390adbfc5664e56f56ebb88cc1 Gerrit-Change-Number: 35777 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Feb 2024 12:03:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: l1gprs: minor changes to l1gprs_handle_rts_ind()
by pespin 02 Feb '24

02 Feb '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35776?usp=email ) Change subject: l1gprs: minor changes to l1gprs_handle_rts_ind() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35776?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie74d1c4123715d61875c4c956eb4a1ce97ed5f24 Gerrit-Change-Number: 35776 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Feb 2024 12:01:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: l1gprs: implement UL BLOCK.cnf (L1CTL_GPRS_UL_BLOCK_CNF)
by fixeria 02 Feb '24

02 Feb '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35777?usp=email ) Change subject: l1gprs: implement UL BLOCK.cnf (L1CTL_GPRS_UL_BLOCK_CNF) ...................................................................... l1gprs: implement UL BLOCK.cnf (L1CTL_GPRS_UL_BLOCK_CNF) Change-Id: I56e0b5631c7446390adbfc5664e56f56ebb88cc1 --- M include/l1ctl_proto.h M include/l1gprs.h M src/shared/l1gprs.c 3 files changed, 55 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/77/35777/1 diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index 941a947..ab98b09 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -60,6 +60,7 @@ /* Extended (11-bit) RACH (see 3GPP TS 05.02, section 5.2.7) */ L1CTL_EXT_RACH_REQ = 0x24, L1CTL_GPRS_RTS_IND = 0x25, + L1CTL_GPRS_UL_BLOCK_CNF = 0x26, }; enum ccch_mode { @@ -401,4 +402,10 @@ uint8_t usf; } __attribute__((packed)); +/* payload of L1CTL_GPRS_UL_BLOCK_CNF */ +struct l1ctl_gprs_ul_block_cnf { + uint32_t fn; + uint8_t tn; +} __attribute__((packed)); + #endif /* __L1CTL_PROTO_H__ */ diff --git a/include/l1gprs.h b/include/l1gprs.h index 57380d3..1c77525 100644 --- a/include/l1gprs.h +++ b/include/l1gprs.h @@ -111,6 +111,8 @@ int l1gprs_handle_ul_block_req(struct l1gprs_state *gprs, struct l1gprs_prim_ul_block_req *req, const struct msgb *msg); +struct msgb *l1gprs_handle_ul_block_cnf(struct l1gprs_state *gprs, + uint32_t fn, uint8_t tn); struct msgb *l1gprs_handle_dl_block_ind(struct l1gprs_state *gprs, const struct l1gprs_prim_dl_block_ind *ind, uint8_t *usf); struct msgb *l1gprs_handle_rts_ind(struct l1gprs_state *gprs, uint32_t fn, uint8_t tn, uint8_t usf); diff --git a/src/shared/l1gprs.c b/src/shared/l1gprs.c index 1da2276..d93a149 100644 --- a/src/shared/l1gprs.c +++ b/src/shared/l1gprs.c @@ -1,7 +1,7 @@ /* * l1gprs - GPRS layer 1 implementation * - * (C) 2022-2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * (C) 2022-2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> * * All Rights Reserved @@ -656,6 +656,42 @@ return 0; } +struct msgb *l1gprs_handle_ul_block_cnf(struct l1gprs_state *gprs, + uint32_t fn, uint8_t tn) +{ + const struct l1gprs_pdch *pdch = NULL; + struct l1ctl_gprs_ul_block_cnf *l1bc; + struct msgb *msg; + + OSMO_ASSERT(tn < ARRAY_SIZE(gprs->pdch)); + pdch = &gprs->pdch[tn]; + + LOGP_PDCH(pdch, LOGL_DEBUG, "Rx UL BLOCK.cnf (fn=%u)\n", fn); + + if (pdch->ul_tbf_count + pdch->dl_tbf_count == 0) { + LOGP_PDCH(pdch, LOGL_ERROR, + "Rx UL BLOCK.cnf (fn=%u), but this PDCH has no active TBFs\n", + fn); + return NULL; + } + + msg = l1gprs_l1ctl_msgb_alloc(L1CTL_GPRS_UL_BLOCK_CNF); + if (OSMO_UNLIKELY(msg == NULL)) { + LOGP_GPRS(gprs, LOGL_ERROR, "l1gprs_l1ctl_msgb_alloc() failed\n"); + return NULL; + } + + l1bc = (void *)msgb_put(msg, sizeof(*l1bc)); + *l1bc = (struct l1ctl_gprs_ul_block_cnf) { + .fn = htonl(fn), + .tn = tn, + }; + + /* TODO: include the block data? */ + + return msg; +} + /* Check if a Downlink block is a PTCCH/D (see 3GPP TS 45.002, table 6) */ #define BLOCK_IND_IS_PTCCH(ind) \ (((ind)->hdr.fn % 104) == 12) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35777?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I56e0b5631c7446390adbfc5664e56f56ebb88cc1 Gerrit-Change-Number: 35777 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: trigger sending UL BLOCK.cnf for PDTCH
by fixeria 02 Feb '24

02 Feb '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35778?usp=email ) Change subject: trxcon/l1sched: trigger sending UL BLOCK.cnf for PDTCH ...................................................................... trxcon/l1sched: trigger sending UL BLOCK.cnf for PDTCH In tx_pdtch_fn(), delay sending DATA.cnf until bid=3. Otherwise we send it too early (at bid=0) and trick the upper layers (RLC/MAC) to believe that the whole block (all bursts) has been transmitted. Change-Id: If32fafeef0ea347ed3800e6b67349bf12e66047f --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_lchan_pdtch.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 34 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/78/35778/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 3f5e8b0..6c5a31e 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -223,6 +223,8 @@ /*! Queue of Tx primitives */ struct llist_head tx_prims; + /*! Tx primitive being sent */ + struct msgb *prim; /*! Mode for TCH channels (see GSM48_CMODE_*) */ uint8_t tch_mode; diff --git a/src/host/trxcon/src/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c index 4c49504..e5bf18b 100644 --- a/src/host/trxcon/src/sched_lchan_pdtch.c +++ b/src/host/trxcon/src/sched_lchan_pdtch.c @@ -160,8 +160,8 @@ return -EINVAL; } - /* Confirm data / traffic sending (pass ownership of the msgb/prim) */ - l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + /* Cache the prim, so that we can confirm it later (see below) */ + lchan->prim = msg; send_burst: /* Determine which burst should be sent */ @@ -183,5 +183,12 @@ LOGP_LCHAND(lchan, LOGL_DEBUG, "Scheduled at fn=%u burst=%u\n", br->fn, br->bid); + /* Confirm data / traffic sending (pass ownership of the msgb/prim) */ + if (br->bid == 3 && lchan->prim != NULL) { + l1sched_lchan_emit_data_cnf(lchan, lchan->prim, + GSM_TDMA_FN_SUB(br->fn, 3)); + lchan->prim = NULL; + } + return 0; } diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index f6c9a05..6523a85 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -610,6 +610,16 @@ l1sched_prim_from_user(trxcon->sched, msg); break; } + case TRXCON_EV_TX_DATA_CNF: + { + const struct trxcon_param_tx_data_cnf *cnf = data; + struct msgb *msg; + + msg = l1gprs_handle_ul_block_cnf(trxcon->gprs, cnf->frame_nr, cnf->chan_nr & 0x07); + if (msg != NULL) + trxcon_l1ctl_send(trxcon, msg); + break; + } case TRXCON_EV_RX_DATA_IND: { const struct trxcon_param_rx_data_ind *ind = data; @@ -655,8 +665,6 @@ l1sched_reset(trxcon->sched, false); /* TODO: switch to (not implemented) TRXCON_ST_DCH_TUNING? */ break; - case TRXCON_EV_TX_DATA_CNF: - break; default: OSMO_ASSERT(0); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35778?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If32fafeef0ea347ed3800e6b67349bf12e66047f Gerrit-Change-Number: 35778 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: layer23: cosmetic: clarify GPRS related L1CTL logging
by fixeria 02 Feb '24

02 Feb '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35779?usp=email ) Change subject: layer23: cosmetic: clarify GPRS related L1CTL logging ...................................................................... layer23: cosmetic: clarify GPRS related L1CTL logging Change-Id: Idcde85c132a52b7bc6c3f2f58c2eac0a509b7b43 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/35779/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 349f048..a0f25b8 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -983,7 +983,7 @@ rxlev2dbm(ind->meas.rx_lev), 0, msgb_l2(msg), msgb_l2len(msg)); - DEBUGP(DL1C, "Rx GPRS DL block (fn=%u, tn=%u, len=%u): %s\n", + DEBUGP(DL1C, "Rx GPRS DL BLOCK.ind (fn=%u, tn=%u, len=%u): %s\n", fn, ind->hdr.tn, msgb_l2len(msg), msgb_hexdump_l2(msg)); /* distribute or drop */ @@ -1012,7 +1012,7 @@ return -EINVAL; } - DEBUGP(DL1C, "Rx RTS.ind (fn=%u, tn=%u, usf=%u)\n", + DEBUGP(DL1C, "Rx GPRS RTS.ind (fn=%u, tn=%u, usf=%u)\n", ntohl(ind->fn), ind->tn, ind->usf); /* distribute or drop */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35779?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idcde85c132a52b7bc6c3f2f58c2eac0a509b7b43 Gerrit-Change-Number: 35779 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: l1gprs: minor changes to l1gprs_handle_rts_ind()
by fixeria 02 Feb '24

02 Feb '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35776?usp=email ) Change subject: l1gprs: minor changes to l1gprs_handle_rts_ind() ...................................................................... l1gprs: minor changes to l1gprs_handle_rts_ind() * assert() the given TDMA Tn before accessing gprs->pdch[] * do not check TDMA Fn, as there can be no RTS.ind for PTCCH/U ** unlike PTCCH/D, we send Access Bursts on PTCCH/U Change-Id: Ie74d1c4123715d61875c4c956eb4a1ce97ed5f24 --- M src/shared/l1gprs.c 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/76/35776/1 diff --git a/src/shared/l1gprs.c b/src/shared/l1gprs.c index 3294a42..1da2276 100644 --- a/src/shared/l1gprs.c +++ b/src/shared/l1gprs.c @@ -754,11 +754,11 @@ struct l1ctl_gprs_rts_ind *l1bi; struct msgb *msg; + OSMO_ASSERT(tn < ARRAY_SIZE(gprs->pdch)); pdch = &gprs->pdch[tn]; LOGP_PDCH(pdch, LOGL_DEBUG, - "Rx RTS.ind (%s, fn=%u, usf=%u)\n", - ((fn % 104) == 12) ? "PTCCH" : "PDTCH", + "Rx RTS.ind (PDTCH, fn=%u, usf=%u)\n", fn, usf); l1gprs_check_pending_tbfs(gprs, fn); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35776?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie74d1c4123715d61875c4c956eb4a1ce97ed5f24 Gerrit-Change-Number: 35776 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmocom-bb[master]: layer23/modem: handle and forward L1CTL UL BLOCK.cnf
by fixeria 02 Feb '24

02 Feb '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35780?usp=email ) Change subject: layer23/modem: handle and forward L1CTL UL BLOCK.cnf ...................................................................... layer23/modem: handle and forward L1CTL UL BLOCK.cnf Change-Id: I9255ac17529b5ac260f9a0f141f3af6b3b72a802 Depends: libosmo-gprs.git I145b9586f83ae0235b4648916bd44996e8dc57f0 --- M src/host/layer23/include/osmocom/bb/common/ms.h M src/host/layer23/include/osmocom/bb/modem/grr.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/modem/grr.c M src/host/layer23/src/modem/rlcmac.c 5 files changed, 68 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/80/35780/1 diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h index 0b3e13c..36d3e3b 100644 --- a/src/host/layer23/include/osmocom/bb/common/ms.h +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -42,6 +42,7 @@ struct osmol1_entity { int (*l1_traffic_ind)(struct osmocom_ms *ms, struct msgb *msg); + int (*l1_gprs_ul_block_cnf)(struct osmocom_ms *ms, struct msgb *msg); int (*l1_gprs_dl_block_ind)(struct osmocom_ms *ms, struct msgb *msg); int (*l1_gprs_rts_ind)(struct osmocom_ms *ms, struct msgb *msg); }; diff --git a/src/host/layer23/include/osmocom/bb/modem/grr.h b/src/host/layer23/include/osmocom/bb/modem/grr.h index 99800ad..a86a089 100644 --- a/src/host/layer23/include/osmocom/bb/modem/grr.h +++ b/src/host/layer23/include/osmocom/bb/modem/grr.h @@ -25,6 +25,7 @@ GRR_EV_PDCH_UL_TBF_CFG_REQ, GRR_EV_PDCH_DL_TBF_CFG_REQ, GRR_EV_PDCH_BLOCK_REQ, + GRR_EV_PDCH_BLOCK_CNF, GRR_EV_PDCH_BLOCK_IND, GRR_EV_PDCH_RTS_IND, }; diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index a0f25b8..db2903c 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -949,6 +949,34 @@ return 0; } +/* Receive L1CTL_GPRS_UL_BLOCK_CNF */ +static int rx_l1_gprs_ul_block_cnf(struct osmocom_ms *ms, struct msgb *msg) +{ + const struct l1ctl_gprs_ul_block_cnf *cnf = (void *)msg->l1h; + + if (msgb_l1len(msg) < sizeof(*cnf)) { + LOGP(DL1C, LOGL_ERROR, + "Rx malformed GPRS UL BLOCK.cnf (len=%u < %zu)\n", + msgb_l1len(msg), sizeof(*cnf)); + return -EINVAL; + } + if (OSMO_UNLIKELY(cnf->tn >= 8)) { + LOGP(DL1C, LOGL_ERROR, + "Rx malformed GPRS UL BLOCK.cnf (tn=%u)\n", cnf->tn); + return -EINVAL; + } + + DEBUGP(DL1C, "Rx GPRS UL BLOCK.cnf (fn=%u, tn=%u)\n", + ntohl(cnf->fn), cnf->tn); + + /* distribute or drop */ + if (ms->l1_entity.l1_gprs_ul_block_cnf) + return ms->l1_entity.l1_gprs_ul_block_cnf(ms, msg); + + msgb_free(msg); + return 0; +} + /* Receive L1CTL_GPRS_DL_BLOCK_IND */ static int rx_l1_gprs_dl_block_ind(struct osmocom_ms *ms, struct msgb *msg) { @@ -1171,6 +1199,9 @@ case L1CTL_TRAFFIC_CONF: msgb_free(msg); break; + case L1CTL_GPRS_UL_BLOCK_CNF: + rc = rx_l1_gprs_ul_block_cnf(ms, msg); + break; case L1CTL_GPRS_DL_BLOCK_IND: rc = rx_l1_gprs_dl_block_ind(ms, msg); break; diff --git a/src/host/layer23/src/modem/grr.c b/src/host/layer23/src/modem/grr.c index cbabdc9..0953a2b 100644 --- a/src/host/layer23/src/modem/grr.c +++ b/src/host/layer23/src/modem/grr.c @@ -521,6 +521,16 @@ osmo_fsm_inst_state_chg(fi, GRR_ST_PACKET_TRANSFER, 0, 0); } +static void handle_pdch_block_cnf(struct osmocom_ms *ms, struct msgb *msg) +{ + const struct l1ctl_gprs_ul_block_cnf *cnf = (void *)msg->l1h; + const uint32_t fn = osmo_load32be(&cnf->fn); + struct osmo_gprs_rlcmac_prim *prim; + + prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_data_cnf(cnf->tn, fn, NULL, 0); /* XXX */ + osmo_gprs_rlcmac_prim_lower_up(prim); +} + static void handle_pdch_block_ind(struct osmocom_ms *ms, struct msgb *msg) { const struct l1ctl_gprs_dl_block_ind *ind = (void *)msg->l1h; @@ -753,6 +763,9 @@ lp->pdch_data_req.data_len); break; } + case GRR_EV_PDCH_BLOCK_CNF: + handle_pdch_block_cnf(ms, (struct msgb *)data); + break; case GRR_EV_PDCH_BLOCK_IND: handle_pdch_block_ind(ms, (struct msgb *)data); break; @@ -819,6 +832,7 @@ .in_event_mask = S(GRR_EV_PDCH_UL_TBF_CFG_REQ) | S(GRR_EV_PDCH_DL_TBF_CFG_REQ) | S(GRR_EV_PDCH_BLOCK_REQ) + | S(GRR_EV_PDCH_BLOCK_CNF) | S(GRR_EV_PDCH_BLOCK_IND) | S(GRR_EV_PDCH_RTS_IND) | S(GRR_EV_PDCH_RELEASE_REQ), @@ -838,6 +852,7 @@ OSMO_VALUE_STRING(GRR_EV_PDCH_UL_TBF_CFG_REQ), OSMO_VALUE_STRING(GRR_EV_PDCH_DL_TBF_CFG_REQ), OSMO_VALUE_STRING(GRR_EV_PDCH_BLOCK_REQ), + OSMO_VALUE_STRING(GRR_EV_PDCH_BLOCK_CNF), OSMO_VALUE_STRING(GRR_EV_PDCH_BLOCK_IND), OSMO_VALUE_STRING(GRR_EV_PDCH_RTS_IND), { 0, NULL } diff --git a/src/host/layer23/src/modem/rlcmac.c b/src/host/layer23/src/modem/rlcmac.c index a9588f7..7f7b566 100644 --- a/src/host/layer23/src/modem/rlcmac.c +++ b/src/host/layer23/src/modem/rlcmac.c @@ -162,12 +162,17 @@ } } -static int l1ctl_dl_block_cb(struct osmocom_ms *ms, struct msgb *msg) +static int l1ctl_ul_block_cnf_cb(struct osmocom_ms *ms, struct msgb *msg) +{ + return osmo_fsm_inst_dispatch(ms->grr_fi, GRR_EV_PDCH_BLOCK_CNF, msg); +} + +static int l1ctl_dl_block_ind_cb(struct osmocom_ms *ms, struct msgb *msg) { return osmo_fsm_inst_dispatch(ms->grr_fi, GRR_EV_PDCH_BLOCK_IND, msg); } -static int l1ctl_rts_cb(struct osmocom_ms *ms, struct msgb *msg) +static int l1ctl_rts_ind_cb(struct osmocom_ms *ms, struct msgb *msg) { return osmo_fsm_inst_dispatch(ms->grr_fi, GRR_EV_PDCH_RTS_IND, msg); } @@ -186,8 +191,9 @@ osmo_gprs_rlcmac_prim_set_up_cb(modem_rlcmac_prim_up_cb, ms); osmo_gprs_rlcmac_prim_set_down_cb(modem_rlcmac_prim_down_cb, ms); - ms->l1_entity.l1_gprs_dl_block_ind = &l1ctl_dl_block_cb; - ms->l1_entity.l1_gprs_rts_ind = &l1ctl_rts_cb; + ms->l1_entity.l1_gprs_ul_block_cnf = &l1ctl_ul_block_cnf_cb; + ms->l1_entity.l1_gprs_dl_block_ind = &l1ctl_dl_block_ind_cb; + ms->l1_entity.l1_gprs_rts_ind = &l1ctl_rts_ind_cb; return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35780?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9255ac17529b5ac260f9a0f141f3af6b3b72a802 Gerrit-Change-Number: 35780 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-gprs[master]: rlcmac: add definition for OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Cnf
by pespin 01 Feb '24

01 Feb '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35774?usp=email ) Change subject: rlcmac: add definition for OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Cnf ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: we still need a bool in PDCH_DATA.req to enable receiving a confirmation. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35774?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I145b9586f83ae0235b4648916bd44996e8dc57f0 Gerrit-Change-Number: 35774 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 01 Feb 2024 22:47:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: add definition for OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Cnf
by pespin 01 Feb '24

01 Feb '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35774?usp=email ) Change subject: rlcmac: add definition for OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Cnf ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35774?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I145b9586f83ae0235b4648916bd44996e8dc57f0 Gerrit-Change-Number: 35774 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 01 Feb 2024 22:46:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: add definition for OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Cnf
by fixeria 01 Feb '24

01 Feb '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35774?usp=email ) Change subject: rlcmac: add definition for OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Cnf ...................................................................... rlcmac: add definition for OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Cnf Change-Id: I145b9586f83ae0235b4648916bd44996e8dc57f0 --- M include/osmocom/gprs/rlcmac/rlcmac_prim.h M src/rlcmac/rlcmac_prim.c 2 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/74/35774/1 diff --git a/include/osmocom/gprs/rlcmac/rlcmac_prim.h b/include/osmocom/gprs/rlcmac/rlcmac_prim.h index d6f733e..8791d97 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac_prim.h +++ b/include/osmocom/gprs/rlcmac/rlcmac_prim.h @@ -149,6 +149,13 @@ uint8_t data_len; uint8_t *data; } pdch_data_req; + /* OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Cnf */ + struct { + uint32_t fn; + uint8_t ts_nr; + uint8_t data_len; + uint8_t *data; + } pdch_data_cnf; /* OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Ind */ struct { uint32_t fn; @@ -234,6 +241,8 @@ struct osmo_gprs_rlcmac_prim *osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_data_ind(uint8_t ts_nr, uint32_t fn, uint8_t rx_lev, uint16_t ber10k, int16_t ci_cb, uint8_t *data, uint8_t data_len); +struct osmo_gprs_rlcmac_prim *osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_data_cnf(uint8_t ts_nr, uint32_t fn, + uint8_t *data, uint8_t data_len); struct osmo_gprs_rlcmac_prim *osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_rts_ind(uint8_t ts_nr, uint32_t fn, uint8_t usf); struct osmo_gprs_rlcmac_prim *gprs_rlcmac_prim_alloc_l1ctl_pdch_est_req(uint8_t ts_nr, uint8_t tsc, uint8_t ta); struct osmo_gprs_rlcmac_prim *gprs_rlcmac_prim_alloc_l1ctl_pdch_rel_req(void); diff --git a/src/rlcmac/rlcmac_prim.c b/src/rlcmac/rlcmac_prim.c index f5c171a..b8518c0 100644 --- a/src/rlcmac/rlcmac_prim.c +++ b/src/rlcmac/rlcmac_prim.c @@ -280,6 +280,19 @@ return rlcmac_prim; } +/* L1CTL-PDCH_DATA.cnf */ +struct osmo_gprs_rlcmac_prim *gprs_rlcmac_prim_alloc_l1ctl_pdch_data_cnf(uint8_t ts_nr, uint32_t fn, + uint8_t *data, uint8_t data_len) +{ + struct osmo_gprs_rlcmac_prim *rlcmac_prim; + rlcmac_prim = rlcmac_prim_l1ctl_alloc(OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA, PRIM_OP_CONFIRM, 0); + rlcmac_prim->l1ctl.pdch_data_cnf.fn = fn; + rlcmac_prim->l1ctl.pdch_data_cnf.ts_nr = ts_nr; + rlcmac_prim->l1ctl.pdch_data_ind.data_len = data_len; + rlcmac_prim->l1ctl.pdch_data_ind.data = data; + return rlcmac_prim; +} + /* L1CTL-PDCH_DATA.ind */ struct osmo_gprs_rlcmac_prim *osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_data_ind(uint8_t ts_nr, uint32_t fn, uint8_t rx_lev, uint16_t ber10k, int16_t ci_cb, uint8_t *data, uint8_t data_len) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35774?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I145b9586f83ae0235b4648916bd44996e8dc57f0 Gerrit-Change-Number: 35774 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log