Merge remote-tracking branch 'origin/sysmocom/master'

1 files changed, 3 insertions, 1536 deletions

diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp
index 9b4e6436..ac8f2d12 100644
--- a/src/gprs_rlcmac.cpp
+++ b/src/gprs_rlcmac.cpp
@@ -22,1451 +22,20 @@
 #include <gprs_bssgp_pcu.h>
 #include <pcu_l1_if.h>
 #include <gprs_rlcmac.h>
+#include <bts.h>
+#include <encoding.h>
 #include <tbf.h>
 
-/* 3GPP TS 05.02 Annex B.1 */
 
-#define MS_NA	255 /* N/A */
-#define MS_A	254 /* 1 with hopping, 0 without */
-#define MS_B	253 /* 1 with hopping, 0 without (change Rx to Tx)*/
-#define MS_C	252 /* 1 with hopping, 0 without (change Tx to Rx)*/
-
-struct gprs_ms_multislot_class {
-	uint8_t rx, tx, sum;	/* Maximum Number of Slots: RX, Tx, Sum Rx+Tx */
-	uint8_t ta, tb, ra, rb;	/* Minimum Number of Slots */
-	uint8_t type; /* Type of Mobile */
-};
-
-static const struct gprs_ms_multislot_class gprs_ms_multislot_class[32] = {
-/* M-S Class	  Rx	Tx	Sum	Tta	Ttb	Tra	Trb	Type */
-/* N/A */	{ MS_NA,MS_NA,	MS_NA,	MS_NA,	MS_NA,	MS_NA,	MS_NA,	MS_NA },
-/* 1 */		{ 1,	1,	2,	3,	2,	4,	2,	1 },
-/* 2 */		{ 2,	1,	3,	3,	2,	3,	1,	1 },
-/* 3 */		{ 2,	2,	3,	3,	2,	3,	1,	1 },
-/* 4 */		{ 3,	1,	4,	3,	1,	3,	1,	1 },
-/* 5 */		{ 2,	2,	4,	3,	1,	3,	1,	1 },
-/* 6 */		{ 3,	2,	4,	3,	1,	3,	1,	1 },
-/* 7 */		{ 3,	3,	4,	3,	1,	3,	1,	1 },
-/* 8 */		{ 4,	1,	5,	3,	1,	2,	1,	1 },
-/* 9 */		{ 3,	2,	5,	3,	1,	2,	1,	1 },
-/* 10 */	{ 4,	2,	5,	3,	1,	2,	1,	1 },
-/* 11 */	{ 4,	3,	5,	3,	1,	2,	1,	1 },
-/* 12 */	{ 4,	4,	5,	2,	1,	2,	1,	1 },
-/* 13 */	{ 3,	3,	MS_NA,	MS_NA,	MS_A,	3,	MS_A,	2 },
-/* 14 */	{ 4,	4,	MS_NA,	MS_NA,	MS_A,	3,	MS_A,	2 },
-/* 15 */	{ 5,	5,	MS_NA,	MS_NA,	MS_A,	3,	MS_A,	2 },
-/* 16 */	{ 6,	6,	MS_NA,	MS_NA,	MS_A,	2,	MS_A,	2 },
-/* 17 */	{ 7,	7,	MS_NA,	MS_NA,	MS_A,	1,	0,	2 },
-/* 18 */	{ 8,	8,	MS_NA,	MS_NA,	0,	0,	0,	2 },
-/* 19 */	{ 6,	2,	MS_NA,	3,	MS_B,	2,	MS_C,	1 },
-/* 20 */	{ 6,	3,	MS_NA,	3,	MS_B,	2,	MS_C,	1 },
-/* 21 */	{ 6,	4,	MS_NA,	3,	MS_B,	2,	MS_C,	1 },
-/* 22 */	{ 6,	4,	MS_NA,	2,	MS_B,	2,	MS_C,	1 },
-/* 23 */	{ 6,	6,	MS_NA,	2,	MS_B,	2,	MS_C,	1 },
-/* 24 */	{ 8,	2,	MS_NA,	3,	MS_B,	2,	MS_C,	1 },
-/* 25 */	{ 8,	3,	MS_NA,	3,	MS_B,	2,	MS_C,	1 },
-/* 26 */	{ 8,	4,	MS_NA,	3,	MS_B,	2,	MS_C,	1 },
-/* 27 */	{ 8,	4,	MS_NA,	2,	MS_B,	2,	MS_C,	1 },
-/* 28 */	{ 8,	6,	MS_NA,	2,	MS_B,	2,	MS_C,	1 },
-/* 29 */	{ 8,	8,	MS_NA,	2,	MS_B,	2,	MS_C,	1 },
-/* N/A */	{ MS_NA,MS_NA,	MS_NA,	MS_NA,	MS_NA,	MS_NA,	MS_NA,	MS_NA },
-/* N/A */	{ MS_NA,MS_NA,	MS_NA,	MS_NA,	MS_NA,	MS_NA,	MS_NA,	MS_NA },
-};
-
-struct gprs_rlcmac_cs gprs_rlcmac_cs[] = {
-/*	frame length	data block	max payload */
-	{ 0,		0,		0  },
-	{ 23,		23,		20 }, /* CS-1 */
-	{ 34,		33,		30 }, /* CS-2 */
-	{ 40,		39,		36 }, /* CS-3 */
-	{ 54,		53,		50 }, /* CS-4 */
-};
-
-LLIST_HEAD(gprs_rlcmac_ul_tbfs);
-LLIST_HEAD(gprs_rlcmac_dl_tbfs);
-llist_head *gprs_rlcmac_tbfs_lists[] = {
-	&gprs_rlcmac_ul_tbfs,
-	&gprs_rlcmac_dl_tbfs,
-	NULL
-};
 extern void *tall_pcu_ctx;
 
-#ifdef DEBUG_DIAGRAM
-struct timeval diagram_time = {0,0};
-struct timeval diagram_last_tv = {0,0};
-
-void debug_diagram(int diag, const char *format, ...)
-{
-	va_list ap;
-	char debug[128];
-	char line[1024];
-	struct gprs_rlcmac_tbf *tbf, *tbf_a[16];
-	int max_diag = -1, i;
-	uint64_t diff = 0;
-
-	va_start(ap, format);
-	vsnprintf(debug, sizeof(debug) - 1, format, ap);
-	debug[19] = ' ';
-	debug[20] = '\0';
-	va_end(ap);
-
-	memset(tbf_a, 0, sizeof(tbf_a));
-	llist_for_each_entry(tbf, &gprs_rlcmac_ul_tbfs, list) {
-		if (tbf->diag < 16) {
-			if (tbf->diag > max_diag)
-				max_diag = tbf->diag;
-			tbf_a[tbf->diag] = tbf;
-		}
-	}
-	llist_for_each_entry(tbf, &gprs_rlcmac_dl_tbfs, list) {
-		if (tbf->diag < 16) {
-			if (tbf->diag > max_diag)
-				max_diag = tbf->diag;
-			tbf_a[tbf->diag] = tbf;
-		}
-	}
-
-	if (diagram_last_tv.tv_sec) {
-		diff = (uint64_t)(diagram_time.tv_sec -
-					diagram_last_tv.tv_sec) * 1000;
-		diff += diagram_time.tv_usec / 1000;
-		diff -= diagram_last_tv.tv_usec / 1000;
-	}
-	memcpy(&diagram_last_tv, &diagram_time, sizeof(struct timeval));
-
-	if (diff > 0) {
-		if (diff > 99999)
-			strcpy(line, "  ...  : ");
-		else
-			sprintf(line, "%3d.%03d: ", (int)(diff / 1000),
-				(int)(diff % 1000));
-		for (i = 0; i <= max_diag; i++) {
-			if (tbf_a[i] == NULL) {
-				strcat(line, "                    ");
-				continue;
-			}
-			if (tbf_a[i]->diag_new) {
-				strcat(line, "         |          ");
-				continue;
-			}
-			strcat(line, "                    ");
-		}
-		puts(line);
-	}
-	strcpy(line, "       : ");
-	for (i = 0; i <= max_diag; i++) {
-		if (tbf_a[i] == NULL) {
-			strcat(line, "                    ");
-			continue;
-		}
-		if (tbf_a[i]->diag != diag) {
-			strcat(line, "         |          ");
-			continue;
-		}
-		if (strlen(debug) < 19) {
-			strcat(line, "                    ");
-			memcpy(line + strlen(line) - 11 - strlen(debug) / 2,
-				debug, strlen(debug));
-		} else
-			strcat(line, debug);
-		tbf_a[i]->diag_new = 1;
-	}
-	puts(line);
-}
-#endif
-
-/* FIXME: spread resources over multiple TRX. Also add option to use same
- * TRX in case of existing TBF for TLLI in the other direction. */
-/* search for free TFI and return TFI, TRX */
-int tfi_find_free(struct gprs_rlcmac_bts *bts, enum gprs_rlcmac_tbf_direction dir,
-		uint8_t *_trx, int8_t use_trx)
-{
-	struct gprs_rlcmac_pdch *pdch;
-	struct gprs_rlcmac_tbf **tbfp;
-	uint8_t trx_from, trx_to, trx, ts, tfi;
-
-	if (use_trx >= 0 && use_trx < 8)
-		trx_from = trx_to = use_trx;
-	else {
-		trx_from = 0;
-		trx_to = 7;
-	}
-
-	/* on TRX find first enabled TS */
-	for (trx = trx_from; trx <= trx_to; trx++) {
-		for (ts = 0; ts < 8; ts++) {
-			pdch = &bts->trx[trx].pdch[ts];
-			if (!pdch->enable)
-				continue;
-			break;
-		}
-		if (ts < 8)
-			break;
-	}
-	if (trx > trx_to) {
-		LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH available.\n");
-		return -EINVAL;
-	}
-
-
-	LOGP(DRLCMAC, LOGL_DEBUG, "Searching for first unallocated TFI: "
-		"TRX=%d first TS=%d\n", trx, ts);
-	if (dir == GPRS_RLCMAC_UL_TBF)
-		tbfp = bts->trx[trx].ul_tbf;
-	else
-		tbfp = bts->trx[trx].dl_tbf;
-	for (tfi = 0; tfi < 32; tfi++) {
-		if (!tbfp[tfi])
-			break;
-	}
-	
-	if (tfi < 32) {
-		LOGP(DRLCMAC, LOGL_DEBUG, " Found TFI=%d.\n", tfi);
-		*_trx = trx;
-		return tfi;
-	}
-	LOGP(DRLCMAC, LOGL_NOTICE, "No TFI available.\n");
-
-	return -1;
-}
-
-static inline int8_t find_free_usf(struct gprs_rlcmac_pdch *pdch, uint8_t ts)
-{
-	struct gprs_rlcmac_tbf *tbf;
-	uint8_t usf_map = 0;
-	uint8_t tfi, usf;
-
-	/* make map of used USF */
-	for (tfi = 0; tfi < 32; tfi++) {
-		tbf = pdch->ul_tbf[tfi];
-		if (!tbf)
-			continue;
-		usf_map |= (1 << tbf->dir.ul.usf[ts]);
-	}
-
-	/* look for USF, don't use USF=7 */
-	for (usf = 0; usf < 7; usf++) {
-		if (!(usf_map & (1 << usf)))
-			return usf;
-	}
-
-	return -1;
-}
-
-/* Slot Allocation: Algorithm A
- *
- * Assign single slot for uplink and downlink
- */
-int alloc_algorithm_a(struct gprs_rlcmac_bts *bts,
-	struct gprs_rlcmac_tbf *old_tbf,
-	struct gprs_rlcmac_tbf *tbf, uint32_t cust, uint8_t single)
-{
-	struct gprs_rlcmac_pdch *pdch;
-	uint8_t ts;
-	int8_t usf; /* must be signed */
-
-	LOGP(DRLCMAC, LOGL_DEBUG, "Slot Allocation (Algorithm A) for class "
-		"%d\n", tbf->ms_class);
-
-	for (ts = 0; ts < 8; ts++) {
-		pdch = &bts->trx[tbf->trx].pdch[ts];
-		if (!pdch->enable) {
-			LOGP(DRLCMAC, LOGL_DEBUG, "- Skipping TS %d, because "
-				"not enabled\n", ts);
-			continue;
-		}
-		break;
-	}
-	if (ts == 8)
-		return -EINVAL;
-
-	tbf->tsc = pdch->tsc;
-	if (tbf->direction == GPRS_RLCMAC_UL_TBF) {
-		/* if USF available */
-		usf = find_free_usf(pdch, ts);
-		if (usf >= 0) {
-			LOGP(DRLCMAC, LOGL_DEBUG, "- Assign uplink "
-				"TS=%d USF=%d\n", ts, usf);
-			bts->trx[tbf->trx].ul_tbf[tbf->tfi] = tbf;
-			pdch->ul_tbf[tbf->tfi] = tbf;
-			tbf->pdch[ts] = pdch;
-		} else {
-			LOGP(DRLCMAC, LOGL_NOTICE, "- Failed "
-				"allocating TS=%d, no USF available\n", ts);
-			return -EBUSY;
-		}
-	} else {
-		LOGP(DRLCMAC, LOGL_DEBUG, "- Assign downlink TS=%d\n", ts);
-		bts->trx[tbf->trx].dl_tbf[tbf->tfi] = tbf;
-		pdch->dl_tbf[tbf->tfi] = tbf;
-		tbf->pdch[ts] = pdch;
-	}
-	/* the only one TS is the common TS */
-	tbf->first_ts = tbf->first_common_ts = ts;
-
-	return 0;
-}
-
-/* Slot Allocation: Algorithm B
- *
- * Assign as many downlink slots as possible.
- * Assign one uplink slot. (With free USF)
- *
- */
-int alloc_algorithm_b(struct gprs_rlcmac_bts *bts,
-	struct gprs_rlcmac_tbf *old_tbf,
-	struct gprs_rlcmac_tbf *tbf, uint32_t cust, uint8_t single)
-{
-	struct gprs_rlcmac_pdch *pdch;
-	const struct gprs_ms_multislot_class *ms_class;
-	uint8_t Rx, Tx, Sum;	/* Maximum Number of Slots: RX, Tx, Sum Rx+Tx */
-	uint8_t Tta, Ttb, Tra, Trb, Tt, Tr;	/* Minimum Number of Slots */
-	uint8_t Type; /* Type of Mobile */
-	uint8_t rx_win_min = 0, rx_win_max = 7;
-	uint8_t tx_win_min, tx_win_max, tx_range;
-	uint8_t rx_window = 0, tx_window = 0;
-	static const char *digit[10] = { "0","1","2","3","4","5","6","7","8","9" };
-	int8_t usf[8] = { -1, -1, -1, -1, -1, -1, -1, -1 }; /* must be signed */
-	int8_t tsc = -1; /* must be signed */
-	int8_t first_common_ts = -1;
-	uint8_t i, ts;
-	uint8_t slotcount = 0;
-
-
-	if (tbf->ms_class >= 32) {
-		LOGP(DRLCMAC, LOGL_ERROR, "Multislot class %d out of range.\n",
-			tbf->ms_class);
-		return -EINVAL;
-	}
-
-	if (tbf->ms_class) {
-		ms_class = &gprs_ms_multislot_class[tbf->ms_class];
-		LOGP(DRLCMAC, LOGL_DEBUG, "Slot Allocation (Algorithm B) for "
-			"class %d\n", tbf->ms_class);
-	} else {
-		ms_class = &gprs_ms_multislot_class[12];
-		LOGP(DRLCMAC, LOGL_DEBUG, "Slot Allocation (Algorithm B) for "
-			"unknow class (assuming 12)\n");
-	}
-
-	if (ms_class->tx == MS_NA) {
-		LOGP(DRLCMAC, LOGL_NOTICE, "Multislot class %d not "
-			"applicable.\n", tbf->ms_class);
-		return -EINVAL;
-	}
-
-	Rx = ms_class->rx;
-#if 0
-	if (Rx > 4) {
-		LOGP(DRLCMAC, LOGL_DEBUG, "- Degrading max Rx slots to 4\n");
-		Rx = 4;
-	}
-#endif
-	Tx = ms_class->tx;
-#if 0
-	if (Tx > 4) {
-		LOGP(DRLCMAC, LOGL_DEBUG, "- Degrading max Tx slots to 4\n");
-		Tx = 4;
-	}
-#endif
-	Sum = ms_class->sum;
-	Tta = ms_class->ta;
-	Ttb = ms_class->tb;
-	Tra = ms_class->ra;
-	Trb = ms_class->rb;
-	Type = ms_class->type;
-
-	/* Tta and Ttb may depend on hopping or frequency change */
-	if (Ttb == MS_A) {
-		if (/* FIXME: hopping*/ 0)
-			Ttb = 1;
-		else
-			Ttb = 0;
-	}
-	if (Trb == MS_A) {
-		if (/* FIXME: hopping*/ 0)
-			Trb = 1;
-		else
-			Trb = 0;
-	}
-	if (Ttb == MS_B) {
-		/* FIXME: or frequency change */
-		if (/* FIXME: hopping*/ 0)
-			Ttb = 1;
-		else
-			Ttb = 0;
-	}
-	if (Trb == MS_C) {
-		/* FIXME: or frequency change */
-		if (/* FIXME: hopping*/ 0)
-			Trb = 1;
-		else
-			Trb = 0;
-	}
-
-	LOGP(DRLCMAC, LOGL_DEBUG, "- Rx=%d Tx=%d Sum Rx+Tx=%s  Tta=%s Ttb=%d "
-		" Tra=%d Trb=%d Type=%d\n", Rx, Tx,
-		(Sum == MS_NA) ? "N/A" : digit[Sum],
-		(Tta == MS_NA) ? "N/A" : digit[Tta], Ttb, Tra, Trb, Type);
-
-	/* select the values for time contraints */
-	if (/* FIXME: monitoring */0) {	
-		/* applicable to type 1 and type 2 */
-		Tt = Ttb;
-		Tr = Tra;
-	} else {
-		/* applicable to type 1 and type 2 */
-		Tt = Ttb;
-		Tr = Trb;
-	}
-
-	/* select a window of Rx slots if available
-	 * The maximum allowed slots depend on RX or the window of available
-	 * slots.
-	 * This must be done for uplink TBF also, because it is the basis
-	 * for calculating control slot and uplink slot(s). */
-	for (ts = 0, i = 0; ts < 8; ts++) {
-		pdch = &bts->trx[tbf->trx].pdch[ts];
-		/* check if enabled */
-		if (!pdch->enable) {
-			LOGP(DRLCMAC, LOGL_DEBUG, "- Skipping TS %d, because "
-				"not enabled\n", ts);
-			/* increase window for Type 1 */
-			if (Type == 1 && rx_window)
-				i++;
-			continue;
-		}
-		/* check if TSC changes */
-		if (tsc < 0)
-			tbf->tsc = tsc = pdch->tsc;
-		else if (tsc != pdch->tsc) {
-			LOGP(DRLCMAC, LOGL_ERROR, "Skipping TS %d of TRX=%d, "
-				"because it has different TSC than lower TS "
-				"of TRX. In order to allow multislot, all "
-				"slots must be configured with the same "
-				"TSC!\n", ts, tbf->trx);
-			/* increase window for Type 1 */
-			if (Type == 1 && rx_window)
-				i++;
-			continue;
-		}
-
-		if (!rx_window)
-			rx_win_min = ts;
-
-		rx_window |= (1 << ts);
-		LOGP(DRLCMAC, LOGL_DEBUG, "- Selected DL TS %d\n", ts);
-
-		/* range of window (required for Type 1) */
-		rx_win_max = ts;
-
-		if (++i == Rx) {
-			LOGP(DRLCMAC, LOGL_DEBUG, "- Done, because slots / "
-				"window reached maximum alowed Rx size\n");
-			break;
-		}
-	}
-
-	LOGP(DRLCMAC, LOGL_DEBUG, "- Selected slots for RX: "
-		"(TS=0)\"%c%c%c%c%c%c%c%c\"(TS=7)\n",
-		((rx_window & 0x01)) ? 'D' : '.',
-		((rx_window & 0x02)) ? 'D' : '.',
-		((rx_window & 0x04)) ? 'D' : '.',
-		((rx_window & 0x08)) ? 'D' : '.',
-		((rx_window & 0x10)) ? 'D' : '.',
-		((rx_window & 0x20)) ? 'D' : '.',
-		((rx_window & 0x40)) ? 'D' : '.',
-		((rx_window & 0x80)) ? 'D' : '.');
-
-	/* reduce window, if existing uplink slots collide RX window */
-	if (Type == 1 && old_tbf && old_tbf->direction == GPRS_RLCMAC_UL_TBF) {
-		uint8_t collide = 0, ul_usage = 0;
-		int j;
-
-		/* calculate mask of colliding slots */
-		for (ts = 0; ts < 8; ts++) {
-			if (old_tbf->pdch[ts]) {
-				ul_usage |= (1 << ts);
-				/* mark bits from TS-t .. TS+r */
-				for (j = ts - Tt; j != ((ts + Tr + 1) & 7);
-				     j = (j + 1) & 7)
-					collide |= (1 << j);
-			}
-		}
-		LOGP(DRLCMAC, LOGL_DEBUG, "- Not allowed slots due to existing "
-			"UL allocation: (TS=0)\"%c%c%c%c%c%c%c%c\"(TS=7) "
-			" D=downlink  x=not usable\n",
-			((ul_usage & 0x01)) ? 'D' : ((collide & 0x01))?'x':'.',
-			((ul_usage & 0x02)) ? 'D' : ((collide & 0x02))?'x':'.',
-			((ul_usage & 0x04)) ? 'D' : ((collide & 0x04))?'x':'.',
-			((ul_usage & 0x08)) ? 'D' : ((collide & 0x08))?'x':'.',
-			((ul_usage & 0x10)) ? 'D' : ((collide & 0x10))?'x':'.',
-			((ul_usage & 0x20)) ? 'D' : ((collide & 0x20))?'x':'.',
-			((ul_usage & 0x40)) ? 'D' : ((collide & 0x40))?'x':'.',
-			((ul_usage & 0x80)) ? 'D' : ((collide & 0x80))?'x':'.');
-
-		/* apply mask to reduce tx_window (shifted by 3 slots) */
-		rx_window &= ~(collide << 3);
-		rx_window &= ~(collide >> 5);
-		LOGP(DRLCMAC, LOGL_DEBUG, "- Remaining slots for RX: "
-			"(TS=0)\"%c%c%c%c%c%c%c%c\"(TS=7)\n",
-			((rx_window & 0x01)) ? 'D' : '.',
-			((rx_window & 0x02)) ? 'D' : '.',
-			((rx_window & 0x04)) ? 'D' : '.',
-			((rx_window & 0x08)) ? 'D' : '.',
-			((rx_window & 0x10)) ? 'D' : '.',
-			((rx_window & 0x20)) ? 'D' : '.',
-			((rx_window & 0x40)) ? 'D' : '.',
-			((rx_window & 0x80)) ? 'D' : '.');
-		if (!rx_window) {
-			LOGP(DRLCMAC, LOGL_NOTICE, "No suitable downlink slots "
-				"available with current uplink assignment\n");
-			return -EBUSY;
-		}
-
-		/* calculate new min/max */
-		for (ts = rx_win_min; ts <= rx_win_max; ts++) {
-			if ((rx_window & (1 << ts)))
-				break;
-			rx_win_min = ts + 1;
-			LOGP(DRLCMAC, LOGL_DEBUG, "- TS has been deleted, so "
-				"raising start of DL window to %d\n",
-				rx_win_min);
-		}
-		for (ts = rx_win_max; ts >= rx_win_min; ts--) {
-			if ((rx_window & (1 << ts)))
-				break;
-			rx_win_max = ts - 1;
-			LOGP(DRLCMAC, LOGL_DEBUG, "- TS has been deleted, so "
-				"lowering end of DL window to %d\n",
-				rx_win_max);
-		}
-	}
-
-	/* reduce window, to allow at least one uplink TX slot
-	 * this is only required for Type 1 */
-	if (Type == 1 && rx_win_max - rx_win_min + 1 + Tt + 1 + Tr > 8) {
-		rx_win_max = rx_win_min + 7 - Tt - 1 - Tr;
-		LOGP(DRLCMAC, LOGL_DEBUG, "- Reduce RX window due to time "
-			"contraints to %d slots\n",
-			rx_win_max - rx_win_min + 1);
-	}
-
-	LOGP(DRLCMAC, LOGL_DEBUG, "- RX-Window is: %d..%d\n", rx_win_min,
-		rx_win_max);
-
-	/* calculate TX window */
-	if (Type == 1) {
-		/* calculate TX window (shifted by 3 timeslots)
-		 * it uses the space between tx_win_max and tx_win_min */
-		tx_win_min = (rx_win_max - 2 + Tt) & 7;
-		tx_win_max = (rx_win_min + 4 - Tr) & 7;
-		/* calculate the TX window size (might be larger than Tx) */
-		tx_range = (tx_win_max - tx_win_min + 1) & 7;
-	} else {
-		/* TX and RX simultaniously */
-		tx_win_min = rx_win_min;
-		tx_win_max = 7;
-		/* TX window size (might be larger than Tx) */
-		tx_range = tx_win_max - tx_win_min + 1;
-	}
-
-	LOGP(DRLCMAC, LOGL_DEBUG, "- TX-Window is: %d..%d\n", tx_win_min,
-		tx_win_max);
-
-	/* select a window of Tx slots if available
-	 * The maximum allowed slots depend on TX or the window of available
-	 * slots.
-	 *
-	 * also assign the first common ts, which is used for control or single
-	 * slot. */
-	if (tbf->direction == GPRS_RLCMAC_UL_TBF) {
-		for (ts = tx_win_min, i = 0; i < tx_range; ts = (ts + 1) & 7) {
-			pdch = &bts->trx[tbf->trx].pdch[ts];
-			/* check if enabled */
-			if (!pdch->enable) {
-				LOGP(DRLCMAC, LOGL_DEBUG, "- Skipping TS %d, "
-					"because not enabled\n", ts);
-				continue;
-			}
-			/* check if TSC changes */
-			if (tsc < 0)
-				tbf->tsc = tsc = pdch->tsc;
-			else if (tsc != pdch->tsc) {
-				LOGP(DRLCMAC, LOGL_ERROR, "Skipping TS %d of "
-					"TRX=%d, because it has different TSC "
-					"than lower TS of TRX. In order to "
-					"allow multislot, all slots must be "
-					"configured with the same TSC!\n",
-					ts, tbf->trx);
-				/* increase window for Type 1 */
-				if (Type == 1)
-					i++;
-				continue;
-			}
-			/* check for free usf */
-			usf[ts] = find_free_usf(pdch, ts);
-			if (usf[ts] < 0) {
-				LOGP(DRLCMAC, LOGL_DEBUG, "- Skipping TS %d, "
-					"because no USF available\n", ts);
-				/* increase window for Type 1 */
-				if (Type == 1)
-					i++;
-				continue;
-			}
-
-			if (!tx_window)
-				first_common_ts = ts;
-
-			tx_window |= (1 << ts);
-			LOGP(DRLCMAC, LOGL_DEBUG, "- Selected UL TS %d\n", ts);
-
-			if (1 && Type == 1) { /* FIXME: multislot UL assignment */
-				LOGP(DRLCMAC, LOGL_DEBUG, "- Done, because "
-					"1 slot assigned\n");
-				break;
-			}
-			if (++i == Tx) {
-				LOGP(DRLCMAC, LOGL_DEBUG, "- Done, because "
-					"slots / window reached maximum "
-					"allowed Tx size\n");
-				break;
-			}
-		}
-
-		LOGP(DRLCMAC, LOGL_DEBUG, "- Selected TX window: "
-			"(TS=0)\"%c%c%c%c%c%c%c%c\"(TS=7)\n",
-			((tx_window & 0x01)) ? 'U' : '.',
-			((tx_window & 0x02)) ? 'U' : '.',
-			((tx_window & 0x04)) ? 'U' : '.',
-			((tx_window & 0x08)) ? 'U' : '.',
-			((tx_window & 0x10)) ? 'U' : '.',
-			((tx_window & 0x20)) ? 'U' : '.',
-			((tx_window & 0x40)) ? 'U' : '.',
-			((tx_window & 0x80)) ? 'U' : '.');
-
-		if (!tx_window) {
-			LOGP(DRLCMAC, LOGL_NOTICE, "No suitable uplink slots "
-				"available\n");
-			return -EBUSY;
-		}
-	} else {
-		/* assign the first common ts, which is used for control or
-		 * single slot. */
-		for (ts = tx_win_min, i = 0; i < tx_range; ts = (ts + 1) & 7) {
-			pdch = &bts->trx[tbf->trx].pdch[ts];
-			/* check if enabled */
-			if (!pdch->enable) {
-				LOGP(DRLCMAC, LOGL_DEBUG, "- Skipping TS %d, "
-					"because not enabled\n", ts);
-				continue;
-			}
-			first_common_ts = ts;
-			break;
-		}
-	}
-
-	if (first_common_ts < 0) {
-		LOGP(DRLCMAC, LOGL_NOTICE, "No first common slots available\n");
-		return -EINVAL;
-	}
-
-	if (tbf->direction == GPRS_RLCMAC_DL_TBF) {
-		/* assign downlink */
-		if (rx_window == 0) {
-			LOGP(DRLCMAC, LOGL_NOTICE, "No downlink slots "
-				"available\n");
-			return -EINVAL;
-		}
-		for (ts = 0; ts < 8; ts++) {
-			if ((rx_window & (1 << ts))) {
-				/* be sure to select a single downlink slots
-				 * that can be used for uplink, if multiple
-				 * slots are assigned later. */
-				if (single && first_common_ts != ts)
-					continue;
-				LOGP(DRLCMAC, LOGL_DEBUG, "- Assigning DL TS "
-					"%d\n", ts);
-				pdch = &bts->trx[tbf->trx].pdch[ts];
-				bts->trx[tbf->trx].dl_tbf[tbf->tfi] = tbf;
-				pdch->dl_tbf[tbf->tfi] = tbf;
-				tbf->pdch[ts] = pdch;
-				slotcount++;
-				if (slotcount == 1)
-					tbf->first_ts = ts;
-				if (single)
-					break;
-			}
-		}
-	} else {
-		/* assign uplink */
-		if (tx_window == 0) {
-			LOGP(DRLCMAC, LOGL_NOTICE, "No uplink slots "
-				"available\n");
-			return -EINVAL;
-		}
-		for (ts = 0; ts < 8; ts++) {
-			if ((tx_window & (1 << ts))) {
-				LOGP(DRLCMAC, LOGL_DEBUG, "- Assigning UL TS "
-					"%d\n", ts);
-				pdch = &bts->trx[tbf->trx].pdch[ts];
-				bts->trx[tbf->trx].ul_tbf[tbf->tfi] = tbf;
-				pdch->ul_tbf[tbf->tfi] = tbf;
-				tbf->pdch[ts] = pdch;
-				tbf->dir.ul.usf[ts] = usf[ts];
-				slotcount++;
-				if (slotcount == 1)
-					tbf->first_ts = ts;
-				if (single)
-					break;
-			}
-		}
-	}
-	if (single && slotcount) {
-		LOGP(DRLCMAC, LOGL_INFO, "Using single slot at TS %d for %s\n",
-			tbf->first_ts,
-			(tbf->direction == GPRS_RLCMAC_DL_TBF) ? "DL" : "UL");
-	} else {
-		LOGP(DRLCMAC, LOGL_INFO, "Using %d slots for %s\n", slotcount,
-			(tbf->direction == GPRS_RLCMAC_DL_TBF) ? "DL" : "UL");
-	}
-	if (slotcount == 0)
-		return -EBUSY;
-
-	tbf->first_common_ts = first_common_ts;
-
-	return 0;
-}
-
-/* starting time for assigning single slot
- * This offset must be a multiple of 13. */
-#define AGCH_START_OFFSET 52
-
-LLIST_HEAD(gprs_rlcmac_sbas);
-
-int sba_alloc(uint8_t *_trx, uint8_t *_ts, uint32_t *_fn, uint8_t ta)
-{
-
-	struct gprs_rlcmac_bts *bts = gprs_rlcmac_bts;
-	struct gprs_rlcmac_pdch *pdch;
-	struct gprs_rlcmac_sba *sba;
-	uint8_t trx, ts;
-	uint32_t fn;
-
-	sba = talloc_zero(tall_pcu_ctx, struct gprs_rlcmac_sba);
-	if (!sba)
-		return -ENOMEM;
-
-	for (trx = 0; trx < 8; trx++) {
-		for (ts = 0; ts < 8; ts++) {
-			pdch = &bts->trx[trx].pdch[ts];
-			if (!pdch->enable)
-				continue;
-			break;
-		}
-		if (ts < 8)
-			break;
-	}
-	if (trx == 8) {
-		LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH available.\n");
-		talloc_free(sba);
-		return -EINVAL;
-	}
-
-	fn = (pdch->last_rts_fn + AGCH_START_OFFSET) % 2715648;
-
-	sba->trx = trx;
-	sba->ts = ts;
-	sba->fn = fn;
-	sba->ta = ta;
-
-	llist_add(&sba->list, &gprs_rlcmac_sbas);
-
-	*_trx = trx;
-	*_ts = ts;
-	*_fn = fn;
-	return 0;
-}
-
-struct gprs_rlcmac_sba *sba_find(uint8_t trx, uint8_t ts, uint32_t fn)
-{
-	struct gprs_rlcmac_sba *sba;
-
-	llist_for_each_entry(sba, &gprs_rlcmac_sbas, list) {
-		if (sba->trx == trx && sba->ts == ts && sba->fn == fn)
-			return sba;
-	}
-
-	return NULL;
-}
-
-/* received RLC/MAC block from L1 */
-int gprs_rlcmac_rcv_block(uint8_t trx, uint8_t ts, uint8_t *data, uint8_t len,
-	uint32_t fn, int8_t rssi)
-{
-	unsigned payload = data[0] >> 6;
-	bitvec *block;
-	int rc = 0;
-
-	switch (payload) {
-	case GPRS_RLCMAC_DATA_BLOCK:
-		rc = gprs_rlcmac_rcv_data_block_acknowledged(trx, ts, data,
-			len, rssi);
-		break;
-	case GPRS_RLCMAC_CONTROL_BLOCK:
-		block = bitvec_alloc(len);
-		if (!block)
-			return -ENOMEM;
-		bitvec_unpack(block, data);
-		rc = gprs_rlcmac_rcv_control_block(block, trx, ts, fn);
-		bitvec_free(block);
-		break;
-	case GPRS_RLCMAC_CONTROL_BLOCK_OPT:
-		LOGP(DRLCMAC, LOGL_NOTICE, "GPRS_RLCMAC_CONTROL_BLOCK_OPT block payload is not supported.\n");
-		break;
-	default:
-		LOGP(DRLCMAC, LOGL_NOTICE, "Unknown RLCMAC block payload(%u).\n", payload);
-		rc = -EINVAL;
-	}
-
-	return rc;
-}
-
-/* add paging to paging queue(s) */
-int gprs_rlcmac_add_paging(uint8_t chan_needed, uint8_t *identity_lv)
-{
-	struct gprs_rlcmac_bts *bts = gprs_rlcmac_bts;
-	uint8_t l, trx, ts, any_tbf = 0;
-	struct gprs_rlcmac_tbf *tbf;
-	struct gprs_rlcmac_paging *pag;
-	uint8_t slot_mask[8];
-	int8_t first_ts; /* must be signed */
-
-	LOGP(DRLCMAC, LOGL_INFO, "Add RR paging: chan-needed=%d MI=%s\n",
-		chan_needed, osmo_hexdump(identity_lv + 1, identity_lv[0]));
-
-	/* collect slots to page
-	 * Mark slots for every TBF, but only mark one of it.
-	 * Mark only the first slot found.
-	 * Don't mark, if TBF uses a different slot that is already marked. */
-	memset(slot_mask, 0, sizeof(slot_mask));
-	for (l = 0; gprs_rlcmac_tbfs_lists[l]; l++) {
-		llist_for_each_entry(tbf, gprs_rlcmac_tbfs_lists[l], list) {
-			first_ts = -1;
-			for (ts = 0; ts < 8; ts++) {
-				if (tbf->pdch[ts]) {
-					/* remember the first slot found */
-					if (first_ts < 0)
-						first_ts = ts;
-					/* break, if we already marked a slot */
-					if ((slot_mask[tbf->trx] & (1 << ts)))
-						break;
-				}
-			}
-			/* mark first slot found, if none is marked already */
-			if (ts == 8 && first_ts >= 0) {
-				LOGP(DRLCMAC, LOGL_DEBUG, "- %s TBF=%d uses "
-					"TRX=%d TS=%d, so we mark\n",
-					(tbf->direction == GPRS_RLCMAC_UL_TBF)
-						? "UL" : "DL",
-					tbf->tfi, tbf->trx, first_ts);
-				slot_mask[tbf->trx] |= (1 << first_ts);
-			} else
-				LOGP(DRLCMAC, LOGL_DEBUG, "- %s TBF=%d uses "
-					"already marked TRX=%d TS=%d\n",
-					(tbf->direction == GPRS_RLCMAC_UL_TBF)
-						? "UL" : "DL",
-					tbf->tfi, tbf->trx, ts);
-		}
-	}
-
-	/* Now we have a list of marked slots. Every TBF uses at least one
-	 * of these slots. */
-
-	/* schedule paging to all marked slots */
-	for (trx = 0; trx < 8; trx++) {
-		if (slot_mask[trx] == 0)
-			continue;
-		any_tbf = 1;
-		for (ts = 0; ts < 8; ts++) {
-			if ((slot_mask[trx] & (1 << ts))) {
-				/* schedule */
-				pag = talloc_zero(tall_pcu_ctx,
-					struct gprs_rlcmac_paging);
-				if (!pag)
-					return -ENOMEM;
-				pag->chan_needed = chan_needed;
-				memcpy(pag->identity_lv, identity_lv,
-					identity_lv[0] + 1);
-				llist_add(&pag->list,
-					&bts->trx[trx].pdch[ts].paging_list);
-				LOGP(DRLCMAC, LOGL_INFO, "Paging on PACCH of "
-					"TRX=%d TS=%d\n", trx, ts);
-			}
-		}
-	}
-
-	if (!any_tbf)
-		LOGP(DRLCMAC, LOGL_INFO, "No paging, because no TBF\n");
-
-	return 0;
-}
-
-struct gprs_rlcmac_paging *gprs_rlcmac_dequeue_paging(
-	struct gprs_rlcmac_pdch *pdch)
-{
-	struct gprs_rlcmac_paging *pag;
-
-	if (llist_empty(&pdch->paging_list))
-		return NULL;
-	pag = llist_entry(pdch->paging_list.next,
-		struct gprs_rlcmac_paging, list);
-        llist_del(&pag->list);
-
-	return pag;
-}
-
-struct msgb *gprs_rlcmac_send_packet_paging_request(
-	struct gprs_rlcmac_pdch *pdch)
-{
-	struct gprs_rlcmac_paging *pag;
-	struct msgb *msg;
-	unsigned wp = 0, len;
-
-	/* no paging, no message */
-	pag = gprs_rlcmac_dequeue_paging(pdch);
-	if (!pag)
-		return NULL;
-
-	LOGP(DRLCMAC, LOGL_DEBUG, "Scheduling paging\n");
-
-	/* alloc message */
-	msg = msgb_alloc(23, "pag ctrl block");
-	if (!msg) {
-		talloc_free(pag);
-		return NULL;
-	}
-	bitvec *pag_vec = bitvec_alloc(23);
-	if (!pag_vec) {
-		msgb_free(msg);
-		talloc_free(pag);
-		return NULL;
-	}
-	wp = write_packet_paging_request(pag_vec);
-
-	/* loop until message is full */
-	while (pag) {
-		/* try to add paging */
-		if ((pag->identity_lv[1] & 0x07) == 4) {
-			/* TMSI */
-			LOGP(DRLCMAC, LOGL_DEBUG, "- TMSI=0x%08x\n",
-				ntohl(*((uint32_t *)(pag->identity_lv + 1))));
-			len = 1 + 1 + 1 + 32 + 2 + 1;
-			if (pag->identity_lv[0] != 5) {
-				LOGP(DRLCMAC, LOGL_ERROR, "TMSI paging with "
-					"MI != 5 octets!\n");
-				goto continue_next;
-			}
-		} else {
-			/* MI */
-			LOGP(DRLCMAC, LOGL_DEBUG, "- MI=%s\n",
-				osmo_hexdump(pag->identity_lv + 1,
-					pag->identity_lv[0]));
-			len = 1 + 1 + 1 + 4 + (pag->identity_lv[0]<<3) + 2 + 1;
-			if (pag->identity_lv[0] > 8) {
-				LOGP(DRLCMAC, LOGL_ERROR, "Paging with "
-					"MI > 8 octets!\n");
-				goto continue_next;
-			}
-		}
-		if (wp + len > 184) {
-			LOGP(DRLCMAC, LOGL_DEBUG, "- Does not fit, so schedule "
-				"next time\n");
-			/* put back paging record, because does not fit */
-			llist_add_tail(&pag->list, &pdch->paging_list);
-			break;
-		}
-		write_repeated_page_info(pag_vec, wp, pag->identity_lv[0],
-			pag->identity_lv + 1, pag->chan_needed);
-
-continue_next:
-		talloc_free(pag);
-		pag = gprs_rlcmac_dequeue_paging(pdch);
-	}
-
-	bitvec_pack(pag_vec, msgb_put(msg, 23));
-	RlcMacDownlink_t * mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t);
-	LOGP(DRLCMAC, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Paging Request +++++++++++++++++++++++++\n");
-	decode_gsm_rlcmac_downlink(pag_vec, mac_control_block);
-	LOGPC(DCSN1, LOGL_NOTICE, "\n");
-	LOGP(DRLCMAC, LOGL_DEBUG, "------------------------- TX : Packet Paging Request -------------------------\n");
-	bitvec_free(pag_vec);
-	talloc_free(mac_control_block);
-
-	return msg;
-}
-
-// GSM 04.08 9.1.18 Immediate assignment
-int write_immediate_assignment(bitvec * dest, uint8_t downlink, uint8_t ra,
-	uint32_t ref_fn, uint8_t ta, uint16_t arfcn, uint8_t ts, uint8_t tsc,
-	uint8_t tfi, uint8_t usf, uint32_t tlli,
-	uint8_t polling, uint32_t fn, uint8_t single_block, uint8_t alpha,
-	uint8_t gamma, int8_t ta_idx)
-{
-	unsigned wp = 0;
-	uint8_t plen;
-
-	bitvec_write_field(dest, wp,0x0,4);  // Skip Indicator
-	bitvec_write_field(dest, wp,0x6,4);  // Protocol Discriminator
-	bitvec_write_field(dest, wp,0x3F,8); // Immediate Assignment Message Type
-
-	// 10.5.2.25b Dedicated mode or TBF
-	bitvec_write_field(dest, wp,0x0,1);      // spare
-	bitvec_write_field(dest, wp,0x0,1);      // TMA : Two-message assignment: No meaning
-	bitvec_write_field(dest, wp,downlink,1); // Downlink : Downlink assignment to mobile in packet idle mode
-	bitvec_write_field(dest, wp,0x1,1);      // T/D : TBF or dedicated mode: this message assigns a Temporary Block Flow (TBF).
-
-	bitvec_write_field(dest, wp,0x0,4); // Page Mode
-
-	// GSM 04.08 10.5.2.25a Packet Channel Description
-	bitvec_write_field(dest, wp,0x1,5);                               // Channel type
-	bitvec_write_field(dest, wp,ts,3);     // TN
-	bitvec_write_field(dest, wp,tsc,3);    // TSC
-	bitvec_write_field(dest, wp,0x0,3);                               // non-hopping RF channel configuraion
-	bitvec_write_field(dest, wp,arfcn,10); // ARFCN
-
-	//10.5.2.30 Request Reference
-	bitvec_write_field(dest, wp,ra,8);                    // RA
-	bitvec_write_field(dest, wp,(ref_fn / (26 * 51)) % 32,5); // T1'
-	bitvec_write_field(dest, wp,ref_fn % 51,6);               // T3
-	bitvec_write_field(dest, wp,ref_fn % 26,5);               // T2
-
-	// 10.5.2.40 Timing Advance
-	bitvec_write_field(dest, wp,0x0,2); // spare
-	bitvec_write_field(dest, wp,ta,6);  // Timing Advance value
-
-	// No mobile allocation in non-hopping systems.
-	// A zero-length LV.  Just write L=0.
-	bitvec_write_field(dest, wp,0,8);
-
-	if ((wp % 8)) {
-		LOGP(DRLCMACUL, LOGL_ERROR, "Length of IMM.ASS without rest "
-			"octets is not multiple of 8 bits, PLEASE FIX!\n");
-		exit (0);
-	}
-	plen = wp / 8;
-
-	if (downlink)
-	{
-		// GSM 04.08 10.5.2.16 IA Rest Octets
-		bitvec_write_field(dest, wp, 3, 2);   // "HH"
-		bitvec_write_field(dest, wp, 1, 2);   // "01" Packet Downlink Assignment
-		bitvec_write_field(dest, wp,tlli,32); // TLLI
-		bitvec_write_field(dest, wp,0x1,1);   // switch TFI   : on
-		bitvec_write_field(dest, wp,tfi,5);   // TFI
-		bitvec_write_field(dest, wp,0x0,1);   // RLC acknowledged mode
-		if (alpha) {
-			bitvec_write_field(dest, wp,0x1,1);   // ALPHA = present
-			bitvec_write_field(dest, wp,alpha,4);   // ALPHA
-		} else {
-			bitvec_write_field(dest, wp,0x0,1);   // ALPHA = not present
-		}
-		bitvec_write_field(dest, wp,gamma,5);   // GAMMA power control parameter
-		bitvec_write_field(dest, wp,polling,1);   // Polling Bit
-		bitvec_write_field(dest, wp,!polling,1);   // TA_VALID ???
-		if (ta_idx < 0) {
-			bitvec_write_field(dest, wp,0x0,1);   // switch TIMING_ADVANCE_INDEX = off
-		} else {
-			bitvec_write_field(dest, wp,0x1,1);   // switch TIMING_ADVANCE_INDEX = on
-			bitvec_write_field(dest, wp,ta_idx,4);   // TIMING_ADVANCE_INDEX
-		}
-		if (polling) {
-			bitvec_write_field(dest, wp,0x1,1);   // TBF Starting TIME present
-			bitvec_write_field(dest, wp,(fn / (26 * 51)) % 32,5); // T1'
-			bitvec_write_field(dest, wp,fn % 51,6);               // T3
-			bitvec_write_field(dest, wp,fn % 26,5);               // T2
-		} else {
-			bitvec_write_field(dest, wp,0x0,1);   // TBF Starting TIME present
-		}
-		bitvec_write_field(dest, wp,0x0,1);   // P0 not present
-//		bitvec_write_field(dest, wp,0x1,1);   // P0 not present
-//		bitvec_write_field(dest, wp,0xb,4);
-	}
-	else
-	{
-		struct gprs_rlcmac_bts *bts = gprs_rlcmac_bts;
-		// GMS 04.08 10.5.2.37b 10.5.2.16
-		bitvec_write_field(dest, wp, 3, 2);    // "HH"
-		bitvec_write_field(dest, wp, 0, 2);    // "0" Packet Uplink Assignment
-		if (single_block) {
-			bitvec_write_field(dest, wp, 0, 1);    // Block Allocation : Single Block Allocation
-			if (alpha) {
-				bitvec_write_field(dest, wp,0x1,1);   // ALPHA = present
-				bitvec_write_field(dest, wp,alpha,4);   // ALPHA = present
-			} else
-				bitvec_write_field(dest, wp,0x0,1);   // ALPHA = not present
-			bitvec_write_field(dest, wp,gamma,5);   // GAMMA power control parameter
-			if (ta_idx < 0) {
-				bitvec_write_field(dest, wp,0x0,1);   // switch TIMING_ADVANCE_INDEX = off
-			} else {
-				bitvec_write_field(dest, wp,0x1,1);   // switch TIMING_ADVANCE_INDEX = on
-				bitvec_write_field(dest, wp,ta_idx,4);   // TIMING_ADVANCE_INDEX
-			}
-			bitvec_write_field(dest, wp, 1, 1);    // TBF_STARTING_TIME_FLAG
-			bitvec_write_field(dest, wp,(fn / (26 * 51)) % 32,5); // T1'
-			bitvec_write_field(dest, wp,fn % 51,6);               // T3
-			bitvec_write_field(dest, wp,fn % 26,5);               // T2
-		} else {
-			bitvec_write_field(dest, wp, 1, 1);    // Block Allocation : Not Single Block Allocation
-			bitvec_write_field(dest, wp, tfi, 5);  // TFI_ASSIGNMENT Temporary Flow Identity
-			bitvec_write_field(dest, wp, 0, 1);    // POLLING
-			bitvec_write_field(dest, wp, 0, 1);    // ALLOCATION_TYPE: dynamic
-			bitvec_write_field(dest, wp, usf, 3);    // USF
-			bitvec_write_field(dest, wp, 0, 1);    // USF_GRANULARITY
-			bitvec_write_field(dest, wp, 0, 1);   // "0" power control: Not Present
-			bitvec_write_field(dest, wp, bts->initial_cs_ul-1, 2);    // CHANNEL_CODING_COMMAND 
-			bitvec_write_field(dest, wp, 1, 1);    // TLLI_BLOCK_CHANNEL_CODING
-			if (alpha) {
-				bitvec_write_field(dest, wp,0x1,1);   // ALPHA = present
-				bitvec_write_field(dest, wp,alpha,4);   // ALPHA
-			} else
-				bitvec_write_field(dest, wp,0x0,1);   // ALPHA = not present
-			bitvec_write_field(dest, wp,gamma,5);   // GAMMA power control parameter
-			/* note: there is no choise for TAI and no starting time */
-			bitvec_write_field(dest, wp, 0, 1);   // switch TIMING_ADVANCE_INDEX = off
-			bitvec_write_field(dest, wp, 0, 1);    // TBF_STARTING_TIME_FLAG
-		}
-	}
-
-	return plen;
-}
-
-/* generate uplink assignment */
-void write_packet_uplink_assignment(bitvec * dest, uint8_t old_tfi,
-	uint8_t old_downlink, uint32_t tlli, uint8_t use_tlli,
-	struct gprs_rlcmac_tbf *tbf, uint8_t poll, uint8_t alpha,
-	uint8_t gamma, int8_t ta_idx)
-{
-	// TODO We should use our implementation of encode RLC/MAC Control messages.
-	struct gprs_rlcmac_bts *bts = gprs_rlcmac_bts;
-	unsigned wp = 0;
-	uint8_t ts;
-
-	bitvec_write_field(dest, wp,0x1,2);  // Payload Type
-	bitvec_write_field(dest, wp,0x0,2);  // Uplink block with TDMA framenumber (N+13)
-	bitvec_write_field(dest, wp,poll,1);  // Suppl/Polling Bit
-	bitvec_write_field(dest, wp,0x0,3);  // Uplink state flag
-	bitvec_write_field(dest, wp,0xa,6);  // MESSAGE TYPE
-
-	bitvec_write_field(dest, wp,0x0,2);  // Page Mode
-
-	bitvec_write_field(dest, wp,0x0,1); // switch PERSIST_LEVEL: off
-	if (use_tlli) {
-		bitvec_write_field(dest, wp,0x2,2); // switch TLLI   : on
-		bitvec_write_field(dest, wp,tlli,32); // TLLI
-	} else {
-		bitvec_write_field(dest, wp,0x0,1); // switch TFI : on
-		bitvec_write_field(dest, wp,old_downlink,1); // 0=UPLINK TFI, 1=DL TFI
-		bitvec_write_field(dest, wp,old_tfi,5); // TFI
-	}
-
-	bitvec_write_field(dest, wp,0x0,1); // Message escape
-	bitvec_write_field(dest, wp,bts->initial_cs_ul-1, 2); // CHANNEL_CODING_COMMAND 
-	bitvec_write_field(dest, wp,0x1,1); // TLLI_BLOCK_CHANNEL_CODING 
-	bitvec_write_field(dest, wp,0x1,1); // switch TIMING_ADVANCE_VALUE = on
-	bitvec_write_field(dest, wp,tbf->ta,6); // TIMING_ADVANCE_VALUE
-	if (ta_idx < 0) {
-		bitvec_write_field(dest, wp,0x0,1);   // switch TIMING_ADVANCE_INDEX = off
-	} else {
-		bitvec_write_field(dest, wp,0x1,1);   // switch TIMING_ADVANCE_INDEX = on
-		bitvec_write_field(dest, wp,ta_idx,4);   // TIMING_ADVANCE_INDEX
-	}
-
-#if 1
-	bitvec_write_field(dest, wp,0x1,1); // Frequency Parameters information elements = present
-	bitvec_write_field(dest, wp,tbf->tsc,3); // Training Sequence Code (TSC)
-	bitvec_write_field(dest, wp,0x0,2); // ARFCN = present
-	bitvec_write_field(dest, wp,tbf->arfcn,10); // ARFCN
-#else
-	bitvec_write_field(dest, wp,0x0,1); // Frequency Parameters = off
-#endif
-
-	bitvec_write_field(dest, wp,0x1,2); // Dynamic Allocation
-	
-	bitvec_write_field(dest, wp,0x0,1); // Extended Dynamic Allocation = off
-	bitvec_write_field(dest, wp,0x0,1); // P0 = off
-	
-	bitvec_write_field(dest, wp,0x0,1); // USF_GRANULARITY
-	bitvec_write_field(dest, wp,0x1,1); // switch TFI   : on
-	bitvec_write_field(dest, wp,tbf->tfi,5);// TFI
-
-	bitvec_write_field(dest, wp,0x0,1); //
-	bitvec_write_field(dest, wp,0x0,1); // TBF Starting Time = off
-	if (alpha || gamma) {
-		bitvec_write_field(dest, wp,0x1,1); // Timeslot Allocation with Power Control
-		bitvec_write_field(dest, wp,alpha,4);   // ALPHA
-	} else
-		bitvec_write_field(dest, wp,0x0,1); // Timeslot Allocation
-	
-	for (ts = 0; ts < 8; ts++) {
-		if (tbf->pdch[ts]) {
-			bitvec_write_field(dest, wp,0x1,1); // USF_TN(i): on
-			bitvec_write_field(dest, wp,tbf->dir.ul.usf[ts],3); // USF_TN(i)
-			if (alpha || gamma)
-				bitvec_write_field(dest, wp,gamma,5);   // GAMMA power control parameter
-		} else
-			bitvec_write_field(dest, wp,0x0,1); // USF_TN(i): off
-	}
-//	bitvec_write_field(dest, wp,0x0,1); // Measurement Mapping struct not present
-}
-
-
-/* generate downlink assignment */
-void write_packet_downlink_assignment(RlcMacDownlink_t * block, uint8_t old_tfi,
-	uint8_t old_downlink, struct gprs_rlcmac_tbf *tbf, uint8_t poll,
-	uint8_t alpha, uint8_t gamma, int8_t ta_idx, uint8_t ta_ts)
-{
-	// Packet downlink assignment TS 44.060 11.2.7
-
-	uint8_t tn;
-
-	block->PAYLOAD_TYPE = 0x1;  // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
-	block->RRBP         = 0x0;  // N+13
-	block->SP           = poll; // RRBP field is valid
-	block->USF          = 0x0;  // Uplink state flag
-
-	block->u.Packet_Downlink_Assignment.MESSAGE_TYPE = 0x2;  // Packet Downlink Assignment
-	block->u.Packet_Downlink_Assignment.PAGE_MODE    = 0x0;  // Normal Paging
-
-	block->u.Packet_Downlink_Assignment.Exist_PERSISTENCE_LEVEL      = 0x0;          // PERSISTENCE_LEVEL: off
-
-	block->u.Packet_Downlink_Assignment.ID.UnionType                 = 0x0;          // TFI = on
-	block->u.Packet_Downlink_Assignment.ID.u.Global_TFI.UnionType    = old_downlink; // 0=UPLINK TFI, 1=DL TFI
-	block->u.Packet_Downlink_Assignment.ID.u.Global_TFI.u.UPLINK_TFI = old_tfi;      // TFI
-
-	block->u.Packet_Downlink_Assignment.MAC_MODE            = 0x0;          // Dynamic Allocation
-	block->u.Packet_Downlink_Assignment.RLC_MODE            = 0x0;          // RLC acknowledged mode
-	block->u.Packet_Downlink_Assignment.CONTROL_ACK         = old_downlink; // NW establishes no new DL TBF for the MS with running timer T3192
-	block->u.Packet_Downlink_Assignment.TIMESLOT_ALLOCATION = 0;   // timeslot(s)
-	for (tn = 0; tn < 8; tn++) {
-		if (tbf->pdch[tn])
-			block->u.Packet_Downlink_Assignment.TIMESLOT_ALLOCATION |= 0x80 >> tn;   // timeslot(s)
-	}
-
-	block->u.Packet_Downlink_Assignment.Packet_Timing_Advance.Exist_TIMING_ADVANCE_VALUE = 0x1; // TIMING_ADVANCE_VALUE = on
-	block->u.Packet_Downlink_Assignment.Packet_Timing_Advance.TIMING_ADVANCE_VALUE       = tbf->ta;  // TIMING_ADVANCE_VALUE
-	if (ta_idx < 0) {
-		block->u.Packet_Downlink_Assignment.Packet_Timing_Advance.Exist_IndexAndtimeSlot     = 0x0; // TIMING_ADVANCE_INDEX = off
-	} else {
-		block->u.Packet_Downlink_Assignment.Packet_Timing_Advance.Exist_IndexAndtimeSlot     = 0x1; // TIMING_ADVANCE_INDEX = on
-		block->u.Packet_Downlink_Assignment.Packet_Timing_Advance.TIMING_ADVANCE_INDEX       = ta_idx; // TIMING_ADVANCE_INDEX
-		block->u.Packet_Downlink_Assignment.Packet_Timing_Advance.TIMING_ADVANCE_TIMESLOT_NUMBER = ta_ts; // TIMING_ADVANCE_TS
-	}
-
-	block->u.Packet_Downlink_Assignment.Exist_P0_and_BTS_PWR_CTRL_MODE = 0x0;   // POWER CONTROL = off
-
-	block->u.Packet_Downlink_Assignment.Exist_Frequency_Parameters     = 0x1;   // Frequency Parameters = on
-	block->u.Packet_Downlink_Assignment.Frequency_Parameters.TSC       = tbf->tsc;   // Training Sequence Code (TSC)
-	block->u.Packet_Downlink_Assignment.Frequency_Parameters.UnionType = 0x0;   // ARFCN = on
-	block->u.Packet_Downlink_Assignment.Frequency_Parameters.u.ARFCN   = tbf->arfcn; // ARFCN
-
-	block->u.Packet_Downlink_Assignment.Exist_DOWNLINK_TFI_ASSIGNMENT  = 0x1;     // DOWNLINK TFI ASSIGNMENT = on
-	block->u.Packet_Downlink_Assignment.DOWNLINK_TFI_ASSIGNMENT        = tbf->tfi; // TFI
-
-	block->u.Packet_Downlink_Assignment.Exist_Power_Control_Parameters = 0x1;   // Power Control Parameters = on
-	block->u.Packet_Downlink_Assignment.Power_Control_Parameters.ALPHA = alpha;   // ALPHA
-
-	for (tn = 0; tn < 8; tn++)
-	{
-		if (tbf->pdch[tn])
-		{
-			block->u.Packet_Downlink_Assignment.Power_Control_Parameters.Slot[tn].Exist    = 0x1; // Slot[i] = on
-			block->u.Packet_Downlink_Assignment.Power_Control_Parameters.Slot[tn].GAMMA_TN = gamma; // GAMMA_TN
-		}
-		else
-		{
-			block->u.Packet_Downlink_Assignment.Power_Control_Parameters.Slot[tn].Exist    = 0x0; // Slot[i] = off
-		}
-	}
-
-	block->u.Packet_Downlink_Assignment.Exist_TBF_Starting_Time   = 0x0; // TBF Starting TIME = off
-	block->u.Packet_Downlink_Assignment.Exist_Measurement_Mapping = 0x0; // Measurement_Mapping = off
-	block->u.Packet_Downlink_Assignment.Exist_AdditionsR99        = 0x0; // AdditionsR99 = off
-}
-
-/* generate paging request */
-int write_paging_request(bitvec * dest, uint8_t *ptmsi, uint16_t ptmsi_len)
-{
-	unsigned wp = 0;
-	int plen;
-
-	bitvec_write_field(dest, wp,0x0,4);  // Skip Indicator
-	bitvec_write_field(dest, wp,0x6,4);  // Protocol Discriminator
-	bitvec_write_field(dest, wp,0x21,8); // Paging Request Message Type
-
-	bitvec_write_field(dest, wp,0x0,4);  // Page Mode
-	bitvec_write_field(dest, wp,0x0,4);  // Channel Needed
-
-	// Mobile Identity
-	bitvec_write_field(dest, wp,ptmsi_len+1,8);  // Mobile Identity length
-	bitvec_write_field(dest, wp,0xf,4);          // unused
-	bitvec_write_field(dest, wp,0x4,4);          // PTMSI type
-	for (int i = 0; i < ptmsi_len; i++)
-	{
-		bitvec_write_field(dest, wp,ptmsi[i],8); // PTMSI
-	}
-	if ((wp % 8)) {
-		LOGP(DRLCMACUL, LOGL_ERROR, "Length of PAG.REQ without rest "
-			"octets is not multiple of 8 bits, PLEASE FIX!\n");
-		exit (0);
-	}
-	plen = wp / 8;
-	bitvec_write_field(dest, wp,0x0,1); // "L" NLN(PCH) = off
-	bitvec_write_field(dest, wp,0x0,1); // "L" Priority1 = off
-	bitvec_write_field(dest, wp,0x1,1); // "L" Priority2 = off
-	bitvec_write_field(dest, wp,0x0,1); // "L" Group Call information = off
-	bitvec_write_field(dest, wp,0x0,1); // "H" Packet Page Indication 1 = packet paging procedure
-	bitvec_write_field(dest, wp,0x1,1); // "H" Packet Page Indication 2 = packet paging procedure
-
-	return plen;
-}
-
-/* generate uplink ack */
-void write_packet_uplink_ack(RlcMacDownlink_t * block, struct gprs_rlcmac_tbf *tbf,
-	uint8_t final)
-{
-	// Packet Uplink Ack/Nack  TS 44.060 11.2.28
-
-	char show_v_n[65];
-
-	struct gprs_rlcmac_bts *bts = gprs_rlcmac_bts;
-	uint8_t rbb = 0;
-	uint16_t i, bbn;
-	uint16_t mod_sns_half = (tbf->sns >> 1) - 1;
-	char bit;
-
-	LOGP(DRLCMACUL, LOGL_DEBUG, "Sending Ack/Nack for TBF=%d "
-		"(final=%d)\n", tbf->tfi, final);
-
-	block->PAYLOAD_TYPE = 0x1;   // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
-	block->RRBP         = 0x0;   // N+13
-	block->SP           = final; // RRBP field is valid, if it is final ack
-	block->USF          = 0x0;   // Uplink state flag
-
-	block->u.Packet_Uplink_Ack_Nack.MESSAGE_TYPE = 0x9;      // Packet Downlink Assignment
-	block->u.Packet_Uplink_Ack_Nack.PAGE_MODE    = 0x0;      // Normal Paging
-	block->u.Packet_Uplink_Ack_Nack.UPLINK_TFI   = tbf->tfi; // Uplink TFI
-
-	block->u.Packet_Uplink_Ack_Nack.UnionType    = 0x0;      // PU_AckNack_GPRS = on
-	block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.CHANNEL_CODING_COMMAND                        = bts->initial_cs_ul - 1;             // CS1
-	block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.Ack_Nack_Description.FINAL_ACK_INDICATION     = final;           // FINAL ACK INDICATION
-	block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.Ack_Nack_Description.STARTING_SEQUENCE_NUMBER = tbf->dir.ul.v_r; // STARTING_SEQUENCE_NUMBER
-	// RECEIVE_BLOCK_BITMAP
-	for (i = 0, bbn = (tbf->dir.ul.v_r - 64) & mod_sns_half; i < 64;
-	     i++, bbn = (bbn + 1) & mod_sns_half) {
-	     	bit = tbf->dir.ul.v_n[bbn];
-		if (bit == 0)
-			bit = ' ';
-		show_v_n[i] = bit;
-		if (bit == 'R')
-			rbb = (rbb << 1)|1;
-		else
-			rbb = (rbb << 1);
-		if((i%8) == 7)
-		{
-			block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.Ack_Nack_Description.RECEIVED_BLOCK_BITMAP[i/8] = rbb;
-			rbb = 0;
-		}
-	}
-	show_v_n[64] = '\0';
-	LOGP(DRLCMACUL, LOGL_DEBUG, "- V(N): \"%s\" R=Received "
-		"N=Not-Received\n", show_v_n);
-
-	block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.UnionType              = 0x0; // Fixed Allocation Dummy = on
-	block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.u.FixedAllocationDummy = 0x0; // Fixed Allocation Dummy
-	block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.Exist_AdditionsR99     = 0x0; // AdditionsR99 = off
-
-	block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.Common_Uplink_Ack_Nack_Data.Exist_CONTENTION_RESOLUTION_TLLI = 0x1;
-	block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.Common_Uplink_Ack_Nack_Data.CONTENTION_RESOLUTION_TLLI       = tbf->tlli;
-	block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.Common_Uplink_Ack_Nack_Data.Exist_Packet_Timing_Advance      = 0x0;
-	block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.Common_Uplink_Ack_Nack_Data.Exist_Extension_Bits             = 0x0;
-	block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.Common_Uplink_Ack_Nack_Data.Exist_Power_Control_Parameters   = 0x0;
-}
-
-unsigned write_packet_paging_request(bitvec * dest)
-{
-	unsigned wp = 0;
-
-	bitvec_write_field(dest, wp,0x1,2);  // Payload Type
-	bitvec_write_field(dest, wp,0x0,3);  // No polling
-	bitvec_write_field(dest, wp,0x0,3);  // Uplink state flag
-	bitvec_write_field(dest, wp,0x22,6);  // MESSAGE TYPE
-
-	bitvec_write_field(dest, wp,0x0,2);  // Page Mode
-
-	bitvec_write_field(dest, wp,0x0,1);  // No PERSISTENCE_LEVEL
-	bitvec_write_field(dest, wp,0x0,1);  // No NLN
-
-	return wp;
-}
-
-unsigned write_repeated_page_info(bitvec * dest, unsigned& wp, uint8_t len,
-	uint8_t *identity, uint8_t chan_needed)
-{
-	bitvec_write_field(dest, wp,0x1,1);  // Repeated Page info exists
-
-	bitvec_write_field(dest, wp,0x1,1);  // RR connection paging
-
-	if ((identity[0] & 0x07) == 4) {
-		bitvec_write_field(dest, wp,0x0,1);  // TMSI
-		identity++;
-		len--;
-	} else {
-		bitvec_write_field(dest, wp,0x0,1);  // MI
-		bitvec_write_field(dest, wp,len,4);  // MI len
-	}
-	while (len) {
-		bitvec_write_field(dest, wp,*identity++,8);  // MI data
-		len--;
-	}
-	bitvec_write_field(dest, wp,chan_needed,2);  // CHANNEL_NEEDED
-	bitvec_write_field(dest, wp,0x0,1);  // No eMLPP_PRIORITY
-
-	return wp;
-}
-
-/* Send Uplink unit-data to SGSN. */
-int gprs_rlcmac_tx_ul_ud(gprs_rlcmac_tbf *tbf)
-{
-	uint8_t qos_profile[3];
-	struct msgb *llc_pdu;
-	unsigned msg_len = NS_HDR_LEN + BSSGP_HDR_LEN + tbf->llc_index;
-	struct bssgp_bvc_ctx *bctx = gprs_bssgp_pcu_current_bctx();
-
-	LOGP(DBSSGP, LOGL_INFO, "LLC [PCU -> SGSN] TFI: %u TLLI: 0x%08x len=%d\n", tbf->tfi, tbf->tlli, tbf->llc_index);
-	if (!bctx) {
-		LOGP(DBSSGP, LOGL_ERROR, "No bctx\n");
-		return -EIO;
-	}
-	
-	llc_pdu = msgb_alloc_headroom(msg_len, msg_len,"llc_pdu");
-	uint8_t *buf = msgb_push(llc_pdu, TL16V_GROSS_LEN(sizeof(uint8_t)*tbf->llc_index));
-	tl16v_put(buf, BSSGP_IE_LLC_PDU, sizeof(uint8_t)*tbf->llc_index, tbf->llc_frame);
-	qos_profile[0] = QOS_PROFILE >> 16;
-	qos_profile[1] = QOS_PROFILE >> 8;
-	qos_profile[2] = QOS_PROFILE;
-	bssgp_tx_ul_ud(bctx, tbf->tlli, qos_profile, llc_pdu);
-
-	return 0;
-}
-
 int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len,
 	const char *imsi)
 {
 	LOGP(DRLCMAC, LOGL_NOTICE, "TX: [PCU -> BTS] Paging Request (CCCH)\n");
 	bitvec *paging_request = bitvec_alloc(23);
 	bitvec_unhex(paging_request, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");
-	int plen = write_paging_request(paging_request, ptmsi, ptmsi_len);
+	int plen = Encoding::write_paging_request(paging_request, ptmsi, ptmsi_len);
 	pcu_l1if_tx_pch(paging_request, plen, (char *)imsi);
 	bitvec_free(paging_request);
 
@@ -1474,105 +43,3 @@ int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len,
 }
 
 
-/*
- * timing advance memory
- */
-
-/* enable to debug timing advance memory */
-//#define DEBUG_TA
-
-static LLIST_HEAD(gprs_rlcmac_ta_list);
-static int gprs_rlcmac_ta_num = 0;
-
-struct gprs_rlcmac_ta {
-	struct llist_head	list;
-	uint32_t		tlli;
-	uint8_t			ta;
-};
-
-/* remember timing advance of a given TLLI */
-int remember_timing_advance(uint32_t tlli, uint8_t ta)
-{
-	struct gprs_rlcmac_ta *ta_entry;
-
-	/* check for existing entry */
-	llist_for_each_entry(ta_entry, &gprs_rlcmac_ta_list, list) {
-		if (ta_entry->tlli == tlli) {
-#ifdef DEBUG_TA
-			fprintf(stderr, "update %08x %d\n", tlli, ta);
-#endif
-			ta_entry->ta = ta;
-			/* relink to end of list */
-			llist_del(&ta_entry->list);
-			llist_add_tail(&ta_entry->list, &gprs_rlcmac_ta_list);
-			return 0;
-		}
-	}
-
-#ifdef DEBUG_TA
-	fprintf(stderr, "remember %08x %d\n", tlli, ta);
-#endif
-	/* if list is full, remove oldest entry */
-	if (gprs_rlcmac_ta_num == 30) {
-		ta_entry = llist_entry(gprs_rlcmac_ta_list.next,
-			struct gprs_rlcmac_ta, list);
-	        llist_del(&ta_entry->list);
-		talloc_free(ta_entry);
-		gprs_rlcmac_ta_num--;
-	}
-
-	/* create new TA entry */
-	ta_entry = talloc_zero(tall_pcu_ctx, struct gprs_rlcmac_ta);
-	if (!ta_entry)
-		return -ENOMEM;
-
-	ta_entry->tlli = tlli;
-	ta_entry->ta = ta;
-	llist_add_tail(&ta_entry->list, &gprs_rlcmac_ta_list);
-	gprs_rlcmac_ta_num++;
-
-	return 0;
-}
-
-int recall_timing_advance(uint32_t tlli)
-{
-	struct gprs_rlcmac_ta *ta_entry;
-	uint8_t ta;
-
-	llist_for_each_entry(ta_entry, &gprs_rlcmac_ta_list, list) {
-		if (ta_entry->tlli == tlli) {
-			ta = ta_entry->ta;
-#ifdef DEBUG_TA
-			fprintf(stderr, "recall %08x %d\n", tlli, ta);
-#endif
-			return ta;
-		}
-	}
-#ifdef DEBUG_TA
-	fprintf(stderr, "no entry for %08x\n", tlli);
-#endif
-
-	return -EINVAL;
-}
-
-int flush_timing_advance(void)
-{
-	struct gprs_rlcmac_ta *ta_entry;
-	int count = 0;
-
-	while (!llist_empty(&gprs_rlcmac_ta_list)) {
-		ta_entry = llist_entry(gprs_rlcmac_ta_list.next,
-			struct gprs_rlcmac_ta, list);
-#ifdef DEBUG_TA
-		fprintf(stderr, "flush entry %08x %d\n", ta_entry->tlli,
-			ta_entry->ta);
-#endif
-	        llist_del(&ta_entry->list);
-		talloc_free(ta_entry);
-		count++;
-	}
-	gprs_rlcmac_ta_num = 0;
-
-	return count;
-}
-