commit a4f570fe7a9e511d04ba3aade4a144b4cb74deb8
author Max <msuraev@sysmocom.de> Fri Dec 15 11:21:57 2017 +0100
committer Max <msuraev@sysmocom.de> Thu Jan 04 10:15:59 2018 +0000
tree 22cbfd891c3f3dfa9f0698850bc9c0a520bb597a
parent 7df82d412eca327b94f6040a140d1f8d5d9c7c53

window: move encoding into functions

* move window size encoding and writing into separate functions
* introduce necessary TBF wrappers to avoid direct m_window access

This is part of preparation work to move to separate UL/DL windows.

Related: OS#1759
Change-Id: I60184d5049bc7d7b119df5a9eb82d1c4b788c840

tests/tbf/TbfTest.cpp

diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index 2863151..40cb313 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -2214,9 +2214,9 @@
 	fprintf(stderr, "DL TBF slots: 0x%02x, N: %d, WS: %d\n",
 		dl_tbf->dl_slots(),
 		pcu_bitcount(dl_tbf->dl_slots()),
-		dl_tbf->window()->ws());
+		dl_tbf->window_size());
 	OSMO_ASSERT(pcu_bitcount(dl_tbf->dl_slots()) == 4);
-	OSMO_ASSERT(dl_tbf->window()->ws() == 64);
+	OSMO_ASSERT(dl_tbf->window_size() == 64);
 	tbf_free(dl_tbf);
 
 	/* EGPRS-only */
@@ -2229,9 +2229,9 @@
 	fprintf(stderr, "DL TBF slots: 0x%02x, N: %d, WS: %d\n",
 		dl_tbf->dl_slots(),
 		pcu_bitcount(dl_tbf->dl_slots()),
-		dl_tbf->window()->ws());
+		dl_tbf->window_size());
 	OSMO_ASSERT(pcu_bitcount(dl_tbf->dl_slots()) == 4);
-	OSMO_ASSERT(dl_tbf->window()->ws() == 128 + 4 * 64);
+	OSMO_ASSERT(dl_tbf->window_size() == 128 + 4 * 64);
 	tbf_free(dl_tbf);
 
 	printf("=== end %s ===\n", __func__);
@@ -2273,9 +2273,9 @@
 	fprintf(stderr, "DL TBF slots: 0x%02x, N: %d, WS: %d\n",
 		dl_tbf->dl_slots(),
 		pcu_bitcount(dl_tbf->dl_slots()),
-		dl_tbf->window()->ws());
+		dl_tbf->window_size());
 	OSMO_ASSERT(pcu_bitcount(dl_tbf->dl_slots()) == 1);
-	OSMO_ASSERT(dl_tbf->window()->ws() == 128 + 1 * 64);
+	OSMO_ASSERT(dl_tbf->window_size() == 128 + 1 * 64);
 
 	dl_tbf->update();
 
@@ -2284,9 +2284,9 @@
 	fprintf(stderr, "DL TBF slots: 0x%02x, N: %d, WS: %d\n",
 		dl_tbf->dl_slots(),
 		pcu_bitcount(dl_tbf->dl_slots()),
-		dl_tbf->window()->ws());
+		dl_tbf->window_size());
 	OSMO_ASSERT(pcu_bitcount(dl_tbf->dl_slots()) == 4);
-	OSMO_ASSERT(dl_tbf->window()->ws() == 128 + 4 * 64);
+	OSMO_ASSERT(dl_tbf->window_size() == 128 + 4 * 64);
 
 	tbf_free(dl_tbf);