From 9da0686371214f0c1ce9d54596fa76380e8d820b Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 17 Apr 2023 19:00:04 +0200 Subject: Merge bts_alloc_ms() and ms_alloc() gprs_default_cb_ms_idle() is changed to have the same implementation as previous bts_ms_idle_cb(), since that's the only one being used in osmo-pcu code. It makes no sense to use different callback logic in unit tests. This is another step towards simplifying the code and getting rid of the idle/active_cb(). Change-Id: I2a06d17588572a21dc5a14ddbde83766076b446d --- src/pdch.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pdch.cpp') diff --git a/src/pdch.cpp b/src/pdch.cpp index 43b39360..1c39ceba 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -665,7 +665,7 @@ void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, uint32_t tlli = request->ID.u.TLLI; ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) { - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_tlli(ms, tlli); } } else if (request->ID.u.Global_TFI.UnionType) { /* ID_TYPE = DL_TFI */ @@ -857,7 +857,7 @@ void gprs_rlcmac_pdch::rcv_measurement_report(Packet_Measurement_Report_t *repor if (!ms) { LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "MS send measurement " "but TLLI 0x%08x is unknown\n", report->TLLI); - ms = bts_alloc_ms(bts()); + ms = ms_alloc(bts()); ms_set_tlli(ms, report->TLLI); } if ((poll = pdch_ulc_get_node(ulc, fn))) { -- cgit v1.2.3