simplify asn1 choice types with one single type with a packer

lib/include/srslte/asn1/rrc.h

@@ -142,9 +142,6 @@ struct bcch_dl_sch_msg_type_mbms_r14_c {
 
   // choice methods
   bcch_dl_sch_msg_type_mbms_r14_c() = default;
-  bcch_dl_sch_msg_type_mbms_r14_c(const bcch_dl_sch_msg_type_mbms_r14_c& other);
-  bcch_dl_sch_msg_type_mbms_r14_c& operator=(const bcch_dl_sch_msg_type_mbms_r14_c& other);
-  ~bcch_dl_sch_msg_type_mbms_r14_c() { destroy_(); }
   void        set(types::options e = types::nulltype);
   types       type() const { return type_; }
   SRSASN_CODE pack(bit_ref& bref) const;
@@ -154,24 +151,23 @@ struct bcch_dl_sch_msg_type_mbms_r14_c {
   c1_c_& c1()
   {
     assert_choice_type("c1", type_.to_string(), "BCCH-DL-SCH-MessageType-MBMS-r14");
-    return c.get<c1_c_>();
+    return c;
   }
   const c1_c_& c1() const
   {
     assert_choice_type("c1", type_.to_string(), "BCCH-DL-SCH-MessageType-MBMS-r14");
-    return c.get<c1_c_>();
+    return c;
   }
   c1_c_& set_c1()
   {
     set(types::c1);
-    return c.get<c1_c_>();
+    return c;
   }
+  void set_msg_class_ext() { set(types::msg_class_ext); }
 
 private:
   types type_;
-  choice_buffer_t<c1_c_> c;
-
-  void destroy_();
+  c1_c_ c;
 };
 
 // BCCH-DL-SCH-Message-MBMS ::= SEQUENCE
@@ -184,6 +180,9 @@ struct bcch_dl_sch_msg_mbms_s {
   void        to_json(json_writer& j) const;
 };
 
+// ThresholdEUTRA-v1250 ::= INTEGER (0..97)
+typedef uint8_t thres_eutra_v1250;
+
 // MBMS-SessionInfo-r9 ::= SEQUENCE
 struct mbms_session_info_r9_s {
   bool               ext                   = false;
@@ -498,9 +497,6 @@ struct mcch_msg_type_c {
 
     // choice methods
     later_c_() = default;
-    later_c_(const later_c_& other);
-    later_c_& operator=(const later_c_& other);
-    ~later_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -510,24 +506,23 @@ struct mcch_msg_type_c {
     c2_c_& c2()
     {
       assert_choice_type("c2", type_.to_string(), "later");
-      return c.get<c2_c_>();
+      return c;
     }
     const c2_c_& c2() const
     {
       assert_choice_type("c2", type_.to_string(), "later");
-      return c.get<c2_c_>();
+      return c;
     }
     c2_c_& set_c2()
     {
       set(types::c2);
-      return c.get<c2_c_>();
+      return c;
     }
+    void set_msg_class_ext() { set(types::msg_class_ext); }
 
   private:
     types type_;
-    choice_buffer_t<c2_c_> c;
-
-    void destroy_();
+    c2_c_ c;
   };
   struct types_opts {
     enum options { c1, later, nulltype } value;
@@ -1609,6 +1604,7 @@ struct sc_mcch_msg_type_r13_c {
         set(types::scptm_cfg_br_r14);
         return c;
       }
+      void set_spare() { set(types::spare); }
 
     private:
       types              type_;
@@ -1625,9 +1621,6 @@ struct sc_mcch_msg_type_r13_c {
 
     // choice methods
     msg_class_ext_c_() = default;
-    msg_class_ext_c_(const msg_class_ext_c_& other);
-    msg_class_ext_c_& operator=(const msg_class_ext_c_& other);
-    ~msg_class_ext_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -1637,24 +1630,23 @@ struct sc_mcch_msg_type_r13_c {
     c2_c_& c2()
     {
       assert_choice_type("c2", type_.to_string(), "messageClassExtension");
-      return c.get<c2_c_>();
+      return c;
     }
     const c2_c_& c2() const
     {
       assert_choice_type("c2", type_.to_string(), "messageClassExtension");
-      return c.get<c2_c_>();
+      return c;
     }
     c2_c_& set_c2()
     {
       set(types::c2);
-      return c.get<c2_c_>();
+      return c;
     }
+    void set_msg_class_ext_future_r14() { set(types::msg_class_ext_future_r14); }
 
   private:
     types type_;
-    choice_buffer_t<c2_c_> c;
-
-    void destroy_();
+    c2_c_ c;
   };
   struct types_opts {
     enum options { c1, msg_class_ext, nulltype } value;
@@ -1735,18 +1727,6 @@ struct fail_report_scg_v12d0_s {
   void        to_json(json_writer& j) const;
 };
 
-// SCGFailureInformation-v12d0b-IEs ::= SEQUENCE
-struct scg_fail_info_v12d0b_ies_s {
-  bool                    fail_report_scg_v12d0_present = false;
-  bool                    non_crit_ext_present          = false;
-  fail_report_scg_v12d0_s fail_report_scg_v12d0;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
 // MIMO-WeightedLayersCapabilities-r13 ::= SEQUENCE
 struct mimo_weighted_layers_cap_r13_s {
   struct rel_weight_two_layers_r13_opts {
@@ -1843,10 +1823,11 @@ struct phy_layer_params_v13e0_s {
   void        to_json(json_writer& j) const;
 };
 
-// UE-EUTRA-Capability-v13e0b-IEs ::= SEQUENCE
-struct ue_eutra_cap_v13e0b_ies_s {
+// SCGFailureInformation-v12d0b-IEs ::= SEQUENCE
+struct scg_fail_info_v12d0b_ies_s {
+  bool                    fail_report_scg_v12d0_present = false;
   bool                    non_crit_ext_present          = false;
-  phy_layer_params_v13e0_s phy_layer_params_v13e0;
+  fail_report_scg_v12d0_s fail_report_scg_v12d0;
 
   // sequence methods
   SRSASN_CODE pack(bit_ref& bref) const;
@@ -1854,11 +1835,10 @@ struct ue_eutra_cap_v13e0b_ies_s {
   void        to_json(json_writer& j) const;
 };
 
-// SCG-Config-v12i0b-IEs ::= SEQUENCE
-struct scg_cfg_v12i0b_ies_s {
-  bool                     scg_radio_cfg_v12i0_present = false;
+// UE-EUTRA-Capability-v13e0b-IEs ::= SEQUENCE
+struct ue_eutra_cap_v13e0b_ies_s {
   bool                     non_crit_ext_present = false;
-  scg_cfg_part_scg_v12f0_s scg_radio_cfg_v12i0;
+  phy_layer_params_v13e0_s phy_layer_params_v13e0;
 
   // sequence methods
   SRSASN_CODE pack(bit_ref& bref) const;
@@ -2233,6 +2213,18 @@ struct sbcch_sl_bch_msg_v2x_r14_s {
   void        to_json(json_writer& j) const;
 };
 
+// SCG-Config-v12i0b-IEs ::= SEQUENCE
+struct scg_cfg_v12i0b_ies_s {
+  bool                     scg_radio_cfg_v12i0_present = false;
+  bool                     non_crit_ext_present        = false;
+  scg_cfg_part_scg_v12f0_s scg_radio_cfg_v12i0;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
 // SCG-ConfigInfo-v1530-IEs ::= SEQUENCE
 struct scg_cfg_info_v1530_ies_s {
   bool                      drb_to_add_mod_list_scg_r15_present = false;
@@ -2379,6 +2371,13 @@ struct scg_cfg_info_r12_s {
         set(types::scg_cfg_info_r12);
         return c;
       }
+      void set_spare7() { set(types::spare7); }
+      void set_spare6() { set(types::spare6); }
+      void set_spare5() { set(types::spare5); }
+      void set_spare4() { set(types::spare4); }
+      void set_spare3() { set(types::spare3); }
+      void set_spare2() { set(types::spare2); }
+      void set_spare1() { set(types::spare1); }
 
     private:
       types                  type_;
@@ -2388,9 +2387,6 @@ struct scg_cfg_info_r12_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -2400,24 +2396,23 @@ struct scg_cfg_info_r12_s {
     c1_c_& c1()
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     const c1_c_& c1() const
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     c1_c_& set_c1()
     {
       set(types::c1);
-      return c.get<c1_c_>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types type_;
-    choice_buffer_t<c1_c_> c;
-
-    void destroy_();
+    c1_c_ c;
   };
 
   // member variables

lib/include/srslte/asn1/rrc/common_ext.h

@@ -71,6 +71,7 @@ struct sl_tx_pwr_r14_c {
     assert_choice_type("txPower-r14", type_.to_string(), "SL-TxPower-r14");
     return c;
   }
+  void    set_minusinfinity_r14() { set(types::minusinfinity_r14); }
   int8_t& set_tx_pwr_r14()
   {
     set(types::tx_pwr_r14);
@@ -918,6 +919,7 @@ struct sl_disc_res_pool_r12_s {
           set(types::rsrp_based_r12);
           return c;
         }
+        void set_random_r12() { set(types::random_r12); }
 
       private:
         types                 type_;
@@ -976,6 +978,7 @@ struct sl_disc_res_pool_r12_s {
       assert_choice_type("setup", type_.to_string(), "discPeriod-v1310");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_e_& set_setup()
     {
       set(types::setup);
@@ -1010,6 +1013,7 @@ struct sl_disc_res_pool_r12_s {
       assert_choice_type("setup", type_.to_string(), "rxParamsAddNeighFreq-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -1073,6 +1077,7 @@ struct sl_disc_res_pool_r12_s {
       assert_choice_type("setup", type_.to_string(), "txParamsAddNeighFreq-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -1112,6 +1117,7 @@ struct sl_disc_res_pool_r12_s {
       assert_choice_type("setup", type_.to_string(), "txParamsAddNeighFreq-v1370");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -1397,11 +1403,14 @@ struct sl_disc_tx_res_inter_freq_r13_c {
     assert_choice_type("discTxPoolCommon-r13", type_.to_string(), "SL-DiscTxResourcesInterFreq-r13");
     return c;
   }
+  void                        set_acquire_si_from_carrier_r13() { set(types::acquire_si_from_carrier_r13); }
   sl_disc_tx_pool_list_r12_l& set_disc_tx_pool_common_r13()
   {
     set(types::disc_tx_pool_common_r13);
     return c;
   }
+  void set_request_ded_r13() { set(types::request_ded_r13); }
+  void set_no_tx_on_carrier_r13() { set(types::no_tx_on_carrier_r13); }
 
 private:
   types                      type_;

lib/include/srslte/asn1/rrc/dl_ccch_msg.h

@@ -578,6 +578,13 @@ struct rrc_conn_reest_s {
         set(types::rrc_conn_reest_r8);
         return c;
       }
+      void set_spare7() { set(types::spare7); }
+      void set_spare6() { set(types::spare6); }
+      void set_spare5() { set(types::spare5); }
+      void set_spare4() { set(types::spare4); }
+      void set_spare3() { set(types::spare3); }
+      void set_spare2() { set(types::spare2); }
+      void set_spare1() { set(types::spare1); }
 
     private:
       types                   type_;
@@ -587,9 +594,6 @@ struct rrc_conn_reest_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -599,24 +603,23 @@ struct rrc_conn_reest_s {
     c1_c_& c1()
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     const c1_c_& c1() const
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     c1_c_& set_c1()
     {
       set(types::c1);
-      return c.get<c1_c_>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types type_;
-    choice_buffer_t<c1_c_> c;
-
-    void destroy_();
+    c1_c_ c;
   };
 
   // member variables
@@ -641,9 +644,6 @@ struct rrc_conn_reest_reject_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -653,24 +653,23 @@ struct rrc_conn_reest_reject_s {
     rrc_conn_reest_reject_r8_ies_s& rrc_conn_reest_reject_r8()
     {
       assert_choice_type("rrcConnectionReestablishmentReject-r8", type_.to_string(), "criticalExtensions");
-      return c.get<rrc_conn_reest_reject_r8_ies_s>();
+      return c;
     }
     const rrc_conn_reest_reject_r8_ies_s& rrc_conn_reest_reject_r8() const
     {
       assert_choice_type("rrcConnectionReestablishmentReject-r8", type_.to_string(), "criticalExtensions");
-      return c.get<rrc_conn_reest_reject_r8_ies_s>();
+      return c;
     }
     rrc_conn_reest_reject_r8_ies_s& set_rrc_conn_reest_reject_r8()
     {
       set(types::rrc_conn_reest_reject_r8);
-      return c.get<rrc_conn_reest_reject_r8_ies_s>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types                          type_;
-    choice_buffer_t<rrc_conn_reest_reject_r8_ies_s> c;
-
-    void destroy_();
+    rrc_conn_reest_reject_r8_ies_s c;
   };
 
   // member variables
@@ -716,6 +715,9 @@ struct rrc_conn_reject_s {
         set(types::rrc_conn_reject_r8);
         return c;
       }
+      void set_spare3() { set(types::spare3); }
+      void set_spare2() { set(types::spare2); }
+      void set_spare1() { set(types::spare1); }
 
     private:
       types                    type_;
@@ -725,9 +727,6 @@ struct rrc_conn_reject_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -737,24 +736,23 @@ struct rrc_conn_reject_s {
     c1_c_& c1()
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     const c1_c_& c1() const
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     c1_c_& set_c1()
     {
       set(types::c1);
-      return c.get<c1_c_>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types type_;
-    choice_buffer_t<c1_c_> c;
-
-    void destroy_();
+    c1_c_ c;
   };
 
   // member variables
@@ -800,6 +798,13 @@ struct rrc_conn_setup_s {
         set(types::rrc_conn_setup_r8);
         return c;
       }
+      void set_spare7() { set(types::spare7); }
+      void set_spare6() { set(types::spare6); }
+      void set_spare5() { set(types::spare5); }
+      void set_spare4() { set(types::spare4); }
+      void set_spare3() { set(types::spare3); }
+      void set_spare2() { set(types::spare2); }
+      void set_spare1() { set(types::spare1); }
 
     private:
       types                   type_;
@@ -809,9 +814,6 @@ struct rrc_conn_setup_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -821,24 +823,23 @@ struct rrc_conn_setup_s {
     c1_c_& c1()
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     const c1_c_& c1() const
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     c1_c_& set_c1()
     {
       set(types::c1);
-      return c.get<c1_c_>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types type_;
-    choice_buffer_t<c1_c_> c;
-
-    void destroy_();
+    c1_c_ c;
   };
 
   // member variables
@@ -863,9 +864,6 @@ struct rrc_early_data_complete_r15_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -875,24 +873,23 @@ struct rrc_early_data_complete_r15_s {
     rrc_early_data_complete_r15_ies_s& rrc_early_data_complete_r15()
     {
       assert_choice_type("rrcEarlyDataComplete-r15", type_.to_string(), "criticalExtensions");
-      return c.get<rrc_early_data_complete_r15_ies_s>();
+      return c;
     }
     const rrc_early_data_complete_r15_ies_s& rrc_early_data_complete_r15() const
     {
       assert_choice_type("rrcEarlyDataComplete-r15", type_.to_string(), "criticalExtensions");
-      return c.get<rrc_early_data_complete_r15_ies_s>();
+      return c;
     }
     rrc_early_data_complete_r15_ies_s& set_rrc_early_data_complete_r15()
     {
       set(types::rrc_early_data_complete_r15);
-      return c.get<rrc_early_data_complete_r15_ies_s>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types                             type_;
-    choice_buffer_t<rrc_early_data_complete_r15_ies_s> c;
-
-    void destroy_();
+    rrc_early_data_complete_r15_ies_s c;
   };
 
   // member variables
@@ -1024,6 +1021,9 @@ struct dl_ccch_msg_type_c {
         set(types::rrc_early_data_complete_r15);
         return c;
       }
+      void set_spare3() { set(types::spare3); }
+      void set_spare2() { set(types::spare2); }
+      void set_spare1() { set(types::spare1); }
 
     private:
       types                         type_;
@@ -1040,9 +1040,6 @@ struct dl_ccch_msg_type_c {
 
     // choice methods
     msg_class_ext_c_() = default;
-    msg_class_ext_c_(const msg_class_ext_c_& other);
-    msg_class_ext_c_& operator=(const msg_class_ext_c_& other);
-    ~msg_class_ext_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -1052,24 +1049,23 @@ struct dl_ccch_msg_type_c {
     c2_c_& c2()
     {
       assert_choice_type("c2", type_.to_string(), "messageClassExtension");
-      return c.get<c2_c_>();
+      return c;
     }
     const c2_c_& c2() const
     {
       assert_choice_type("c2", type_.to_string(), "messageClassExtension");
-      return c.get<c2_c_>();
+      return c;
     }
     c2_c_& set_c2()
     {
       set(types::c2);
-      return c.get<c2_c_>();
+      return c;
     }
+    void set_msg_class_ext_future_r15() { set(types::msg_class_ext_future_r15); }
 
   private:
     types type_;
-    choice_buffer_t<c2_c_> c;
-
-    void destroy_();
+    c2_c_ c;
   };
   struct types_opts {
     enum options { c1, msg_class_ext, nulltype } value;

lib/include/srslte/asn1/rrc/ho_cmd.h

@@ -142,6 +142,13 @@ struct scg_cfg_r12_s {
         set(types::scg_cfg_r12);
         return c;
       }
+      void set_spare7() { set(types::spare7); }
+      void set_spare6() { set(types::spare6); }
+      void set_spare5() { set(types::spare5); }
+      void set_spare4() { set(types::spare4); }
+      void set_spare3() { set(types::spare3); }
+      void set_spare2() { set(types::spare2); }
+      void set_spare1() { set(types::spare1); }
 
     private:
       types             type_;
@@ -151,9 +158,6 @@ struct scg_cfg_r12_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -163,24 +167,23 @@ struct scg_cfg_r12_s {
     c1_c_& c1()
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     const c1_c_& c1() const
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     c1_c_& set_c1()
     {
       set(types::c1);
-      return c.get<c1_c_>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types type_;
-    choice_buffer_t<c1_c_> c;
-
-    void destroy_();
+    c1_c_ c;
   };
 
   // member variables
@@ -459,6 +462,13 @@ struct ho_cmd_s {
         set(types::ho_cmd_r8);
         return c;
       }
+      void set_spare7() { set(types::spare7); }
+      void set_spare6() { set(types::spare6); }
+      void set_spare5() { set(types::spare5); }
+      void set_spare4() { set(types::spare4); }
+      void set_spare3() { set(types::spare3); }
+      void set_spare2() { set(types::spare2); }
+      void set_spare1() { set(types::spare1); }
 
     private:
       types           type_;
@@ -468,9 +478,6 @@ struct ho_cmd_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -480,24 +487,23 @@ struct ho_cmd_s {
     c1_c_& c1()
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     const c1_c_& c1() const
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     c1_c_& set_c1()
     {
       set(types::c1);
-      return c.get<c1_c_>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types type_;
-    choice_buffer_t<c1_c_> c;
-
-    void destroy_();
+    c1_c_ c;
   };
 
   // member variables
@@ -563,31 +569,6 @@ struct ho_prep_info_v1320_ies_s {
   void        to_json(json_writer& j) const;
 };
 
-// HandoverPreparationInformation-v13c0-IEs ::= SEQUENCE
-struct ho_prep_info_v13c0_ies_s {
-  bool           as_cfg_v13c0_present = false;
-  bool           non_crit_ext_present = false;
-  as_cfg_v13c0_s as_cfg_v13c0;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
-// HandoverPreparationInformation-v10x0-IEs ::= SEQUENCE
-struct ho_prep_info_v10x0_ies_s {
-  bool                     late_non_crit_ext_present = false;
-  bool                     non_crit_ext_present      = false;
-  dyn_octstring            late_non_crit_ext;
-  ho_prep_info_v13c0_ies_s non_crit_ext;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
 // HandoverPreparationInformation-v1250-IEs ::= SEQUENCE
 struct ho_prep_info_v1250_ies_s {
   bool                     ue_supported_earfcn_r12_present = false;
@@ -603,19 +584,6 @@ struct ho_prep_info_v1250_ies_s {
   void        to_json(json_writer& j) const;
 };
 
-// HandoverPreparationInformation-v10j0-IEs ::= SEQUENCE
-struct ho_prep_info_v10j0_ies_s {
-  bool                     as_cfg_v10j0_present = false;
-  bool                     non_crit_ext_present = false;
-  as_cfg_v10j0_s           as_cfg_v10j0;
-  ho_prep_info_v10x0_ies_s non_crit_ext;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
 // HandoverPreparationInformation-v1130-IEs ::= SEQUENCE
 struct ho_prep_info_v1130_ies_s {
   bool                     as_context_v1130_present = false;
@@ -642,19 +610,6 @@ struct ho_prep_info_v9e0_ies_s {
   void        to_json(json_writer& j) const;
 };
 
-// HandoverPreparationInformation-v9j0-IEs ::= SEQUENCE
-struct ho_prep_info_v9j0_ies_s {
-  bool                     late_non_crit_ext_present = false;
-  bool                     non_crit_ext_present      = false;
-  dyn_octstring            late_non_crit_ext;
-  ho_prep_info_v10j0_ies_s non_crit_ext;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
 // HandoverPreparationInformation-v9d0-IEs ::= SEQUENCE
 struct ho_prep_info_v9d0_ies_s {
   bool                    late_non_crit_ext_present = false;
@@ -832,6 +787,13 @@ struct ho_prep_info_s {
         set(types::ho_prep_info_r8);
         return c;
       }
+      void set_spare7() { set(types::spare7); }
+      void set_spare6() { set(types::spare6); }
+      void set_spare5() { set(types::spare5); }
+      void set_spare4() { set(types::spare4); }
+      void set_spare3() { set(types::spare3); }
+      void set_spare2() { set(types::spare2); }
+      void set_spare1() { set(types::spare1); }
 
     private:
       types                 type_;
@@ -841,9 +803,6 @@ struct ho_prep_info_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -853,24 +812,23 @@ struct ho_prep_info_s {
     c1_c_& c1()
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     const c1_c_& c1() const
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     c1_c_& set_c1()
     {
       set(types::c1);
-      return c.get<c1_c_>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types type_;
-    choice_buffer_t<c1_c_> c;
-
-    void destroy_();
+    c1_c_ c;
   };
 
   // member variables
@@ -882,6 +840,57 @@ struct ho_prep_info_s {
   void        to_json(json_writer& j) const;
 };
 
+// HandoverPreparationInformation-v13c0-IEs ::= SEQUENCE
+struct ho_prep_info_v13c0_ies_s {
+  bool           as_cfg_v13c0_present = false;
+  bool           non_crit_ext_present = false;
+  as_cfg_v13c0_s as_cfg_v13c0;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
+// HandoverPreparationInformation-v10x0-IEs ::= SEQUENCE
+struct ho_prep_info_v10x0_ies_s {
+  bool                     late_non_crit_ext_present = false;
+  bool                     non_crit_ext_present      = false;
+  dyn_octstring            late_non_crit_ext;
+  ho_prep_info_v13c0_ies_s non_crit_ext;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
+// HandoverPreparationInformation-v10j0-IEs ::= SEQUENCE
+struct ho_prep_info_v10j0_ies_s {
+  bool                     as_cfg_v10j0_present = false;
+  bool                     non_crit_ext_present = false;
+  as_cfg_v10j0_s           as_cfg_v10j0;
+  ho_prep_info_v10x0_ies_s non_crit_ext;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
+// HandoverPreparationInformation-v9j0-IEs ::= SEQUENCE
+struct ho_prep_info_v9j0_ies_s {
+  bool                     late_non_crit_ext_present = false;
+  bool                     non_crit_ext_present      = false;
+  dyn_octstring            late_non_crit_ext;
+  ho_prep_info_v10j0_ies_s non_crit_ext;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
 // VarMeasConfig ::= SEQUENCE
 struct var_meas_cfg_s {
   struct speed_state_pars_c_ {
@@ -909,6 +918,7 @@ struct var_meas_cfg_s {
       assert_choice_type("setup", type_.to_string(), "speedStatePars");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);

lib/include/srslte/asn1/rrc/meascfg.h

@@ -721,6 +721,7 @@ struct bt_name_list_cfg_r15_c {
     assert_choice_type("setup", type_.to_string(), "BT-NameListConfig-r15");
     return c;
   }
+  void                set_release() { set(types::release); }
   bt_name_list_r15_l& set_setup()
   {
     set(types::setup);
@@ -955,6 +956,7 @@ struct meas_ds_cfg_r12_c {
     assert_choice_type("setup", type_.to_string(), "MeasDS-Config-r12");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -1342,6 +1344,7 @@ struct meas_gap_cfg_c {
     assert_choice_type("setup", type_.to_string(), "MeasGapConfig");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -1420,6 +1423,7 @@ struct meas_sf_pattern_cfg_neigh_r10_c {
     assert_choice_type("setup", type_.to_string(), "MeasSubframePatternConfigNeigh-r10");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -1511,6 +1515,7 @@ struct rmtc_cfg_r13_c {
     assert_choice_type("setup", type_.to_string(), "RMTC-Config-r13");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -1555,6 +1560,7 @@ struct rs_cfg_ssb_nr_r15_s {
       assert_choice_type("setup", type_.to_string(), "ssb-ToMeasure-r15");
       return c;
     }
+    void                  set_release() { set(types::release); }
     ssb_to_measure_r15_c& set_setup()
     {
       set(types::setup);
@@ -1606,6 +1612,7 @@ struct rsrq_range_cfg_r12_c {
     assert_choice_type("setup", type_.to_string(), "RSRQ-RangeConfig-r12");
     return c;
   }
+  void    set_release() { set(types::release); }
   int8_t& set_setup()
   {
     set(types::setup);
@@ -1962,6 +1969,7 @@ struct ul_delay_cfg_r13_c {
     assert_choice_type("setup", type_.to_string(), "UL-DelayConfig-r13");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -2027,6 +2035,7 @@ struct wlan_name_list_cfg_r15_c {
     assert_choice_type("setup", type_.to_string(), "WLAN-NameListConfig-r15");
     return c;
   }
+  void                  set_release() { set(types::release); }
   wlan_name_list_r15_l& set_setup()
   {
     set(types::setup);
@@ -2110,6 +2119,7 @@ struct meas_obj_eutra_s {
       assert_choice_type("setup", type_.to_string(), "t312-r12");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_e_& set_setup()
     {
       set(types::setup);
@@ -2232,6 +2242,7 @@ struct meas_obj_nr_r15_s {
       assert_choice_type("setup", type_.to_string(), "bandNR-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     uint16_t& set_setup()
     {
       set(types::setup);
@@ -2926,6 +2937,7 @@ struct report_cfg_eutra_s {
       assert_choice_type("setup", type_.to_string(), "alternativeTimeToTrigger-r12");
       return c;
     }
+    void               set_release() { set(types::release); }
     time_to_trigger_e& set_setup()
     {
       set(types::setup);
@@ -2975,6 +2987,7 @@ struct report_cfg_eutra_s {
       assert_choice_type("setup", type_.to_string(), "rs-sinr-Config-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -3491,6 +3504,7 @@ struct report_cfg_inter_rat_s {
       assert_choice_type("setup", type_.to_string(), "b2-Threshold1-v1250");
       return c;
     }
+    void    set_release() { set(types::release); }
     int8_t& set_setup()
     {
       set(types::setup);
@@ -4491,6 +4505,7 @@ struct meas_gap_cfg_dense_prs_r15_c {
     assert_choice_type("setup", type_.to_string(), "MeasGapConfigDensePRS-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4530,6 +4545,7 @@ struct meas_gap_cfg_per_cc_list_r14_c {
     assert_choice_type("setup", type_.to_string(), "MeasGapConfigPerCC-List-r14");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4577,6 +4593,7 @@ struct meas_gap_sharing_cfg_r14_c {
     assert_choice_type("setup", type_.to_string(), "MeasGapSharingConfig-r14");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4715,6 +4732,9 @@ struct rach_skip_r14_s {
       assert_choice_type("scg-STAG-r14", type_.to_string(), "targetTA-r14");
       return c.get<uint8_t>();
     }
+    void     set_ta0_r14() { set(types::ta0_r14); }
+    void     set_mcg_ptag_r14() { set(types::mcg_ptag_r14); }
+    void     set_scg_ptag_r14() { set(types::scg_ptag_r14); }
     uint8_t& set_mcg_stag_r14()
     {
       set(types::mcg_stag_r14);
@@ -4793,6 +4813,7 @@ struct meas_cfg_s {
       assert_choice_type("setup", type_.to_string(), "speedStatePars");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -4824,6 +4845,7 @@ struct meas_cfg_s {
       assert_choice_type("setup", type_.to_string(), "measScaleFactor-r12");
       return c;
     }
+    void                     set_release() { set(types::release); }
     meas_scale_factor_r12_e& set_setup()
     {
       set(types::setup);
@@ -4855,6 +4877,7 @@ struct meas_cfg_s {
       assert_choice_type("setup", type_.to_string(), "heightThreshRef-r15");
       return c;
     }
+    void     set_release() { set(types::release); }
     uint8_t& set_setup()
     {
       set(types::setup);
@@ -4936,17 +4959,6 @@ struct carrier_freq_geran_s {
   void        to_json(json_writer& j) const;
 };
 
-// MobilityControlInfo-v10l0 ::= SEQUENCE
-struct mob_ctrl_info_v10l0_s {
-  bool     add_spec_emission_v10l0_present = false;
-  uint16_t add_spec_emission_v10l0         = 33;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
 // LoggedMeasurementConfiguration-v1530-IEs ::= SEQUENCE
 struct logged_meas_cfg_v1530_ies_s {
   bool                 bt_name_list_r15_present   = false;
@@ -6572,6 +6584,13 @@ struct meas_report_s {
         set(types::meas_report_r8);
         return c;
       }
+      void set_spare7() { set(types::spare7); }
+      void set_spare6() { set(types::spare6); }
+      void set_spare5() { set(types::spare5); }
+      void set_spare4() { set(types::spare4); }
+      void set_spare3() { set(types::spare3); }
+      void set_spare2() { set(types::spare2); }
+      void set_spare1() { set(types::spare1); }
 
     private:
       types                type_;
@@ -6581,9 +6600,6 @@ struct meas_report_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -6593,24 +6609,23 @@ struct meas_report_s {
     c1_c_& c1()
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     const c1_c_& c1() const
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     c1_c_& set_c1()
     {
       set(types::c1);
-      return c.get<c1_c_>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types type_;
-    choice_buffer_t<c1_c_> c;
-
-    void destroy_();
+    c1_c_ c;
   };
 
   // member variables
@@ -6622,6 +6637,17 @@ struct meas_report_s {
   void        to_json(json_writer& j) const;
 };
 
+// MobilityControlInfo-v10l0 ::= SEQUENCE
+struct mob_ctrl_info_v10l0_s {
+  bool     add_spec_emission_v10l0_present = false;
+  uint16_t add_spec_emission_v10l0         = 33;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
 } // namespace rrc
 } // namespace asn1
 

lib/include/srslte/asn1/rrc/paging.h

@@ -265,9 +265,6 @@ struct pcch_msg_type_c {
 
   // choice methods
   pcch_msg_type_c() = default;
-  pcch_msg_type_c(const pcch_msg_type_c& other);
-  pcch_msg_type_c& operator=(const pcch_msg_type_c& other);
-  ~pcch_msg_type_c() { destroy_(); }
   void        set(types::options e = types::nulltype);
   types       type() const { return type_; }
   SRSASN_CODE pack(bit_ref& bref) const;
@@ -277,24 +274,23 @@ struct pcch_msg_type_c {
   c1_c_& c1()
   {
     assert_choice_type("c1", type_.to_string(), "PCCH-MessageType");
-    return c.get<c1_c_>();
+    return c;
   }
   const c1_c_& c1() const
   {
     assert_choice_type("c1", type_.to_string(), "PCCH-MessageType");
-    return c.get<c1_c_>();
+    return c;
   }
   c1_c_& set_c1()
   {
     set(types::c1);
-    return c.get<c1_c_>();
+    return c;
   }
+  void set_msg_class_ext() { set(types::msg_class_ext); }
 
 private:
   types type_;
-  choice_buffer_t<c1_c_> c;
-
-  void destroy_();
+  c1_c_ c;
 };
 
 // PCCH-Message ::= SEQUENCE
@@ -363,6 +359,13 @@ struct ue_paging_coverage_info_s {
         set(types::ue_paging_coverage_info_r13);
         return c;
       }
+      void set_spare7() { set(types::spare7); }
+      void set_spare6() { set(types::spare6); }
+      void set_spare5() { set(types::spare5); }
+      void set_spare4() { set(types::spare4); }
+      void set_spare3() { set(types::spare3); }
+      void set_spare2() { set(types::spare2); }
+      void set_spare1() { set(types::spare1); }
 
     private:
       types                             type_;
@@ -372,9 +375,6 @@ struct ue_paging_coverage_info_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -384,24 +384,23 @@ struct ue_paging_coverage_info_s {
     c1_c_& c1()
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     const c1_c_& c1() const
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     c1_c_& set_c1()
     {
       set(types::c1);
-      return c.get<c1_c_>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types type_;
-    choice_buffer_t<c1_c_> c;
-
-    void destroy_();
+    c1_c_ c;
   };
 
   // member variables
@@ -484,6 +483,13 @@ struct ue_radio_paging_info_s {
         set(types::ue_radio_paging_info_r12);
         return c;
       }
+      void set_spare7() { set(types::spare7); }
+      void set_spare6() { set(types::spare6); }
+      void set_spare5() { set(types::spare5); }
+      void set_spare4() { set(types::spare4); }
+      void set_spare3() { set(types::spare3); }
+      void set_spare2() { set(types::spare2); }
+      void set_spare1() { set(types::spare1); }
 
     private:
       types                          type_;
@@ -493,9 +499,6 @@ struct ue_radio_paging_info_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -505,24 +508,23 @@ struct ue_radio_paging_info_s {
     c1_c_& c1()
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     const c1_c_& c1() const
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     c1_c_& set_c1()
     {
       set(types::c1);
-      return c.get<c1_c_>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types type_;
-    choice_buffer_t<c1_c_> c;
-
-    void destroy_();
+    c1_c_ c;
   };
 
   // member variables

lib/include/srslte/asn1/rrc/phy_ded.h

@@ -221,6 +221,7 @@ struct csi_rs_cfg_nzp_r11_s {
         assert_choice_type("setup", type_.to_string(), "mbsfn-SubframeConfigList-r11");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -264,6 +265,7 @@ struct csi_rs_cfg_nzp_r11_s {
       assert_choice_type("setup", type_.to_string(), "mbsfn-SubframeConfigList-v1430");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -413,6 +415,7 @@ struct csi_rs_cfg_nzp_emimo_r13_c {
     assert_choice_type("setup", type_.to_string(), "CSI-RS-ConfigNZP-EMIMO-r13");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -524,6 +527,7 @@ struct csi_rs_cfg_emimo2_r14_c {
     assert_choice_type("setup", type_.to_string(), "CSI-RS-ConfigEMIMO2-r14");
     return c;
   }
+  void                 set_release() { set(types::release); }
   csi_rs_cfg_bf_r14_s& set_setup()
   {
     set(types::setup);
@@ -766,6 +770,7 @@ struct cri_report_cfg_r13_c {
     assert_choice_type("setup", type_.to_string(), "CRI-ReportConfig-r13");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -807,6 +812,7 @@ struct csi_rs_cfg_emimo_hybrid_r14_c {
     assert_choice_type("setup", type_.to_string(), "CSI-RS-ConfigEMIMO-Hybrid-r14");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -900,6 +906,7 @@ struct csi_rs_cfg_emimo_r13_c {
     assert_choice_type("setup", type_.to_string(), "CSI-RS-ConfigEMIMO-r13");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_c_& set_setup()
   {
     set(types::setup);
@@ -993,6 +1000,7 @@ struct csi_rs_cfg_emimo_v1430_c {
     assert_choice_type("setup", type_.to_string(), "CSI-RS-ConfigEMIMO-v1430");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_c_& set_setup()
   {
     set(types::setup);
@@ -1086,6 +1094,7 @@ struct csi_rs_cfg_emimo_v1480_c {
     assert_choice_type("setup", type_.to_string(), "CSI-RS-ConfigEMIMO-v1480");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_c_& set_setup()
   {
     set(types::setup);
@@ -1143,6 +1152,7 @@ struct csi_rs_cfg_emimo_v1530_c {
     assert_choice_type("setup", type_.to_string(), "CSI-RS-ConfigEMIMO-v1530");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_c_& set_setup()
   {
     set(types::setup);
@@ -1273,6 +1283,7 @@ struct cqi_report_periodic_proc_ext_r11_s {
       assert_choice_type("setup", type_.to_string(), "csi-ConfigIndex-r11");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -1382,6 +1393,7 @@ struct csi_process_r11_s {
       assert_choice_type("setup", type_.to_string(), "csi-IM-ConfigIdList-r12");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_l_& set_setup()
     {
       set(types::setup);
@@ -1415,6 +1427,7 @@ struct csi_process_r11_s {
       assert_choice_type("setup", type_.to_string(), "cqi-ReportAperiodicProc2-r12");
       return c;
     }
+    void                             set_release() { set(types::release); }
     cqi_report_aperiodic_proc_r11_s& set_setup()
     {
       set(types::setup);
@@ -1448,6 +1461,7 @@ struct csi_process_r11_s {
       assert_choice_type("setup", type_.to_string(), "cqi-ReportAperiodicProc-v1310");
       return c;
     }
+    void                               set_release() { set(types::release); }
     cqi_report_aperiodic_proc_v1310_s& set_setup()
     {
       set(types::setup);
@@ -1481,6 +1495,7 @@ struct csi_process_r11_s {
       assert_choice_type("setup", type_.to_string(), "cqi-ReportAperiodicProc2-v1310");
       return c;
     }
+    void                               set_release() { set(types::release); }
     cqi_report_aperiodic_proc_v1310_s& set_setup()
     {
       set(types::setup);
@@ -1621,6 +1636,7 @@ struct cqi_report_aperiodic_r10_c {
     assert_choice_type("setup", type_.to_string(), "CQI-ReportAperiodic-r10");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -1676,6 +1692,7 @@ struct cqi_report_aperiodic_v1250_c {
     assert_choice_type("setup", type_.to_string(), "CQI-ReportAperiodic-v1250");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -1729,6 +1746,7 @@ struct cqi_report_aperiodic_v1310_c {
         assert_choice_type("setup", type_.to_string(), "aperiodicCSI-Trigger2-r13");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -1768,6 +1786,7 @@ struct cqi_report_aperiodic_v1310_c {
     assert_choice_type("setup", type_.to_string(), "CQI-ReportAperiodic-v1310");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -2052,6 +2071,7 @@ struct cqi_report_periodic_r10_c {
         assert_choice_type("setup", type_.to_string(), "csi-ConfigIndex-r10");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -2098,6 +2118,7 @@ struct cqi_report_periodic_r10_c {
     assert_choice_type("setup", type_.to_string(), "CQI-ReportPeriodic-r10");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -2249,6 +2270,7 @@ struct spdcch_elems_r15_c {
     assert_choice_type("setup", type_.to_string(), "SPDCCH-Elements-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -2311,6 +2333,7 @@ struct spucch_elems_r15_c {
     assert_choice_type("setup", type_.to_string(), "SPUCCH-Elements-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -2406,6 +2429,7 @@ struct zero_tx_pwr_csi_rs_conf_r12_c {
     assert_choice_type("setup", type_.to_string(), "ZeroTxPowerCSI-RS-Conf-r12");
     return c;
   }
+  void                      set_release() { set(types::release); }
   zero_tx_pwr_csi_rs_r12_s& set_setup()
   {
     set(types::setup);
@@ -2446,6 +2470,7 @@ struct cqi_report_cfg_r10_s {
       assert_choice_type("setup", type_.to_string(), "csi-SubframePatternConfig-r10");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -2516,6 +2541,7 @@ struct cqi_report_cfg_v1250_s {
       assert_choice_type("setup", type_.to_string(), "csi-SubframePatternConfig-r12");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -2637,6 +2663,7 @@ struct csi_rs_cfg_r10_s {
       assert_choice_type("setup", type_.to_string(), "csi-RS-r10");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -2693,6 +2720,7 @@ struct csi_rs_cfg_v1250_s {
       assert_choice_type("setup", type_.to_string(), "ds-ZeroTxPowerCSI-RS-r12");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -2860,6 +2888,7 @@ struct epdcch_set_cfg_r11_s {
       assert_choice_type("setup", type_.to_string(), "csi-RS-ConfigZPId2-r12");
       return c;
     }
+    void     set_release() { set(types::release); }
     uint8_t& set_setup()
     {
       set(types::setup);
@@ -2882,6 +2911,9 @@ struct epdcch_set_cfg_r11_s {
     void        to_json(json_writer& j) const;
     bool        operator==(const num_prb_pairs_v1310_c_& other) const;
     bool        operator!=(const num_prb_pairs_v1310_c_& other) const { return not(*this == other); }
+    // getters
+    void set_release() { set(types::release); }
+    void set_setup() { set(types::setup); }
 
   private:
     types type_;
@@ -3015,6 +3047,7 @@ struct epdcch_set_cfg_r11_s {
       assert_choice_type("setup", type_.to_string(), "mpdcch-config-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -3142,6 +3175,7 @@ struct enable256_qam_r14_c {
     assert_choice_type("setup", type_.to_string(), "Enable256QAM-r14");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_c_& set_setup()
   {
     set(types::setup);
@@ -3190,6 +3224,7 @@ struct pdsch_re_map_qcl_cfg_r11_s {
         assert_choice_type("setup", type_.to_string(), "mbsfn-SubframeConfigList-r11");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -3242,6 +3277,7 @@ struct pdsch_re_map_qcl_cfg_r11_s {
       assert_choice_type("setup", type_.to_string(), "mbsfn-SubframeConfigList-v1430");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -3305,6 +3341,7 @@ struct pdsch_re_map_qcl_cfg_r11_s {
       assert_choice_type("setup", type_.to_string(), "codewordOneConfig-v1530");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -3393,6 +3430,7 @@ struct tpc_pdcch_cfg_c {
     assert_choice_type("setup", type_.to_string(), "TPC-PDCCH-Config");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -3704,6 +3742,7 @@ struct ant_info_ded_stti_r15_c {
     assert_choice_type("setup", type_.to_string(), "AntennaInfoDedicatedSTTI-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -3788,6 +3827,7 @@ struct cqi_report_cfg_r15_c {
     assert_choice_type("setup", type_.to_string(), "CQI-ReportConfig-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -3831,6 +3871,7 @@ struct cqi_report_periodic_c {
         assert_choice_type("subbandCQI", type_.to_string(), "cqi-FormatIndicatorPeriodic");
         return c;
       }
+      void            set_wideband_cqi() { set(types::wideband_cqi); }
       subband_cqi_s_& set_subband_cqi()
       {
         set(types::subband_cqi);
@@ -3870,6 +3911,7 @@ struct cqi_report_periodic_c {
     assert_choice_type("setup", type_.to_string(), "CQI-ReportPeriodic");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -3915,6 +3957,7 @@ struct csi_rs_cfg_r15_c {
     assert_choice_type("setup", type_.to_string(), "CSI-RS-Config-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -3957,6 +4000,7 @@ struct csi_rs_cfg_zp_ap_list_r14_c {
     assert_choice_type("setup", type_.to_string(), "CSI-RS-ConfigZP-ApList-r14");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_l_& set_setup()
   {
     set(types::setup);
@@ -4002,6 +4046,7 @@ struct dmrs_cfg_r11_c {
     assert_choice_type("setup", type_.to_string(), "DMRS-Config-r11");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4137,6 +4182,7 @@ struct eimta_main_cfg_r12_c {
     assert_choice_type("setup", type_.to_string(), "EIMTA-MainConfig-r12");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4185,6 +4231,7 @@ struct eimta_main_cfg_serv_cell_r12_c {
         assert_choice_type("setup", type_.to_string(), "mbsfn-SubframeConfigList-v1250");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -4223,6 +4270,7 @@ struct eimta_main_cfg_serv_cell_r12_c {
     assert_choice_type("setup", type_.to_string(), "EIMTA-MainConfigServCell-r12");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4334,6 +4382,7 @@ struct pucch_format3_conf_r13_s {
       assert_choice_type("setup", type_.to_string(), "twoAntennaPortActivatedPUCCH-Format3-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -4405,6 +4454,7 @@ struct spdcch_cfg_r15_c {
     assert_choice_type("setup", type_.to_string(), "SPDCCH-Config-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4454,6 +4504,7 @@ struct spucch_cfg_r15_c {
     assert_choice_type("setup", type_.to_string(), "SPUCCH-Config-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4637,6 +4688,7 @@ struct sched_request_cfg_v1530_c {
     assert_choice_type("setup", type_.to_string(), "SchedulingRequestConfig-v1530");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4726,6 +4778,7 @@ struct slot_or_subslot_pdsch_cfg_r15_c {
     assert_choice_type("setup", type_.to_string(), "SlotOrSubslotPDSCH-Config-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4791,6 +4844,7 @@ struct slot_or_subslot_pusch_cfg_r15_c {
     assert_choice_type("setup", type_.to_string(), "SlotOrSubslotPUSCH-Config-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4839,6 +4893,7 @@ struct tdd_pusch_up_pts_r14_c {
     assert_choice_type("setup", type_.to_string(), "TDD-PUSCH-UpPTS-r14");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -5058,6 +5113,7 @@ struct ant_info_ded_s {
       assert_choice_type("setup", type_.to_string(), "ue-TransmitAntennaSelection");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_e_& set_setup()
     {
       set(types::setup);
@@ -5138,6 +5194,7 @@ struct ant_info_ded_r10_s {
       assert_choice_type("setup", type_.to_string(), "ue-TransmitAntennaSelection");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_e_& set_setup()
     {
       set(types::setup);
@@ -5228,6 +5285,7 @@ struct ant_info_ded_v1530_c {
       assert_choice_type("ue-TxAntennaSelection-SRS-2T4R-NrOfPairs-r15", type_.to_string(), "setup");
       return c;
     }
+    void set_ue_tx_ant_sel_srs_minus1_t4_r_cfg_r15() { set(types::ue_tx_ant_sel_srs_minus1_t4_r_cfg_r15); }
     ue_tx_ant_sel_srs_minus2_t4_r_nr_of_pairs_r15_e_& set_ue_tx_ant_sel_srs_minus2_t4_r_nr_of_pairs_r15()
     {
       set(types::ue_tx_ant_sel_srs_minus2_t4_r_nr_of_pairs_r15);
@@ -5258,6 +5316,7 @@ struct ant_info_ded_v1530_c {
     assert_choice_type("setup", type_.to_string(), "AntennaInfoDedicated-v1530");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_c_& set_setup()
   {
     set(types::setup);
@@ -5518,6 +5577,7 @@ struct epdcch_cfg_r11_s {
           assert_choice_type("setup", type_.to_string(), "subframePatternConfig-r11");
           return c;
         }
+        void      set_release() { set(types::release); }
         setup_s_& set_setup()
         {
           set(types::setup);
@@ -5561,6 +5621,7 @@ struct epdcch_cfg_r11_s {
       assert_choice_type("setup", type_.to_string(), "config-r11");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -5614,6 +5675,7 @@ struct pdcch_candidate_reductions_r13_c {
     assert_choice_type("setup", type_.to_string(), "PDCCH-CandidateReductions-r13");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -5811,6 +5873,7 @@ struct pucch_cfg_ded_s {
       assert_choice_type("setup", type_.to_string(), "ackNackRepetition");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -5878,6 +5941,7 @@ struct pucch_cfg_ded_r13_s {
       assert_choice_type("setup", type_.to_string(), "ackNackRepetition-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -5926,6 +5990,7 @@ struct pucch_cfg_ded_r13_s {
           assert_choice_type("setup", type_.to_string(), "twoAntennaPortActivatedPUCCH-Format3-r13");
           return c;
         }
+        void      set_release() { set(types::release); }
         setup_s_& set_setup()
         {
           set(types::setup);
@@ -5975,6 +6040,7 @@ struct pucch_cfg_ded_r13_s {
           assert_choice_type("setup", type_.to_string(), "n1PUCCH-AN-CS-r13");
           return c;
         }
+        void      set_release() { set(types::release); }
         setup_s_& set_setup()
         {
           set(types::setup);
@@ -6123,6 +6189,7 @@ struct pucch_cfg_ded_r13_s {
       assert_choice_type("setup", type_.to_string(), "nPUCCH-Param-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -6159,6 +6226,7 @@ struct pucch_cfg_ded_r13_s {
       assert_choice_type("setup", type_.to_string(), "nkaPUCCH-Param-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -6300,6 +6368,7 @@ struct pucch_cfg_ded_r13_s {
       assert_choice_type("setup", type_.to_string(), "pucch-NumRepetitionCE-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_c_& set_setup()
     {
       set(types::setup);
@@ -6374,6 +6443,7 @@ struct pucch_cfg_ded_v1020_s {
           assert_choice_type("setup", type_.to_string(), "n1PUCCH-AN-CS-r10");
           return c;
         }
+        void      set_release() { set(types::release); }
         setup_s_& set_setup()
         {
           set(types::setup);
@@ -6490,6 +6560,7 @@ struct pucch_cfg_ded_v1130_s {
       assert_choice_type("setup", type_.to_string(), "n1PUCCH-AN-CS-v1130");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -6525,6 +6596,7 @@ struct pucch_cfg_ded_v1130_s {
       assert_choice_type("setup", type_.to_string(), "nPUCCH-Param-r11");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -6574,6 +6646,7 @@ struct pucch_cfg_ded_v1250_s {
       assert_choice_type("setup", type_.to_string(), "nkaPUCCH-Param-r12");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -6663,6 +6736,7 @@ struct pusch_cfg_ded_r13_s {
       assert_choice_type("setup", type_.to_string(), "pusch-DMRS-r11");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -6714,6 +6788,7 @@ struct pusch_cfg_ded_r13_s {
       assert_choice_type("setup", type_.to_string(), "uciOnPUSCH");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -6798,6 +6873,7 @@ struct pusch_cfg_ded_v1130_s {
       assert_choice_type("setup", type_.to_string(), "pusch-DMRS-r11");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -6857,6 +6933,7 @@ struct pusch_cfg_ded_v1250_s {
       assert_choice_type("setup", type_.to_string(), "uciOnPUSCH");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -6920,6 +6997,7 @@ struct pusch_cfg_ded_v1530_s {
       assert_choice_type("setup", type_.to_string(), "ce-PUSCH-FlexibleStartPRB-AllocConfig-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -6957,6 +7035,7 @@ struct pusch_cfg_ded_v1530_s {
       assert_choice_type("setup", type_.to_string(), "ce-PUSCH-SubPRB-Config-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -7081,6 +7160,7 @@ struct pusch_enhance_cfg_r14_c {
     assert_choice_type("setup", type_.to_string(), "PUSCH-EnhancementsConfig-r14");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -7159,6 +7239,7 @@ struct phys_cfg_ded_stti_r15_c {
     assert_choice_type("setup", type_.to_string(), "PhysicalConfigDedicatedSTTI-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -7205,6 +7286,7 @@ struct spucch_cfg_v1550_c {
     assert_choice_type("setup", type_.to_string(), "SPUCCH-Config-v1550");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -7250,6 +7332,7 @@ struct srs_tpc_pdcch_cfg_r14_c {
     assert_choice_type("setup", type_.to_string(), "SRS-TPC-PDCCH-Config-r14");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -7298,6 +7381,7 @@ struct sched_request_cfg_c {
     assert_choice_type("setup", type_.to_string(), "SchedulingRequestConfig");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -7379,6 +7463,7 @@ struct srs_ul_cfg_ded_c {
     assert_choice_type("setup", type_.to_string(), "SoundingRS-UL-ConfigDedicated");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -7452,6 +7537,7 @@ struct srs_ul_cfg_ded_v1310_c {
     assert_choice_type("setup", type_.to_string(), "SoundingRS-UL-ConfigDedicated-v1310");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -7496,6 +7582,7 @@ struct srs_ul_cfg_ded_aperiodic_r10_c {
         assert_choice_type("setup", type_.to_string(), "srs-ActivateAp-r10");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -7536,6 +7623,7 @@ struct srs_ul_cfg_ded_aperiodic_r10_c {
     assert_choice_type("setup", type_.to_string(), "SoundingRS-UL-ConfigDedicatedAperiodic-r10");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -7580,6 +7668,7 @@ struct srs_ul_cfg_ded_aperiodic_v1310_c {
         assert_choice_type("setup", type_.to_string(), "srs-ActivateAp-v1310");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -7619,6 +7708,7 @@ struct srs_ul_cfg_ded_aperiodic_v1310_c {
     assert_choice_type("setup", type_.to_string(), "SoundingRS-UL-ConfigDedicatedAperiodic-v1310");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -7669,6 +7759,7 @@ struct srs_ul_cfg_ded_aperiodic_up_pts_ext_r13_c {
         assert_choice_type("setup", type_.to_string(), "srs-ActivateAp-r13");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -7710,6 +7801,7 @@ struct srs_ul_cfg_ded_aperiodic_up_pts_ext_r13_c {
     assert_choice_type("setup", type_.to_string(), "SoundingRS-UL-ConfigDedicatedAperiodicUpPTsExt-r13");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -7799,6 +7891,7 @@ struct srs_ul_cfg_ded_up_pts_ext_r13_c {
     assert_choice_type("setup", type_.to_string(), "SoundingRS-UL-ConfigDedicatedUpPTsExt-r13");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -7897,6 +7990,7 @@ struct ul_pwr_ctrl_ded_v1250_s {
       assert_choice_type("setup", type_.to_string(), "set2PowerControlParameter");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -7967,6 +8061,7 @@ struct phys_cfg_ded_s {
       set(types::explicit_value);
       return c;
     }
+    void set_default_value() { set(types::default_value); }
 
   private:
     types          type_;
@@ -8003,6 +8098,7 @@ struct phys_cfg_ded_s {
       set(types::explicit_value_r10);
       return c;
     }
+    void set_default_value() { set(types::default_value); }
 
   private:
     types              type_;
@@ -8032,6 +8128,7 @@ struct phys_cfg_ded_s {
       assert_choice_type("setup", type_.to_string(), "additionalSpectrumEmissionCA-r10");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -8069,6 +8166,7 @@ struct phys_cfg_ded_s {
       assert_choice_type("setup", type_.to_string(), "ce-Mode-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_e_& set_setup()
     {
       set(types::setup);
@@ -8101,6 +8199,7 @@ struct phys_cfg_ded_s {
       assert_choice_type("setup", type_.to_string(), "typeA-SRS-TPC-PDCCH-Group-r14");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_l_& set_setup()
     {
       set(types::setup);
@@ -8156,6 +8255,7 @@ struct phys_cfg_ded_s {
       assert_choice_type("setup", type_.to_string(), "must-Config-r14");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -8247,6 +8347,7 @@ struct phys_cfg_ded_s {
       assert_choice_type("setup", type_.to_string(), "semiStaticCFI-Config-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_c_& set_setup()
     {
       set(types::setup);
@@ -8349,6 +8450,7 @@ struct phys_cfg_ded_s {
       assert_choice_type("setup", type_.to_string(), "blindPDSCH-Repetition-Config-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);

lib/include/srslte/asn1/rrc/rr_common.h

@@ -284,47 +284,6 @@ struct tdd_cfg_v1130_s {
   bool        operator!=(const tdd_cfg_v1130_s& other) const { return not(*this == other); }
 };
 
-// UplinkPowerControlCommon-v1310 ::= SEQUENCE
-struct ul_pwr_ctrl_common_v1310_s {
-  struct delta_f_pucch_format4_r13_opts {
-    enum options {
-      delta_f16,
-      delta_f15,
-      delta_f14,
-      delta_f13,
-      delta_f12,
-      delta_f11,
-      delta_f10,
-      spare1,
-      nulltype
-    } value;
-    typedef uint8_t number_type;
-
-    std::string to_string() const;
-    uint8_t     to_number() const;
-  };
-  typedef enumerated<delta_f_pucch_format4_r13_opts> delta_f_pucch_format4_r13_e_;
-  struct delta_f_pucch_format5_minus13_opts {
-    enum options { delta_f13, delta_f12, delta_f11, delta_f10, delta_f9, delta_f8, delta_f7, spare1, nulltype } value;
-    typedef uint8_t number_type;
-
-    std::string to_string() const;
-    uint8_t     to_number() const;
-  };
-  typedef enumerated<delta_f_pucch_format5_minus13_opts> delta_f_pucch_format5_minus13_e_;
-
-  // member variables
-  bool                             delta_f_pucch_format4_r13_present     = false;
-  bool                             delta_f_pucch_format5_minus13_present = false;
-  delta_f_pucch_format4_r13_e_     delta_f_pucch_format4_r13;
-  delta_f_pucch_format5_minus13_e_ delta_f_pucch_format5_minus13;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
 // PRACH-ParametersCE-r13 ::= SEQUENCE
 struct prach_params_ce_r13_s {
   struct prach_start_sf_r13_opts {
@@ -713,6 +672,7 @@ struct delta_flist_spucch_r15_c {
     assert_choice_type("setup", type_.to_string(), "DeltaFList-SPUCCH-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -1874,6 +1834,7 @@ struct srs_ul_cfg_common_c {
     assert_choice_type("setup", type_.to_string(), "SoundingRS-UL-ConfigCommon");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -2433,6 +2394,47 @@ struct rr_cfg_common_scell_r10_s {
   bool        operator!=(const rr_cfg_common_scell_r10_s& other) const { return not(*this == other); }
 };
 
+// UplinkPowerControlCommon-v1310 ::= SEQUENCE
+struct ul_pwr_ctrl_common_v1310_s {
+  struct delta_f_pucch_format4_r13_opts {
+    enum options {
+      delta_f16,
+      delta_f15,
+      delta_f14,
+      delta_f13,
+      delta_f12,
+      delta_f11,
+      delta_f10,
+      spare1,
+      nulltype
+    } value;
+    typedef uint8_t number_type;
+
+    std::string to_string() const;
+    uint8_t     to_number() const;
+  };
+  typedef enumerated<delta_f_pucch_format4_r13_opts> delta_f_pucch_format4_r13_e_;
+  struct delta_f_pucch_format5_minus13_opts {
+    enum options { delta_f13, delta_f12, delta_f11, delta_f10, delta_f9, delta_f8, delta_f7, spare1, nulltype } value;
+    typedef uint8_t number_type;
+
+    std::string to_string() const;
+    uint8_t     to_number() const;
+  };
+  typedef enumerated<delta_f_pucch_format5_minus13_opts> delta_f_pucch_format5_minus13_e_;
+
+  // member variables
+  bool                             delta_f_pucch_format4_r13_present     = false;
+  bool                             delta_f_pucch_format5_minus13_present = false;
+  delta_f_pucch_format4_r13_e_     delta_f_pucch_format4_r13;
+  delta_f_pucch_format5_minus13_e_ delta_f_pucch_format5_minus13;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
 // PRACH-Config-v1310 ::= SEQUENCE
 struct prach_cfg_v1310_s {
   struct mpdcch_start_sf_css_ra_r13_c_ {

lib/include/srslte/asn1/rrc/rr_ded.h

@@ -527,6 +527,7 @@ struct lc_ch_cfg_s {
       assert_choice_type("setup", type_.to_string(), "allowedTTI-Lengths-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -566,6 +567,7 @@ struct lc_ch_cfg_s {
       assert_choice_type("setup", type_.to_string(), "logicalChannelSR-Restriction-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_e_& set_setup()
     {
       set(types::setup);
@@ -599,6 +601,7 @@ struct lc_ch_cfg_s {
       assert_choice_type("setup", type_.to_string(), "channelAccessPriority-r15");
       return c;
     }
+    void     set_release() { set(types::release); }
     uint8_t& set_setup()
     {
       set(types::setup);
@@ -986,6 +989,7 @@ struct pdcp_cfg_s {
       assert_choice_type("rohc", type_.to_string(), "headerCompression");
       return c;
     }
+    void     set_not_used() { set(types::not_used); }
     rohc_s_& set_rohc()
     {
       set(types::rohc);
@@ -1087,6 +1091,7 @@ struct pdcp_cfg_s {
       assert_choice_type("setup", type_.to_string(), "ul-DataSplitThreshold-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_e_& set_setup()
     {
       set(types::setup);
@@ -1210,6 +1215,7 @@ struct pdcp_cfg_s {
       assert_choice_type("setup", type_.to_string(), "statusFeedback-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -1275,6 +1281,7 @@ struct pdcp_cfg_s {
       assert_choice_type("setup", type_.to_string(), "ul-LWA-Config-r14");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -1325,6 +1332,7 @@ struct pdcp_cfg_s {
       assert_choice_type("rohc-r14", type_.to_string(), "uplinkOnlyHeaderCompression-r14");
       return c;
     }
+    void         set_not_used_r14() { set(types::not_used_r14); }
     rohc_r14_s_& set_rohc_r14()
     {
       set(types::rohc_r14);
@@ -1392,6 +1400,7 @@ struct pdcp_cfg_s {
       assert_choice_type("setup", type_.to_string(), "pdcp-DuplicationConfig-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -1532,6 +1541,7 @@ struct rlc_bearer_cfg_r15_c {
     assert_choice_type("setup", type_.to_string(), "RLC-BearerConfig-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -1702,6 +1712,7 @@ struct rlc_cfg_v1430_c {
     assert_choice_type("setup", type_.to_string(), "RLC-Config-v1430");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -1738,25 +1749,11 @@ struct rlc_cfg_v1530_c {
   bool        operator==(const rlc_cfg_v1530_c& other) const;
   bool        operator!=(const rlc_cfg_v1530_c& other) const { return not(*this == other); }
   // getters
-  setup_s_& setup()
-  {
-    assert_choice_type("setup", type_.to_string(), "RLC-Config-v1530");
-    return c;
-  }
-  const setup_s_& setup() const
-  {
-    assert_choice_type("setup", type_.to_string(), "RLC-Config-v1530");
-    return c;
-  }
-  setup_s_& set_setup()
-  {
-    set(types::setup);
-    return c;
-  }
+  void set_release() { set(types::release); }
+  void set_setup() { set(types::setup); }
 
 private:
   types type_;
-  setup_s_ c;
 };
 
 // SPS-ConfigSL-r14 ::= SEQUENCE
@@ -1866,6 +1863,7 @@ struct sps_cfg_ul_c {
         assert_choice_type("setup", type_.to_string(), "p0-PersistentSubframeSet2-r12");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -1988,6 +1986,7 @@ struct sps_cfg_ul_c {
     assert_choice_type("setup", type_.to_string(), "SPS-ConfigUL");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -2067,6 +2066,7 @@ struct sps_cfg_ul_stti_r15_c {
         assert_choice_type("setup", type_.to_string(), "p0-PersistentSubframeSet2-r15");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -2163,6 +2163,7 @@ struct sps_cfg_ul_stti_r15_c {
     assert_choice_type("setup", type_.to_string(), "SPS-ConfigUL-STTI-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -2684,6 +2685,7 @@ struct drx_cfg_c {
     assert_choice_type("setup", type_.to_string(), "DRX-Config");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -3003,6 +3005,7 @@ struct sps_cfg_dl_c {
         assert_choice_type("setup", type_.to_string(), "twoAntennaPortActivated-r10");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -3052,6 +3055,7 @@ struct sps_cfg_dl_c {
     assert_choice_type("setup", type_.to_string(), "SPS-ConfigDL");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -3116,6 +3120,7 @@ struct sps_cfg_dl_stti_r15_c {
         assert_choice_type("setup", type_.to_string(), "twoAntennaPortActivated-r15");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -3158,6 +3163,7 @@ struct sps_cfg_dl_stti_r15_c {
     assert_choice_type("setup", type_.to_string(), "SPS-ConfigDL-STTI-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -3228,6 +3234,7 @@ struct srb_to_add_mod_s {
       set(types::explicit_value);
       return c;
     }
+    void set_default_value() { set(types::default_value); }
 
   private:
     types     type_;
@@ -3266,6 +3273,7 @@ struct srb_to_add_mod_s {
       set(types::explicit_value);
       return c;
     }
+    void set_default_value() { set(types::default_value); }
 
   private:
     types       type_;
@@ -3387,6 +3395,7 @@ struct mac_main_cfg_s {
       assert_choice_type("setup", type_.to_string(), "phr-Config");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -3445,6 +3454,7 @@ struct mac_main_cfg_s {
       assert_choice_type("setup", type_.to_string(), "dualConnectivityPHR");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -3489,6 +3499,7 @@ struct mac_main_cfg_s {
       assert_choice_type("setup", type_.to_string(), "logicalChannelSR-Config-r12");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -3578,6 +3589,7 @@ struct mac_main_cfg_s {
       assert_choice_type("setup", type_.to_string(), "eDRX-Config-CycleStartOffset-r13");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_c_& set_setup()
     {
       set(types::setup);
@@ -3609,6 +3621,7 @@ struct mac_main_cfg_s {
       assert_choice_type("setup", type_.to_string(), "drx-Config-r13");
       return c;
     }
+    void           set_release() { set(types::release); }
     drx_cfg_r13_s& set_setup()
     {
       set(types::setup);
@@ -3644,6 +3657,7 @@ struct mac_main_cfg_s {
       assert_choice_type("setup", type_.to_string(), "skipUplinkTx-r14");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -3678,6 +3692,7 @@ struct mac_main_cfg_s {
       assert_choice_type("setup", type_.to_string(), "dataInactivityTimerConfig-r14");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -3753,6 +3768,7 @@ struct mac_main_cfg_s {
       assert_choice_type("setup", type_.to_string(), "shortTTI-AndSPT-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -3826,6 +3842,7 @@ struct mac_main_cfg_s {
       assert_choice_type("setup", type_.to_string(), "dormantStateTimers-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -3907,6 +3924,7 @@ struct meas_sf_pattern_pcell_r10_c {
     assert_choice_type("setup", type_.to_string(), "MeasSubframePatternPCell-r10");
     return c;
   }
+  void                   set_release() { set(types::release); }
   meas_sf_pattern_r10_c& set_setup()
   {
     set(types::setup);
@@ -3950,6 +3968,7 @@ struct naics_assist_info_r12_c {
     assert_choice_type("setup", type_.to_string(), "NAICS-AssistanceInfo-r12");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -3983,6 +4002,7 @@ struct neigh_cells_crs_info_r11_c {
     assert_choice_type("setup", type_.to_string(), "NeighCellsCRS-Info-r11");
     return c;
   }
+  void                        set_release() { set(types::release); }
   crs_assist_info_list_r11_l& set_setup()
   {
     set(types::setup);
@@ -4018,6 +4038,7 @@ struct neigh_cells_crs_info_r13_c {
     assert_choice_type("setup", type_.to_string(), "NeighCellsCRS-Info-r13");
     return c;
   }
+  void                        set_release() { set(types::release); }
   crs_assist_info_list_r13_l& set_setup()
   {
     set(types::setup);
@@ -4053,6 +4074,7 @@ struct neigh_cells_crs_info_r15_c {
     assert_choice_type("setup", type_.to_string(), "NeighCellsCRS-Info-r15");
     return c;
   }
+  void                        set_release() { set(types::release); }
   crs_assist_info_list_r15_l& set_setup()
   {
     set(types::setup);
@@ -4117,6 +4139,7 @@ struct rlf_timers_and_consts_r13_c {
     assert_choice_type("setup", type_.to_string(), "RLF-TimersAndConstants-r13");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4201,6 +4224,7 @@ struct rlf_timers_and_consts_r9_c {
     assert_choice_type("setup", type_.to_string(), "RLF-TimersAndConstants-r9");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4321,6 +4345,7 @@ struct rr_cfg_ded_s {
       set(types::explicit_value);
       return c;
     }
+    void set_default_value() { set(types::default_value); }
 
   private:
     types          type_;
@@ -4361,6 +4386,7 @@ struct rr_cfg_ded_s {
         assert_choice_type("crs-IntfMitigNumPRBs", type_.to_string(), "setup");
         return c;
       }
+      void                        set_crs_intf_mitig_enabled() { set(types::crs_intf_mitig_enabled); }
       crs_intf_mitig_num_prbs_e_& set_crs_intf_mitig_num_prbs()
       {
         set(types::crs_intf_mitig_num_prbs);
@@ -4391,6 +4417,7 @@ struct rr_cfg_ded_s {
       assert_choice_type("setup", type_.to_string(), "crs-IntfMitigConfig-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_c_& set_setup()
     {
       set(types::setup);
@@ -4491,6 +4518,7 @@ struct pdcch_candidate_reductions_laa_ul_r14_c {
     assert_choice_type("setup", type_.to_string(), "PDCCH-CandidateReductionsLAA-UL-r14");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4601,6 +4629,7 @@ struct aul_cfg_r15_c {
     assert_choice_type("setup", type_.to_string(), "AUL-Config-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4642,6 +4671,7 @@ struct cqi_report_periodic_scell_r15_c {
         assert_choice_type("setup", type_.to_string(), "csi-SubframePatternDormant-r15");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -4770,6 +4800,7 @@ struct cqi_report_periodic_scell_r15_c {
     assert_choice_type("setup", type_.to_string(), "CQI-ReportPeriodicSCell-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -4939,6 +4970,7 @@ struct srs_ul_cfg_ded_aperiodic_v1430_c {
     assert_choice_type("setup", type_.to_string(), "SoundingRS-UL-ConfigDedicatedAperiodic-v1430");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -5111,6 +5143,7 @@ struct cqi_short_cfg_scell_r15_c {
     assert_choice_type("setup", type_.to_string(), "CQI-ShortConfigSCell-r15");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -5333,6 +5366,7 @@ struct laa_scell_cfg_v1430_s {
       assert_choice_type("setup", type_.to_string(), "crossCarrierSchedulingConfig-UL-r14");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -5427,6 +5461,7 @@ struct pucch_cfg_ded_v1370_s {
       assert_choice_type("setup", type_.to_string(), "pucch-Format-v1370");
       return c;
     }
+    void                      set_release() { set(types::release); }
     pucch_format3_conf_r13_s& set_setup()
     {
       set(types::setup);
@@ -5503,6 +5538,7 @@ struct pusch_cfg_ded_scell_v1530_s {
       assert_choice_type("setup", type_.to_string(), "uci-OnPUSCH-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -5566,6 +5602,7 @@ struct sched_request_cfg_scell_r13_c {
     assert_choice_type("setup", type_.to_string(), "SchedulingRequestConfigSCell-r13");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -5638,6 +5675,7 @@ struct tpc_pdcch_cfg_scell_r13_c {
     assert_choice_type("setup", type_.to_string(), "TPC-PDCCH-ConfigSCell-r13");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -5793,6 +5831,7 @@ struct phys_cfg_ded_scell_r10_s {
       assert_choice_type("setup", type_.to_string(), "pucch-SCell");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -5854,6 +5893,7 @@ struct phys_cfg_ded_scell_r10_s {
       assert_choice_type("setup", type_.to_string(), "must-Config-r14");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -5945,6 +5985,7 @@ struct phys_cfg_ded_scell_r10_s {
       assert_choice_type("setup", type_.to_string(), "semiStaticCFI-Config-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_c_& set_setup()
     {
       set(types::setup);
@@ -6049,6 +6090,7 @@ struct phys_cfg_ded_scell_r10_s {
       assert_choice_type("setup", type_.to_string(), "blindPDSCH-Repetition-Config-r15");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -6172,6 +6214,7 @@ struct phys_cfg_ded_scell_v1370_s {
       assert_choice_type("setup", type_.to_string(), "pucch-SCell-v1370");
       return c;
     }
+    void      set_release() { set(types::release); }
     setup_s_& set_setup()
     {
       set(types::setup);
@@ -6217,60 +6260,6 @@ struct ant_info_ded_v10i0_s {
   bool        operator!=(const ant_info_ded_v10i0_s& other) const { return not(*this == other); }
 };
 
-// PUCCH-ConfigDedicated-v13c0 ::= SEQUENCE
-struct pucch_cfg_ded_v13c0_s {
-  struct ch_sel_v13c0_s_ {
-    struct n1_pucch_an_cs_v13c0_c_ {
-      struct setup_s_ {
-        using n1_pucch_an_cs_list_p1_v13c0_l_ = bounded_array<uint16_t, 4>;
-
-        // member variables
-        n1_pucch_an_cs_list_p1_v13c0_l_ n1_pucch_an_cs_list_p1_v13c0;
-      };
-      typedef setup_e types;
-
-      // choice methods
-      n1_pucch_an_cs_v13c0_c_() = default;
-      void        set(types::options e = types::nulltype);
-      types       type() const { return type_; }
-      SRSASN_CODE pack(bit_ref& bref) const;
-      SRSASN_CODE unpack(cbit_ref& bref);
-      void        to_json(json_writer& j) const;
-      // getters
-      setup_s_& setup()
-      {
-        assert_choice_type("setup", type_.to_string(), "n1PUCCH-AN-CS-v13c0");
-        return c;
-      }
-      const setup_s_& setup() const
-      {
-        assert_choice_type("setup", type_.to_string(), "n1PUCCH-AN-CS-v13c0");
-        return c;
-      }
-      setup_s_& set_setup()
-      {
-        set(types::setup);
-        return c;
-      }
-
-    private:
-      types    type_;
-      setup_s_ c;
-    };
-
-    // member variables
-    n1_pucch_an_cs_v13c0_c_ n1_pucch_an_cs_v13c0;
-  };
-
-  // member variables
-  ch_sel_v13c0_s_ ch_sel_v13c0;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
 // RadioResourceConfigDedicatedSCell-r10 ::= SEQUENCE
 struct rr_cfg_ded_scell_r10_s {
   bool                     ext                            = false;
@@ -6299,16 +6288,47 @@ struct rr_cfg_ded_scell_r10_s {
   bool        operator!=(const rr_cfg_ded_scell_r10_s& other) const { return not(*this == other); }
 };
 
-// PhysicalConfigDedicatedSCell-v13c0 ::= SEQUENCE
-struct phys_cfg_ded_scell_v13c0_s {
-  struct pucch_scell_v13c0_c_ {
+// SCellToAddModExt-r13 ::= SEQUENCE
+struct scell_to_add_mod_ext_r13_s {
+  struct cell_identif_r13_s_ {
+    uint16_t pci_r13             = 0;
+    uint32_t dl_carrier_freq_r13 = 0;
+  };
+
+  // member variables
+  bool                      cell_identif_r13_present        = false;
+  bool                      rr_cfg_common_scell_r13_present = false;
+  bool                      rr_cfg_ded_scell_r13_present    = false;
+  bool                      ant_info_ded_scell_r13_present  = false;
+  uint8_t                   scell_idx_r13                   = 1;
+  cell_identif_r13_s_       cell_identif_r13;
+  rr_cfg_common_scell_r10_s rr_cfg_common_scell_r13;
+  rr_cfg_ded_scell_r10_s    rr_cfg_ded_scell_r13;
+  ant_info_ded_v10i0_s      ant_info_ded_scell_r13;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
+// SCellToAddModListExt-r13 ::= SEQUENCE (SIZE (1..31)) OF SCellToAddModExt-r13
+using scell_to_add_mod_list_ext_r13_l = dyn_array<scell_to_add_mod_ext_r13_s>;
+
+// PUCCH-ConfigDedicated-v13c0 ::= SEQUENCE
+struct pucch_cfg_ded_v13c0_s {
+  struct ch_sel_v13c0_s_ {
+    struct n1_pucch_an_cs_v13c0_c_ {
       struct setup_s_ {
-      pucch_cfg_ded_v13c0_s pucch_cfg_ded_v13c0;
+        using n1_pucch_an_cs_list_p1_v13c0_l_ = bounded_array<uint16_t, 4>;
+
+        // member variables
+        n1_pucch_an_cs_list_p1_v13c0_l_ n1_pucch_an_cs_list_p1_v13c0;
       };
       typedef setup_e types;
 
       // choice methods
-    pucch_scell_v13c0_c_() = default;
+      n1_pucch_an_cs_v13c0_c_() = default;
       void        set(types::options e = types::nulltype);
       types       type() const { return type_; }
       SRSASN_CODE pack(bit_ref& bref) const;
@@ -6317,14 +6337,15 @@ struct phys_cfg_ded_scell_v13c0_s {
       // getters
       setup_s_& setup()
       {
-      assert_choice_type("setup", type_.to_string(), "pucch-SCell-v13c0");
+        assert_choice_type("setup", type_.to_string(), "n1PUCCH-AN-CS-v13c0");
         return c;
       }
       const setup_s_& setup() const
       {
-      assert_choice_type("setup", type_.to_string(), "pucch-SCell-v13c0");
+        assert_choice_type("setup", type_.to_string(), "n1PUCCH-AN-CS-v13c0");
         return c;
       }
+      void      set_release() { set(types::release); }
       setup_s_& set_setup()
       {
         set(types::setup);
@@ -6337,55 +6358,11 @@ struct phys_cfg_ded_scell_v13c0_s {
     };
 
     // member variables
-  pucch_scell_v13c0_c_ pucch_scell_v13c0;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
-// SCellToAddModExt-r13 ::= SEQUENCE
-struct scell_to_add_mod_ext_r13_s {
-  struct cell_identif_r13_s_ {
-    uint16_t pci_r13             = 0;
-    uint32_t dl_carrier_freq_r13 = 0;
+    n1_pucch_an_cs_v13c0_c_ n1_pucch_an_cs_v13c0;
   };
 
   // member variables
-  bool                      cell_identif_r13_present        = false;
-  bool                      rr_cfg_common_scell_r13_present = false;
-  bool                      rr_cfg_ded_scell_r13_present    = false;
-  bool                      ant_info_ded_scell_r13_present  = false;
-  uint8_t                   scell_idx_r13                   = 1;
-  cell_identif_r13_s_       cell_identif_r13;
-  rr_cfg_common_scell_r10_s rr_cfg_common_scell_r13;
-  rr_cfg_ded_scell_r10_s    rr_cfg_ded_scell_r13;
-  ant_info_ded_v10i0_s      ant_info_ded_scell_r13;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
-// RadioResourceConfigDedicatedSCell-v13c0 ::= SEQUENCE
-struct rr_cfg_ded_scell_v13c0_s {
-  phys_cfg_ded_scell_v13c0_s phys_cfg_ded_scell_v13c0;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
-// SCellToAddModListExt-r13 ::= SEQUENCE (SIZE (1..31)) OF SCellToAddModExt-r13
-using scell_to_add_mod_list_ext_r13_l = dyn_array<scell_to_add_mod_ext_r13_s>;
-
-// SCellToAddMod-v13c0 ::= SEQUENCE
-struct scell_to_add_mod_v13c0_s {
-  bool                     rr_cfg_ded_scell_v13c0_present = false;
-  rr_cfg_ded_scell_v13c0_s rr_cfg_ded_scell_v13c0;
+  ch_sel_v13c0_s_ ch_sel_v13c0;
 
   // sequence methods
   SRSASN_CODE pack(bit_ref& bref) const;
@@ -6427,6 +6404,7 @@ struct drb_to_add_mod_scg_r12_s {
       assert_choice_type("scg-r12", type_.to_string(), "drb-Type-r12");
       return c;
     }
+    void        set_split_r12() { set(types::split_r12); }
     scg_r12_s_& set_scg_r12()
     {
       set(types::scg_r12);
@@ -6493,12 +6471,6 @@ struct rr_cfg_common_scell_v10l0_s {
   void        to_json(json_writer& j) const;
 };
 
-// SCellToAddModList-v13c0 ::= SEQUENCE (SIZE (1..4)) OF SCellToAddMod-v13c0
-using scell_to_add_mod_list_v13c0_l = dyn_array<scell_to_add_mod_v13c0_s>;
-
-// SCellToAddModListExt-v13c0 ::= SEQUENCE (SIZE (1..31)) OF SCellToAddMod-v13c0
-using scell_to_add_mod_list_ext_v13c0_l = dyn_array<scell_to_add_mod_v13c0_s>;
-
 // DRB-ToAddModListSCG-r12 ::= SEQUENCE (SIZE (1..11)) OF DRB-ToAddModSCG-r12
 using drb_to_add_mod_list_scg_r12_l = dyn_array<drb_to_add_mod_scg_r12_s>;
 
@@ -6560,6 +6532,7 @@ struct rlf_timers_and_consts_scg_r12_c {
     assert_choice_type("setup", type_.to_string(), "RLF-TimersAndConstantsSCG-r12");
     return c;
   }
+  void      set_release() { set(types::release); }
   setup_s_& set_setup()
   {
     set(types::setup);
@@ -6614,17 +6587,6 @@ struct scell_to_add_mod_r10_s {
   bool        operator!=(const scell_to_add_mod_r10_s& other) const { return not(*this == other); }
 };
 
-// SCellToAddMod-v10l0 ::= SEQUENCE
-struct scell_to_add_mod_v10l0_s {
-  bool                        rr_cfg_common_scell_v10l0_present = false;
-  rr_cfg_common_scell_v10l0_s rr_cfg_common_scell_v10l0;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
 // SCellToAddModExt-v1370 ::= SEQUENCE
 struct scell_to_add_mod_ext_v1370_s {
   bool                        rr_cfg_common_scell_v1370_present = false;
@@ -6663,16 +6625,6 @@ struct scell_to_add_mod_ext_v1430_s {
 // SRB-ToReleaseList-r15 ::= SEQUENCE (SIZE (1..2)) OF INTEGER (1..2)
 using srb_to_release_list_r15_l = bounded_array<uint8_t, 2>;
 
-// RadioResourceConfigDedicated-v13c0 ::= SEQUENCE
-struct rr_cfg_ded_v13c0_s {
-  phys_cfg_ded_v13c0_s phys_cfg_ded_v13c0;
-
-  // sequence methods
-  SRSASN_CODE pack(bit_ref& bref) const;
-  SRSASN_CODE unpack(cbit_ref& bref);
-  void        to_json(json_writer& j) const;
-};
-
 // RadioResourceConfigDedicatedSCG-r12 ::= SEQUENCE
 struct rr_cfg_ded_scg_r12_s {
   bool                            ext                                   = false;
@@ -6700,15 +6652,110 @@ struct rr_cfg_ded_scg_r12_s {
 // SCellToAddModList-r10 ::= SEQUENCE (SIZE (1..4)) OF SCellToAddMod-r10
 using scell_to_add_mod_list_r10_l = dyn_array<scell_to_add_mod_r10_s>;
 
-// SCellToAddModList-v10l0 ::= SEQUENCE (SIZE (1..4)) OF SCellToAddMod-v10l0
-using scell_to_add_mod_list_v10l0_l = dyn_array<scell_to_add_mod_v10l0_s>;
-
 // SCellToAddModListExt-v1370 ::= SEQUENCE (SIZE (1..31)) OF SCellToAddModExt-v1370
 using scell_to_add_mod_list_ext_v1370_l = dyn_array<scell_to_add_mod_ext_v1370_s>;
 
 // SCellToAddModListExt-v1430 ::= SEQUENCE (SIZE (1..31)) OF SCellToAddModExt-v1430
 using scell_to_add_mod_list_ext_v1430_l = dyn_array<scell_to_add_mod_ext_v1430_s>;
 
+// PhysicalConfigDedicatedSCell-v13c0 ::= SEQUENCE
+struct phys_cfg_ded_scell_v13c0_s {
+  struct pucch_scell_v13c0_c_ {
+    struct setup_s_ {
+      pucch_cfg_ded_v13c0_s pucch_cfg_ded_v13c0;
+    };
+    typedef setup_e types;
+
+    // choice methods
+    pucch_scell_v13c0_c_() = default;
+    void        set(types::options e = types::nulltype);
+    types       type() const { return type_; }
+    SRSASN_CODE pack(bit_ref& bref) const;
+    SRSASN_CODE unpack(cbit_ref& bref);
+    void        to_json(json_writer& j) const;
+    // getters
+    setup_s_& setup()
+    {
+      assert_choice_type("setup", type_.to_string(), "pucch-SCell-v13c0");
+      return c;
+    }
+    const setup_s_& setup() const
+    {
+      assert_choice_type("setup", type_.to_string(), "pucch-SCell-v13c0");
+      return c;
+    }
+    void      set_release() { set(types::release); }
+    setup_s_& set_setup()
+    {
+      set(types::setup);
+      return c;
+    }
+
+  private:
+    types    type_;
+    setup_s_ c;
+  };
+
+  // member variables
+  pucch_scell_v13c0_c_ pucch_scell_v13c0;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
+// RadioResourceConfigDedicatedSCell-v13c0 ::= SEQUENCE
+struct rr_cfg_ded_scell_v13c0_s {
+  phys_cfg_ded_scell_v13c0_s phys_cfg_ded_scell_v13c0;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
+// SCellToAddMod-v13c0 ::= SEQUENCE
+struct scell_to_add_mod_v13c0_s {
+  bool                     rr_cfg_ded_scell_v13c0_present = false;
+  rr_cfg_ded_scell_v13c0_s rr_cfg_ded_scell_v13c0;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
+// SCellToAddModList-v13c0 ::= SEQUENCE (SIZE (1..4)) OF SCellToAddMod-v13c0
+using scell_to_add_mod_list_v13c0_l = dyn_array<scell_to_add_mod_v13c0_s>;
+
+// SCellToAddModListExt-v13c0 ::= SEQUENCE (SIZE (1..31)) OF SCellToAddMod-v13c0
+using scell_to_add_mod_list_ext_v13c0_l = dyn_array<scell_to_add_mod_v13c0_s>;
+
+// SCellToAddMod-v10l0 ::= SEQUENCE
+struct scell_to_add_mod_v10l0_s {
+  bool                        rr_cfg_common_scell_v10l0_present = false;
+  rr_cfg_common_scell_v10l0_s rr_cfg_common_scell_v10l0;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
+// RadioResourceConfigDedicated-v13c0 ::= SEQUENCE
+struct rr_cfg_ded_v13c0_s {
+  phys_cfg_ded_v13c0_s phys_cfg_ded_v13c0;
+
+  // sequence methods
+  SRSASN_CODE pack(bit_ref& bref) const;
+  SRSASN_CODE unpack(cbit_ref& bref);
+  void        to_json(json_writer& j) const;
+};
+
+// SCellToAddModList-v10l0 ::= SEQUENCE (SIZE (1..4)) OF SCellToAddMod-v10l0
+using scell_to_add_mod_list_v10l0_l = dyn_array<scell_to_add_mod_v10l0_s>;
+
 // Cell-ToAddMod-r12 ::= SEQUENCE
 struct cell_to_add_mod_r12_s {
   struct cell_identif_r12_s_ {

lib/include/srslte/asn1/rrc/security.h

@@ -300,6 +300,9 @@ struct security_mode_cmd_s {
         set(types::security_mode_cmd_r8);
         return c;
       }
+      void set_spare3() { set(types::spare3); }
+      void set_spare2() { set(types::spare2); }
+      void set_spare1() { set(types::spare1); }
 
     private:
       types                      type_;
@@ -309,9 +312,6 @@ struct security_mode_cmd_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -321,24 +321,23 @@ struct security_mode_cmd_s {
     c1_c_& c1()
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     const c1_c_& c1() const
     {
       assert_choice_type("c1", type_.to_string(), "criticalExtensions");
-      return c.get<c1_c_>();
+      return c;
     }
     c1_c_& set_c1()
     {
       set(types::c1);
-      return c.get<c1_c_>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types type_;
-    choice_buffer_t<c1_c_> c;
-
-    void destroy_();
+    c1_c_ c;
   };
 
   // member variables
@@ -409,9 +408,6 @@ struct security_mode_complete_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -421,24 +417,23 @@ struct security_mode_complete_s {
     security_mode_complete_r8_ies_s& security_mode_complete_r8()
     {
       assert_choice_type("securityModeComplete-r8", type_.to_string(), "criticalExtensions");
-      return c.get<security_mode_complete_r8_ies_s>();
+      return c;
     }
     const security_mode_complete_r8_ies_s& security_mode_complete_r8() const
     {
       assert_choice_type("securityModeComplete-r8", type_.to_string(), "criticalExtensions");
-      return c.get<security_mode_complete_r8_ies_s>();
+      return c;
     }
     security_mode_complete_r8_ies_s& set_security_mode_complete_r8()
     {
       set(types::security_mode_complete_r8);
-      return c.get<security_mode_complete_r8_ies_s>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types                           type_;
-    choice_buffer_t<security_mode_complete_r8_ies_s> c;
-
-    void destroy_();
+    security_mode_complete_r8_ies_s c;
   };
 
   // member variables
@@ -463,9 +458,6 @@ struct security_mode_fail_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -475,24 +467,23 @@ struct security_mode_fail_s {
     security_mode_fail_r8_ies_s& security_mode_fail_r8()
     {
       assert_choice_type("securityModeFailure-r8", type_.to_string(), "criticalExtensions");
-      return c.get<security_mode_fail_r8_ies_s>();
+      return c;
     }
     const security_mode_fail_r8_ies_s& security_mode_fail_r8() const
     {
       assert_choice_type("securityModeFailure-r8", type_.to_string(), "criticalExtensions");
-      return c.get<security_mode_fail_r8_ies_s>();
+      return c;
     }
     security_mode_fail_r8_ies_s& set_security_mode_fail_r8()
     {
       set(types::security_mode_fail_r8);
-      return c.get<security_mode_fail_r8_ies_s>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types                       type_;
-    choice_buffer_t<security_mode_fail_r8_ies_s> c;
-
-    void destroy_();
+    security_mode_fail_r8_ies_s c;
   };
 
   // member variables

lib/include/srslte/asn1/rrc/si.h

@@ -263,6 +263,7 @@ struct sib_type1_v1530_ies_s {
       assert_choice_type("crs-IntfMitigNumPRBs", type_.to_string(), "crs-IntfMitigConfig-r15");
       return c;
     }
+    void                        set_crs_intf_mitig_enabled() { set(types::crs_intf_mitig_enabled); }
     crs_intf_mitig_num_prbs_e_& set_crs_intf_mitig_num_prbs()
     {
       set(types::crs_intf_mitig_num_prbs);
@@ -336,9 +337,12 @@ struct cell_access_related_info_r14_s {
   void        to_json(json_writer& j) const;
 };
 
-// CellSelectionInfoCE1-v1360 ::= SEQUENCE
-struct cell_sel_info_ce1_v1360_s {
-  int8_t delta_rx_lev_min_ce1_v1360 = -8;
+// SystemInformationBlockType1-v1450-IEs ::= SEQUENCE
+struct sib_type1_v1450_ies_s {
+  bool                  tdd_cfg_v1450_present = false;
+  bool                  non_crit_ext_present  = false;
+  tdd_cfg_v1450_s       tdd_cfg_v1450;
+  sib_type1_v1530_ies_s non_crit_ext;
 
   // sequence methods
   SRSASN_CODE pack(bit_ref& bref) const;
@@ -346,22 +350,9 @@ struct cell_sel_info_ce1_v1360_s {
   void        to_json(json_writer& j) const;
 };
 
-// SI-Periodicity-r12 ::= ENUMERATED
-struct si_periodicity_r12_opts {
-  enum options { rf8, rf16, rf32, rf64, rf128, rf256, rf512, nulltype } value;
-  typedef uint16_t number_type;
-
-  std::string to_string() const;
-  uint16_t    to_number() const;
-};
-typedef enumerated<si_periodicity_r12_opts> si_periodicity_r12_e;
-
-// SystemInformationBlockType1-v1450-IEs ::= SEQUENCE
-struct sib_type1_v1450_ies_s {
-  bool                  tdd_cfg_v1450_present = false;
-  bool                  non_crit_ext_present  = false;
-  tdd_cfg_v1450_s       tdd_cfg_v1450;
-  sib_type1_v1530_ies_s non_crit_ext;
+// CellSelectionInfoCE1-v1360 ::= SEQUENCE
+struct cell_sel_info_ce1_v1360_s {
+  int8_t delta_rx_lev_min_ce1_v1360 = -8;
 
   // sequence methods
   SRSASN_CODE pack(bit_ref& bref) const;
@@ -1040,6 +1031,16 @@ struct cell_sel_info_v920_s {
 // PLMN-InfoList-r15 ::= SEQUENCE (SIZE (1..6)) OF PLMN-Info-r15
 using plmn_info_list_r15_l = dyn_array<plmn_info_r15_s>;
 
+// SI-Periodicity-r12 ::= ENUMERATED
+struct si_periodicity_r12_opts {
+  enum options { rf8, rf16, rf32, rf64, rf128, rf256, rf512, nulltype } value;
+  typedef uint16_t number_type;
+
+  std::string to_string() const;
+  uint16_t    to_number() const;
+};
+typedef enumerated<si_periodicity_r12_opts> si_periodicity_r12_e;
+
 // SIB-MappingInfo ::= SEQUENCE (SIZE (0..31)) OF SIB-Type
 using sib_map_info_l = bounded_array<sib_type_e, 31>;
 

lib/include/srslte/asn1/rrc/ul_ccch_msg.h

@@ -462,9 +462,6 @@ struct rrc_conn_reest_request_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -474,24 +471,23 @@ struct rrc_conn_reest_request_s {
     rrc_conn_reest_request_r8_ies_s& rrc_conn_reest_request_r8()
     {
       assert_choice_type("rrcConnectionReestablishmentRequest-r8", type_.to_string(), "criticalExtensions");
-      return c.get<rrc_conn_reest_request_r8_ies_s>();
+      return c;
     }
     const rrc_conn_reest_request_r8_ies_s& rrc_conn_reest_request_r8() const
     {
       assert_choice_type("rrcConnectionReestablishmentRequest-r8", type_.to_string(), "criticalExtensions");
-      return c.get<rrc_conn_reest_request_r8_ies_s>();
+      return c;
     }
     rrc_conn_reest_request_r8_ies_s& set_rrc_conn_reest_request_r8()
     {
       set(types::rrc_conn_reest_request_r8);
-      return c.get<rrc_conn_reest_request_r8_ies_s>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types                           type_;
-    choice_buffer_t<rrc_conn_reest_request_r8_ies_s> c;
-
-    void destroy_();
+    rrc_conn_reest_request_r8_ies_s c;
   };
 
   // member variables
@@ -651,9 +647,6 @@ struct rrc_early_data_request_r15_s {
 
     // choice methods
     crit_exts_c_() = default;
-    crit_exts_c_(const crit_exts_c_& other);
-    crit_exts_c_& operator=(const crit_exts_c_& other);
-    ~crit_exts_c_() { destroy_(); }
     void        set(types::options e = types::nulltype);
     types       type() const { return type_; }
     SRSASN_CODE pack(bit_ref& bref) const;
@@ -663,24 +656,23 @@ struct rrc_early_data_request_r15_s {
     rrc_early_data_request_r15_ies_s& rrc_early_data_request_r15()
     {
       assert_choice_type("rrcEarlyDataRequest-r15", type_.to_string(), "criticalExtensions");
-      return c.get<rrc_early_data_request_r15_ies_s>();
+      return c;
     }
     const rrc_early_data_request_r15_ies_s& rrc_early_data_request_r15() const
     {
       assert_choice_type("rrcEarlyDataRequest-r15", type_.to_string(), "criticalExtensions");
-      return c.get<rrc_early_data_request_r15_ies_s>();
+      return c;
     }
     rrc_early_data_request_r15_ies_s& set_rrc_early_data_request_r15()
     {
       set(types::rrc_early_data_request_r15);
-      return c.get<rrc_early_data_request_r15_ies_s>();
+      return c;
     }
+    void set_crit_exts_future() { set(types::crit_exts_future); }
 
   private:
     types                            type_;
-    choice_buffer_t<rrc_early_data_request_r15_ies_s> c;
-
-    void destroy_();
+    rrc_early_data_request_r15_ies_s c;
   };
 
   // member variables
@@ -803,6 +795,9 @@ struct ul_ccch_msg_type_c {
           set(types::rrc_early_data_request_r15);
           return c;
         }
+        void set_spare3() { set(types::spare3); }
+        void set_spare2() { set(types::spare2); }
+        void set_spare1() { set(types::spare1); }
 
       private:
         types                        type_;
@@ -819,9 +814,6 @@ struct ul_ccch_msg_type_c {
 
       // choice methods
       msg_class_ext_future_r13_c_() = default;
-      msg_class_ext_future_r13_c_(const msg_class_ext_future_r13_c_& other);
-      msg_class_ext_future_r13_c_& operator=(const msg_class_ext_future_r13_c_& other);
-      ~msg_class_ext_future_r13_c_() { destroy_(); }
       void        set(types::options e = types::nulltype);
       types       type() const { return type_; }
       SRSASN_CODE pack(bit_ref& bref) const;
@@ -831,24 +823,23 @@ struct ul_ccch_msg_type_c {
       c3_c_& c3()
       {
         assert_choice_type("c3", type_.to_string(), "messageClassExtensionFuture-r13");
-        return c.get<c3_c_>();
+        return c;
       }
       const c3_c_& c3() const
       {
         assert_choice_type("c3", type_.to_string(), "messageClassExtensionFuture-r13");
-        return c.get<c3_c_>();
+        return c;
       }
       c3_c_& set_c3()
       {
         set(types::c3);
-        return c.get<c3_c_>();
+        return c;
       }
+      void set_msg_class_ext_future_r15() { set(types::msg_class_ext_future_r15); }
 
     private:
       types type_;
-      choice_buffer_t<c3_c_> c;
-
-      void destroy_();
+      c3_c_ c;
     };
     struct types_opts {
       enum options { c2, msg_class_ext_future_r13, nulltype } value;

lib/include/srslte/asn1/s1ap.h

@@ -455,9 +455,6 @@ struct private_ie_id_c {
 
   // choice methods
   private_ie_id_c() = default;
-  private_ie_id_c(const private_ie_id_c& other);
-  private_ie_id_c& operator=(const private_ie_id_c& other);
-  ~private_ie_id_c() { destroy_(); }
   void        set(types::options e = types::nulltype);
   types       type() const { return type_; }
   SRSASN_CODE pack(bit_ref& bref) const;
@@ -467,24 +464,23 @@ struct private_ie_id_c {
   uint32_t& local()
   {
     assert_choice_type("local", type_.to_string(), "PrivateIE-ID");
-    return c.get<uint32_t>();
+    return c;
   }
   const uint32_t& local() const
   {
     assert_choice_type("local", type_.to_string(), "PrivateIE-ID");
-    return c.get<uint32_t>();
+    return c;
   }
   uint32_t& set_local()
   {
     set(types::local);
-    return c.get<uint32_t>();
+    return c;
   }
+  void set_global() { set(types::global); }
 
 private:
   types    type_;
-  pod_choice_buffer_t c;
-
-  void destroy_();
+  uint32_t c;
 };
 
 // PrivateIE-Field{S1AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE{{S1AP-PRIVATE-IES}}
@@ -878,6 +874,7 @@ struct area_scope_of_mdt_c {
     set(types::tabased);
     return c.get<ta_based_mdt_s>();
   }
+  void             set_plmn_wide() { set(types::plmn_wide); }
   tai_based_mdt_s& set_tai_based()
   {
     set(types::tai_based);
@@ -18304,6 +18301,7 @@ struct so_ntransfer_request_container_c {
     assert_choice_type("failureEventReporting", type_.to_string(), "SONtransferRequestContainer");
     return c.get<fail_event_report_c>();
   }
+  void                              set_cell_load_report() { set(types::cell_load_report); }
   multi_cell_load_report_request_s& set_multi_cell_load_report()
   {
     set(types::multi_cell_load_report);
@@ -18433,11 +18431,14 @@ struct so_ntransfer_resp_container_c {
     set(types::event_triggered_cell_load_report);
     return c.get<event_triggered_cell_load_report_resp_s>();
   }
+  void                    set_horeport() { set(types::horeport); }
   cell_activation_resp_s& set_eutran_cell_activation()
   {
     set(types::eutran_cell_activation);
     return c.get<cell_activation_resp_s>();
   }
+  void set_energy_savings_ind() { set(types::energy_savings_ind); }
+  void set_fail_event_report() { set(types::fail_event_report); }
 
 private:
   types type_;

lib/src/asn1/rrc.cc

@@ -459,67 +459,9 @@ uint8_t bcch_dl_sch_msg_type_br_r13_c::types_opts::to_number() const
 }
 
 // BCCH-DL-SCH-MessageType-MBMS-r14 ::= CHOICE
-void bcch_dl_sch_msg_type_mbms_r14_c::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void bcch_dl_sch_msg_type_mbms_r14_c::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::msg_class_ext:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "bcch_dl_sch_msg_type_mbms_r14_c");
-  }
-}
-bcch_dl_sch_msg_type_mbms_r14_c::bcch_dl_sch_msg_type_mbms_r14_c(const bcch_dl_sch_msg_type_mbms_r14_c& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::msg_class_ext:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "bcch_dl_sch_msg_type_mbms_r14_c");
-  }
-}
-bcch_dl_sch_msg_type_mbms_r14_c&
-bcch_dl_sch_msg_type_mbms_r14_c::operator=(const bcch_dl_sch_msg_type_mbms_r14_c& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::msg_class_ext:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "bcch_dl_sch_msg_type_mbms_r14_c");
-  }
-
-  return *this;
 }
 void bcch_dl_sch_msg_type_mbms_r14_c::to_json(json_writer& j) const
 {
@@ -527,7 +469,7 @@ void bcch_dl_sch_msg_type_mbms_r14_c::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::msg_class_ext:
       break;
@@ -541,7 +483,7 @@ SRSASN_CODE bcch_dl_sch_msg_type_mbms_r14_c::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::msg_class_ext:
       break;
@@ -558,7 +500,7 @@ SRSASN_CODE bcch_dl_sch_msg_type_mbms_r14_c::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::msg_class_ext:
       break;
@@ -2471,66 +2413,9 @@ std::string mcch_msg_type_c::c1_c_::types_opts::to_string() const
   return convert_enum_idx(options, 1, value, "mcch_msg_type_c::c1_c_::types");
 }
 
-void mcch_msg_type_c::later_c_::destroy_()
-{
-  switch (type_) {
-    case types::c2:
-      c.destroy<c2_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void mcch_msg_type_c::later_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c2:
-      c.init<c2_c_>();
-      break;
-    case types::msg_class_ext:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "mcch_msg_type_c::later_c_");
-  }
-}
-mcch_msg_type_c::later_c_::later_c_(const mcch_msg_type_c::later_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c2:
-      c.init(other.c.get<c2_c_>());
-      break;
-    case types::msg_class_ext:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "mcch_msg_type_c::later_c_");
-  }
-}
-mcch_msg_type_c::later_c_& mcch_msg_type_c::later_c_::operator=(const mcch_msg_type_c::later_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c2:
-      c.set(other.c.get<c2_c_>());
-      break;
-    case types::msg_class_ext:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "mcch_msg_type_c::later_c_");
-  }
-
-  return *this;
 }
 void mcch_msg_type_c::later_c_::to_json(json_writer& j) const
 {
@@ -2538,7 +2423,7 @@ void mcch_msg_type_c::later_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c2:
       j.write_fieldname("c2");
-      c.get<c2_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::msg_class_ext:
       break;
@@ -2552,7 +2437,7 @@ SRSASN_CODE mcch_msg_type_c::later_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c2:
-      HANDLE_CODE(c.get<c2_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::msg_class_ext:
       break;
@@ -2569,7 +2454,7 @@ SRSASN_CODE mcch_msg_type_c::later_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c2:
-      HANDLE_CODE(c.get<c2_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::msg_class_ext:
       break;
@@ -4268,67 +4153,9 @@ std::string sc_mcch_msg_type_r13_c::c1_c_::types_opts::to_string() const
   return convert_enum_idx(options, 1, value, "sc_mcch_msg_type_r13_c::c1_c_::types");
 }
 
-void sc_mcch_msg_type_r13_c::msg_class_ext_c_::destroy_()
-{
-  switch (type_) {
-    case types::c2:
-      c.destroy<c2_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void sc_mcch_msg_type_r13_c::msg_class_ext_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c2:
-      c.init<c2_c_>();
-      break;
-    case types::msg_class_ext_future_r14:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "sc_mcch_msg_type_r13_c::msg_class_ext_c_");
-  }
-}
-sc_mcch_msg_type_r13_c::msg_class_ext_c_::msg_class_ext_c_(const sc_mcch_msg_type_r13_c::msg_class_ext_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c2:
-      c.init(other.c.get<c2_c_>());
-      break;
-    case types::msg_class_ext_future_r14:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "sc_mcch_msg_type_r13_c::msg_class_ext_c_");
-  }
-}
-sc_mcch_msg_type_r13_c::msg_class_ext_c_&
-sc_mcch_msg_type_r13_c::msg_class_ext_c_::operator=(const sc_mcch_msg_type_r13_c::msg_class_ext_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c2:
-      c.set(other.c.get<c2_c_>());
-      break;
-    case types::msg_class_ext_future_r14:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "sc_mcch_msg_type_r13_c::msg_class_ext_c_");
-  }
-
-  return *this;
 }
 void sc_mcch_msg_type_r13_c::msg_class_ext_c_::to_json(json_writer& j) const
 {
@@ -4336,7 +4163,7 @@ void sc_mcch_msg_type_r13_c::msg_class_ext_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c2:
       j.write_fieldname("c2");
-      c.get<c2_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::msg_class_ext_future_r14:
       break;
@@ -4350,7 +4177,7 @@ SRSASN_CODE sc_mcch_msg_type_r13_c::msg_class_ext_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c2:
-      HANDLE_CODE(c.get<c2_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::msg_class_ext_future_r14:
       break;
@@ -4367,7 +4194,7 @@ SRSASN_CODE sc_mcch_msg_type_r13_c::msg_class_ext_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c2:
-      HANDLE_CODE(c.get<c2_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::msg_class_ext_future_r14:
       break;
@@ -4653,40 +4480,6 @@ std::string visited_cell_info_r12_s::visited_cell_id_r12_c_::types_opts::to_stri
   return convert_enum_idx(options, 2, value, "visited_cell_info_r12_s::visited_cell_id_r12_c_::types");
 }
 
-// FailureReportSCG-v12d0 ::= SEQUENCE
-SRSASN_CODE fail_report_scg_v12d0_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(bref.pack(meas_result_neigh_cells_v12d0_present, 1));
-
-  if (meas_result_neigh_cells_v12d0_present) {
-    HANDLE_CODE(pack_dyn_seq_of(bref, meas_result_neigh_cells_v12d0, 1, 8));
-  }
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE fail_report_scg_v12d0_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(bref.unpack(meas_result_neigh_cells_v12d0_present, 1));
-
-  if (meas_result_neigh_cells_v12d0_present) {
-    HANDLE_CODE(unpack_dyn_seq_of(meas_result_neigh_cells_v12d0, bref, 1, 8));
-  }
-
-  return SRSASN_SUCCESS;
-}
-void fail_report_scg_v12d0_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  if (meas_result_neigh_cells_v12d0_present) {
-    j.start_array("measResultNeighCells-v12d0");
-    for (const auto& e1 : meas_result_neigh_cells_v12d0) {
-      e1.to_json(j);
-    }
-    j.end_array();
-  }
-  j.end_obj();
-}
-
 std::string idc_sf_pattern_r11_c::sf_pattern_tdd_r11_c_::types_opts::to_string() const
 {
   static const char* options[] = {"subframeConfig0-r11", "subframeConfig1-5-r11", "subframeConfig6-r11"};
@@ -4729,44 +4522,6 @@ uint8_t rstd_inter_freq_info_r10_s::meas_prs_offset_r15_c_::types_opts::to_numbe
   return map_enum_number(options, 21, value, "rstd_inter_freq_info_r10_s::meas_prs_offset_r15_c_::types");
 }
 
-// SCGFailureInformation-v12d0b-IEs ::= SEQUENCE
-SRSASN_CODE scg_fail_info_v12d0b_ies_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(bref.pack(fail_report_scg_v12d0_present, 1));
-  HANDLE_CODE(bref.pack(non_crit_ext_present, 1));
-
-  if (fail_report_scg_v12d0_present) {
-    HANDLE_CODE(fail_report_scg_v12d0.pack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE scg_fail_info_v12d0b_ies_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(bref.unpack(fail_report_scg_v12d0_present, 1));
-  HANDLE_CODE(bref.unpack(non_crit_ext_present, 1));
-
-  if (fail_report_scg_v12d0_present) {
-    HANDLE_CODE(fail_report_scg_v12d0.unpack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-void scg_fail_info_v12d0b_ies_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  if (fail_report_scg_v12d0_present) {
-    j.write_fieldname("failureReportSCG-v12d0");
-    fail_report_scg_v12d0.to_json(j);
-  }
-  if (non_crit_ext_present) {
-    j.write_fieldname("nonCriticalExtension");
-    j.start_obj();
-    j.end_obj();
-  }
-  j.end_obj();
-}
-
 std::string meas_results_s::meas_result_neigh_cells_c_::types_opts::to_string() const
 {
   static const char* options[] = {"measResultListEUTRA",
@@ -5096,6 +4851,40 @@ band_combination_params_v1250_s::dc_support_r12_s_::supported_cell_grouping_r12_
       options, 3, value, "band_combination_params_v1250_s::dc_support_r12_s_::supported_cell_grouping_r12_c_::types");
 }
 
+// FailureReportSCG-v12d0 ::= SEQUENCE
+SRSASN_CODE fail_report_scg_v12d0_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(bref.pack(meas_result_neigh_cells_v12d0_present, 1));
+
+  if (meas_result_neigh_cells_v12d0_present) {
+    HANDLE_CODE(pack_dyn_seq_of(bref, meas_result_neigh_cells_v12d0, 1, 8));
+  }
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE fail_report_scg_v12d0_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(bref.unpack(meas_result_neigh_cells_v12d0_present, 1));
+
+  if (meas_result_neigh_cells_v12d0_present) {
+    HANDLE_CODE(unpack_dyn_seq_of(meas_result_neigh_cells_v12d0, bref, 1, 8));
+  }
+
+  return SRSASN_SUCCESS;
+}
+void fail_report_scg_v12d0_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  if (meas_result_neigh_cells_v12d0_present) {
+    j.start_array("measResultNeighCells-v12d0");
+    for (const auto& e1 : meas_result_neigh_cells_v12d0) {
+      e1.to_json(j);
+    }
+    j.end_array();
+  }
+  j.end_obj();
+}
+
 // MIMO-WeightedLayersCapabilities-r13 ::= SEQUENCE
 SRSASN_CODE mimo_weighted_layers_cap_r13_s::pack(bit_ref& bref) const
 {
@@ -5320,34 +5109,36 @@ void phy_layer_params_v13e0_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-std::string mbms_params_v1470_s::mbms_max_bw_r14_c_::types_opts::to_string() const
-{
-  static const char* options[] = {"implicitValue", "explicitValue"};
-  return convert_enum_idx(options, 2, value, "mbms_params_v1470_s::mbms_max_bw_r14_c_::types");
-}
-
-// UE-EUTRA-Capability-v13e0b-IEs ::= SEQUENCE
-SRSASN_CODE ue_eutra_cap_v13e0b_ies_s::pack(bit_ref& bref) const
+// SCGFailureInformation-v12d0b-IEs ::= SEQUENCE
+SRSASN_CODE scg_fail_info_v12d0b_ies_s::pack(bit_ref& bref) const
 {
+  HANDLE_CODE(bref.pack(fail_report_scg_v12d0_present, 1));
   HANDLE_CODE(bref.pack(non_crit_ext_present, 1));
 
-  HANDLE_CODE(phy_layer_params_v13e0.pack(bref));
+  if (fail_report_scg_v12d0_present) {
+    HANDLE_CODE(fail_report_scg_v12d0.pack(bref));
+  }
 
   return SRSASN_SUCCESS;
 }
-SRSASN_CODE ue_eutra_cap_v13e0b_ies_s::unpack(cbit_ref& bref)
+SRSASN_CODE scg_fail_info_v12d0b_ies_s::unpack(cbit_ref& bref)
 {
+  HANDLE_CODE(bref.unpack(fail_report_scg_v12d0_present, 1));
   HANDLE_CODE(bref.unpack(non_crit_ext_present, 1));
 
-  HANDLE_CODE(phy_layer_params_v13e0.unpack(bref));
+  if (fail_report_scg_v12d0_present) {
+    HANDLE_CODE(fail_report_scg_v12d0.unpack(bref));
+  }
 
   return SRSASN_SUCCESS;
 }
-void ue_eutra_cap_v13e0b_ies_s::to_json(json_writer& j) const
+void scg_fail_info_v12d0b_ies_s::to_json(json_writer& j) const
 {
   j.start_obj();
-  j.write_fieldname("phyLayerParameters-v13e0");
-  phy_layer_params_v13e0.to_json(j);
+  if (fail_report_scg_v12d0_present) {
+    j.write_fieldname("failureReportSCG-v12d0");
+    fail_report_scg_v12d0.to_json(j);
+  }
   if (non_crit_ext_present) {
     j.write_fieldname("nonCriticalExtension");
     j.start_obj();
@@ -5356,36 +5147,34 @@ void ue_eutra_cap_v13e0b_ies_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-// SCG-Config-v12i0b-IEs ::= SEQUENCE
-SRSASN_CODE scg_cfg_v12i0b_ies_s::pack(bit_ref& bref) const
+std::string mbms_params_v1470_s::mbms_max_bw_r14_c_::types_opts::to_string() const
+{
+  static const char* options[] = {"implicitValue", "explicitValue"};
+  return convert_enum_idx(options, 2, value, "mbms_params_v1470_s::mbms_max_bw_r14_c_::types");
+}
+
+// UE-EUTRA-Capability-v13e0b-IEs ::= SEQUENCE
+SRSASN_CODE ue_eutra_cap_v13e0b_ies_s::pack(bit_ref& bref) const
 {
-  HANDLE_CODE(bref.pack(scg_radio_cfg_v12i0_present, 1));
   HANDLE_CODE(bref.pack(non_crit_ext_present, 1));
 
-  if (scg_radio_cfg_v12i0_present) {
-    HANDLE_CODE(scg_radio_cfg_v12i0.pack(bref));
-  }
+  HANDLE_CODE(phy_layer_params_v13e0.pack(bref));
 
   return SRSASN_SUCCESS;
 }
-SRSASN_CODE scg_cfg_v12i0b_ies_s::unpack(cbit_ref& bref)
+SRSASN_CODE ue_eutra_cap_v13e0b_ies_s::unpack(cbit_ref& bref)
 {
-  HANDLE_CODE(bref.unpack(scg_radio_cfg_v12i0_present, 1));
   HANDLE_CODE(bref.unpack(non_crit_ext_present, 1));
 
-  if (scg_radio_cfg_v12i0_present) {
-    HANDLE_CODE(scg_radio_cfg_v12i0.unpack(bref));
-  }
+  HANDLE_CODE(phy_layer_params_v13e0.unpack(bref));
 
   return SRSASN_SUCCESS;
 }
-void scg_cfg_v12i0b_ies_s::to_json(json_writer& j) const
+void ue_eutra_cap_v13e0b_ies_s::to_json(json_writer& j) const
 {
   j.start_obj();
-  if (scg_radio_cfg_v12i0_present) {
-    j.write_fieldname("scg-RadioConfig-v12i0");
-    scg_radio_cfg_v12i0.to_json(j);
-  }
+  j.write_fieldname("phyLayerParameters-v13e0");
+  phy_layer_params_v13e0.to_json(j);
   if (non_crit_ext_present) {
     j.write_fieldname("nonCriticalExtension");
     j.start_obj();
@@ -6095,6 +5884,44 @@ void sbcch_sl_bch_msg_v2x_r14_s::to_json(json_writer& j) const
   j.end_array();
 }
 
+// SCG-Config-v12i0b-IEs ::= SEQUENCE
+SRSASN_CODE scg_cfg_v12i0b_ies_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(bref.pack(scg_radio_cfg_v12i0_present, 1));
+  HANDLE_CODE(bref.pack(non_crit_ext_present, 1));
+
+  if (scg_radio_cfg_v12i0_present) {
+    HANDLE_CODE(scg_radio_cfg_v12i0.pack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE scg_cfg_v12i0b_ies_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(bref.unpack(scg_radio_cfg_v12i0_present, 1));
+  HANDLE_CODE(bref.unpack(non_crit_ext_present, 1));
+
+  if (scg_radio_cfg_v12i0_present) {
+    HANDLE_CODE(scg_radio_cfg_v12i0.unpack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+void scg_cfg_v12i0b_ies_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  if (scg_radio_cfg_v12i0_present) {
+    j.write_fieldname("scg-RadioConfig-v12i0");
+    scg_radio_cfg_v12i0.to_json(j);
+  }
+  if (non_crit_ext_present) {
+    j.write_fieldname("nonCriticalExtension");
+    j.start_obj();
+    j.end_obj();
+  }
+  j.end_obj();
+}
+
 // SCG-ConfigInfo-v1530-IEs ::= SEQUENCE
 SRSASN_CODE scg_cfg_info_v1530_ies_s::pack(bit_ref& bref) const
 {
@@ -6606,67 +6433,9 @@ void scg_cfg_info_r12_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void scg_cfg_info_r12_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void scg_cfg_info_r12_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "scg_cfg_info_r12_s::crit_exts_c_");
-  }
-}
-scg_cfg_info_r12_s::crit_exts_c_::crit_exts_c_(const scg_cfg_info_r12_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "scg_cfg_info_r12_s::crit_exts_c_");
-  }
-}
-scg_cfg_info_r12_s::crit_exts_c_&
-scg_cfg_info_r12_s::crit_exts_c_::operator=(const scg_cfg_info_r12_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "scg_cfg_info_r12_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void scg_cfg_info_r12_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -6674,7 +6443,7 @@ void scg_cfg_info_r12_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -6688,7 +6457,7 @@ SRSASN_CODE scg_cfg_info_r12_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -6705,7 +6474,7 @@ SRSASN_CODE scg_cfg_info_r12_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;

lib/src/asn1/rrc/dl_ccch_msg.cc

@@ -1327,66 +1327,9 @@ void rrc_conn_reest_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void rrc_conn_reest_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void rrc_conn_reest_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_reest_s::crit_exts_c_");
-  }
-}
-rrc_conn_reest_s::crit_exts_c_::crit_exts_c_(const rrc_conn_reest_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_reest_s::crit_exts_c_");
-  }
-}
-rrc_conn_reest_s::crit_exts_c_& rrc_conn_reest_s::crit_exts_c_::operator=(const rrc_conn_reest_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_reest_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void rrc_conn_reest_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -1394,7 +1337,7 @@ void rrc_conn_reest_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -1408,7 +1351,7 @@ SRSASN_CODE rrc_conn_reest_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1425,7 +1368,7 @@ SRSASN_CODE rrc_conn_reest_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1545,67 +1488,9 @@ void rrc_conn_reest_reject_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void rrc_conn_reest_reject_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::rrc_conn_reest_reject_r8:
-      c.destroy<rrc_conn_reest_reject_r8_ies_s>();
-      break;
-    default:
-      break;
-  }
-}
 void rrc_conn_reest_reject_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::rrc_conn_reest_reject_r8:
-      c.init<rrc_conn_reest_reject_r8_ies_s>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_reest_reject_s::crit_exts_c_");
-  }
-}
-rrc_conn_reest_reject_s::crit_exts_c_::crit_exts_c_(const rrc_conn_reest_reject_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::rrc_conn_reest_reject_r8:
-      c.init(other.c.get<rrc_conn_reest_reject_r8_ies_s>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_reest_reject_s::crit_exts_c_");
-  }
-}
-rrc_conn_reest_reject_s::crit_exts_c_&
-rrc_conn_reest_reject_s::crit_exts_c_::operator=(const rrc_conn_reest_reject_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::rrc_conn_reest_reject_r8:
-      c.set(other.c.get<rrc_conn_reest_reject_r8_ies_s>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_reest_reject_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void rrc_conn_reest_reject_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -1613,7 +1498,7 @@ void rrc_conn_reest_reject_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::rrc_conn_reest_reject_r8:
       j.write_fieldname("rrcConnectionReestablishmentReject-r8");
-      c.get<rrc_conn_reest_reject_r8_ies_s>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -1627,7 +1512,7 @@ SRSASN_CODE rrc_conn_reest_reject_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::rrc_conn_reest_reject_r8:
-      HANDLE_CODE(c.get<rrc_conn_reest_reject_r8_ies_s>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1644,7 +1529,7 @@ SRSASN_CODE rrc_conn_reest_reject_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::rrc_conn_reest_reject_r8:
-      HANDLE_CODE(c.get<rrc_conn_reest_reject_r8_ies_s>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1676,67 +1561,9 @@ void rrc_conn_reject_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void rrc_conn_reject_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void rrc_conn_reject_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_reject_s::crit_exts_c_");
-  }
-}
-rrc_conn_reject_s::crit_exts_c_::crit_exts_c_(const rrc_conn_reject_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_reject_s::crit_exts_c_");
-  }
-}
-rrc_conn_reject_s::crit_exts_c_&
-rrc_conn_reject_s::crit_exts_c_::operator=(const rrc_conn_reject_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_reject_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void rrc_conn_reject_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -1744,7 +1571,7 @@ void rrc_conn_reject_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -1758,7 +1585,7 @@ SRSASN_CODE rrc_conn_reject_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1775,7 +1602,7 @@ SRSASN_CODE rrc_conn_reject_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1874,66 +1701,9 @@ void rrc_conn_setup_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void rrc_conn_setup_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void rrc_conn_setup_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_setup_s::crit_exts_c_");
-  }
-}
-rrc_conn_setup_s::crit_exts_c_::crit_exts_c_(const rrc_conn_setup_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_setup_s::crit_exts_c_");
-  }
-}
-rrc_conn_setup_s::crit_exts_c_& rrc_conn_setup_s::crit_exts_c_::operator=(const rrc_conn_setup_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_setup_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void rrc_conn_setup_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -1941,7 +1711,7 @@ void rrc_conn_setup_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -1955,7 +1725,7 @@ SRSASN_CODE rrc_conn_setup_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1972,7 +1742,7 @@ SRSASN_CODE rrc_conn_setup_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -2092,67 +1862,9 @@ void rrc_early_data_complete_r15_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void rrc_early_data_complete_r15_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::rrc_early_data_complete_r15:
-      c.destroy<rrc_early_data_complete_r15_ies_s>();
-      break;
-    default:
-      break;
-  }
-}
 void rrc_early_data_complete_r15_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::rrc_early_data_complete_r15:
-      c.init<rrc_early_data_complete_r15_ies_s>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_early_data_complete_r15_s::crit_exts_c_");
-  }
-}
-rrc_early_data_complete_r15_s::crit_exts_c_::crit_exts_c_(const rrc_early_data_complete_r15_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::rrc_early_data_complete_r15:
-      c.init(other.c.get<rrc_early_data_complete_r15_ies_s>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_early_data_complete_r15_s::crit_exts_c_");
-  }
-}
-rrc_early_data_complete_r15_s::crit_exts_c_&
-rrc_early_data_complete_r15_s::crit_exts_c_::operator=(const rrc_early_data_complete_r15_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::rrc_early_data_complete_r15:
-      c.set(other.c.get<rrc_early_data_complete_r15_ies_s>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_early_data_complete_r15_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void rrc_early_data_complete_r15_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -2160,7 +1872,7 @@ void rrc_early_data_complete_r15_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::rrc_early_data_complete_r15:
       j.write_fieldname("rrcEarlyDataComplete-r15");
-      c.get<rrc_early_data_complete_r15_ies_s>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -2174,7 +1886,7 @@ SRSASN_CODE rrc_early_data_complete_r15_s::crit_exts_c_::pack(bit_ref& bref) con
   type_.pack(bref);
   switch (type_) {
     case types::rrc_early_data_complete_r15:
-      HANDLE_CODE(c.get<rrc_early_data_complete_r15_ies_s>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -2191,7 +1903,7 @@ SRSASN_CODE rrc_early_data_complete_r15_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::rrc_early_data_complete_r15:
-      HANDLE_CODE(c.get<rrc_early_data_complete_r15_ies_s>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -2485,67 +2197,9 @@ SRSASN_CODE dl_ccch_msg_type_c::c1_c_::unpack(cbit_ref& bref)
   return SRSASN_SUCCESS;
 }
 
-void dl_ccch_msg_type_c::msg_class_ext_c_::destroy_()
-{
-  switch (type_) {
-    case types::c2:
-      c.destroy<c2_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void dl_ccch_msg_type_c::msg_class_ext_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c2:
-      c.init<c2_c_>();
-      break;
-    case types::msg_class_ext_future_r15:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "dl_ccch_msg_type_c::msg_class_ext_c_");
-  }
-}
-dl_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_c_(const dl_ccch_msg_type_c::msg_class_ext_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c2:
-      c.init(other.c.get<c2_c_>());
-      break;
-    case types::msg_class_ext_future_r15:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "dl_ccch_msg_type_c::msg_class_ext_c_");
-  }
-}
-dl_ccch_msg_type_c::msg_class_ext_c_&
-dl_ccch_msg_type_c::msg_class_ext_c_::operator=(const dl_ccch_msg_type_c::msg_class_ext_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c2:
-      c.set(other.c.get<c2_c_>());
-      break;
-    case types::msg_class_ext_future_r15:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "dl_ccch_msg_type_c::msg_class_ext_c_");
-  }
-
-  return *this;
 }
 void dl_ccch_msg_type_c::msg_class_ext_c_::to_json(json_writer& j) const
 {
@@ -2553,7 +2207,7 @@ void dl_ccch_msg_type_c::msg_class_ext_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c2:
       j.write_fieldname("c2");
-      c.get<c2_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::msg_class_ext_future_r15:
       break;
@@ -2567,7 +2221,7 @@ SRSASN_CODE dl_ccch_msg_type_c::msg_class_ext_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c2:
-      HANDLE_CODE(c.get<c2_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::msg_class_ext_future_r15:
       break;
@@ -2584,7 +2238,7 @@ SRSASN_CODE dl_ccch_msg_type_c::msg_class_ext_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c2:
-      HANDLE_CODE(c.get<c2_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::msg_class_ext_future_r15:
       break;

lib/src/asn1/rrc/ho_cmd.cc

@@ -279,66 +279,9 @@ void scg_cfg_r12_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void scg_cfg_r12_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void scg_cfg_r12_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "scg_cfg_r12_s::crit_exts_c_");
-  }
-}
-scg_cfg_r12_s::crit_exts_c_::crit_exts_c_(const scg_cfg_r12_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "scg_cfg_r12_s::crit_exts_c_");
-  }
-}
-scg_cfg_r12_s::crit_exts_c_& scg_cfg_r12_s::crit_exts_c_::operator=(const scg_cfg_r12_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "scg_cfg_r12_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void scg_cfg_r12_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -346,7 +289,7 @@ void scg_cfg_r12_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -360,7 +303,7 @@ SRSASN_CODE scg_cfg_r12_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -377,7 +320,7 @@ SRSASN_CODE scg_cfg_r12_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1393,66 +1336,9 @@ void ho_cmd_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void ho_cmd_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void ho_cmd_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ho_cmd_s::crit_exts_c_");
-  }
-}
-ho_cmd_s::crit_exts_c_::crit_exts_c_(const ho_cmd_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ho_cmd_s::crit_exts_c_");
-  }
-}
-ho_cmd_s::crit_exts_c_& ho_cmd_s::crit_exts_c_::operator=(const ho_cmd_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ho_cmd_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void ho_cmd_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -1460,7 +1346,7 @@ void ho_cmd_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -1474,7 +1360,7 @@ SRSASN_CODE ho_cmd_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1491,7 +1377,7 @@ SRSASN_CODE ho_cmd_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1773,86 +1659,6 @@ void ho_prep_info_v1320_ies_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-// HandoverPreparationInformation-v13c0-IEs ::= SEQUENCE
-SRSASN_CODE ho_prep_info_v13c0_ies_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(bref.pack(as_cfg_v13c0_present, 1));
-  HANDLE_CODE(bref.pack(non_crit_ext_present, 1));
-
-  if (as_cfg_v13c0_present) {
-    HANDLE_CODE(as_cfg_v13c0.pack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE ho_prep_info_v13c0_ies_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(bref.unpack(as_cfg_v13c0_present, 1));
-  HANDLE_CODE(bref.unpack(non_crit_ext_present, 1));
-
-  if (as_cfg_v13c0_present) {
-    HANDLE_CODE(as_cfg_v13c0.unpack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-void ho_prep_info_v13c0_ies_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  if (as_cfg_v13c0_present) {
-    j.write_fieldname("as-Config-v13c0");
-    as_cfg_v13c0.to_json(j);
-  }
-  if (non_crit_ext_present) {
-    j.write_fieldname("nonCriticalExtension");
-    j.start_obj();
-    j.end_obj();
-  }
-  j.end_obj();
-}
-
-// HandoverPreparationInformation-v10x0-IEs ::= SEQUENCE
-SRSASN_CODE ho_prep_info_v10x0_ies_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(bref.pack(late_non_crit_ext_present, 1));
-  HANDLE_CODE(bref.pack(non_crit_ext_present, 1));
-
-  if (late_non_crit_ext_present) {
-    HANDLE_CODE(late_non_crit_ext.pack(bref));
-  }
-  if (non_crit_ext_present) {
-    HANDLE_CODE(non_crit_ext.pack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE ho_prep_info_v10x0_ies_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(bref.unpack(late_non_crit_ext_present, 1));
-  HANDLE_CODE(bref.unpack(non_crit_ext_present, 1));
-
-  if (late_non_crit_ext_present) {
-    HANDLE_CODE(late_non_crit_ext.unpack(bref));
-  }
-  if (non_crit_ext_present) {
-    HANDLE_CODE(non_crit_ext.unpack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-void ho_prep_info_v10x0_ies_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  if (late_non_crit_ext_present) {
-    j.write_str("lateNonCriticalExtension", late_non_crit_ext.to_string());
-  }
-  if (non_crit_ext_present) {
-    j.write_fieldname("nonCriticalExtension");
-    non_crit_ext.to_json(j);
-  }
-  j.end_obj();
-}
-
 // HandoverPreparationInformation-v1250-IEs ::= SEQUENCE
 SRSASN_CODE ho_prep_info_v1250_ies_s::pack(bit_ref& bref) const
 {
@@ -1907,49 +1713,6 @@ void ho_prep_info_v1250_ies_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-// HandoverPreparationInformation-v10j0-IEs ::= SEQUENCE
-SRSASN_CODE ho_prep_info_v10j0_ies_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(bref.pack(as_cfg_v10j0_present, 1));
-  HANDLE_CODE(bref.pack(non_crit_ext_present, 1));
-
-  if (as_cfg_v10j0_present) {
-    HANDLE_CODE(as_cfg_v10j0.pack(bref));
-  }
-  if (non_crit_ext_present) {
-    HANDLE_CODE(non_crit_ext.pack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE ho_prep_info_v10j0_ies_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(bref.unpack(as_cfg_v10j0_present, 1));
-  HANDLE_CODE(bref.unpack(non_crit_ext_present, 1));
-
-  if (as_cfg_v10j0_present) {
-    HANDLE_CODE(as_cfg_v10j0.unpack(bref));
-  }
-  if (non_crit_ext_present) {
-    HANDLE_CODE(non_crit_ext.unpack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-void ho_prep_info_v10j0_ies_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  if (as_cfg_v10j0_present) {
-    j.write_fieldname("as-Config-v10j0");
-    as_cfg_v10j0.to_json(j);
-  }
-  if (non_crit_ext_present) {
-    j.write_fieldname("nonCriticalExtension");
-    non_crit_ext.to_json(j);
-  }
-  j.end_obj();
-}
-
 // HandoverPreparationInformation-v1130-IEs ::= SEQUENCE
 SRSASN_CODE ho_prep_info_v1130_ies_s::pack(bit_ref& bref) const
 {
@@ -2036,48 +1799,6 @@ void ho_prep_info_v9e0_ies_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-// HandoverPreparationInformation-v9j0-IEs ::= SEQUENCE
-SRSASN_CODE ho_prep_info_v9j0_ies_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(bref.pack(late_non_crit_ext_present, 1));
-  HANDLE_CODE(bref.pack(non_crit_ext_present, 1));
-
-  if (late_non_crit_ext_present) {
-    HANDLE_CODE(late_non_crit_ext.pack(bref));
-  }
-  if (non_crit_ext_present) {
-    HANDLE_CODE(non_crit_ext.pack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE ho_prep_info_v9j0_ies_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(bref.unpack(late_non_crit_ext_present, 1));
-  HANDLE_CODE(bref.unpack(non_crit_ext_present, 1));
-
-  if (late_non_crit_ext_present) {
-    HANDLE_CODE(late_non_crit_ext.unpack(bref));
-  }
-  if (non_crit_ext_present) {
-    HANDLE_CODE(non_crit_ext.unpack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-void ho_prep_info_v9j0_ies_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  if (late_non_crit_ext_present) {
-    j.write_str("lateNonCriticalExtension", late_non_crit_ext.to_string());
-  }
-  if (non_crit_ext_present) {
-    j.write_fieldname("nonCriticalExtension");
-    non_crit_ext.to_json(j);
-  }
-  j.end_obj();
-}
-
 // HandoverPreparationInformation-v9d0-IEs ::= SEQUENCE
 SRSASN_CODE ho_prep_info_v9d0_ies_s::pack(bit_ref& bref) const
 {
@@ -2373,66 +2094,9 @@ void ho_prep_info_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void ho_prep_info_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void ho_prep_info_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ho_prep_info_s::crit_exts_c_");
-  }
-}
-ho_prep_info_s::crit_exts_c_::crit_exts_c_(const ho_prep_info_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ho_prep_info_s::crit_exts_c_");
-  }
-}
-ho_prep_info_s::crit_exts_c_& ho_prep_info_s::crit_exts_c_::operator=(const ho_prep_info_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ho_prep_info_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void ho_prep_info_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -2440,7 +2104,7 @@ void ho_prep_info_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -2454,7 +2118,7 @@ SRSASN_CODE ho_prep_info_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -2471,7 +2135,7 @@ SRSASN_CODE ho_prep_info_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -2570,6 +2234,171 @@ SRSASN_CODE ho_prep_info_s::crit_exts_c_::c1_c_::unpack(cbit_ref& bref)
   return SRSASN_SUCCESS;
 }
 
+// HandoverPreparationInformation-v13c0-IEs ::= SEQUENCE
+SRSASN_CODE ho_prep_info_v13c0_ies_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(bref.pack(as_cfg_v13c0_present, 1));
+  HANDLE_CODE(bref.pack(non_crit_ext_present, 1));
+
+  if (as_cfg_v13c0_present) {
+    HANDLE_CODE(as_cfg_v13c0.pack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE ho_prep_info_v13c0_ies_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(bref.unpack(as_cfg_v13c0_present, 1));
+  HANDLE_CODE(bref.unpack(non_crit_ext_present, 1));
+
+  if (as_cfg_v13c0_present) {
+    HANDLE_CODE(as_cfg_v13c0.unpack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+void ho_prep_info_v13c0_ies_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  if (as_cfg_v13c0_present) {
+    j.write_fieldname("as-Config-v13c0");
+    as_cfg_v13c0.to_json(j);
+  }
+  if (non_crit_ext_present) {
+    j.write_fieldname("nonCriticalExtension");
+    j.start_obj();
+    j.end_obj();
+  }
+  j.end_obj();
+}
+
+// HandoverPreparationInformation-v10x0-IEs ::= SEQUENCE
+SRSASN_CODE ho_prep_info_v10x0_ies_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(bref.pack(late_non_crit_ext_present, 1));
+  HANDLE_CODE(bref.pack(non_crit_ext_present, 1));
+
+  if (late_non_crit_ext_present) {
+    HANDLE_CODE(late_non_crit_ext.pack(bref));
+  }
+  if (non_crit_ext_present) {
+    HANDLE_CODE(non_crit_ext.pack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE ho_prep_info_v10x0_ies_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(bref.unpack(late_non_crit_ext_present, 1));
+  HANDLE_CODE(bref.unpack(non_crit_ext_present, 1));
+
+  if (late_non_crit_ext_present) {
+    HANDLE_CODE(late_non_crit_ext.unpack(bref));
+  }
+  if (non_crit_ext_present) {
+    HANDLE_CODE(non_crit_ext.unpack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+void ho_prep_info_v10x0_ies_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  if (late_non_crit_ext_present) {
+    j.write_str("lateNonCriticalExtension", late_non_crit_ext.to_string());
+  }
+  if (non_crit_ext_present) {
+    j.write_fieldname("nonCriticalExtension");
+    non_crit_ext.to_json(j);
+  }
+  j.end_obj();
+}
+
+// HandoverPreparationInformation-v10j0-IEs ::= SEQUENCE
+SRSASN_CODE ho_prep_info_v10j0_ies_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(bref.pack(as_cfg_v10j0_present, 1));
+  HANDLE_CODE(bref.pack(non_crit_ext_present, 1));
+
+  if (as_cfg_v10j0_present) {
+    HANDLE_CODE(as_cfg_v10j0.pack(bref));
+  }
+  if (non_crit_ext_present) {
+    HANDLE_CODE(non_crit_ext.pack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE ho_prep_info_v10j0_ies_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(bref.unpack(as_cfg_v10j0_present, 1));
+  HANDLE_CODE(bref.unpack(non_crit_ext_present, 1));
+
+  if (as_cfg_v10j0_present) {
+    HANDLE_CODE(as_cfg_v10j0.unpack(bref));
+  }
+  if (non_crit_ext_present) {
+    HANDLE_CODE(non_crit_ext.unpack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+void ho_prep_info_v10j0_ies_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  if (as_cfg_v10j0_present) {
+    j.write_fieldname("as-Config-v10j0");
+    as_cfg_v10j0.to_json(j);
+  }
+  if (non_crit_ext_present) {
+    j.write_fieldname("nonCriticalExtension");
+    non_crit_ext.to_json(j);
+  }
+  j.end_obj();
+}
+
+// HandoverPreparationInformation-v9j0-IEs ::= SEQUENCE
+SRSASN_CODE ho_prep_info_v9j0_ies_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(bref.pack(late_non_crit_ext_present, 1));
+  HANDLE_CODE(bref.pack(non_crit_ext_present, 1));
+
+  if (late_non_crit_ext_present) {
+    HANDLE_CODE(late_non_crit_ext.pack(bref));
+  }
+  if (non_crit_ext_present) {
+    HANDLE_CODE(non_crit_ext.pack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE ho_prep_info_v9j0_ies_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(bref.unpack(late_non_crit_ext_present, 1));
+  HANDLE_CODE(bref.unpack(non_crit_ext_present, 1));
+
+  if (late_non_crit_ext_present) {
+    HANDLE_CODE(late_non_crit_ext.unpack(bref));
+  }
+  if (non_crit_ext_present) {
+    HANDLE_CODE(non_crit_ext.unpack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+void ho_prep_info_v9j0_ies_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  if (late_non_crit_ext_present) {
+    j.write_str("lateNonCriticalExtension", late_non_crit_ext.to_string());
+  }
+  if (non_crit_ext_present) {
+    j.write_fieldname("nonCriticalExtension");
+    non_crit_ext.to_json(j);
+  }
+  j.end_obj();
+}
+
 // VarMeasConfig ::= SEQUENCE
 SRSASN_CODE var_meas_cfg_s::pack(bit_ref& bref) const
 {

lib/src/asn1/rrc/meascfg.cc

@@ -10235,36 +10235,6 @@ void carrier_freq_geran_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-// MobilityControlInfo-v10l0 ::= SEQUENCE
-SRSASN_CODE mob_ctrl_info_v10l0_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(bref.pack(add_spec_emission_v10l0_present, 1));
-
-  if (add_spec_emission_v10l0_present) {
-    HANDLE_CODE(pack_integer(bref, add_spec_emission_v10l0, (uint16_t)33u, (uint16_t)288u));
-  }
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE mob_ctrl_info_v10l0_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(bref.unpack(add_spec_emission_v10l0_present, 1));
-
-  if (add_spec_emission_v10l0_present) {
-    HANDLE_CODE(unpack_integer(add_spec_emission_v10l0, bref, (uint16_t)33u, (uint16_t)288u));
-  }
-
-  return SRSASN_SUCCESS;
-}
-void mob_ctrl_info_v10l0_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  if (add_spec_emission_v10l0_present) {
-    j.write_int("additionalSpectrumEmission-v10l0", add_spec_emission_v10l0);
-  }
-  j.end_obj();
-}
-
 // LoggedMeasurementConfiguration-v1530-IEs ::= SEQUENCE
 SRSASN_CODE logged_meas_cfg_v1530_ies_s::pack(bit_ref& bref) const
 {
@@ -14691,66 +14661,9 @@ void meas_report_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void meas_report_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void meas_report_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "meas_report_s::crit_exts_c_");
-  }
-}
-meas_report_s::crit_exts_c_::crit_exts_c_(const meas_report_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "meas_report_s::crit_exts_c_");
-  }
-}
-meas_report_s::crit_exts_c_& meas_report_s::crit_exts_c_::operator=(const meas_report_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "meas_report_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void meas_report_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -14758,7 +14671,7 @@ void meas_report_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -14772,7 +14685,7 @@ SRSASN_CODE meas_report_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -14789,7 +14702,7 @@ SRSASN_CODE meas_report_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -14887,3 +14800,33 @@ SRSASN_CODE meas_report_s::crit_exts_c_::c1_c_::unpack(cbit_ref& bref)
   }
   return SRSASN_SUCCESS;
 }
+
+// MobilityControlInfo-v10l0 ::= SEQUENCE
+SRSASN_CODE mob_ctrl_info_v10l0_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(bref.pack(add_spec_emission_v10l0_present, 1));
+
+  if (add_spec_emission_v10l0_present) {
+    HANDLE_CODE(pack_integer(bref, add_spec_emission_v10l0, (uint16_t)33u, (uint16_t)288u));
+  }
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE mob_ctrl_info_v10l0_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(bref.unpack(add_spec_emission_v10l0_present, 1));
+
+  if (add_spec_emission_v10l0_present) {
+    HANDLE_CODE(unpack_integer(add_spec_emission_v10l0, bref, (uint16_t)33u, (uint16_t)288u));
+  }
+
+  return SRSASN_SUCCESS;
+}
+void mob_ctrl_info_v10l0_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  if (add_spec_emission_v10l0_present) {
+    j.write_int("additionalSpectrumEmission-v10l0", add_spec_emission_v10l0);
+  }
+  j.end_obj();
+}

lib/src/asn1/rrc/paging.cc

@@ -485,66 +485,9 @@ void paging_s::to_json(json_writer& j) const
 }
 
 // PCCH-MessageType ::= CHOICE
-void pcch_msg_type_c::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void pcch_msg_type_c::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::msg_class_ext:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "pcch_msg_type_c");
-  }
-}
-pcch_msg_type_c::pcch_msg_type_c(const pcch_msg_type_c& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::msg_class_ext:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "pcch_msg_type_c");
-  }
-}
-pcch_msg_type_c& pcch_msg_type_c::operator=(const pcch_msg_type_c& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::msg_class_ext:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "pcch_msg_type_c");
-  }
-
-  return *this;
 }
 void pcch_msg_type_c::to_json(json_writer& j) const
 {
@@ -552,7 +495,7 @@ void pcch_msg_type_c::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::msg_class_ext:
       break;
@@ -566,7 +509,7 @@ SRSASN_CODE pcch_msg_type_c::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::msg_class_ext:
       break;
@@ -583,7 +526,7 @@ SRSASN_CODE pcch_msg_type_c::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::msg_class_ext:
       break;
@@ -699,67 +642,9 @@ void ue_paging_coverage_info_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void ue_paging_coverage_info_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void ue_paging_coverage_info_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ue_paging_coverage_info_s::crit_exts_c_");
-  }
-}
-ue_paging_coverage_info_s::crit_exts_c_::crit_exts_c_(const ue_paging_coverage_info_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ue_paging_coverage_info_s::crit_exts_c_");
-  }
-}
-ue_paging_coverage_info_s::crit_exts_c_&
-ue_paging_coverage_info_s::crit_exts_c_::operator=(const ue_paging_coverage_info_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ue_paging_coverage_info_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void ue_paging_coverage_info_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -767,7 +652,7 @@ void ue_paging_coverage_info_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -781,7 +666,7 @@ SRSASN_CODE ue_paging_coverage_info_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -798,7 +683,7 @@ SRSASN_CODE ue_paging_coverage_info_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -995,67 +880,9 @@ void ue_radio_paging_info_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void ue_radio_paging_info_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void ue_radio_paging_info_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ue_radio_paging_info_s::crit_exts_c_");
-  }
-}
-ue_radio_paging_info_s::crit_exts_c_::crit_exts_c_(const ue_radio_paging_info_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ue_radio_paging_info_s::crit_exts_c_");
-  }
-}
-ue_radio_paging_info_s::crit_exts_c_&
-ue_radio_paging_info_s::crit_exts_c_::operator=(const ue_radio_paging_info_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ue_radio_paging_info_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void ue_radio_paging_info_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -1063,7 +890,7 @@ void ue_radio_paging_info_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -1077,7 +904,7 @@ SRSASN_CODE ue_radio_paging_info_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1094,7 +921,7 @@ SRSASN_CODE ue_radio_paging_info_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;

lib/src/asn1/rrc/rr_common.cc

@@ -498,71 +498,6 @@ uint8_t tdd_cfg_v1130_s::special_sf_patterns_v1130_opts::to_number() const
   return map_enum_number(options, 2, value, "tdd_cfg_v1130_s::special_sf_patterns_v1130_e_");
 }
 
-// UplinkPowerControlCommon-v1310 ::= SEQUENCE
-SRSASN_CODE ul_pwr_ctrl_common_v1310_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(bref.pack(delta_f_pucch_format4_r13_present, 1));
-  HANDLE_CODE(bref.pack(delta_f_pucch_format5_minus13_present, 1));
-
-  if (delta_f_pucch_format4_r13_present) {
-    HANDLE_CODE(delta_f_pucch_format4_r13.pack(bref));
-  }
-  if (delta_f_pucch_format5_minus13_present) {
-    HANDLE_CODE(delta_f_pucch_format5_minus13.pack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE ul_pwr_ctrl_common_v1310_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(bref.unpack(delta_f_pucch_format4_r13_present, 1));
-  HANDLE_CODE(bref.unpack(delta_f_pucch_format5_minus13_present, 1));
-
-  if (delta_f_pucch_format4_r13_present) {
-    HANDLE_CODE(delta_f_pucch_format4_r13.unpack(bref));
-  }
-  if (delta_f_pucch_format5_minus13_present) {
-    HANDLE_CODE(delta_f_pucch_format5_minus13.unpack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-void ul_pwr_ctrl_common_v1310_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  if (delta_f_pucch_format4_r13_present) {
-    j.write_str("deltaF-PUCCH-Format4-r13", delta_f_pucch_format4_r13.to_string());
-  }
-  if (delta_f_pucch_format5_minus13_present) {
-    j.write_str("deltaF-PUCCH-Format5-13", delta_f_pucch_format5_minus13.to_string());
-  }
-  j.end_obj();
-}
-
-std::string ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format4_r13_opts::to_string() const
-{
-  static const char* options[] = {
-      "deltaF16", "deltaF15", "deltaF14", "deltaF13", "deltaF12", "deltaF11", "deltaF10", "spare1"};
-  return convert_enum_idx(options, 8, value, "ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format4_r13_e_");
-}
-uint8_t ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format4_r13_opts::to_number() const
-{
-  static const uint8_t options[] = {16, 15, 14, 13, 12, 11, 10};
-  return map_enum_number(options, 7, value, "ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format4_r13_e_");
-}
-
-std::string ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format5_minus13_opts::to_string() const
-{
-  static const char* options[] = {
-      "deltaF13", "deltaF12", "deltaF11", "deltaF10", "deltaF9", "deltaF8", "deltaF7", "spare1"};
-  return convert_enum_idx(options, 8, value, "ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format5_minus13_e_");
-}
-uint8_t ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format5_minus13_opts::to_number() const
-{
-  static const uint8_t options[] = {13, 12, 11, 10, 9, 8, 7};
-  return map_enum_number(options, 7, value, "ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format5_minus13_e_");
-}
-
 // PRACH-ParametersCE-r13 ::= SEQUENCE
 SRSASN_CODE prach_params_ce_r13_s::pack(bit_ref& bref) const
 {
@@ -5127,6 +5062,71 @@ uint8_t rr_cfg_common_scell_r10_s::harq_ref_cfg_r14_opts::to_number() const
   return map_enum_number(options, 3, value, "rr_cfg_common_scell_r10_s::harq_ref_cfg_r14_e_");
 }
 
+// UplinkPowerControlCommon-v1310 ::= SEQUENCE
+SRSASN_CODE ul_pwr_ctrl_common_v1310_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(bref.pack(delta_f_pucch_format4_r13_present, 1));
+  HANDLE_CODE(bref.pack(delta_f_pucch_format5_minus13_present, 1));
+
+  if (delta_f_pucch_format4_r13_present) {
+    HANDLE_CODE(delta_f_pucch_format4_r13.pack(bref));
+  }
+  if (delta_f_pucch_format5_minus13_present) {
+    HANDLE_CODE(delta_f_pucch_format5_minus13.pack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE ul_pwr_ctrl_common_v1310_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(bref.unpack(delta_f_pucch_format4_r13_present, 1));
+  HANDLE_CODE(bref.unpack(delta_f_pucch_format5_minus13_present, 1));
+
+  if (delta_f_pucch_format4_r13_present) {
+    HANDLE_CODE(delta_f_pucch_format4_r13.unpack(bref));
+  }
+  if (delta_f_pucch_format5_minus13_present) {
+    HANDLE_CODE(delta_f_pucch_format5_minus13.unpack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+void ul_pwr_ctrl_common_v1310_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  if (delta_f_pucch_format4_r13_present) {
+    j.write_str("deltaF-PUCCH-Format4-r13", delta_f_pucch_format4_r13.to_string());
+  }
+  if (delta_f_pucch_format5_minus13_present) {
+    j.write_str("deltaF-PUCCH-Format5-13", delta_f_pucch_format5_minus13.to_string());
+  }
+  j.end_obj();
+}
+
+std::string ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format4_r13_opts::to_string() const
+{
+  static const char* options[] = {
+      "deltaF16", "deltaF15", "deltaF14", "deltaF13", "deltaF12", "deltaF11", "deltaF10", "spare1"};
+  return convert_enum_idx(options, 8, value, "ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format4_r13_e_");
+}
+uint8_t ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format4_r13_opts::to_number() const
+{
+  static const uint8_t options[] = {16, 15, 14, 13, 12, 11, 10};
+  return map_enum_number(options, 7, value, "ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format4_r13_e_");
+}
+
+std::string ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format5_minus13_opts::to_string() const
+{
+  static const char* options[] = {
+      "deltaF13", "deltaF12", "deltaF11", "deltaF10", "deltaF9", "deltaF8", "deltaF7", "spare1"};
+  return convert_enum_idx(options, 8, value, "ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format5_minus13_e_");
+}
+uint8_t ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format5_minus13_opts::to_number() const
+{
+  static const uint8_t options[] = {13, 12, 11, 10, 9, 8, 7};
+  return map_enum_number(options, 7, value, "ul_pwr_ctrl_common_v1310_s::delta_f_pucch_format5_minus13_e_");
+}
+
 // PRACH-Config-v1310 ::= SEQUENCE
 SRSASN_CODE prach_cfg_v1310_s::pack(bit_ref& bref) const
 {

lib/src/asn1/rrc/rr_ded.cc

@@ -2953,32 +2953,11 @@ void rlc_cfg_v1530_c::set(types::options e)
 void rlc_cfg_v1530_c::to_json(json_writer& j) const
 {
   j.start_obj();
-  switch (type_) {
-    case types::release:
-      break;
-    case types::setup:
-      j.write_fieldname("setup");
-      j.start_obj();
-      j.write_str("rlc-OutOfOrderDelivery-r15", "true");
-      j.end_obj();
-      break;
-    default:
-      log_invalid_choice_id(type_, "rlc_cfg_v1530_c");
-  }
   j.end_obj();
 }
 SRSASN_CODE rlc_cfg_v1530_c::pack(bit_ref& bref) const
 {
   type_.pack(bref);
-  switch (type_) {
-    case types::release:
-      break;
-    case types::setup:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rlc_cfg_v1530_c");
-      return SRSASN_ERROR_ENCODE_FAIL;
-  }
   return SRSASN_SUCCESS;
 }
 SRSASN_CODE rlc_cfg_v1530_c::unpack(cbit_ref& bref)
@@ -2986,15 +2965,6 @@ SRSASN_CODE rlc_cfg_v1530_c::unpack(cbit_ref& bref)
   types e;
   e.unpack(bref);
   set(e);
-  switch (type_) {
-    case types::release:
-      break;
-    case types::setup:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rlc_cfg_v1530_c");
-      return SRSASN_ERROR_DECODE_FAIL;
-  }
   return SRSASN_SUCCESS;
 }
 bool rlc_cfg_v1530_c::operator==(const rlc_cfg_v1530_c& other) const
@@ -13486,88 +13456,6 @@ uint8_t ant_info_ded_v10i0_s::max_layers_mimo_r10_opts::to_number() const
   return map_enum_number(options, 3, value, "ant_info_ded_v10i0_s::max_layers_mimo_r10_e_");
 }
 
-// PUCCH-ConfigDedicated-v13c0 ::= SEQUENCE
-SRSASN_CODE pucch_cfg_ded_v13c0_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(ch_sel_v13c0.n1_pucch_an_cs_v13c0.pack(bref));
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE pucch_cfg_ded_v13c0_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(ch_sel_v13c0.n1_pucch_an_cs_v13c0.unpack(bref));
-
-  return SRSASN_SUCCESS;
-}
-void pucch_cfg_ded_v13c0_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  j.write_fieldname("channelSelection-v13c0");
-  j.start_obj();
-  j.write_fieldname("n1PUCCH-AN-CS-v13c0");
-  ch_sel_v13c0.n1_pucch_an_cs_v13c0.to_json(j);
-  j.end_obj();
-  j.end_obj();
-}
-
-void pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_::set(types::options e)
-{
-  type_ = e;
-}
-void pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_::to_json(json_writer& j) const
-{
-  j.start_obj();
-  switch (type_) {
-    case types::release:
-      break;
-    case types::setup:
-      j.write_fieldname("setup");
-      j.start_obj();
-      j.start_array("n1PUCCH-AN-CS-ListP1-v13c0");
-      for (const auto& e1 : c.n1_pucch_an_cs_list_p1_v13c0) {
-        j.write_int(e1);
-      }
-      j.end_array();
-      j.end_obj();
-      break;
-    default:
-      log_invalid_choice_id(type_, "pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_");
-  }
-  j.end_obj();
-}
-SRSASN_CODE pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_::pack(bit_ref& bref) const
-{
-  type_.pack(bref);
-  switch (type_) {
-    case types::release:
-      break;
-    case types::setup:
-      HANDLE_CODE(pack_dyn_seq_of(bref, c.n1_pucch_an_cs_list_p1_v13c0, 2, 4, integer_packer<uint16_t>(0, 2047)));
-      break;
-    default:
-      log_invalid_choice_id(type_, "pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_");
-      return SRSASN_ERROR_ENCODE_FAIL;
-  }
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_::unpack(cbit_ref& bref)
-{
-  types e;
-  e.unpack(bref);
-  set(e);
-  switch (type_) {
-    case types::release:
-      break;
-    case types::setup:
-      HANDLE_CODE(unpack_dyn_seq_of(c.n1_pucch_an_cs_list_p1_v13c0, bref, 2, 4, integer_packer<uint16_t>(0, 2047)));
-      break;
-    default:
-      log_invalid_choice_id(type_, "pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_");
-      return SRSASN_ERROR_DECODE_FAIL;
-  }
-  return SRSASN_SUCCESS;
-}
-
 // RadioResourceConfigDedicatedSCell-r10 ::= SEQUENCE
 SRSASN_CODE rr_cfg_ded_scell_r10_s::pack(bit_ref& bref) const
 {
@@ -13779,82 +13667,6 @@ bool rr_cfg_ded_scell_r10_s::operator==(const rr_cfg_ded_scell_r10_s& other) con
            (not sps_cfg_v1530.is_present() or *sps_cfg_v1530 == *other.sps_cfg_v1530)));
 }
 
-// PhysicalConfigDedicatedSCell-v13c0 ::= SEQUENCE
-SRSASN_CODE phys_cfg_ded_scell_v13c0_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(pucch_scell_v13c0.pack(bref));
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE phys_cfg_ded_scell_v13c0_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(pucch_scell_v13c0.unpack(bref));
-
-  return SRSASN_SUCCESS;
-}
-void phys_cfg_ded_scell_v13c0_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  j.write_fieldname("pucch-SCell-v13c0");
-  pucch_scell_v13c0.to_json(j);
-  j.end_obj();
-}
-
-void phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_::set(types::options e)
-{
-  type_ = e;
-}
-void phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_::to_json(json_writer& j) const
-{
-  j.start_obj();
-  switch (type_) {
-    case types::release:
-      break;
-    case types::setup:
-      j.write_fieldname("setup");
-      j.start_obj();
-      j.write_fieldname("pucch-ConfigDedicated-v13c0");
-      c.pucch_cfg_ded_v13c0.to_json(j);
-      j.end_obj();
-      break;
-    default:
-      log_invalid_choice_id(type_, "phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_");
-  }
-  j.end_obj();
-}
-SRSASN_CODE phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_::pack(bit_ref& bref) const
-{
-  type_.pack(bref);
-  switch (type_) {
-    case types::release:
-      break;
-    case types::setup:
-      HANDLE_CODE(c.pucch_cfg_ded_v13c0.pack(bref));
-      break;
-    default:
-      log_invalid_choice_id(type_, "phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_");
-      return SRSASN_ERROR_ENCODE_FAIL;
-  }
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_::unpack(cbit_ref& bref)
-{
-  types e;
-  e.unpack(bref);
-  set(e);
-  switch (type_) {
-    case types::release:
-      break;
-    case types::setup:
-      HANDLE_CODE(c.pucch_cfg_ded_v13c0.unpack(bref));
-      break;
-    default:
-      log_invalid_choice_id(type_, "phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_");
-      return SRSASN_ERROR_DECODE_FAIL;
-  }
-  return SRSASN_SUCCESS;
-}
-
 // SCellToAddModExt-r13 ::= SEQUENCE
 SRSASN_CODE scell_to_add_mod_ext_r13_s::pack(bit_ref& bref) const
 {
@@ -13930,56 +13742,86 @@ void scell_to_add_mod_ext_r13_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-// RadioResourceConfigDedicatedSCell-v13c0 ::= SEQUENCE
-SRSASN_CODE rr_cfg_ded_scell_v13c0_s::pack(bit_ref& bref) const
+// PUCCH-ConfigDedicated-v13c0 ::= SEQUENCE
+SRSASN_CODE pucch_cfg_ded_v13c0_s::pack(bit_ref& bref) const
 {
-  HANDLE_CODE(phys_cfg_ded_scell_v13c0.pack(bref));
+  HANDLE_CODE(ch_sel_v13c0.n1_pucch_an_cs_v13c0.pack(bref));
 
   return SRSASN_SUCCESS;
 }
-SRSASN_CODE rr_cfg_ded_scell_v13c0_s::unpack(cbit_ref& bref)
+SRSASN_CODE pucch_cfg_ded_v13c0_s::unpack(cbit_ref& bref)
 {
-  HANDLE_CODE(phys_cfg_ded_scell_v13c0.unpack(bref));
+  HANDLE_CODE(ch_sel_v13c0.n1_pucch_an_cs_v13c0.unpack(bref));
 
   return SRSASN_SUCCESS;
 }
-void rr_cfg_ded_scell_v13c0_s::to_json(json_writer& j) const
+void pucch_cfg_ded_v13c0_s::to_json(json_writer& j) const
 {
   j.start_obj();
-  j.write_fieldname("physicalConfigDedicatedSCell-v13c0");
-  phys_cfg_ded_scell_v13c0.to_json(j);
+  j.write_fieldname("channelSelection-v13c0");
+  j.start_obj();
+  j.write_fieldname("n1PUCCH-AN-CS-v13c0");
+  ch_sel_v13c0.n1_pucch_an_cs_v13c0.to_json(j);
+  j.end_obj();
   j.end_obj();
 }
 
-// SCellToAddMod-v13c0 ::= SEQUENCE
-SRSASN_CODE scell_to_add_mod_v13c0_s::pack(bit_ref& bref) const
+void pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_::set(types::options e)
 {
-  HANDLE_CODE(bref.pack(rr_cfg_ded_scell_v13c0_present, 1));
-
-  if (rr_cfg_ded_scell_v13c0_present) {
-    HANDLE_CODE(rr_cfg_ded_scell_v13c0.pack(bref));
+  type_ = e;
+}
+void pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_::to_json(json_writer& j) const
+{
+  j.start_obj();
+  switch (type_) {
+    case types::release:
+      break;
+    case types::setup:
+      j.write_fieldname("setup");
+      j.start_obj();
+      j.start_array("n1PUCCH-AN-CS-ListP1-v13c0");
+      for (const auto& e1 : c.n1_pucch_an_cs_list_p1_v13c0) {
+        j.write_int(e1);
       }
-
-  return SRSASN_SUCCESS;
+      j.end_array();
+      j.end_obj();
+      break;
+    default:
+      log_invalid_choice_id(type_, "pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_");
+  }
+  j.end_obj();
 }
-SRSASN_CODE scell_to_add_mod_v13c0_s::unpack(cbit_ref& bref)
+SRSASN_CODE pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_::pack(bit_ref& bref) const
 {
-  HANDLE_CODE(bref.unpack(rr_cfg_ded_scell_v13c0_present, 1));
-
-  if (rr_cfg_ded_scell_v13c0_present) {
-    HANDLE_CODE(rr_cfg_ded_scell_v13c0.unpack(bref));
+  type_.pack(bref);
+  switch (type_) {
+    case types::release:
+      break;
+    case types::setup:
+      HANDLE_CODE(pack_dyn_seq_of(bref, c.n1_pucch_an_cs_list_p1_v13c0, 2, 4, integer_packer<uint16_t>(0, 2047)));
+      break;
+    default:
+      log_invalid_choice_id(type_, "pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_");
+      return SRSASN_ERROR_ENCODE_FAIL;
   }
-
   return SRSASN_SUCCESS;
 }
-void scell_to_add_mod_v13c0_s::to_json(json_writer& j) const
+SRSASN_CODE pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_::unpack(cbit_ref& bref)
 {
-  j.start_obj();
-  if (rr_cfg_ded_scell_v13c0_present) {
-    j.write_fieldname("radioResourceConfigDedicatedSCell-v13c0");
-    rr_cfg_ded_scell_v13c0.to_json(j);
+  types e;
+  e.unpack(bref);
+  set(e);
+  switch (type_) {
+    case types::release:
+      break;
+    case types::setup:
+      HANDLE_CODE(unpack_dyn_seq_of(c.n1_pucch_an_cs_list_p1_v13c0, bref, 2, 4, integer_packer<uint16_t>(0, 2047)));
+      break;
+    default:
+      log_invalid_choice_id(type_, "pucch_cfg_ded_v13c0_s::ch_sel_v13c0_s_::n1_pucch_an_cs_v13c0_c_");
+      return SRSASN_ERROR_DECODE_FAIL;
   }
-  j.end_obj();
+  return SRSASN_SUCCESS;
 }
 
 // DRB-ToAddModSCG-r12 ::= SEQUENCE
@@ -14573,37 +14415,6 @@ std::string scell_to_add_mod_r10_s::scell_state_r15_opts::to_string() const
   return convert_enum_idx(options, 2, value, "scell_to_add_mod_r10_s::scell_state_r15_e_");
 }
 
-// SCellToAddMod-v10l0 ::= SEQUENCE
-SRSASN_CODE scell_to_add_mod_v10l0_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(bref.pack(rr_cfg_common_scell_v10l0_present, 1));
-
-  if (rr_cfg_common_scell_v10l0_present) {
-    HANDLE_CODE(rr_cfg_common_scell_v10l0.pack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE scell_to_add_mod_v10l0_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(bref.unpack(rr_cfg_common_scell_v10l0_present, 1));
-
-  if (rr_cfg_common_scell_v10l0_present) {
-    HANDLE_CODE(rr_cfg_common_scell_v10l0.unpack(bref));
-  }
-
-  return SRSASN_SUCCESS;
-}
-void scell_to_add_mod_v10l0_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  if (rr_cfg_common_scell_v10l0_present) {
-    j.write_fieldname("radioResourceConfigCommonSCell-v10l0");
-    rr_cfg_common_scell_v10l0.to_json(j);
-  }
-  j.end_obj();
-}
-
 // SCellToAddModExt-v1370 ::= SEQUENCE
 SRSASN_CODE scell_to_add_mod_ext_v1370_s::pack(bit_ref& bref) const
 {
@@ -14705,27 +14516,6 @@ std::string scell_to_add_mod_ext_v1430_s::scell_state_r15_opts::to_string() cons
   return convert_enum_idx(options, 2, value, "scell_to_add_mod_ext_v1430_s::scell_state_r15_e_");
 }
 
-// RadioResourceConfigDedicated-v13c0 ::= SEQUENCE
-SRSASN_CODE rr_cfg_ded_v13c0_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(phys_cfg_ded_v13c0.pack(bref));
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE rr_cfg_ded_v13c0_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(phys_cfg_ded_v13c0.unpack(bref));
-
-  return SRSASN_SUCCESS;
-}
-void rr_cfg_ded_v13c0_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  j.write_fieldname("physicalConfigDedicated-v13c0");
-  phys_cfg_ded_v13c0.to_json(j);
-  j.end_obj();
-}
-
 // RadioResourceConfigDedicatedSCG-r12 ::= SEQUENCE
 SRSASN_CODE rr_cfg_ded_scg_r12_s::pack(bit_ref& bref) const
 {
@@ -14894,6 +14684,186 @@ void rr_cfg_ded_scg_r12_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
+// PhysicalConfigDedicatedSCell-v13c0 ::= SEQUENCE
+SRSASN_CODE phys_cfg_ded_scell_v13c0_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(pucch_scell_v13c0.pack(bref));
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE phys_cfg_ded_scell_v13c0_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(pucch_scell_v13c0.unpack(bref));
+
+  return SRSASN_SUCCESS;
+}
+void phys_cfg_ded_scell_v13c0_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  j.write_fieldname("pucch-SCell-v13c0");
+  pucch_scell_v13c0.to_json(j);
+  j.end_obj();
+}
+
+void phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_::set(types::options e)
+{
+  type_ = e;
+}
+void phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_::to_json(json_writer& j) const
+{
+  j.start_obj();
+  switch (type_) {
+    case types::release:
+      break;
+    case types::setup:
+      j.write_fieldname("setup");
+      j.start_obj();
+      j.write_fieldname("pucch-ConfigDedicated-v13c0");
+      c.pucch_cfg_ded_v13c0.to_json(j);
+      j.end_obj();
+      break;
+    default:
+      log_invalid_choice_id(type_, "phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_");
+  }
+  j.end_obj();
+}
+SRSASN_CODE phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_::pack(bit_ref& bref) const
+{
+  type_.pack(bref);
+  switch (type_) {
+    case types::release:
+      break;
+    case types::setup:
+      HANDLE_CODE(c.pucch_cfg_ded_v13c0.pack(bref));
+      break;
+    default:
+      log_invalid_choice_id(type_, "phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_");
+      return SRSASN_ERROR_ENCODE_FAIL;
+  }
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_::unpack(cbit_ref& bref)
+{
+  types e;
+  e.unpack(bref);
+  set(e);
+  switch (type_) {
+    case types::release:
+      break;
+    case types::setup:
+      HANDLE_CODE(c.pucch_cfg_ded_v13c0.unpack(bref));
+      break;
+    default:
+      log_invalid_choice_id(type_, "phys_cfg_ded_scell_v13c0_s::pucch_scell_v13c0_c_");
+      return SRSASN_ERROR_DECODE_FAIL;
+  }
+  return SRSASN_SUCCESS;
+}
+
+// RadioResourceConfigDedicatedSCell-v13c0 ::= SEQUENCE
+SRSASN_CODE rr_cfg_ded_scell_v13c0_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(phys_cfg_ded_scell_v13c0.pack(bref));
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE rr_cfg_ded_scell_v13c0_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(phys_cfg_ded_scell_v13c0.unpack(bref));
+
+  return SRSASN_SUCCESS;
+}
+void rr_cfg_ded_scell_v13c0_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  j.write_fieldname("physicalConfigDedicatedSCell-v13c0");
+  phys_cfg_ded_scell_v13c0.to_json(j);
+  j.end_obj();
+}
+
+// SCellToAddMod-v13c0 ::= SEQUENCE
+SRSASN_CODE scell_to_add_mod_v13c0_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(bref.pack(rr_cfg_ded_scell_v13c0_present, 1));
+
+  if (rr_cfg_ded_scell_v13c0_present) {
+    HANDLE_CODE(rr_cfg_ded_scell_v13c0.pack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE scell_to_add_mod_v13c0_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(bref.unpack(rr_cfg_ded_scell_v13c0_present, 1));
+
+  if (rr_cfg_ded_scell_v13c0_present) {
+    HANDLE_CODE(rr_cfg_ded_scell_v13c0.unpack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+void scell_to_add_mod_v13c0_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  if (rr_cfg_ded_scell_v13c0_present) {
+    j.write_fieldname("radioResourceConfigDedicatedSCell-v13c0");
+    rr_cfg_ded_scell_v13c0.to_json(j);
+  }
+  j.end_obj();
+}
+
+// SCellToAddMod-v10l0 ::= SEQUENCE
+SRSASN_CODE scell_to_add_mod_v10l0_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(bref.pack(rr_cfg_common_scell_v10l0_present, 1));
+
+  if (rr_cfg_common_scell_v10l0_present) {
+    HANDLE_CODE(rr_cfg_common_scell_v10l0.pack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE scell_to_add_mod_v10l0_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(bref.unpack(rr_cfg_common_scell_v10l0_present, 1));
+
+  if (rr_cfg_common_scell_v10l0_present) {
+    HANDLE_CODE(rr_cfg_common_scell_v10l0.unpack(bref));
+  }
+
+  return SRSASN_SUCCESS;
+}
+void scell_to_add_mod_v10l0_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  if (rr_cfg_common_scell_v10l0_present) {
+    j.write_fieldname("radioResourceConfigCommonSCell-v10l0");
+    rr_cfg_common_scell_v10l0.to_json(j);
+  }
+  j.end_obj();
+}
+
+// RadioResourceConfigDedicated-v13c0 ::= SEQUENCE
+SRSASN_CODE rr_cfg_ded_v13c0_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(phys_cfg_ded_v13c0.pack(bref));
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE rr_cfg_ded_v13c0_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(phys_cfg_ded_v13c0.unpack(bref));
+
+  return SRSASN_SUCCESS;
+}
+void rr_cfg_ded_v13c0_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  j.write_fieldname("physicalConfigDedicated-v13c0");
+  phys_cfg_ded_v13c0.to_json(j);
+  j.end_obj();
+}
+
 // Cell-ToAddMod-r12 ::= SEQUENCE
 SRSASN_CODE cell_to_add_mod_r12_s::pack(bit_ref& bref) const
 {

lib/src/asn1/rrc/security.cc

@@ -548,67 +548,9 @@ void security_mode_cmd_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void security_mode_cmd_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::c1:
-      c.destroy<c1_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void security_mode_cmd_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c1:
-      c.init<c1_c_>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "security_mode_cmd_s::crit_exts_c_");
-  }
-}
-security_mode_cmd_s::crit_exts_c_::crit_exts_c_(const security_mode_cmd_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c1:
-      c.init(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "security_mode_cmd_s::crit_exts_c_");
-  }
-}
-security_mode_cmd_s::crit_exts_c_&
-security_mode_cmd_s::crit_exts_c_::operator=(const security_mode_cmd_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c1:
-      c.set(other.c.get<c1_c_>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "security_mode_cmd_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void security_mode_cmd_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -616,7 +558,7 @@ void security_mode_cmd_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::c1:
       j.write_fieldname("c1");
-      c.get<c1_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -630,7 +572,7 @@ SRSASN_CODE security_mode_cmd_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -647,7 +589,7 @@ SRSASN_CODE security_mode_cmd_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::c1:
-      HANDLE_CODE(c.get<c1_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -882,67 +824,9 @@ void security_mode_complete_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void security_mode_complete_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::security_mode_complete_r8:
-      c.destroy<security_mode_complete_r8_ies_s>();
-      break;
-    default:
-      break;
-  }
-}
 void security_mode_complete_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::security_mode_complete_r8:
-      c.init<security_mode_complete_r8_ies_s>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "security_mode_complete_s::crit_exts_c_");
-  }
-}
-security_mode_complete_s::crit_exts_c_::crit_exts_c_(const security_mode_complete_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::security_mode_complete_r8:
-      c.init(other.c.get<security_mode_complete_r8_ies_s>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "security_mode_complete_s::crit_exts_c_");
-  }
-}
-security_mode_complete_s::crit_exts_c_&
-security_mode_complete_s::crit_exts_c_::operator=(const security_mode_complete_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::security_mode_complete_r8:
-      c.set(other.c.get<security_mode_complete_r8_ies_s>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "security_mode_complete_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void security_mode_complete_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -950,7 +834,7 @@ void security_mode_complete_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::security_mode_complete_r8:
       j.write_fieldname("securityModeComplete-r8");
-      c.get<security_mode_complete_r8_ies_s>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -964,7 +848,7 @@ SRSASN_CODE security_mode_complete_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::security_mode_complete_r8:
-      HANDLE_CODE(c.get<security_mode_complete_r8_ies_s>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -981,7 +865,7 @@ SRSASN_CODE security_mode_complete_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::security_mode_complete_r8:
-      HANDLE_CODE(c.get<security_mode_complete_r8_ies_s>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1016,67 +900,9 @@ void security_mode_fail_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void security_mode_fail_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::security_mode_fail_r8:
-      c.destroy<security_mode_fail_r8_ies_s>();
-      break;
-    default:
-      break;
-  }
-}
 void security_mode_fail_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::security_mode_fail_r8:
-      c.init<security_mode_fail_r8_ies_s>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "security_mode_fail_s::crit_exts_c_");
-  }
-}
-security_mode_fail_s::crit_exts_c_::crit_exts_c_(const security_mode_fail_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::security_mode_fail_r8:
-      c.init(other.c.get<security_mode_fail_r8_ies_s>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "security_mode_fail_s::crit_exts_c_");
-  }
-}
-security_mode_fail_s::crit_exts_c_&
-security_mode_fail_s::crit_exts_c_::operator=(const security_mode_fail_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::security_mode_fail_r8:
-      c.set(other.c.get<security_mode_fail_r8_ies_s>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "security_mode_fail_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void security_mode_fail_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -1084,7 +910,7 @@ void security_mode_fail_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::security_mode_fail_r8:
       j.write_fieldname("securityModeFailure-r8");
-      c.get<security_mode_fail_r8_ies_s>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -1098,7 +924,7 @@ SRSASN_CODE security_mode_fail_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::security_mode_fail_r8:
-      HANDLE_CODE(c.get<security_mode_fail_r8_ies_s>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1115,7 +941,7 @@ SRSASN_CODE security_mode_fail_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::security_mode_fail_r8:
-      HANDLE_CODE(c.get<security_mode_fail_r8_ies_s>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;

lib/src/asn1/rrc/si.cc

@@ -563,38 +563,6 @@ void cell_access_related_info_r14_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-// CellSelectionInfoCE1-v1360 ::= SEQUENCE
-SRSASN_CODE cell_sel_info_ce1_v1360_s::pack(bit_ref& bref) const
-{
-  HANDLE_CODE(pack_integer(bref, delta_rx_lev_min_ce1_v1360, (int8_t)-8, (int8_t)-1));
-
-  return SRSASN_SUCCESS;
-}
-SRSASN_CODE cell_sel_info_ce1_v1360_s::unpack(cbit_ref& bref)
-{
-  HANDLE_CODE(unpack_integer(delta_rx_lev_min_ce1_v1360, bref, (int8_t)-8, (int8_t)-1));
-
-  return SRSASN_SUCCESS;
-}
-void cell_sel_info_ce1_v1360_s::to_json(json_writer& j) const
-{
-  j.start_obj();
-  j.write_int("delta-RxLevMinCE1-v1360", delta_rx_lev_min_ce1_v1360);
-  j.end_obj();
-}
-
-// SI-Periodicity-r12 ::= ENUMERATED
-std::string si_periodicity_r12_opts::to_string() const
-{
-  static const char* options[] = {"rf8", "rf16", "rf32", "rf64", "rf128", "rf256", "rf512"};
-  return convert_enum_idx(options, 7, value, "si_periodicity_r12_e");
-}
-uint16_t si_periodicity_r12_opts::to_number() const
-{
-  static const uint16_t options[] = {8, 16, 32, 64, 128, 256, 512};
-  return map_enum_number(options, 7, value, "si_periodicity_r12_e");
-}
-
 // SystemInformationBlockType1-v1450-IEs ::= SEQUENCE
 SRSASN_CODE sib_type1_v1450_ies_s::pack(bit_ref& bref) const
 {
@@ -638,6 +606,26 @@ void sib_type1_v1450_ies_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
+// CellSelectionInfoCE1-v1360 ::= SEQUENCE
+SRSASN_CODE cell_sel_info_ce1_v1360_s::pack(bit_ref& bref) const
+{
+  HANDLE_CODE(pack_integer(bref, delta_rx_lev_min_ce1_v1360, (int8_t)-8, (int8_t)-1));
+
+  return SRSASN_SUCCESS;
+}
+SRSASN_CODE cell_sel_info_ce1_v1360_s::unpack(cbit_ref& bref)
+{
+  HANDLE_CODE(unpack_integer(delta_rx_lev_min_ce1_v1360, bref, (int8_t)-8, (int8_t)-1));
+
+  return SRSASN_SUCCESS;
+}
+void cell_sel_info_ce1_v1360_s::to_json(json_writer& j) const
+{
+  j.start_obj();
+  j.write_int("delta-RxLevMinCE1-v1360", delta_rx_lev_min_ce1_v1360);
+  j.end_obj();
+}
+
 // SystemInformationBlockType1-v1430-IEs ::= SEQUENCE
 SRSASN_CODE sib_type1_v1430_ies_s::pack(bit_ref& bref) const
 {
@@ -2171,6 +2159,18 @@ void cell_sel_info_v920_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
+// SI-Periodicity-r12 ::= ENUMERATED
+std::string si_periodicity_r12_opts::to_string() const
+{
+  static const char* options[] = {"rf8", "rf16", "rf32", "rf64", "rf128", "rf256", "rf512"};
+  return convert_enum_idx(options, 7, value, "si_periodicity_r12_e");
+}
+uint16_t si_periodicity_r12_opts::to_number() const
+{
+  static const uint16_t options[] = {8, 16, 32, 64, 128, 256, 512};
+  return map_enum_number(options, 7, value, "si_periodicity_r12_e");
+}
+
 // SystemInformationBlockType1-v1130-IEs ::= SEQUENCE
 SRSASN_CODE sib_type1_v1130_ies_s::pack(bit_ref& bref) const
 {

lib/src/asn1/rrc/ul_ccch_msg.cc

@@ -825,67 +825,9 @@ void rrc_conn_reest_request_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void rrc_conn_reest_request_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::rrc_conn_reest_request_r8:
-      c.destroy<rrc_conn_reest_request_r8_ies_s>();
-      break;
-    default:
-      break;
-  }
-}
 void rrc_conn_reest_request_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::rrc_conn_reest_request_r8:
-      c.init<rrc_conn_reest_request_r8_ies_s>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_reest_request_s::crit_exts_c_");
-  }
-}
-rrc_conn_reest_request_s::crit_exts_c_::crit_exts_c_(const rrc_conn_reest_request_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::rrc_conn_reest_request_r8:
-      c.init(other.c.get<rrc_conn_reest_request_r8_ies_s>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_reest_request_s::crit_exts_c_");
-  }
-}
-rrc_conn_reest_request_s::crit_exts_c_&
-rrc_conn_reest_request_s::crit_exts_c_::operator=(const rrc_conn_reest_request_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::rrc_conn_reest_request_r8:
-      c.set(other.c.get<rrc_conn_reest_request_r8_ies_s>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_conn_reest_request_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void rrc_conn_reest_request_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -893,7 +835,7 @@ void rrc_conn_reest_request_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::rrc_conn_reest_request_r8:
       j.write_fieldname("rrcConnectionReestablishmentRequest-r8");
-      c.get<rrc_conn_reest_request_r8_ies_s>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -907,7 +849,7 @@ SRSASN_CODE rrc_conn_reest_request_s::crit_exts_c_::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::rrc_conn_reest_request_r8:
-      HANDLE_CODE(c.get<rrc_conn_reest_request_r8_ies_s>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -924,7 +866,7 @@ SRSASN_CODE rrc_conn_reest_request_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::rrc_conn_reest_request_r8:
-      HANDLE_CODE(c.get<rrc_conn_reest_request_r8_ies_s>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1238,67 +1180,9 @@ void rrc_early_data_request_r15_s::to_json(json_writer& j) const
   j.end_obj();
 }
 
-void rrc_early_data_request_r15_s::crit_exts_c_::destroy_()
-{
-  switch (type_) {
-    case types::rrc_early_data_request_r15:
-      c.destroy<rrc_early_data_request_r15_ies_s>();
-      break;
-    default:
-      break;
-  }
-}
 void rrc_early_data_request_r15_s::crit_exts_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::rrc_early_data_request_r15:
-      c.init<rrc_early_data_request_r15_ies_s>();
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_early_data_request_r15_s::crit_exts_c_");
-  }
-}
-rrc_early_data_request_r15_s::crit_exts_c_::crit_exts_c_(const rrc_early_data_request_r15_s::crit_exts_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::rrc_early_data_request_r15:
-      c.init(other.c.get<rrc_early_data_request_r15_ies_s>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_early_data_request_r15_s::crit_exts_c_");
-  }
-}
-rrc_early_data_request_r15_s::crit_exts_c_&
-rrc_early_data_request_r15_s::crit_exts_c_::operator=(const rrc_early_data_request_r15_s::crit_exts_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::rrc_early_data_request_r15:
-      c.set(other.c.get<rrc_early_data_request_r15_ies_s>());
-      break;
-    case types::crit_exts_future:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "rrc_early_data_request_r15_s::crit_exts_c_");
-  }
-
-  return *this;
 }
 void rrc_early_data_request_r15_s::crit_exts_c_::to_json(json_writer& j) const
 {
@@ -1306,7 +1190,7 @@ void rrc_early_data_request_r15_s::crit_exts_c_::to_json(json_writer& j) const
   switch (type_) {
     case types::rrc_early_data_request_r15:
       j.write_fieldname("rrcEarlyDataRequest-r15");
-      c.get<rrc_early_data_request_r15_ies_s>().to_json(j);
+      c.to_json(j);
       break;
     case types::crit_exts_future:
       break;
@@ -1320,7 +1204,7 @@ SRSASN_CODE rrc_early_data_request_r15_s::crit_exts_c_::pack(bit_ref& bref) cons
   type_.pack(bref);
   switch (type_) {
     case types::rrc_early_data_request_r15:
-      HANDLE_CODE(c.get<rrc_early_data_request_r15_ies_s>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1337,7 +1221,7 @@ SRSASN_CODE rrc_early_data_request_r15_s::crit_exts_c_::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::rrc_early_data_request_r15:
-      HANDLE_CODE(c.get<rrc_early_data_request_r15_ies_s>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::crit_exts_future:
       break;
@@ -1725,69 +1609,9 @@ SRSASN_CODE ul_ccch_msg_type_c::msg_class_ext_c_::c2_c_::unpack(cbit_ref& bref)
   return SRSASN_SUCCESS;
 }
 
-void ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_::destroy_()
-{
-  switch (type_) {
-    case types::c3:
-      c.destroy<c3_c_>();
-      break;
-    default:
-      break;
-  }
-}
 void ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_::set(types::options e)
 {
-  destroy_();
   type_ = e;
-  switch (type_) {
-    case types::c3:
-      c.init<c3_c_>();
-      break;
-    case types::msg_class_ext_future_r15:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_");
-  }
-}
-ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_::msg_class_ext_future_r13_c_(
-    const ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::c3:
-      c.init(other.c.get<c3_c_>());
-      break;
-    case types::msg_class_ext_future_r15:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_");
-  }
-}
-ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_&
-ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_::operator=(
-    const ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::c3:
-      c.set(other.c.get<c3_c_>());
-      break;
-    case types::msg_class_ext_future_r15:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_");
-  }
-
-  return *this;
 }
 void ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_::to_json(json_writer& j) const
 {
@@ -1795,7 +1619,7 @@ void ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_::to_json(
   switch (type_) {
     case types::c3:
       j.write_fieldname("c3");
-      c.get<c3_c_>().to_json(j);
+      c.to_json(j);
       break;
     case types::msg_class_ext_future_r15:
       break;
@@ -1809,7 +1633,7 @@ SRSASN_CODE ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_::p
   type_.pack(bref);
   switch (type_) {
     case types::c3:
-      HANDLE_CODE(c.get<c3_c_>().pack(bref));
+      HANDLE_CODE(c.pack(bref));
       break;
     case types::msg_class_ext_future_r15:
       break;
@@ -1826,7 +1650,7 @@ SRSASN_CODE ul_ccch_msg_type_c::msg_class_ext_c_::msg_class_ext_future_r13_c_::u
   set(e);
   switch (type_) {
     case types::c3:
-      HANDLE_CODE(c.get<c3_c_>().unpack(bref));
+      HANDLE_CODE(c.unpack(bref));
       break;
     case types::msg_class_ext_future_r15:
       break;

lib/src/asn1/s1ap.cc

@@ -35,53 +35,16 @@ std::string presence_opts::to_string() const
 }
 
 // PrivateIE-ID ::= CHOICE
-void private_ie_id_c::destroy_() {}
 void private_ie_id_c::set(types::options e)
 {
-  destroy_();
   type_ = e;
 }
-private_ie_id_c::private_ie_id_c(const private_ie_id_c& other)
-{
-  type_ = other.type();
-  switch (type_) {
-    case types::local:
-      c.init(other.c.get<uint32_t>());
-      break;
-    case types::global:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "private_ie_id_c");
-  }
-}
-private_ie_id_c& private_ie_id_c::operator=(const private_ie_id_c& other)
-{
-  if (this == &other) {
-    return *this;
-  }
-  set(other.type());
-  switch (type_) {
-    case types::local:
-      c.set(other.c.get<uint32_t>());
-      break;
-    case types::global:
-      break;
-    case types::nulltype:
-      break;
-    default:
-      log_invalid_choice_id(type_, "private_ie_id_c");
-  }
-
-  return *this;
-}
 void private_ie_id_c::to_json(json_writer& j) const
 {
   j.start_obj();
   switch (type_) {
     case types::local:
-      j.write_int("local", c.get<uint32_t>());
+      j.write_int("local", c);
       break;
     case types::global:
       break;
@@ -95,7 +58,7 @@ SRSASN_CODE private_ie_id_c::pack(bit_ref& bref) const
   type_.pack(bref);
   switch (type_) {
     case types::local:
-      HANDLE_CODE(pack_integer(bref, c.get<uint32_t>(), (uint32_t)0u, (uint32_t)65535u, false, true));
+      HANDLE_CODE(pack_integer(bref, c, (uint32_t)0u, (uint32_t)65535u, false, true));
       break;
     case types::global:
       break;
@@ -112,7 +75,7 @@ SRSASN_CODE private_ie_id_c::unpack(cbit_ref& bref)
   set(e);
   switch (type_) {
     case types::local:
-      HANDLE_CODE(unpack_integer(c.get<uint32_t>(), bref, (uint32_t)0u, (uint32_t)65535u, false, true));
+      HANDLE_CODE(unpack_integer(c, bref, (uint32_t)0u, (uint32_t)65535u, false, true));
       break;
     case types::global:
       break;