From 8a35e640a33373ea137125a5654bd9ae445b3769 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 18 Jan 2021 17:14:14 +0100 Subject: Convert gprs_bssgp_pcu.cpp to C There's no real use of C++ in that file, and it causes problems when using llist_head entry macros in future patches adding initial support for multiple BTS in PCU object, so let's move it to plain C. Change-Id: Ic771a89fd78b5e66151a5384f0ff6a8895589466 --- tests/rlcmac/RLCMACTest.cpp | 8 ++++---- tests/tbf/TbfTest.cpp | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 140b2f28..c6ad1925 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -259,8 +259,8 @@ MS RA capability 1 OSMO_ASSERT(data.Count_MS_RA_capability_value == 1); /* Make sure GPRS / EGPRS multislot class is parsed correctly */ - printf("GPRS multislot class = %u\n", Decoding::get_ms_class_by_capability(&data)); - printf("EGPRS multislot class = %u\n", Decoding::get_egprs_ms_class_by_capability(&data)); + printf("GPRS multislot class = %u\n", get_ms_class_by_capability(&data)); + printf("EGPRS multislot class = %u\n", get_egprs_ms_class_by_capability(&data)); /* Test encoding of decoded MS RA Capability */ printf("=== Test encoding of MS RA Capability ===\n"); @@ -466,8 +466,8 @@ MS Radio Access Capability OSMO_ASSERT(data.Count_MS_RA_capability_value == 3); /* Make sure GPRS / EGPRS multislot class is parsed correctly */ - printf("GPRS multislot class = %u\n", Decoding::get_ms_class_by_capability(&data)); - printf("EGPRS multislot class = %u\n", Decoding::get_egprs_ms_class_by_capability(&data)); + printf("GPRS multislot class = %u\n", get_ms_class_by_capability(&data)); + printf("EGPRS multislot class = %u\n", get_egprs_ms_class_by_capability(&data)); bitvec_free(bv_dec); } diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index ef268629..fbcb503c 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -500,7 +500,7 @@ static void test_tbf_exhaustion() snprintf(imsi, sizeof(imsi), "001001%09d", i); - rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0, + rc = dl_tbf_handle(bts, tlli, 0, imsi, ms_class, 0, delay_csec, buf, sizeof(buf)); if (rc < 0) @@ -545,7 +545,7 @@ static void test_tbf_dl_llc_loss() /* Handle LLC frame 1 */ memset(buf, 1, sizeof(buf)); - rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0, + rc = dl_tbf_handle(bts, tlli, 0, imsi, ms_class, 0, delay_csec, buf, sizeof(buf)); OSMO_ASSERT(rc >= 0); @@ -556,7 +556,7 @@ static void test_tbf_dl_llc_loss() /* Handle LLC frame 2 */ memset(buf, 2, sizeof(buf)); - rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0, + rc = dl_tbf_handle(bts, tlli, 0, imsi, ms_class, 0, delay_csec, buf, sizeof(buf)); OSMO_ASSERT(rc >= 0); @@ -565,7 +565,7 @@ static void test_tbf_dl_llc_loss() /* Handle LLC frame 3 */ memset(buf, 3, sizeof(buf)); - rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0, + rc = dl_tbf_handle(bts, tlli, 0, imsi, ms_class, 0, delay_csec, buf, sizeof(buf)); OSMO_ASSERT(rc >= 0); @@ -1651,7 +1651,7 @@ static void send_dl_data(struct gprs_rlcmac_bts *bts, uint32_t tlli, const char ms = bts_ms_store(bts)->get_ms(tlli, 0, imsi); - gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, 0, 0, + dl_tbf_handle(bts, tlli, 0, imsi, 0, 0, 1000, data, data_size); ms = bts_ms_by_imsi(bts, imsi); @@ -2206,7 +2206,7 @@ static void test_tbf_gprs_egprs() gprs_bssgp_init(bts, 3234, 3234, 1, 1, false, 0, 0, 0); /* Does not support EGPRS */ - rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0, + rc = dl_tbf_handle(bts, tlli, 0, imsi, ms_class, 0, delay_csec, buf, sizeof(buf)); OSMO_ASSERT(rc == 0); -- cgit v1.2.3