Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 530 insertions, 529 deletions

diff --git a/plugins/epan/wimax/msg_ulmap.c b/plugins/epan/wimax/msg_ulmap.c
index b4909cc5..d0794266 100644
--- a/plugins/epan/wimax/msg_ulmap.c
+++ b/plugins/epan/wimax/msg_ulmap.c
@@ -21,8 +21,9 @@
 #include "wimax_mac.h"
 #include "wimax_bits.h"
 #include "wimax_utils.h"
-
-extern	gboolean include_cor2_changes;
+#if 0
+#include "wimax_prefs.h"
+#endif
 
 static dissector_handle_t ulmap_handle;
 
@@ -49,62 +50,62 @@ void proto_reg_handoff_mac_mgmt_msg_ulmap(void);
 	} while(0)
 
 /* from msg_ucd.c */
-extern guint cqich_id_size;		/* Set for CQICH_Alloc_IE */
+extern unsigned cqich_id_size;		/* Set for CQICH_Alloc_IE */
 
 /* from msg_dlmap.c */
-extern gint harq;
-extern gint ir_type;
-extern gint N_layer;
-extern gint RCID_Type;
-
-static gint proto_mac_mgmt_msg_ulmap_decoder = -1;
-
-static gint ett_ulmap = -1;
-static gint ett_ulmap_ie = -1;
-static gint ett_ulmap_ffb = -1;
-/* static gint ett_ulmap_c = -1;    */
-/* static gint ett_ulmap_c_ie = -1; */
-/* static gint ett_ulmap_s = -1;    */
-/* static gint ett_ulmap_s_ie = -1; */
-static gint ett_287_1 = -1;
-static gint ett_287_2 = -1;
-static gint ett_289 = -1;
-static gint ett_290 = -1;
-static gint ett_290b = -1;
-static gint ett_291 = -1;
-static gint ett_292 = -1;
-static gint ett_293 = -1;
-static gint ett_294 = -1;
-static gint ett_295 = -1;
-static gint ett_299 = -1;
-static gint ett_300 = -1;
-static gint ett_302 = -1;
-static gint ett_302a = -1;
-static gint ett_302b = -1;
-static gint ett_302c = -1;
-static gint ett_302d = -1;
-static gint ett_302e = -1;
-static gint ett_302f = -1;
-static gint ett_302g = -1;
-static gint ett_302h = -1;
-static gint ett_302i = -1;
-static gint ett_302j = -1;
-static gint ett_302k = -1;
-static gint ett_302l = -1;
-static gint ett_302m = -1;
-static gint ett_302n = -1;
-static gint ett_302o = -1;
-static gint ett_302p = -1;
-static gint ett_302q = -1;
-static gint ett_302r = -1;
-static gint ett_302s = -1;
-static gint ett_302t = -1;
-static gint ett_302u = -1;
-static gint ett_302v = -1;
-static gint ett_306 = -1;
-static gint ett_306_ul = -1;
-static gint ett_308b = -1;
-static gint ett_315d = -1;
+extern int harq;
+extern int ir_type;
+extern int N_layer;
+extern int RCID_Type;
+
+static int proto_mac_mgmt_msg_ulmap_decoder;
+
+static int ett_ulmap;
+static int ett_ulmap_ie;
+static int ett_ulmap_ffb;
+/* static int ett_ulmap_c;    */
+/* static int ett_ulmap_c_ie; */
+/* static int ett_ulmap_s;    */
+/* static int ett_ulmap_s_ie; */
+static int ett_287_1;
+static int ett_287_2;
+static int ett_289;
+static int ett_290;
+static int ett_290b;
+static int ett_291;
+static int ett_292;
+static int ett_293;
+static int ett_294;
+static int ett_295;
+static int ett_299;
+static int ett_300;
+static int ett_302;
+static int ett_302a;
+static int ett_302b;
+static int ett_302c;
+static int ett_302d;
+static int ett_302e;
+static int ett_302f;
+static int ett_302g;
+static int ett_302h;
+static int ett_302i;
+static int ett_302j;
+static int ett_302k;
+static int ett_302l;
+static int ett_302m;
+static int ett_302n;
+static int ett_302o;
+static int ett_302p;
+static int ett_302q;
+static int ett_302r;
+static int ett_302s;
+static int ett_302t;
+static int ett_302u;
+static int ett_302v;
+static int ett_306;
+static int ett_306_ul;
+static int ett_308b;
+static int ett_315d;
 
 #define DCD_DOWNLINK_BURST_PROFILE        1
 #define DCD_BS_EIRP                       2
@@ -196,348 +197,348 @@ static const value_string boost_msgs[] =
 #endif
 
 /* ul-map fields */
-static gint hf_ulmap_reserved = -1;
-static gint hf_ulmap_ucd_count = -1;
-static gint hf_ulmap_alloc_start_time = -1;
-static gint hf_ulmap_ofdma_sym = -1;
-static gint hf_ulmap_ie_diuc_ext = -1;
-static gint hf_ulmap_ie_diuc_ext2 = -1;
-static gint hf_ulmap_ie_length = -1;
-static gint hf_ulmap_ie_reserved_extended2_duic = -1;
-static gint hf_ulmap_ie_reserved_extended_duic = -1;
-/* static gint hf_ulmap_fch_expected = -1; */
-
-/* static gint hf_ulmap_ie = -1; */
-
-static gint hf_ulmap_ie_cid      = -1;
-static gint hf_ulmap_ie_uiuc     = -1;
-static gint hf_ulmap_uiuc12_symofs = -1;
-static gint hf_ulmap_uiuc12_subofs = -1;
-static gint hf_ulmap_uiuc12_numsym = -1;
-static gint hf_ulmap_uiuc12_numsub = -1;
-static gint hf_ulmap_uiuc12_method = -1;
-static gint hf_ulmap_uiuc12_dri    = -1;
-static gint hf_ulmap_uiuc10_dur    = -1;
-static gint hf_ulmap_uiuc10_rep    = -1;
-static gint hf_ulmap_uiuc10_slot_offset = -1;
-
-static gint hf_ulmap_uiuc14_dur  = -1;
-static gint hf_ulmap_uiuc14_uiuc = -1;
-static gint hf_ulmap_uiuc14_rep  = -1;
-static gint hf_ulmap_uiuc14_idx  = -1;
-static gint hf_ulmap_uiuc14_code = -1;
-static gint hf_ulmap_uiuc14_sym  = -1;
-static gint hf_ulmap_uiuc14_sub  = -1;
-static gint hf_ulmap_uiuc14_bwr  = -1;
-
-/* static gint hf_ulmap_uiuc11_ext = -1; */
-/* static gint hf_ulmap_uiuc11_len = -1; */
-/* static gint hf_ulmap_uiuc11_data = -1; */
-/* static gint hf_ulmap_uiuc15_ext = -1; */
-/* static gint hf_ulmap_uiuc15_len = -1; */
-/* static gint hf_ulmap_uiuc15_data = -1; */
-
-static gint hf_ulmap_uiuc0_symofs = -1;
-static gint hf_ulmap_uiuc0_subofs = -1;
-static gint hf_ulmap_uiuc0_numsym = -1;
-static gint hf_ulmap_uiuc0_numsub = -1;
-static gint hf_ulmap_uiuc0_rsv    = -1;
-
-static gint hf_ulmap_uiuc13_symofs = -1;
-static gint hf_ulmap_uiuc13_subofs = -1;
-static gint hf_ulmap_uiuc13_numsym = -1;
-static gint hf_ulmap_uiuc13_numsub = -1;
-static gint hf_ulmap_uiuc13_papr   = -1;
-static gint hf_ulmap_uiuc13_zone   = -1;
-static gint hf_ulmap_uiuc13_rsv    = -1;
-/* static gint hf_ulmap_crc16         = -1; */
-/* static gint hf_ulmap_crc16_status = -1; */
-static gint hf_ulmap_padding       = -1;
+static int hf_ulmap_reserved;
+static int hf_ulmap_ucd_count;
+static int hf_ulmap_alloc_start_time;
+static int hf_ulmap_ofdma_sym;
+static int hf_ulmap_ie_diuc_ext;
+static int hf_ulmap_ie_diuc_ext2;
+static int hf_ulmap_ie_length;
+static int hf_ulmap_ie_reserved_extended2_duic;
+static int hf_ulmap_ie_reserved_extended_duic;
+/* static int hf_ulmap_fch_expected; */
+
+/* static int hf_ulmap_ie; */
+
+static int hf_ulmap_ie_cid;
+static int hf_ulmap_ie_uiuc;
+static int hf_ulmap_uiuc12_symofs;
+static int hf_ulmap_uiuc12_subofs;
+static int hf_ulmap_uiuc12_numsym;
+static int hf_ulmap_uiuc12_numsub;
+static int hf_ulmap_uiuc12_method;
+static int hf_ulmap_uiuc12_dri;
+static int hf_ulmap_uiuc10_dur;
+static int hf_ulmap_uiuc10_rep;
+static int hf_ulmap_uiuc10_slot_offset;
+
+static int hf_ulmap_uiuc14_dur;
+static int hf_ulmap_uiuc14_uiuc;
+static int hf_ulmap_uiuc14_rep;
+static int hf_ulmap_uiuc14_idx;
+static int hf_ulmap_uiuc14_code;
+static int hf_ulmap_uiuc14_sym;
+static int hf_ulmap_uiuc14_sub;
+static int hf_ulmap_uiuc14_bwr;
+
+/* static int hf_ulmap_uiuc11_ext; */
+/* static int hf_ulmap_uiuc11_len; */
+/* static int hf_ulmap_uiuc11_data; */
+/* static int hf_ulmap_uiuc15_ext; */
+/* static int hf_ulmap_uiuc15_len; */
+/* static int hf_ulmap_uiuc15_data; */
+
+static int hf_ulmap_uiuc0_symofs;
+static int hf_ulmap_uiuc0_subofs;
+static int hf_ulmap_uiuc0_numsym;
+static int hf_ulmap_uiuc0_numsub;
+static int hf_ulmap_uiuc0_rsv;
+
+static int hf_ulmap_uiuc13_symofs;
+static int hf_ulmap_uiuc13_subofs;
+static int hf_ulmap_uiuc13_numsym;
+static int hf_ulmap_uiuc13_numsub;
+static int hf_ulmap_uiuc13_papr;
+static int hf_ulmap_uiuc13_zone;
+static int hf_ulmap_uiuc13_rsv;
+/* static int hf_ulmap_crc16; */
+/* static int hf_ulmap_crc16_status; */
+static int hf_ulmap_padding;
 
 /* Generated via "one time" script to help create filterable fields */
-static int hf_ulmap_dedicated_ul_control_length = -1;
-static int hf_ulmap_dedicated_ul_control_control_header = -1;
-static int hf_ulmap_dedicated_ul_control_num_sdma_layers = -1;
-static int hf_ulmap_dedicated_ul_control_pilot_pattern = -1;
-static int hf_ulmap_dedicated_mimo_ul_control_matrix = -1;
-static int hf_ulmap_dedicated_mimo_ul_control_n_layer = -1;
-static int hf_ulmap_harq_chase_dedicated_ul_control_indicator = -1;
-static int hf_ulmap_harq_chase_uiuc = -1;
-static int hf_ulmap_harq_chase_repetition_coding_indication = -1;
-static int hf_ulmap_harq_chase_duration = -1;
-static int hf_ulmap_harq_chase_acid = -1;
-static int hf_ulmap_harq_chase_ai_sn = -1;
-static int hf_ulmap_harq_chase_ack_disable = -1;
-static int hf_ulmap_reserved_uint = -1;
-static int hf_ulmap_harq_ir_ctc_dedicated_ul_control_indicator = -1;
-static int hf_ulmap_harq_ir_ctc_nep = -1;
-static int hf_ulmap_harq_ir_ctc_nsch = -1;
-static int hf_ulmap_harq_ir_ctc_spid = -1;
-static int hf_ulmap_harq_ir_ctc_acin = -1;
-static int hf_ulmap_harq_ir_ctc_ai_sn = -1;
-static int hf_ulmap_harq_ir_ctc_ack_disable = -1;
-static int hf_ulmap_harq_ir_cc_dedicated_ul_control_indicator = -1;
-static int hf_ulmap_harq_ir_cc_uiuc = -1;
-static int hf_ulmap_harq_ir_cc_repetition_coding_indication = -1;
-static int hf_ulmap_harq_ir_cc_duration = -1;
-static int hf_ulmap_harq_ir_cc_spid = -1;
-static int hf_ulmap_harq_ir_cc_acid = -1;
-static int hf_ulmap_harq_ir_cc_ai_sn = -1;
-static int hf_ulmap_harq_ir_cc_ack_disable = -1;
-static int hf_ulmap_mimo_ul_chase_harq_mu_indicator = -1;
-static int hf_ulmap_mimo_ul_chase_harq_dedicated_mimo_ulcontrol_indicator = -1;
-static int hf_ulmap_mimo_ul_chase_harq_ack_disable = -1;
-static int hf_ulmap_mimo_ul_chase_harq_matrix = -1;
-static int hf_ulmap_mimo_ul_chase_harq_duration = -1;
-static int hf_ulmap_mimo_ul_chase_harq_uiuc = -1;
-static int hf_ulmap_mimo_ul_chase_harq_repetition_coding_indication = -1;
-static int hf_ulmap_mimo_ul_chase_harq_acid = -1;
-static int hf_ulmap_mimo_ul_chase_harq_ai_sn = -1;
-static int hf_ulmap_mimo_ul_ir_harq_mu_indicator = -1;
-static int hf_ulmap_mimo_ul_ir_harq_dedicated_mimo_ul_control_indicator = -1;
-static int hf_ulmap_mimo_ul_ir_harq_ack_disable = -1;
-static int hf_ulmap_mimo_ul_ir_harq_matrix = -1;
-static int hf_ulmap_mimo_ul_ir_harq_nsch = -1;
-static int hf_ulmap_mimo_ul_ir_harq_nep = -1;
-static int hf_ulmap_mimo_ul_ir_harq_spid = -1;
-static int hf_ulmap_mimo_ul_ir_harq_acid = -1;
-static int hf_ulmap_mimo_ul_ir_harq_ai_sn = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_mu_indicator = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_dedicated_mimo_ul_control_indicator = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_ack_disable = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_matrix = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_duration = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_uiuc = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_repetition_coding_indication = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_acid = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_ai_sn = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_spid = -1;
-static int hf_ulmap_mimo_ul_stc_harq_tx_count = -1;
-static int hf_ulmap_mimo_ul_stc_harq_duration = -1;
-static int hf_ulmap_mimo_ul_stc_harq_sub_burst_offset_indication = -1;
-static int hf_ulmap_mimo_ul_stc_harq_sub_burst_offset = -1;
-static int hf_ulmap_mimo_ul_stc_harq_ack_disable = -1;
-static int hf_ulmap_mimo_ul_stc_harq_uiuc = -1;
-static int hf_ulmap_mimo_ul_stc_harq_repetition_coding_indication = -1;
-static int hf_ulmap_mimo_ul_stc_harq_acid = -1;
-static int hf_ulmap_power_control = -1;
-static int hf_ulmap_power_measurement_frame = -1;
-static int hf_ulmap_mini_subcha_alloc_extended_2_uiuc = -1;
-static int hf_ulmap_mini_subcha_alloc_length = -1;
-static int hf_ulmap_mini_subcha_alloc_ctype = -1;
-static int hf_ulmap_mini_subcha_alloc_duration = -1;
-static int hf_ulmap_mini_subcha_alloc_cid = -1;
-static int hf_ulmap_mini_subcha_alloc_uiuc = -1;
-static int hf_ulmap_mini_subcha_alloc_repetition = -1;
-static int hf_ulmap_mini_subcha_alloc_padding = -1;
-static int hf_ulmap_aas_ul_extended_uiuc = -1;
-static int hf_ulmap_aas_ul_length = -1;
-static int hf_ulmap_aas_ul_permutation = -1;
-static int hf_ulmap_aas_ul_ul_permbase = -1;
-static int hf_ulmap_aas_ul_ofdma_symbol_offset = -1;
-static int hf_ulmap_aas_ul_aas_zone_length = -1;
-static int hf_ulmap_aas_ul_uplink_preamble_config = -1;
-static int hf_ulmap_aas_ul_preamble_type = -1;
-static int hf_ulmap_cqich_alloc_extended_uiuc = -1;
-static int hf_ulmap_cqich_alloc_length = -1;
-static int hf_ulmap_cqich_alloc_cqich_id = -1;
-static int hf_ulmap_cqich_alloc_allocation_offset = -1;
-static int hf_ulmap_cqich_alloc_period = -1;
-static int hf_ulmap_cqich_alloc_frame_offset = -1;
-static int hf_ulmap_cqich_alloc_duration = -1;
-static int hf_ulmap_cqich_alloc_report_configuration_included = -1;
-static int hf_ulmap_cqich_alloc_feedback_type = -1;
-static int hf_ulmap_cqich_alloc_report_type = -1;
-static int hf_ulmap_cqich_alloc_cinr_preamble_report_type = -1;
-static int hf_ulmap_cqich_alloc_zone_permutation = -1;
-static int hf_ulmap_cqich_alloc_zone_type = -1;
-static int hf_ulmap_cqich_alloc_zone_prbs_id = -1;
-static int hf_ulmap_cqich_alloc_major_group_indication = -1;
-static int hf_ulmap_cqich_alloc_pusc_major_group_bitmap = -1;
-static int hf_ulmap_cqich_alloc_cinr_zone_measurement_type = -1;
-static int hf_ulmap_cqich_alloc_averaging_parameter_included = -1;
-static int hf_ulmap_cqich_alloc_averaging_parameter = -1;
-static int hf_ulmap_cqich_alloc_mimo_permutation_feedback_cycle = -1;
-static int hf_ulmap_zone_extended_uiuc = -1;
-static int hf_ulmap_zone_length = -1;
-static int hf_ulmap_zone_ofdma_symbol_offset = -1;
-static int hf_ulmap_zone_permutation = -1;
-static int hf_ulmap_zone_ul_permbase = -1;
-static int hf_ulmap_zone_amc_type = -1;
-static int hf_ulmap_zone_use_all_sc_indicator = -1;
-static int hf_ulmap_zone_disable_subchannel_rotation = -1;
-static int hf_ulmap_phymod_ul_extended_uiuc = -1;
-static int hf_ulmap_phymod_ul_length = -1;
-static int hf_ulmap_phymod_ul_preamble_modifier_type = -1;
-static int hf_ulmap_phymod_ul_preamble_frequency_shift_index = -1;
-static int hf_ulmap_phymod_ul_preamble_time_shift_index = -1;
-static int hf_ulmap_phymod_ul_pilot_pattern_modifier = -1;
-static int hf_ulmap_phymod_ul_pilot_pattern_index = -1;
-static int hf_ulmap_fast_tracking_extended_uiuc = -1;
-static int hf_ulmap_fast_tracking_length = -1;
-static int hf_ulmap_fast_tracking_map_index = -1;
-static int hf_ulmap_fast_tracking_power_correction = -1;
-static int hf_ulmap_fast_tracking_frequency_correction = -1;
-static int hf_ulmap_fast_tracking_time_correction = -1;
-static int hf_ulmap_pusc_burst_allocation_extended_uiuc = -1;
-static int hf_ulmap_pusc_burst_allocation_length = -1;
-static int hf_ulmap_pusc_burst_allocation_uiuc = -1;
-static int hf_ulmap_pusc_burst_allocation_segment = -1;
-static int hf_ulmap_pusc_burst_allocation_ul_permbase = -1;
-static int hf_ulmap_pusc_burst_allocation_ofdma_symbol_offset = -1;
-static int hf_ulmap_pusc_burst_allocation_subchannel_offset = -1;
-static int hf_ulmap_pusc_burst_allocation_duration = -1;
-static int hf_ulmap_pusc_burst_allocation_repetition_coding_indication = -1;
-static int hf_ulmap_fast_ranging_extended_uiuc = -1;
-static int hf_ulmap_fast_ranging_length = -1;
-static int hf_ulmap_fast_ranging_ho_id_indicator = -1;
-static int hf_ulmap_fast_ranging_ho_id = -1;
-static int hf_ulmap_fast_ranging_mac_address = -1;
-static int hf_ulmap_fast_ranging_uiuc = -1;
-static int hf_ulmap_fast_ranging_duration = -1;
-static int hf_ulmap_fast_ranging_repetition_coding_indication = -1;
-static int hf_ulmap_allocation_start_extended_uiuc = -1;
-static int hf_ulmap_allocation_start_length = -1;
-static int hf_ulmap_allocation_start_ofdma_symbol_offset = -1;
-static int hf_ulmap_allocation_start_subchannel_offset = -1;
-static int hf_ulmap_cqich_enhanced_alloc_extended_2_uiuc = -1;
-static int hf_ulmap_cqich_enhanced_alloc_length = -1;
-static int hf_ulmap_cqich_enhanced_alloc_cqich_id = -1;
-static int hf_ulmap_cqich_enhanced_alloc_period = -1;
-static int hf_ulmap_cqich_enhanced_alloc_frame_offset = -1;
-static int hf_ulmap_cqich_enhanced_alloc_duration = -1;
-static int hf_ulmap_cqich_enhanced_alloc_cqich_num = -1;
-static int hf_ulmap_cqich_enhanced_alloc_feedback_type = -1;
-static int hf_ulmap_cqich_enhanced_alloc_allocation_index = -1;
-static int hf_ulmap_cqich_enhanced_alloc_cqich_type = -1;
-static int hf_ulmap_cqich_enhanced_alloc_sttd_indication = -1;
-static int hf_ulmap_cqich_enhanced_alloc_band_amc_precoding_mode = -1;
-static int hf_ulmap_cqich_enhanced_alloc_nr_precoders_feedback = -1;
-static int hf_ulmap_anchor_bs_switch_extended_2_uiuc = -1;
-static int hf_ulmap_anchor_bs_switch_length = -1;
-static int hf_ulmap_anchor_bs_switch_n_anchor_bs_switch = -1;
-static int hf_ulmap_anchor_bs_switch_reduced_cid = -1;
-static int hf_ulmap_anchor_bs_switch_action_code = -1;
-static int hf_ulmap_anchor_bs_switch_action_time = -1;
-static int hf_ulmap_anchor_bs_switch_temp_bs_id = -1;
-static int hf_ulmap_anchor_bs_switch_ak_change_indicator = -1;
-static int hf_ulmap_anchor_bs_switch_cqich_allocation_indicator = -1;
-static int hf_ulmap_anchor_bs_switch_cqich_id = -1;
-static int hf_ulmap_anchor_bs_switch_feedback_channel_offset = -1;
-static int hf_ulmap_anchor_bs_switch_period = -1;
-static int hf_ulmap_anchor_bs_switch_frame_offset = -1;
-static int hf_ulmap_anchor_bs_switch_duration = -1;
-static int hf_ulmap_anchor_bs_switch_mimo_permutation_feedback_code = -1;
-static int hf_ulmap_sounding_command_extended_2_uiuc = -1;
-static int hf_ulmap_sounding_command_length = -1;
-static int hf_ulmap_sounding_command_type = -1;
-static int hf_ulmap_sounding_command_send_sounding_report_flag = -1;
-static int hf_ulmap_sounding_command_relevance_flag = -1;
-static int hf_ulmap_sounding_command_relevance = -1;
-static int hf_ulmap_sounding_command_include_additional_feedback = -1;
-static int hf_ulmap_sounding_command_num_sounding_symbols = -1;
-static int hf_ulmap_sounding_command_separability_type = -1;
-static int hf_ulmap_sounding_command_max_cyclic_shift_index_p = -1;
-static int hf_ulmap_sounding_command_decimation_value = -1;
-static int hf_ulmap_sounding_command_decimation_offset_randomization = -1;
-static int hf_ulmap_sounding_command_symbol_index = -1;
-static int hf_ulmap_sounding_command_number_of_cids = -1;
-static int hf_ulmap_sounding_command_shorted_basic_cid = -1;
-static int hf_ulmap_sounding_command_power_assignment_method = -1;
-static int hf_ulmap_sounding_command_power_boost = -1;
-static int hf_ulmap_sounding_command_multi_antenna_flag = -1;
-static int hf_ulmap_sounding_command_allocation_mode = -1;
-static int hf_ulmap_sounding_command_band_bit_map = -1;
-static int hf_ulmap_sounding_command_starting_frequency_band = -1;
-static int hf_ulmap_sounding_command_number_of_frequency_bands = -1;
-static int hf_ulmap_sounding_command_cyclic_time_shift_index = -1;
-static int hf_ulmap_sounding_command_decimation_offset = -1;
-static int hf_ulmap_sounding_command_use_same_symbol_for_additional_feedback = -1;
-static int hf_ulmap_sounding_command_periodicity = -1;
-static int hf_ulmap_sounding_command_permutation = -1;
-static int hf_ulmap_sounding_command_dl_permbase = -1;
-static int hf_ulmap_sounding_command_shortened_basic_cid = -1;
-static int hf_ulmap_sounding_command_subchannel_offset = -1;
-static int hf_ulmap_sounding_command_number_of_subchannels = -1;
-static int hf_ulmap_harq_ulmap_extended_2_uiuc = -1;
-static int hf_ulmap_harq_ulmap_length = -1;
-static int hf_ulmap_harq_ulmap_rcid_type = -1;
-static int hf_ulmap_harq_ulmap_mode = -1;
-static int hf_ulmap_harq_ulmap_allocation_start_indication = -1;
-static int hf_ulmap_harq_ulmap_ofdma_symbol_offset = -1;
-static int hf_ulmap_harq_ulmap_subchannel_offset = -1;
-static int hf_ulmap_harq_ulmap_n_sub_burst = -1;
-static int hf_ulmap_harq_ackch_region_alloc_extended_2_uiuc = -1;
-static int hf_ulmap_harq_ackch_region_alloc_length = -1;
-static int hf_ulmap_harq_ackch_region_alloc_ofdma_symbol_offset = -1;
-static int hf_ulmap_harq_ackch_region_alloc_subchannel_offset = -1;
-static int hf_ulmap_harq_ackch_region_alloc_num_ofdma_symbols = -1;
-static int hf_ulmap_harq_ackch_region_alloc_num_subchannels = -1;
-static int hf_ulmap_aas_sdma_extended_2_uiuc = -1;
-static int hf_ulmap_aas_sdma_length = -1;
-static int hf_ulmap_aas_sdma_rcid_type = -1;
-static int hf_ulmap_aas_sdma_num_burst_region = -1;
-static int hf_ulmap_aas_sdma_slot_offset = -1;
-static int hf_ulmap_aas_sdma_slot_duration = -1;
-static int hf_ulmap_aas_sdma_number_of_users = -1;
-static int hf_ulmap_aas_sdma_encoding_mode = -1;
-static int hf_ulmap_aas_sdma_power_adjust = -1;
-static int hf_ulmap_aas_sdma_pilot_pattern_modifier = -1;
-static int hf_ulmap_aas_sdma_preamble_modifier_index = -1;
-static int hf_ulmap_aas_sdma_pilot_pattern = -1;
-static int hf_ulmap_aas_sdma_diuc = -1;
-static int hf_ulmap_aas_sdma_repetition_coding_indication = -1;
-static int hf_ulmap_aas_sdma_acid = -1;
-static int hf_ulmap_aas_sdma_ai_sn = -1;
-static int hf_ulmap_aas_sdma_nep = -1;
-static int hf_ulmap_aas_sdma_nsch = -1;
-static int hf_ulmap_aas_sdma_spid = -1;
-static int hf_ulmap_aas_sdma_power_adjustment = -1;
-static int hf_ulmap_feedback_polling_extended_2_uiuc = -1;
-static int hf_ulmap_feedback_polling_length = -1;
-static int hf_ulmap_feedback_polling_num_allocation = -1;
-static int hf_ulmap_feedback_polling_dedicated_ul_allocation_included = -1;
-static int hf_ulmap_feedback_polling_basic_cid = -1;
-static int hf_ulmap_feedback_polling_allocation_duration = -1;
-static int hf_ulmap_feedback_polling_type = -1;
-static int hf_ulmap_feedback_polling_frame_offset = -1;
-static int hf_ulmap_feedback_polling_period = -1;
-static int hf_ulmap_feedback_polling_uiuc = -1;
-static int hf_ulmap_feedback_polling_ofdma_symbol_offset = -1;
-static int hf_ulmap_feedback_polling_subchannel_offset = -1;
-static int hf_ulmap_feedback_polling_duration = -1;
-static int hf_ulmap_feedback_polling_repetition_coding_indication = -1;
-static int hf_ulmap_reduced_aas_aas_zone_configuration_included = -1;
-static int hf_ulmap_reduced_aas_aas_zone_position_included = -1;
-static int hf_ulmap_reduced_aas_ul_map_information_included = -1;
-static int hf_ulmap_reduced_aas_phy_modification_included = -1;
-static int hf_ulmap_reduced_aas_power_control_included = -1;
-static int hf_ulmap_reduced_aas_include_feedback_header = -1;
-static int hf_ulmap_reduced_aas_encoding_mode = -1;
-static int hf_ulmap_reduced_aas_permutation = -1;
-static int hf_ulmap_reduced_aas_ul_permbase = -1;
-static int hf_ulmap_reduced_aas_preamble_indication = -1;
-static int hf_ulmap_reduced_aas_padding = -1;
-static int hf_ulmap_reduced_aas_zone_symbol_offset = -1;
-static int hf_ulmap_reduced_aas_zone_length = -1;
-static int hf_ulmap_reduced_aas_ucd_count = -1;
-static int hf_ulmap_reduced_aas_private_map_alloc_start_time = -1;
-static int hf_ulmap_reduced_aas_pilot_pattern_index = -1;
-static int hf_ulmap_reduced_aas_preamble_select = -1;
-static int hf_ulmap_reduced_aas_preamble_shift_index = -1;
-static int hf_ulmap_reduced_aas_pilot_pattern_modifier = -1;
-static int hf_ulmap_reduced_aas_power_control = -1;
-static int hf_ulmap_reduced_aas_ul_frame_offset = -1;
-static int hf_ulmap_reduced_aas_slot_offset = -1;
-static int hf_ulmap_reduced_aas_slot_duration = -1;
-static int hf_ulmap_reduced_aas_uiuc_nep = -1;
-static int hf_ulmap_reduced_aas_acid = -1;
-static int hf_ulmap_reduced_aas_ai_sn = -1;
-static int hf_ulmap_reduced_aas_nsch = -1;
-static int hf_ulmap_reduced_aas_spid = -1;
-static int hf_ulmap_reduced_aas_repetition_coding_indication = -1;
-
-static expert_field ei_ulmap_not_implemented = EI_INIT;
+static int hf_ulmap_dedicated_ul_control_length;
+static int hf_ulmap_dedicated_ul_control_control_header;
+static int hf_ulmap_dedicated_ul_control_num_sdma_layers;
+static int hf_ulmap_dedicated_ul_control_pilot_pattern;
+static int hf_ulmap_dedicated_mimo_ul_control_matrix;
+static int hf_ulmap_dedicated_mimo_ul_control_n_layer;
+static int hf_ulmap_harq_chase_dedicated_ul_control_indicator;
+static int hf_ulmap_harq_chase_uiuc;
+static int hf_ulmap_harq_chase_repetition_coding_indication;
+static int hf_ulmap_harq_chase_duration;
+static int hf_ulmap_harq_chase_acid;
+static int hf_ulmap_harq_chase_ai_sn;
+static int hf_ulmap_harq_chase_ack_disable;
+static int hf_ulmap_reserved_uint;
+static int hf_ulmap_harq_ir_ctc_dedicated_ul_control_indicator;
+static int hf_ulmap_harq_ir_ctc_nep;
+static int hf_ulmap_harq_ir_ctc_nsch;
+static int hf_ulmap_harq_ir_ctc_spid;
+static int hf_ulmap_harq_ir_ctc_acin;
+static int hf_ulmap_harq_ir_ctc_ai_sn;
+static int hf_ulmap_harq_ir_ctc_ack_disable;
+static int hf_ulmap_harq_ir_cc_dedicated_ul_control_indicator;
+static int hf_ulmap_harq_ir_cc_uiuc;
+static int hf_ulmap_harq_ir_cc_repetition_coding_indication;
+static int hf_ulmap_harq_ir_cc_duration;
+static int hf_ulmap_harq_ir_cc_spid;
+static int hf_ulmap_harq_ir_cc_acid;
+static int hf_ulmap_harq_ir_cc_ai_sn;
+static int hf_ulmap_harq_ir_cc_ack_disable;
+static int hf_ulmap_mimo_ul_chase_harq_mu_indicator;
+static int hf_ulmap_mimo_ul_chase_harq_dedicated_mimo_ulcontrol_indicator;
+static int hf_ulmap_mimo_ul_chase_harq_ack_disable;
+static int hf_ulmap_mimo_ul_chase_harq_matrix;
+static int hf_ulmap_mimo_ul_chase_harq_duration;
+static int hf_ulmap_mimo_ul_chase_harq_uiuc;
+static int hf_ulmap_mimo_ul_chase_harq_repetition_coding_indication;
+static int hf_ulmap_mimo_ul_chase_harq_acid;
+static int hf_ulmap_mimo_ul_chase_harq_ai_sn;
+static int hf_ulmap_mimo_ul_ir_harq_mu_indicator;
+static int hf_ulmap_mimo_ul_ir_harq_dedicated_mimo_ul_control_indicator;
+static int hf_ulmap_mimo_ul_ir_harq_ack_disable;
+static int hf_ulmap_mimo_ul_ir_harq_matrix;
+static int hf_ulmap_mimo_ul_ir_harq_nsch;
+static int hf_ulmap_mimo_ul_ir_harq_nep;
+static int hf_ulmap_mimo_ul_ir_harq_spid;
+static int hf_ulmap_mimo_ul_ir_harq_acid;
+static int hf_ulmap_mimo_ul_ir_harq_ai_sn;
+static int hf_ulmap_mimo_ul_ir_harq_cc_mu_indicator;
+static int hf_ulmap_mimo_ul_ir_harq_cc_dedicated_mimo_ul_control_indicator;
+static int hf_ulmap_mimo_ul_ir_harq_cc_ack_disable;
+static int hf_ulmap_mimo_ul_ir_harq_cc_matrix;
+static int hf_ulmap_mimo_ul_ir_harq_cc_duration;
+static int hf_ulmap_mimo_ul_ir_harq_cc_uiuc;
+static int hf_ulmap_mimo_ul_ir_harq_cc_repetition_coding_indication;
+static int hf_ulmap_mimo_ul_ir_harq_cc_acid;
+static int hf_ulmap_mimo_ul_ir_harq_cc_ai_sn;
+static int hf_ulmap_mimo_ul_ir_harq_cc_spid;
+static int hf_ulmap_mimo_ul_stc_harq_tx_count;
+static int hf_ulmap_mimo_ul_stc_harq_duration;
+static int hf_ulmap_mimo_ul_stc_harq_sub_burst_offset_indication;
+static int hf_ulmap_mimo_ul_stc_harq_sub_burst_offset;
+static int hf_ulmap_mimo_ul_stc_harq_ack_disable;
+static int hf_ulmap_mimo_ul_stc_harq_uiuc;
+static int hf_ulmap_mimo_ul_stc_harq_repetition_coding_indication;
+static int hf_ulmap_mimo_ul_stc_harq_acid;
+static int hf_ulmap_power_control;
+static int hf_ulmap_power_measurement_frame;
+static int hf_ulmap_mini_subcha_alloc_extended_2_uiuc;
+static int hf_ulmap_mini_subcha_alloc_length;
+static int hf_ulmap_mini_subcha_alloc_ctype;
+static int hf_ulmap_mini_subcha_alloc_duration;
+static int hf_ulmap_mini_subcha_alloc_cid;
+static int hf_ulmap_mini_subcha_alloc_uiuc;
+static int hf_ulmap_mini_subcha_alloc_repetition;
+static int hf_ulmap_mini_subcha_alloc_padding;
+static int hf_ulmap_aas_ul_extended_uiuc;
+static int hf_ulmap_aas_ul_length;
+static int hf_ulmap_aas_ul_permutation;
+static int hf_ulmap_aas_ul_ul_permbase;
+static int hf_ulmap_aas_ul_ofdma_symbol_offset;
+static int hf_ulmap_aas_ul_aas_zone_length;
+static int hf_ulmap_aas_ul_uplink_preamble_config;
+static int hf_ulmap_aas_ul_preamble_type;
+static int hf_ulmap_cqich_alloc_extended_uiuc;
+static int hf_ulmap_cqich_alloc_length;
+static int hf_ulmap_cqich_alloc_cqich_id;
+static int hf_ulmap_cqich_alloc_allocation_offset;
+static int hf_ulmap_cqich_alloc_period;
+static int hf_ulmap_cqich_alloc_frame_offset;
+static int hf_ulmap_cqich_alloc_duration;
+static int hf_ulmap_cqich_alloc_report_configuration_included;
+static int hf_ulmap_cqich_alloc_feedback_type;
+static int hf_ulmap_cqich_alloc_report_type;
+static int hf_ulmap_cqich_alloc_cinr_preamble_report_type;
+static int hf_ulmap_cqich_alloc_zone_permutation;
+static int hf_ulmap_cqich_alloc_zone_type;
+static int hf_ulmap_cqich_alloc_zone_prbs_id;
+static int hf_ulmap_cqich_alloc_major_group_indication;
+static int hf_ulmap_cqich_alloc_pusc_major_group_bitmap;
+static int hf_ulmap_cqich_alloc_cinr_zone_measurement_type;
+static int hf_ulmap_cqich_alloc_averaging_parameter_included;
+static int hf_ulmap_cqich_alloc_averaging_parameter;
+static int hf_ulmap_cqich_alloc_mimo_permutation_feedback_cycle;
+static int hf_ulmap_zone_extended_uiuc;
+static int hf_ulmap_zone_length;
+static int hf_ulmap_zone_ofdma_symbol_offset;
+static int hf_ulmap_zone_permutation;
+static int hf_ulmap_zone_ul_permbase;
+static int hf_ulmap_zone_amc_type;
+static int hf_ulmap_zone_use_all_sc_indicator;
+static int hf_ulmap_zone_disable_subchannel_rotation;
+static int hf_ulmap_phymod_ul_extended_uiuc;
+static int hf_ulmap_phymod_ul_length;
+static int hf_ulmap_phymod_ul_preamble_modifier_type;
+static int hf_ulmap_phymod_ul_preamble_frequency_shift_index;
+static int hf_ulmap_phymod_ul_preamble_time_shift_index;
+static int hf_ulmap_phymod_ul_pilot_pattern_modifier;
+static int hf_ulmap_phymod_ul_pilot_pattern_index;
+static int hf_ulmap_fast_tracking_extended_uiuc;
+static int hf_ulmap_fast_tracking_length;
+static int hf_ulmap_fast_tracking_map_index;
+static int hf_ulmap_fast_tracking_power_correction;
+static int hf_ulmap_fast_tracking_frequency_correction;
+static int hf_ulmap_fast_tracking_time_correction;
+static int hf_ulmap_pusc_burst_allocation_extended_uiuc;
+static int hf_ulmap_pusc_burst_allocation_length;
+static int hf_ulmap_pusc_burst_allocation_uiuc;
+static int hf_ulmap_pusc_burst_allocation_segment;
+static int hf_ulmap_pusc_burst_allocation_ul_permbase;
+static int hf_ulmap_pusc_burst_allocation_ofdma_symbol_offset;
+static int hf_ulmap_pusc_burst_allocation_subchannel_offset;
+static int hf_ulmap_pusc_burst_allocation_duration;
+static int hf_ulmap_pusc_burst_allocation_repetition_coding_indication;
+static int hf_ulmap_fast_ranging_extended_uiuc;
+static int hf_ulmap_fast_ranging_length;
+static int hf_ulmap_fast_ranging_ho_id_indicator;
+static int hf_ulmap_fast_ranging_ho_id;
+static int hf_ulmap_fast_ranging_mac_address;
+static int hf_ulmap_fast_ranging_uiuc;
+static int hf_ulmap_fast_ranging_duration;
+static int hf_ulmap_fast_ranging_repetition_coding_indication;
+static int hf_ulmap_allocation_start_extended_uiuc;
+static int hf_ulmap_allocation_start_length;
+static int hf_ulmap_allocation_start_ofdma_symbol_offset;
+static int hf_ulmap_allocation_start_subchannel_offset;
+static int hf_ulmap_cqich_enhanced_alloc_extended_2_uiuc;
+static int hf_ulmap_cqich_enhanced_alloc_length;
+static int hf_ulmap_cqich_enhanced_alloc_cqich_id;
+static int hf_ulmap_cqich_enhanced_alloc_period;
+static int hf_ulmap_cqich_enhanced_alloc_frame_offset;
+static int hf_ulmap_cqich_enhanced_alloc_duration;
+static int hf_ulmap_cqich_enhanced_alloc_cqich_num;
+static int hf_ulmap_cqich_enhanced_alloc_feedback_type;
+static int hf_ulmap_cqich_enhanced_alloc_allocation_index;
+static int hf_ulmap_cqich_enhanced_alloc_cqich_type;
+static int hf_ulmap_cqich_enhanced_alloc_sttd_indication;
+static int hf_ulmap_cqich_enhanced_alloc_band_amc_precoding_mode;
+static int hf_ulmap_cqich_enhanced_alloc_nr_precoders_feedback;
+static int hf_ulmap_anchor_bs_switch_extended_2_uiuc;
+static int hf_ulmap_anchor_bs_switch_length;
+static int hf_ulmap_anchor_bs_switch_n_anchor_bs_switch;
+static int hf_ulmap_anchor_bs_switch_reduced_cid;
+static int hf_ulmap_anchor_bs_switch_action_code;
+static int hf_ulmap_anchor_bs_switch_action_time;
+static int hf_ulmap_anchor_bs_switch_temp_bs_id;
+static int hf_ulmap_anchor_bs_switch_ak_change_indicator;
+static int hf_ulmap_anchor_bs_switch_cqich_allocation_indicator;
+static int hf_ulmap_anchor_bs_switch_cqich_id;
+static int hf_ulmap_anchor_bs_switch_feedback_channel_offset;
+static int hf_ulmap_anchor_bs_switch_period;
+static int hf_ulmap_anchor_bs_switch_frame_offset;
+static int hf_ulmap_anchor_bs_switch_duration;
+static int hf_ulmap_anchor_bs_switch_mimo_permutation_feedback_code;
+static int hf_ulmap_sounding_command_extended_2_uiuc;
+static int hf_ulmap_sounding_command_length;
+static int hf_ulmap_sounding_command_type;
+static int hf_ulmap_sounding_command_send_sounding_report_flag;
+static int hf_ulmap_sounding_command_relevance_flag;
+static int hf_ulmap_sounding_command_relevance;
+static int hf_ulmap_sounding_command_include_additional_feedback;
+static int hf_ulmap_sounding_command_num_sounding_symbols;
+static int hf_ulmap_sounding_command_separability_type;
+static int hf_ulmap_sounding_command_max_cyclic_shift_index_p;
+static int hf_ulmap_sounding_command_decimation_value;
+static int hf_ulmap_sounding_command_decimation_offset_randomization;
+static int hf_ulmap_sounding_command_symbol_index;
+static int hf_ulmap_sounding_command_number_of_cids;
+static int hf_ulmap_sounding_command_shorted_basic_cid;
+static int hf_ulmap_sounding_command_power_assignment_method;
+static int hf_ulmap_sounding_command_power_boost;
+static int hf_ulmap_sounding_command_multi_antenna_flag;
+static int hf_ulmap_sounding_command_allocation_mode;
+static int hf_ulmap_sounding_command_band_bit_map;
+static int hf_ulmap_sounding_command_starting_frequency_band;
+static int hf_ulmap_sounding_command_number_of_frequency_bands;
+static int hf_ulmap_sounding_command_cyclic_time_shift_index;
+static int hf_ulmap_sounding_command_decimation_offset;
+static int hf_ulmap_sounding_command_use_same_symbol_for_additional_feedback;
+static int hf_ulmap_sounding_command_periodicity;
+static int hf_ulmap_sounding_command_permutation;
+static int hf_ulmap_sounding_command_dl_permbase;
+static int hf_ulmap_sounding_command_shortened_basic_cid;
+static int hf_ulmap_sounding_command_subchannel_offset;
+static int hf_ulmap_sounding_command_number_of_subchannels;
+static int hf_ulmap_harq_ulmap_extended_2_uiuc;
+static int hf_ulmap_harq_ulmap_length;
+static int hf_ulmap_harq_ulmap_rcid_type;
+static int hf_ulmap_harq_ulmap_mode;
+static int hf_ulmap_harq_ulmap_allocation_start_indication;
+static int hf_ulmap_harq_ulmap_ofdma_symbol_offset;
+static int hf_ulmap_harq_ulmap_subchannel_offset;
+static int hf_ulmap_harq_ulmap_n_sub_burst;
+static int hf_ulmap_harq_ackch_region_alloc_extended_2_uiuc;
+static int hf_ulmap_harq_ackch_region_alloc_length;
+static int hf_ulmap_harq_ackch_region_alloc_ofdma_symbol_offset;
+static int hf_ulmap_harq_ackch_region_alloc_subchannel_offset;
+static int hf_ulmap_harq_ackch_region_alloc_num_ofdma_symbols;
+static int hf_ulmap_harq_ackch_region_alloc_num_subchannels;
+static int hf_ulmap_aas_sdma_extended_2_uiuc;
+static int hf_ulmap_aas_sdma_length;
+static int hf_ulmap_aas_sdma_rcid_type;
+static int hf_ulmap_aas_sdma_num_burst_region;
+static int hf_ulmap_aas_sdma_slot_offset;
+static int hf_ulmap_aas_sdma_slot_duration;
+static int hf_ulmap_aas_sdma_number_of_users;
+static int hf_ulmap_aas_sdma_encoding_mode;
+static int hf_ulmap_aas_sdma_power_adjust;
+static int hf_ulmap_aas_sdma_pilot_pattern_modifier;
+static int hf_ulmap_aas_sdma_preamble_modifier_index;
+static int hf_ulmap_aas_sdma_pilot_pattern;
+static int hf_ulmap_aas_sdma_diuc;
+static int hf_ulmap_aas_sdma_repetition_coding_indication;
+static int hf_ulmap_aas_sdma_acid;
+static int hf_ulmap_aas_sdma_ai_sn;
+static int hf_ulmap_aas_sdma_nep;
+static int hf_ulmap_aas_sdma_nsch;
+static int hf_ulmap_aas_sdma_spid;
+static int hf_ulmap_aas_sdma_power_adjustment;
+static int hf_ulmap_feedback_polling_extended_2_uiuc;
+static int hf_ulmap_feedback_polling_length;
+static int hf_ulmap_feedback_polling_num_allocation;
+static int hf_ulmap_feedback_polling_dedicated_ul_allocation_included;
+static int hf_ulmap_feedback_polling_basic_cid;
+static int hf_ulmap_feedback_polling_allocation_duration;
+static int hf_ulmap_feedback_polling_type;
+static int hf_ulmap_feedback_polling_frame_offset;
+static int hf_ulmap_feedback_polling_period;
+static int hf_ulmap_feedback_polling_uiuc;
+static int hf_ulmap_feedback_polling_ofdma_symbol_offset;
+static int hf_ulmap_feedback_polling_subchannel_offset;
+static int hf_ulmap_feedback_polling_duration;
+static int hf_ulmap_feedback_polling_repetition_coding_indication;
+static int hf_ulmap_reduced_aas_aas_zone_configuration_included;
+static int hf_ulmap_reduced_aas_aas_zone_position_included;
+static int hf_ulmap_reduced_aas_ul_map_information_included;
+static int hf_ulmap_reduced_aas_phy_modification_included;
+static int hf_ulmap_reduced_aas_power_control_included;
+static int hf_ulmap_reduced_aas_include_feedback_header;
+static int hf_ulmap_reduced_aas_encoding_mode;
+static int hf_ulmap_reduced_aas_permutation;
+static int hf_ulmap_reduced_aas_ul_permbase;
+static int hf_ulmap_reduced_aas_preamble_indication;
+static int hf_ulmap_reduced_aas_padding;
+static int hf_ulmap_reduced_aas_zone_symbol_offset;
+static int hf_ulmap_reduced_aas_zone_length;
+static int hf_ulmap_reduced_aas_ucd_count;
+static int hf_ulmap_reduced_aas_private_map_alloc_start_time;
+static int hf_ulmap_reduced_aas_pilot_pattern_index;
+static int hf_ulmap_reduced_aas_preamble_select;
+static int hf_ulmap_reduced_aas_preamble_shift_index;
+static int hf_ulmap_reduced_aas_pilot_pattern_modifier;
+static int hf_ulmap_reduced_aas_power_control;
+static int hf_ulmap_reduced_aas_ul_frame_offset;
+static int hf_ulmap_reduced_aas_slot_offset;
+static int hf_ulmap_reduced_aas_slot_duration;
+static int hf_ulmap_reduced_aas_uiuc_nep;
+static int hf_ulmap_reduced_aas_acid;
+static int hf_ulmap_reduced_aas_ai_sn;
+static int hf_ulmap_reduced_aas_nsch;
+static int hf_ulmap_reduced_aas_spid;
+static int hf_ulmap_reduced_aas_repetition_coding_indication;
+
+static expert_field ei_ulmap_not_implemented;
 
 /*  This gets called each time a capture file is loaded. */
 void init_wimax_globals(void)
@@ -555,13 +556,13 @@ void init_wimax_globals(void)
  * these functions take offset/length in bits
  *******************************************************************/
 
-static gint Dedicated_UL_Control_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int Dedicated_UL_Control_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24.1 Dedicated_UL_Control_IE -- table 302r */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
-    gint bit;
+    int bit;
     proto_item *tree;
-    gint sdma;
+    int sdma;
 
     bit = offset;
 
@@ -576,11 +577,11 @@ static gint Dedicated_UL_Control_IE(proto_tree *uiuc_tree, gint offset, gint len
     return (bit - offset); /* length in bits */
 }
 
-static gint Dedicated_MIMO_UL_Control_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int Dedicated_MIMO_UL_Control_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24.2 Dedicated_MIMO_UL_Control_IE -- table 302s */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
-    gint bit;
+    int bit;
     proto_item *tree;
 
     bit = offset;
@@ -595,15 +596,15 @@ static gint Dedicated_MIMO_UL_Control_IE(proto_tree *uiuc_tree, gint offset, gin
 
 /* begin Sub-Burst IEs */
 
-static gint UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 UL_HARQ_Chase_sub_burst_IE -- table 302k */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
-    gint bit;
+    int bit;
     proto_item *tree;
     /*proto_item *generic_item = NULL;*/
-    gint duci;
-    /*guint16 calculated_crc;*/
+    int duci;
+    /*uint16_t calculated_crc;*/
 
     bit = offset;
 
@@ -625,7 +626,7 @@ static gint UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint
 #if 0
     if (include_cor2_changes)
     {
-		calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
+		calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
 		proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc,
 									ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY);
 		bit += 16;
@@ -635,15 +636,15 @@ static gint UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint
     return (bit - offset); /* length in bits */
 }
 
-static gint UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 UL_HARQ_IR_CTC_sub_burst_IE -- table 302l */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
-    gint bit;
+    int bit;
     proto_item *tree;
     /*proto_item *generic_item = NULL;*/
-    gint duci;
-    /*guint16 calculated_crc;*/
+    int duci;
+    /*uint16_t calculated_crc;*/
 
     bit = offset;
 
@@ -666,7 +667,7 @@ static gint UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint
     if (include_cor2_changes)
     {
 		/* CRC-16 is always appended */
-		calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
+		calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
 		proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc,
 									ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY);
 		bit += 16;
@@ -676,15 +677,15 @@ static gint UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint
     return (bit - offset); /* length in bits */
 }
 
-static gint UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 UL_HARQ_IR_CC_sub_burst_IE -- table 302m */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
-    gint bit;
+    int bit;
     proto_item *tree;
     /*proto_item *generic_item = NULL;*/
-    gint duci;
-    /*guint16 calculated_crc;*/
+    int duci;
+    /*uint16_t calculated_crc;*/
 
     bit = offset;
 
@@ -708,7 +709,7 @@ static gint UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint
     if (include_cor2_changes)
     {
 		/* CRC-16 is always appended */
-		calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
+		calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
 		proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc,
 									ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY);
 
@@ -719,15 +720,15 @@ static gint UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint
     return (bit - offset); /* length in bits */
 }
 
-static gint MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 MIMO_UL_Chase_HARQ_Sub_Burst_IE -- table 302n */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
-    gint bit;
+    int bit;
     proto_item *tree;
     /*proto_item *generic_item = NULL;*/
-    gint muin,dmci,ackd,i;
-    /*guint16 calculated_crc;*/
+    int muin,dmci,ackd,i;
+    /*uint16_t calculated_crc;*/
 
     bit = offset;
 
@@ -761,7 +762,7 @@ static gint MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset,
     if (include_cor2_changes)
     {
 		/* CRC-16 is always appended */
-		calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
+		calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
 		proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc,
 									ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY);
 
@@ -772,15 +773,15 @@ static gint MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset,
     return (bit - offset); /* length in bits */
 }
 
-static gint MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 MIMO_UL_IR_HARQ__Sub_Burst_IE -- table 302o */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
-    gint bit;
+    int bit;
     proto_item *tree;
     /*proto_item *generic_item = NULL;*/
-    gint muin,dmci,ackd,i;
-    /*guint16 calculated_crc;*/
+    int muin,dmci,ackd,i;
+    /*uint16_t calculated_crc;*/
 
     bit = offset;
 
@@ -814,7 +815,7 @@ static gint MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi
     if (include_cor2_changes)
     {
 		/* CRC-16 is always appended */
-		calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
+		calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
 		proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc,
 									ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY);
 
@@ -825,15 +826,15 @@ static gint MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi
     return (bit - offset); /* length in bits */
 }
 
-static gint MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE -- table 302p */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
-    gint bit;
+    int bit;
     proto_item *tree;
     /*proto_item *generic_item = NULL;*/
-    gint muin,dmci,ackd,i;
-    /*guint16 calculated_crc;*/
+    int muin,dmci,ackd,i;
+    /*uint16_t calculated_crc;*/
 
     bit = offset;
 
@@ -868,7 +869,7 @@ static gint MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, gint off
     if (include_cor2_changes)
     {
 		/* CRC-16 is always appended */
-		calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
+		calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
 		proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc,
 									ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY);
 
@@ -879,15 +880,15 @@ static gint MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, gint off
     return (bit - offset); /* length in bits */
 }
 
-static gint MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 MIMO_UL_STC_HARQ_Sub_Burst_IE -- table 302q */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
-    gint bit;
+    int bit;
     proto_item *tree;
     /*proto_item *generic_item = NULL;*/
-    gint ackd,txct,sboi;
-    /*guint16 calculated_crc;*/
+    int ackd,txct,sboi;
+    /*uint16_t calculated_crc;*/
 
     bit = offset;
 
@@ -914,7 +915,7 @@ static gint MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi
     if (include_cor2_changes)
     {
 		/* CRC-16 is always appended */
-		calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
+		calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
 		proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc,
 									ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY);
 
@@ -930,13 +931,13 @@ static gint MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi
  * table 290a
  *******************************************************************/
 
-static gint Power_Control_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int Power_Control_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 0 */
     /* 8.4.5.4.5 Power_Control_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint nib;
-    gint data;
+    int nib;
+    int data;
     proto_item *tree;
 
     nib = offset;
@@ -951,17 +952,17 @@ static gint Power_Control_IE(proto_tree *uiuc_tree, gint offset, gint length, tv
     return nib;
 }
 
-static gint Mini_Subchannel_allocation_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int Mini_Subchannel_allocation_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 1 */
     /* 8.4.5.4.8 [2] Mini-Subchannel_allocation_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
-    gint data;
-    guint idx;
+    int bit;
+    int data;
+    unsigned idx;
     proto_item *tree;
-    gint j, M;
-    const gint m_table[4] = { 2, 2, 3, 6 };
+    int j, M;
+    const int m_table[4] = { 2, 2, 3, 6 };
 
     bit = NIB_TO_BIT(offset);
 
@@ -991,12 +992,12 @@ static gint Mini_Subchannel_allocation_IE(proto_tree *uiuc_tree, gint offset, gi
     return BIT_TO_NIB(bit);
 }
 
-static gint AAS_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int AAS_UL_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 2 */
     /* 8.4.5.4.6 [2] AAS_UL_IE*/
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
+    int bit;
     proto_item *tree;
 
     bit = NIB_TO_BIT(offset);
@@ -1016,16 +1017,16 @@ static gint AAS_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t
     return BIT_TO_NIB(bit);
 }
 
-static gint CQICH_Alloc_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int CQICH_Alloc_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 3 */
     /* 8.4.5.4.12 [2] CQICH_Alloc_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
-    gint data;
-    gint target;
+    int bit;
+    int data;
+    int target;
     proto_item *tree;
-    gint rci, rtype, ftype, zperm, mgi, api, pad;
+    int rci, rtype, ftype, zperm, mgi, api, pad;
 
     bit = NIB_TO_BIT(offset);
 
@@ -1086,12 +1087,12 @@ static gint CQICH_Alloc_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbu
     return BIT_TO_NIB(bit);	/* Return position in nibbles. */
 }
 
-static gint UL_Zone_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int UL_Zone_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 4 */
     /* 8.4.5.4.7 [2] UL_Zone_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
+    int bit;
     proto_item *tree;
 
     bit = NIB_TO_BIT(offset);
@@ -1111,14 +1112,14 @@ static gint UL_Zone_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t
     return BIT_TO_NIB(bit);
 }
 
-static gint PHYMOD_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int PHYMOD_UL_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 5 */
     /* 8.4.5.4.14 [2] PHYMOD_UL_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
+    int bit;
     proto_item *tree;
-    gint pmt;
+    int pmt;
 
     bit = NIB_TO_BIT(offset);
 
@@ -1138,13 +1139,13 @@ static gint PHYMOD_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff
     return BIT_TO_NIB(bit);
 }
 
-static gint MIMO_UL_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb)
+static int MIMO_UL_IE(proto_tree *uiuc_tree, packet_info* pinfo, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 6 */
     /* 8.4.5.4.11 MIMO_UL_Basic_IE (not implemented) */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint nib;
-    gint data;
+    int nib;
+    int data;
     proto_item *tree;
 
     nib = offset;
@@ -1157,12 +1158,12 @@ static gint MIMO_UL_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, g
     return nib;
 }
 
-static gint ULMAP_Fast_Tracking_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int ULMAP_Fast_Tracking_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 7 */
     /* 8.4.5.4.22 [2] ULMAP_Fast_Tracking_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
+    int bit;
     proto_item *tree;
 
     bit = NIB_TO_BIT(offset);
@@ -1184,12 +1185,12 @@ static gint ULMAP_Fast_Tracking_IE(proto_tree *uiuc_tree, gint offset, gint leng
     return BIT_TO_NIB(bit);
 }
 
-static gint UL_PUSC_Burst_Allocation_in_other_segment_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int UL_PUSC_Burst_Allocation_in_other_segment_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 8 */
     /* 8.4.5.4.17 [2] UL_PUSC_Burst_Allocation_in_other_segment_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
+    int bit;
     proto_item *tree;
 
     bit = NIB_TO_BIT(offset);
@@ -1210,14 +1211,14 @@ static gint UL_PUSC_Burst_Allocation_in_other_segment_IE(proto_tree *uiuc_tree,
     return BIT_TO_NIB(bit);
 }
 
-static gint Fast_Ranging_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int Fast_Ranging_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 9 */
     /* 8.4.5.4.21 [2] Fast_Ranging_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
+    int bit;
     proto_item *tree;
-    gint hidi;
+    int hidi;
 
     bit = NIB_TO_BIT(offset);
 
@@ -1241,12 +1242,12 @@ static gint Fast_Ranging_IE(proto_tree *uiuc_tree, gint offset, gint length, tvb
     return BIT_TO_NIB(bit);
 }
 
-static gint UL_Allocation_Start_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int UL_Allocation_Start_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 0xA */
     /* 8.4.5.4.15 [2] UL_Allocation_Start_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
+    int bit;
     proto_item *tree;
 
     bit = NIB_TO_BIT(offset);
@@ -1268,16 +1269,16 @@ static gint UL_Allocation_Start_IE(proto_tree *uiuc_tree, gint offset, gint leng
  * table 290c
  *******************************************************************/
 
-static gint CQICH_Enhanced_Allocation_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int CQICH_Enhanced_Allocation_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 0 */
     /* 8.4.5.4.16 [2] CQICH_Enhanced_Allocation_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
-    gint data;
+    int bit;
+    int data;
     proto_item *tree;
-    gint i, cnum, bapm;
-    guint pad;
+    int i, cnum, bapm;
+    unsigned pad;
 
     bit = NIB_TO_BIT(offset);
 
@@ -1319,13 +1320,13 @@ static gint CQICH_Enhanced_Allocation_IE(proto_tree *uiuc_tree, gint offset, gin
     return BIT_TO_NIB(bit);
 }
 
-static gint HO_Anchor_Active_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb)
+static int HO_Anchor_Active_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 1 */
     /* 8.4.5.4.18 [2] HO_Anchor_Active_UL_MAP_IE (not implemented) */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint nib;
-    gint data;
+    int nib;
+    int data;
     proto_item *tree;
 
     nib = offset;
@@ -1338,13 +1339,13 @@ static gint HO_Anchor_Active_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo
     return nib;
 }
 
-static gint HO_Active_Anchor_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb)
+static int HO_Active_Anchor_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 2 */
     /* 8.4.5.4.19 [2] HO_Active_Anchor_UL_MAP_IE (not implemented) */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint nib;
-    gint data;
+    int nib;
+    int data;
     proto_item *tree;
 
     nib = offset;
@@ -1357,16 +1358,16 @@ static gint HO_Active_Anchor_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo
     return nib;
 }
 
-static gint Anchor_BS_switch_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int Anchor_BS_switch_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 3 */
     /* 8.4.5.4.23 [2] Anchor_BS_switch_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
-    gint data;
+    int bit;
+    int data;
     proto_item *tree;
-    gint nbss, acod, cqai, pad;
-    gint i;
+    int nbss, acod, cqai, pad;
+    int i;
 
     bit = NIB_TO_BIT(offset);
 
@@ -1415,16 +1416,16 @@ static gint Anchor_BS_switch_IE(proto_tree *uiuc_tree, gint offset, gint length,
     return BIT_TO_NIB(bit);
 }
 
-static gint UL_sounding_command_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int UL_sounding_command_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 4 */
     /* 8.4.5.4.26 [2] UL_sounding_command_IE */
     /* see 8.4.6.2.7.1 */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
+    int bit;
     proto_item *tree;
-    gint stype, srlf, iafb, pad, sept, nssym, ncid, amod;
-    gint i, j;
+    int stype, srlf, iafb, pad, sept, nssym, ncid, amod;
+    int i, j;
 
     bit = NIB_TO_BIT(offset);
 
@@ -1519,13 +1520,13 @@ static gint UL_sounding_command_IE(proto_tree *uiuc_tree, gint offset, gint leng
     return BIT_TO_NIB(bit);
 }
 
-static gint MIMO_UL_Enhanced_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb)
+static int MIMO_UL_Enhanced_IE(proto_tree *uiuc_tree, packet_info* pinfo, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 6 */
     /* 8.4.5.4.20 [2] MIMO_UL_Enhanced_IE (not implemented) */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint nib;
-    gint data;
+    int nib;
+    int data;
     proto_item *tree;
 
     nib = offset;
@@ -1538,17 +1539,17 @@ static gint MIMO_UL_Enhanced_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint
     return nib;
 }
 
-static gint HARQ_ULMAP_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int HARQ_ULMAP_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 7 */
     /* 8.4.5.4.24 HARQ_ULMAP_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
+    int bit;
     proto_item *tree;
-    gint bitlength;
-    gint lastbit;
-    gint pad, mode, alsi, nsub;
-    gint i;
+    int bitlength;
+    int lastbit;
+    int pad, mode, alsi, nsub;
+    int i;
 
     bit = NIB_TO_BIT(offset);
     bitlength = NIB_TO_BIT(length);
@@ -1598,12 +1599,12 @@ static gint HARQ_ULMAP_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuf
     return BIT_TO_NIB(bit);
 }
 
-static gint HARQ_ACKCH_Region_Allocation_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int HARQ_ACKCH_Region_Allocation_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 8 */
     /* 8.4.5.4.25 [2] HARQ_ACKCH_Region_Allocation_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
+    int bit;
     proto_item *tree;
 
     bit = NIB_TO_BIT(offset);
@@ -1620,16 +1621,16 @@ static gint HARQ_ACKCH_Region_Allocation_IE(proto_tree *uiuc_tree, gint offset,
     return BIT_TO_NIB(bit);
 }
 
-static gint AAS_SDMA_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int AAS_SDMA_UL_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 0xE */
     /* 8.4.5.4.27 [2] AAS_SDMA_UL_IE  */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
+    int bit;
     proto_item *tree;
-    gint nreg, pad, user, encm, ppmd, padj;
-    gint aasp = 0; /* TODO AAS UL preamble used */
-    gint ii, jj;
+    int nreg, pad, user, encm, ppmd, padj;
+    int aasp = 0; /* TODO AAS UL preamble used */
+    int ii, jj;
 
     bit = NIB_TO_BIT(offset);
 
@@ -1701,15 +1702,15 @@ static gint AAS_SDMA_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbu
     return BIT_TO_NIB(bit);
 }
 
-static gint Feedback_Polling_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static int Feedback_Polling_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 0xF */
     /* 8.4.5.4.28 [2] Feedback_Polling_IE */
     /* offset of TLV in nibbles, length of TLV in nibbles */
-    gint bit;
+    int bit;
     proto_item *tree;
-    gint nalloc, dula, pad, adur;
-    gint i;
+    int nalloc, dula, pad, adur;
+    int i;
 
     bit = NIB_TO_BIT(offset);
 
@@ -1750,7 +1751,7 @@ static gint Feedback_Polling_IE(proto_tree *uiuc_tree, gint offset, gint length,
  * UL-MAP Miscellany
  *******************************************************************/
 
-gint dissect_ulmap_ie( proto_tree *ie_tree, packet_info* pinfo, gint offset, gint length _U_, tvbuff_t *tvb)
+int dissect_ulmap_ie( proto_tree *ie_tree, packet_info* pinfo, int offset, int length _U_, tvbuff_t *tvb)
 {
     /* decode a single UL-MAP IE and return the
      * length of the IE in nibbles
@@ -1758,11 +1759,11 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, packet_info* pinfo, gint offset, gin
      * length = total length of tvb (nibbles) */
     proto_item *ti;
     proto_tree *tree;
-    gint nibble;
-    gint uiuc, ext_uiuc, ext2_uiuc, len, aas_or_amc;
-    guint cid;
-    guint data;
-    guint32 data32;
+    int nibble;
+    int uiuc, ext_uiuc, ext2_uiuc, len, aas_or_amc;
+    unsigned cid;
+    unsigned data;
+    uint32_t data32;
 
     nibble = offset;
 
@@ -2041,13 +2042,13 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, packet_info* pinfo, gint offset, gin
 static int dissect_mac_mgmt_msg_ulmap_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
     /* 6.3.2.3.4 [2] UL-MAP table 18 */
-    guint offset = 0;
-    guint length;
-    guint nib, pad;
+    unsigned offset = 0;
+    unsigned length;
+    unsigned nib, pad;
     proto_item *ti         = NULL;
     proto_tree *ulmap_tree = NULL;
     proto_tree *ie_tree    = NULL;
-    guint tvb_len;
+    unsigned tvb_len;
 
     tvb_len = tvb_reported_length(tvb);
 
@@ -2081,13 +2082,13 @@ static int dissect_mac_mgmt_msg_ulmap_decoder(tvbuff_t *tvb, packet_info *pinfo
     return tvb_captured_length(tvb);
 }
 
-/*gint wimax_decode_ulmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)*/
-gint wimax_decode_ulmapc(proto_tree *base_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb)
+/*int wimax_decode_ulmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)*/
+int wimax_decode_ulmapc(proto_tree *base_tree, packet_info* pinfo, int offset, int length, tvbuff_t *tvb)
 {
     /* 8.4.5.6.2 [2] Compressed UL-MAP */
     /* returns length in nibbles */
-    gint nib;
-    guint data;
+    int nib;
+    unsigned data;
     proto_item *ti = NULL;
     proto_tree *tree = NULL;
     proto_tree *ie_tree = NULL;
@@ -2125,16 +2126,16 @@ gint wimax_decode_ulmapc(proto_tree *base_tree, packet_info* pinfo, gint offset,
 }
 
 
-gint wimax_decode_ulmap_reduced_aas(proto_tree *base_tree, gint offset, gint length, tvbuff_t *tvb)
+int wimax_decode_ulmap_reduced_aas(proto_tree *base_tree, int offset, int length, tvbuff_t *tvb)
 {
     /* 8.4.5.8.2 Reduced AAS private UL-MAP */
     /* offset and length are in bits since this is called from within
      * the Reduced AAS private DL-MAP
      * return length in bits */
-    gint bit;
-    guint data;
+    int bit;
+    unsigned data;
     proto_tree *tree;
-    gint azci, azpi, umii, phmi, powi;
+    int azci, azpi, umii, phmi, powi;
 
     bit = offset;
 
@@ -2816,7 +2817,7 @@ void proto_register_mac_mgmt_msg_ulmap(void)
 		{ &hf_ulmap_feedback_polling_allocation_duration, { "Allocation Duration (d)", "wmx.ulmap.feedback_polling.allocation_duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
 		{ &hf_ulmap_feedback_polling_type, { "Feedback type", "wmx.ulmap.feedback_polling.feedback_polling.type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
 		{ &hf_ulmap_feedback_polling_frame_offset, { "Frame Offset", "wmx.ulmap.feedback_polling.frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
-		{ &hf_ulmap_feedback_polling_period, { "Period (p)", "wmx.ulmap.feedback_polling.perio", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+		{ &hf_ulmap_feedback_polling_period, { "Period (p)", "wmx.ulmap.feedback_polling.period", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
 		{ &hf_ulmap_feedback_polling_uiuc, { "UIUC", "wmx.ulmap.feedback_polling.uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
 		{ &hf_ulmap_feedback_polling_ofdma_symbol_offset, { "OFDMA Symbol Offset", "wmx.ulmap.feedback_polling.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
 		{ &hf_ulmap_feedback_polling_subchannel_offset, { "Subchannel offset", "wmx.ulmap.feedback_polling.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
@@ -2854,7 +2855,7 @@ void proto_register_mac_mgmt_msg_ulmap(void)
 	};
 
 	/* Setup protocol subtree array */
-	static gint *ett[] =
+	static int *ett[] =
 		{
 			&ett_ulmap,
 			&ett_ulmap_ie,