Replace ul_ass_state with osmocom FSM

Related: OS#2709
Change-Id: Id414eafe9c04a9a8759c6fb1a483bf2ee093a4d2
diff --git a/src/encoding.h b/src/encoding.h
index 665bd77..39f6974 100644
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -63,13 +63,6 @@
 			uint8_t t3142
 		);
 
-	static void write_packet_uplink_assignment(
-			RlcMacDownlink_t * block, uint8_t old_tfi,
-			uint8_t old_downlink, uint32_t tlli, uint8_t use_tlli,
-			const struct gprs_rlcmac_ul_tbf *tbf, uint8_t poll, uint8_t rrbp,
-			uint8_t alpha, uint8_t gamma, int8_t ta_idx,
-			bool use_egprs);
-
 	static void write_packet_downlink_assignment(RlcMacDownlink_t * block,
 			bool old_tfi_is_valid, uint8_t old_tfi, uint8_t old_downlink,
 			const struct gprs_rlcmac_dl_tbf *tbf, uint8_t poll, uint8_t rrbp,
@@ -78,9 +71,6 @@
 
 	static void encode_rbb(const char *show_rbb, uint8_t *rbb);
 
-	static void write_packet_access_reject(bitvec * dest, uint32_t tlli,
-					       unsigned long t3172_ms);
-
 	static void write_packet_uplink_ack(
 			bitvec * dest, struct gprs_rlcmac_ul_tbf *tbf, bool is_final,
 			uint8_t rrbp);
@@ -121,6 +111,13 @@
 extern "C" {
 #endif
 
+void write_packet_access_reject(struct bitvec *dest, uint32_t tlli, unsigned long t3172_ms);
+void write_packet_uplink_assignment(RlcMacDownlink_t *block, uint8_t old_tfi,
+				    uint8_t old_downlink, uint32_t tlli, uint8_t use_tlli,
+				    const struct gprs_rlcmac_ul_tbf *tbf, uint8_t poll,
+				    uint8_t rrbp, uint8_t alpha, uint8_t gamma, int8_t ta_idx,
+				    bool use_egprs);
+
 void write_packet_neighbour_cell_data(RlcMacDownlink_t *block,
 		bool tfi_is_dl, uint8_t tfi, uint8_t container_id,
 		uint8_t container_idx, PNCDContainer_t *container);