Add new PDCH UL Controller, drop SBAllocator class
Right now we handle different types of UL allocations in different
classes like PollAllocator and SBAllocator, and they usually don't take
into account the other one in most cases. Furthermore, those objects are
usually per-BTS object, instead of per PDCH object.
This is a first step towards having a unified per-PDCH controller which
takes care of controlling what is scheduled and hence expected on the
uplink. Each PDCH has a UL Controller which keeps track of all reserved
uplink frame, be it SB, RRBP poll or USF assigned, all under the same
API.
As a first step, only the SBA part is fully implemented and used (being
it the easiest part to replace); TBF poll+usf will come in follow-up
patches later on. As a result, the SBAllocator per-BTS class dissappears
but some of its code is refactored/reused to provide more features to the
gprs_rlcmac_sba object, which is also further integrated into the new UL
Controller.
Related: OS#5020
Change-Id: I84b24beea4a1aa2c1528f41435f77bd16df2b947
diff --git a/src/pdch.h b/src/pdch.h
index fb28019..cfa0195 100644
--- a/src/pdch.h
+++ b/src/pdch.h
@@ -28,6 +28,7 @@
#include <osmocom/core/linuxlist.h>
#include "gsm_rlcmac.h"
#include "coding_scheme.h"
+#include "pdch_ul_controller.h"
}
#endif
@@ -126,6 +127,7 @@
/* back pointers */
struct gprs_rlcmac_trx *trx;
uint8_t ts_no;
+ struct pdch_ulc *ulc;
#ifdef __cplusplus
private:
@@ -191,10 +193,9 @@
void pdch_disable(struct gprs_rlcmac_pdch *pdch);
#ifdef __cplusplus
}
+#endif
#define LOGPDCH(pdch, category, level, fmt, args...) \
LOGP(category, level, "PDCH(bts=%" PRIu8 ",trx=%" PRIu8 ",ts=%" PRIu8 ") " fmt, \
(pdch)->trx->bts->nr, (pdch)->trx->trx_no, (pdch)->ts_no, \
## args)
-
-#endif