This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20921 )
Change subject: bts: define egprs_enabled as bool
......................................................................
bts: define egprs_enabled as bool
Change-Id: I66a8254ee392ad75226c58b7df5746f409463f0f
---
M src/bts.h
M src/pcu_vty.c
M tests/tbf/TbfTest.cpp
3 files changed, 16 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/21/20921/1
diff --git a/src/bts.h b/src/bts.h
index 4340199..a3fa975 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -43,6 +43,7 @@
#include <pdch.h>
#include <stdint.h>
+#include <stdbool.h>
#define LLC_CODEL_DISABLE 0
#define LLC_CODEL_USE_DEFAULT (-1)
@@ -136,7 +137,7 @@
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;
diff --git a/src/pcu_vty.c b/src/pcu_vty.c
index 1602aef..6dfcdf5 100644
--- a/src/pcu_vty.c
+++ b/src/pcu_vty.c
@@ -281,7 +281,7 @@
{
struct gprs_rlcmac_bts *bts = bts_main_data();
- bts->egprs_enabled = 1;
+ bts->egprs_enabled = true;
return CMD_SUCCESS;
}
@@ -294,7 +294,7 @@
{
struct gprs_rlcmac_bts *bts = bts_main_data();
- bts->egprs_enabled = 0;
+ bts->egprs_enabled = false;
return CMD_SUCCESS;
}
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index d4a5618..04e711c 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -1737,7 +1737,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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;
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20921
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I66a8254ee392ad75226c58b7df5746f409463f0f
Gerrit-Change-Number: 20921
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201026/6fef6df1/attachment.htm>