diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2023-02-07 10:00:28 +0100 |
|---|---|---|
| committer | pespin <pespin@sysmocom.de> | 2023-02-27 14:50:56 +0000 |
| commit | 35f93ac454552d676e9fc6dd61e46953686369d4 (patch) | |
| tree | baf681e7f44e3b8b2364dc3f0cf19c3252aa3789 | |
| parent | 0fb9853582df5cf7134aa6fde5d4e9b1aa43f008 (diff) | |
modem: Use libosmo-gprs-rlcmac L1CTL primitives
Related: OS#5500
Change-Id: I9d3066f19077796b2ccf70b15cc57b6488f015be
| -rw-r--r-- | src/host/layer23/src/modem/app_modem.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 28984e74..b55768fc 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -39,6 +39,7 @@ #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gprs/rlcmac/csn1_defs.h> +#include <osmocom/gprs/rlcmac/rlcmac_prim.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/ms.h> @@ -230,6 +231,7 @@ static int handle_si4(struct osmocom_ms *ms, struct msgb *msg) static int handle_si13(struct osmocom_ms *ms, struct msgb *msg) { int rc; + struct osmo_gprs_rlcmac_prim *rlcmac_prim; if (msgb_l3len(msg) != GSM_MACBLOCK_LEN) return -EINVAL; @@ -240,7 +242,10 @@ static int handle_si13(struct osmocom_ms *ms, struct msgb *msg) if (rc != 0) return rc; - return 0; + /* Forward SI13 to RLC/MAC layer */ + rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_data_ind(0 /* TODO: fn */, msgb_l3(msg)); + rc = osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim); + return rc; } static int modem_rx_bcch(struct osmocom_ms *ms, struct msgb *msg) @@ -275,6 +280,7 @@ static int modem_rx_imm_ass(struct osmocom_ms *ms, struct msgb *msg) struct gsm48_rrlayer *rr = &ms->rrlayer; uint8_t ch_type, ch_subch, ch_ts; int rc; + struct osmo_gprs_rlcmac_prim *rlcmac_prim; /* Discard CS channel assignment */ if ((ia->page_mode >> 4) == 0) @@ -340,17 +346,10 @@ static int modem_rx_imm_ass(struct osmocom_ms *ms, struct msgb *msg) ia->chan_desc.h1.tsc, GSM48_CMODE_SIGN, 0); } - const uint8_t *data = msgb_l3(msg) + sizeof(*ia) + ia->mob_alloc_len; - size_t data_len = msgb_l3len(msg) - (sizeof(*ia) + ia->mob_alloc_len); - IA_RestOctets_t iaro; - - rc = osmo_gprs_rlcmac_decode_imm_ass_ro(&iaro, data, data_len); - if (rc != 0) { - LOGP(DRR, LOGL_ERROR, "Failed to decode IA Rest Octets IE\n"); + rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_data_ind(0 /* TODO: fn */, (uint8_t *)ia); + rc = osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim); + if (rc < 0) return rc; - } - - /* TODO: deliver decoded params to the RLC/MAC layer */ rr->state = GSM48_RR_ST_DEDICATED; return 0; |