cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity

bts: define egprs_enabled as bool 

Change-Id: I66a8254ee392ad75226c58b7df5746f409463f0f
This commit is contained in:
Pau Espin 2020-10-26 18:39:51 +01:00 committed by pespin
parent 983bb7eb31
commit 4d1663594b
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bts.h
View File

@ -43,6 +43,7 @@ extern "C" {
#include <pdch.h>
#include <stdint.h>
#include <stdbool.h>
#define LLC_CODEL_DISABLE 0
#define LLC_CODEL_USE_DEFAULT (-1)
@ -136,7 +137,7 @@ struct gprs_rlcmac_bts {
uint8_t force_two_phase;
uint8_t alpha, gamma;
uint8_t egprs_enabled;
bool egprs_enabled;
bool dl_tbf_preemptive_retransmission;
uint8_t si13[GSM_MACBLOCK_LEN];
bool si13_is_set;

4
src/pcu_vty.c
View File

@ -281,7 +281,7 @@ DEFUN_USRATTR(cfg_pcu_egprs,
{
struct gprs_rlcmac_bts *bts = bts_main_data();
bts->egprs_enabled = 1;
bts->egprs_enabled = true;
return CMD_SUCCESS;
}
@ -294,7 +294,7 @@ DEFUN_USRATTR(cfg_pcu_no_egprs,
{
struct gprs_rlcmac_bts *bts = bts_main_data();
bts->egprs_enabled = 0;
bts->egprs_enabled = false;
return CMD_SUCCESS;
}

24
tests/tbf/TbfTest.cpp
View File

@ -1737,7 +1737,7 @@ static void test_tbf_egprs_two_phase_puan(void)
setup_bts(&the_bts, ts_no, 4);
the_bts.bts_data()->initial_mcs_dl = 9;
the_bts.bts_data()->egprs_enabled = 1;
the_bts.bts_data()->egprs_enabled = true;
bts = the_bts.bts_data();
bts->ws_base = 128;
bts->ws_pdch = 64;
@ -2177,7 +2177,7 @@ static void test_tbf_gprs_egprs()
setup_bts(&the_bts, ts_no);
/* EGPRS-only */
bts->egprs_enabled = 1;
bts->egprs_enabled = true;
gprs_bssgp_init(bts, 3234, 3234, 1, 1, false, 0, 0, 0);
@ -2257,7 +2257,7 @@ static void test_tbf_ws()
ws_check(dl_tbf, __func__, 4, 64, true, false);
/* EGPRS-only */
bts->egprs_enabled = 1;
bts->egprs_enabled = true;
/* Does support EGPRS */
ms = the_bts.ms_alloc(ms_class, ms_class);
@ -2297,7 +2297,7 @@ static void test_tbf_update_ws(void)
gprs_bssgp_init(bts, 5234, 5234, 1, 1, false, 0, 0, 0);
/* EGPRS-only */
bts->egprs_enabled = 1;
bts->egprs_enabled = true;
/* Does support EGPRS */
ms = the_bts.ms_alloc(ms_class, ms_class);
@ -2330,7 +2330,7 @@ static void test_tbf_puan_urbb_len(void)
setup_bts(&the_bts, ts_no, 4);
the_bts.bts_data()->initial_mcs_dl = 9;
the_bts.bts_data()->egprs_enabled = 1;
the_bts.bts_data()->egprs_enabled = true;
ul_tbf = puan_urbb_len_issue(&the_bts, ts_no, tlli, &fn, qta,
ms_class, egprs_ms_class);
@ -2471,7 +2471,7 @@ static void test_tbf_li_decoding(void)
setup_bts(&the_bts, ts_no, 4);
the_bts.bts_data()->initial_mcs_dl = 9;
the_bts.bts_data()->egprs_enabled = 1;
the_bts.bts_data()->egprs_enabled = true;
ul_tbf = tbf_li_decoding(&the_bts, ts_no, tlli, &fn, qta,
ms_class, egprs_ms_class);
@ -2515,7 +2515,7 @@ static void test_tbf_epdan_out_of_rx_window(void)
setup_bts(&the_bts, ts_no);
OSMO_ASSERT(osmo_tdef_set(bts->T_defs_pcu, -2031, 200, OSMO_TDEF_MS) == 0);
bts->egprs_enabled = 1;
bts->egprs_enabled = true;
/* ARQ II */
bts->dl_arq_type = EGPRS_ARQ2;
@ -2599,7 +2599,7 @@ static void test_tbf_egprs_two_phase_spb(void)
setup_bts(&the_bts, ts_no, 4);
the_bts.bts_data()->initial_mcs_dl = 9;
the_bts.bts_data()->egprs_enabled = 1;
the_bts.bts_data()->egprs_enabled = true;
ul_tbf = establish_ul_tbf_two_phase_spb(&the_bts, ts_no, tlli, &fn, qta,
ms_class, egprs_ms_class);
@ -2629,7 +2629,7 @@ static void test_tbf_egprs_two_phase()
setup_bts(&the_bts, ts_no, 4);
the_bts.bts_data()->initial_mcs_dl = 9;
the_bts.bts_data()->egprs_enabled = 1;
the_bts.bts_data()->egprs_enabled = true;
ul_tbf = establish_ul_tbf_two_phase(&the_bts, ts_no, tlli, &fn, qta,
ms_class, egprs_ms_class);
@ -3054,7 +3054,7 @@ static void test_tbf_egprs_retx_dl(void)
bts->cs_downgrade_threshold = 0;
setup_bts(&the_bts, ts_no);
OSMO_ASSERT(osmo_tdef_set(bts->T_defs_pcu, -2031, 200, OSMO_TDEF_MS) == 0);
bts->egprs_enabled = 1;
bts->egprs_enabled = true;
/* ARQ II */
bts->dl_arq_type = EGPRS_ARQ2;
@ -3083,7 +3083,7 @@ static void test_tbf_egprs_spb_dl(void)
bts->cs_downgrade_threshold = 0;
setup_bts(&the_bts, ts_no);
OSMO_ASSERT(osmo_tdef_set(bts->T_defs_pcu, -2031, 200, OSMO_TDEF_MS) == 0);
bts->egprs_enabled = 1;
bts->egprs_enabled = true;
/* ARQ I resegmentation support */
bts->dl_arq_type = EGPRS_ARQ1;
@ -3115,7 +3115,7 @@ static void test_tbf_egprs_dl()
setup_bts(&the_bts, ts_no);
OSMO_ASSERT(osmo_tdef_set(bts->T_defs_pcu, -2031, 200, OSMO_TDEF_MS) == 0);
bts->egprs_enabled = 1;
bts->egprs_enabled = true;
/* ARQ II */
bts->dl_arq_type = EGPRS_ARQ2;