Replace ul_ass_state with osmocom FSM

Related: OS#2709
Change-Id: Id414eafe9c04a9a8759c6fb1a483bf2ee093a4d2
diff --git a/src/encoding.cpp b/src/encoding.cpp
index 0a4050f..886b25d 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -589,8 +589,7 @@
 
 /* Generate Packet Uplink Assignment as per 3GPP TS 44.060, section 11.2.29.
  * NOTE: 'block' is expected to be zero-initialized by the caller. */
-void Encoding::write_packet_uplink_assignment(
-	RlcMacDownlink_t * block, uint8_t old_tfi,
+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)
@@ -1737,8 +1736,7 @@
  * section 7.1.3.2.1 On receipt of a PACKET RESOURCE REQUEST message
  * 8.1.2.5 Establishment of uplink TBF
  */
-void Encoding::write_packet_access_reject(
-	bitvec * dest, uint32_t tlli, unsigned long t3172_ms)
+void write_packet_access_reject(struct bitvec *dest, uint32_t tlli, unsigned long t3172_ms)
 {
 	unsigned wp = 0;