clean-up: Kill the alpha and gammar parameter from the method

3 files changed, 7 insertions, 8 deletions

diff --git a/src/bts.cpp b/src/bts.cpp
index 166354a2..d7a33173 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -407,8 +407,7 @@ bool BTS::rcv_rach_sba(uint8_t ra, uint32_t Fn, int16_t qta, bitvec *immediate_a
 		"(AGCH)\n");
 
 	*plen = Encoding::write_immediate_assignment(&m_bts, immediate_assignment, 0, ra,
-		Fn, qta >> 2, &m_bts.trx[trx_no].pdch[ts_no], 0, 0, 0, 0, sb_fn, 1,
-		m_bts.alpha, m_bts.gamma);
+		Fn, qta >> 2, &m_bts.trx[trx_no].pdch[ts_no], 0, 0, 0, 0, sb_fn, 1);
 	return true;
 }
 
@@ -446,8 +445,7 @@ bool BTS::rcv_rach_tbf(uint8_t ra, uint32_t Fn, int16_t qta, bitvec *immediate_a
 
 	*plen = Encoding::write_immediate_assignment(&m_bts, immediate_assignment, 0, ra,
 		Fn, tbf->ta, tbf->first_pdch(),
-		tbf->tfi(), tbf->dir.ul.usf[tbf->first_ts], 0, 0, 0, 0,
-		m_bts.alpha, m_bts.gamma);
+		tbf->tfi(), tbf->dir.ul.usf[tbf->first_ts], 0, 0, 0, 0);
 	return true;
 }
 
@@ -543,7 +541,7 @@ void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, uint8_t poll, const char *imsi)
 	plen = Encoding::write_immediate_assignment(&m_bts, immediate_assignment, 1, 125,
 		(tbf->pdch[tbf->first_ts]->last_rts_fn + 21216) % 2715648, tbf->ta,
 		tbf->first_pdch(), tbf->tfi(), 0, tbf->tlli(), poll,
-		tbf->poll_fn, 0, m_bts.alpha, m_bts.gamma);
+		tbf->poll_fn, 0);
 	pcu_l1if_tx_pch(immediate_assignment, plen, imsi);
 	bitvec_free(immediate_assignment);
 }
diff --git a/src/encoding.cpp b/src/encoding.cpp
index 1e31853d..3ab68e6a 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -31,11 +31,12 @@ int Encoding::write_immediate_assignment(
 	bitvec * dest, uint8_t downlink, uint8_t ra,
 	uint32_t ref_fn, uint8_t ta, gprs_rlcmac_pdch *pdch,
 	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)
+	uint8_t polling, uint32_t fn, uint8_t single_block)
 {
 	unsigned wp = 0;
 	uint8_t plen;
+	const uint8_t alpha = pdch->bts_data()->alpha;
+	const uint8_t gamma = pdch->bts_data()->gamma;
 
 	bitvec_write_field(dest, wp,0x0,4);  // Skip Indicator
 	bitvec_write_field(dest, wp,0x6,4);  // Protocol Discriminator
diff --git a/src/encoding.h b/src/encoding.h
index 89d4cc9f..98d54bd7 100644
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -41,7 +41,7 @@ public:
 			bitvec * dest, uint8_t downlink, uint8_t ra, 
 		        uint32_t ref_fn, uint8_t ta, gprs_rlcmac_pdch *pdch,
 		        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);
+			uint32_t fn, uint8_t single_block);
 
 	static void write_packet_uplink_assignment(
 			struct gprs_rlcmac_bts *bts,