aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-12-30 16:45:01 -0500
committerAnders Broman <a.broman58@gmail.com>2015-01-01 04:34:44 +0000
commit889c566b9a20d9804f654a13b5006c123b5c8301 (patch)
tree459457acfbe3c3cf7d6cf9775acd90d854936e43 /plugins
parent114e7735b961720e63d2145770ed9b82c0200ff8 (diff)
Eliminate proto_tree_add_text from WiMax plugin.
Most of this was done with a custom perl script that picked out the field names from the XBIT macro and generated an hf_ and filter (that was humanly tweaked from there). Change-Id: I563db9f8ea216efe37322b784ab0daf25c038d9e Reviewed-on: https://code.wireshark.org/review/6149 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/wimax/mac_hd_generic_decoder.c17
-rw-r--r--plugins/wimax/msg_dlmap.c1484
-rw-r--r--plugins/wimax/msg_sbc.c54
-rw-r--r--plugins/wimax/msg_ucd.c78
-rw-r--r--plugins/wimax/msg_ulmap.c1472
-rw-r--r--plugins/wimax/wimax_utils.c15
6 files changed, 2228 insertions, 892 deletions
diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c
index 7d72b6c22d..88bb0f1850 100644
--- a/plugins/wimax/mac_hd_generic_decoder.c
+++ b/plugins/wimax/mac_hd_generic_decoder.c
@@ -585,6 +585,7 @@ static gint hf_mac_header_generic_arq_fb_ie_seq_ack_map_2 = -1;
static gint hf_mac_header_generic_arq_fb_ie_seq1_length_6 = -1;
static gint hf_mac_header_generic_arq_fb_ie_seq2_length_6 = -1;
static gint hf_mac_header_generic_arq_fb_ie_rsv = -1;
+static gint hf_mac_header_payload_fragment = -1;
static expert_field ei_mac_crc_malformed = EI_INIT;
static expert_field ei_mac_crc_missing = EI_INIT;
@@ -1087,7 +1088,7 @@ static void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo
cid_vernier[cid_index]++;
}
/* Don't show reassembled packet until last fragment. */
- proto_tree_add_text(tree, tvb, offset, frag_len, "Payload Fragment (%d bytes)", frag_len);
+ proto_tree_add_bytes_format(tree, hf_mac_header_payload_fragment, tvb, offset, frag_len, NULL, "Payload Fragment (%d bytes)", frag_len);
if (payload_frag && frag_type == LAST_FRAG)
{ /* defragmented completely */
@@ -1989,7 +1990,7 @@ void proto_register_mac_header_generic(void)
&hf_mac_header_generic_grant_mgmt_ext_pbr_tree,
{
"Scheduling Service Type (Default)",
- "wimax.genericGrantSubhd.Default",
+ "wmx.genericGrantSubhd.Default",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -2054,7 +2055,7 @@ void proto_register_mac_header_generic(void)
&hf_mac_header_generic_grant_mgmt_ext_rtps_tree,
{
"Scheduling Service Type (Extended rtPS)",
- "wimax.genericGrantSubhd.ExtendedRTPS",
+ "wmx.genericGrantSubhd.ExtendedRTPS",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
@@ -2213,7 +2214,15 @@ void proto_register_mac_header_generic(void)
FT_UINT16, BASE_DEC, NULL, ARQ_FB_IE_RSV_MASK,
NULL, HFILL
}
- }
+ },
+ {
+ &hf_mac_header_payload_fragment,
+ {
+ "Payload Fragment", "wmx.payload_fragment",
+ FT_BYTES, BASE_NONE, NULL, 0x0,
+ NULL, HFILL
+ }
+ },
};
/* Setup protocol subtree array */
diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c
index d7d92476d3..8f8262c4f8 100644
--- a/plugins/wimax/msg_dlmap.c
+++ b/plugins/wimax/msg_dlmap.c
@@ -29,6 +29,7 @@
#include "config.h"
#include <epan/packet.h>
+#include <epan/expert.h>
#include "wimax_mac.h"
#include "crc.h"
#include "wimax_bits.h"
@@ -40,10 +41,13 @@ void proto_reg_handoff_mac_mgmt_msg_dlmap(void);
#define MAC_MGMT_MSG_DLMAP 2
-#define XBIT(var, bits, desc) \
+#define XBIT_HF(bits, hf) \
+ proto_tree_add_bits_item(tree, hf, tvb, bit, bits, ENC_BIG_ENDIAN); bit += bits;
+
+#define XBIT_HF_VALUE(var, bits, hf) \
do { \
var = TVB_BIT_BITS(bit, tvb, bits); \
- proto_tree_add_text(tree, tvb, BITHI(bit, bits), desc ": %d", var); \
+ proto_tree_add_bits_item(tree, hf, tvb, bit, bits, ENC_BIG_ENDIAN); \
bit += bits; \
} while(0)
@@ -54,13 +58,6 @@ void proto_reg_handoff_mac_mgmt_msg_dlmap(void);
bit += bits; \
} while(0)
-#define XNIB(var, nibs, desc) \
- do { \
- var = TVB_NIB_NIBS(nib, tvb, nibs); \
- proto_tree_add_text(tree, tvb, NIBHI(nib, nibs), desc ": %d", var); \
- nib += nibs; \
- } while(0)
-
#define VNIB(var, nibs, hf) \
do { \
var = TVB_NIB_NIBS(nib, tvb, nibs); \
@@ -256,7 +253,10 @@ static gint hf_dlmap_bsid = -1;
static gint hf_dlmap_ofdma_sym = -1;
/* static gint hf_dlmap_ie = -1; */
static gint hf_dlmap_ie_diuc = -1;
+static gint hf_dlmap_ie_reserved_extended2_duic = -1;
+static gint hf_dlmap_ie_reserved_extended_duic = -1;
static gint hf_dlmap_ie_diuc_ext = -1;
+static gint hf_dlmap_ie_diuc_ext2 = -1;
static gint hf_dlmap_ie_length = -1;
static gint hf_dlmap_ie_bitmap = -1;
static gint hf_dlmap_ie_bitmap_cqi = -1;
@@ -311,6 +311,293 @@ static gint hf_308a_type = -1;
static gint hf_308a_mult = -1;
static gint hf_308a_rsv = -1;
static gint hf_mac_header_compress_dlmap_crc = -1;
+static gint hf_crc16 = -1;
+static gint hf_padding = -1;
+static gint hf_cid_mask = -1;
+static gint hf_reserved = -1;
+
+/* Generated via "one time" script to help create filterable fields */
+static int hf_dlmap_rcid_ie_cid = -1;
+static int hf_dlmap_rcid_ie_prefix = -1;
+static int hf_dlmap_rcid_ie_cid11 = -1;
+static int hf_dlmap_rcid_ie_cid7 = -1;
+static int hf_dlmap_rcid_ie_cid3 = -1;
+static int hf_dlmap_dedicated_dl_control_length = -1;
+static int hf_dlmap_dedicated_dl_control_control_header = -1;
+static int hf_dlmap_dedicated_dl_control_num_sdma_layers = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_length = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_control_header_mimo_control_info = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_control_header_cqi_control_info = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_control_header_closed_mimo_control_info = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_n_layer = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_matrix = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_num_beamformed_streams = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_period = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_frame_offset = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_duration = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_allocation_index = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_cqich_num = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_feedback_type = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_antenna_grouping_index = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_num_stream = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_antenna_selection_index = -1;
+static int hf_dlmap_dedicated_mimo_dl_control_codebook_precoding_index = -1;
+static int hf_dlmap_n_sub_burst_isi = -1;
+static int hf_dlmap_harq_chase_n_ack_channel = -1;
+static int hf_dlmap_harq_chase_duration = -1;
+static int hf_dlmap_harq_chase_sub_burst_diuc_indicator = -1;
+static int hf_dlmap_reserved_uint = -1;
+static int hf_dlmap_harq_chase_diuc = -1;
+static int hf_dlmap_harq_chase_repetition_coding_indication = -1;
+static int hf_dlmap_harq_chase_acid = -1;
+static int hf_dlmap_harq_chase_ai_sn = -1;
+static int hf_dlmap_harq_chase_ack_disable = -1;
+static int hf_dlmap_harq_chase_dedicated_dl_control_indicator = -1;
+static int hf_dlmap_harq_chase_allocation_index = -1;
+static int hf_dlmap_harq_chase_period = -1;
+static int hf_dlmap_harq_chase_frame_offset = -1;
+static int hf_dlmap_harq_ir_ctc_n_ack_channel = -1;
+static int hf_dlmap_harq_ir_ctc_nep = -1;
+static int hf_dlmap_harq_ir_ctc_nsch = -1;
+static int hf_dlmap_harq_ir_ctc_spid = -1;
+static int hf_dlmap_harq_ir_ctc_acid = -1;
+static int hf_dlmap_harq_ir_ctc_ai_sn = -1;
+static int hf_dlmap_harq_ir_ctc_ack_disable = -1;
+static int hf_dlmap_harq_ir_ctc_dedicated_dl_control_indicator = -1;
+static int hf_dlmap_harq_ir_ctc_duration = -1;
+static int hf_dlmap_harq_ir_ctc_allocation_index = -1;
+static int hf_dlmap_harq_ir_ctc_period = -1;
+static int hf_dlmap_harq_ir_ctc_frame_offset = -1;
+static int hf_dlmap_harq_ir_cc_n_ack_channel = -1;
+static int hf_dlmap_harq_ir_cc_duration = -1;
+static int hf_dlmap_harq_ir_cc_sub_burst_diuc_indicator = -1;
+static int hf_dlmap_harq_ir_cc_diuc = -1;
+static int hf_dlmap_harq_ir_cc_repetition_coding_indication = -1;
+static int hf_dlmap_harq_ir_cc_acid = -1;
+static int hf_dlmap_harq_ir_cc_ai_sn = -1;
+static int hf_dlmap_harq_ir_cc_spid = -1;
+static int hf_dlmap_harq_ir_cc_ack_disable = -1;
+static int hf_dlmap_harq_ir_cc_dedicated_dl_control_indicator = -1;
+static int hf_dlmap_harq_ir_cc_allocation_index = -1;
+static int hf_dlmap_harq_ir_cc_period = -1;
+static int hf_dlmap_harq_ir_cc_frame_offset = -1;
+static int hf_dlmap_mimo_dl_chase_harq_n_ack_channel = -1;
+static int hf_dlmap_mimo_dl_chase_harq_mu_indicator = -1;
+static int hf_dlmap_mimo_dl_chase_harq_dedicated_mimo_dl_control_indicator = -1;
+static int hf_dlmap_mimo_dl_chase_harq_ack_disable = -1;
+static int hf_dlmap_mimo_dl_chase_harq_duration = -1;
+static int hf_dlmap_mimo_dl_chase_harq_diuc = -1;
+static int hf_dlmap_mimo_dl_chase_harq_repetition_coding_indication = -1;
+static int hf_dlmap_mimo_dl_chase_harq_acid = -1;
+static int hf_dlmap_mimo_dl_chase_harq_ai_sn = -1;
+static int hf_dlmap_mimo_dl_ir_harq_n_ack_channel = -1;
+static int hf_dlmap_mimo_dl_ir_harq_mu_indicator = -1;
+static int hf_dlmap_mimo_dl_ir_harq_dedicated_mimo_dl_control_indicator = -1;
+static int hf_dlmap_mimo_dl_ir_harq_ack_disable = -1;
+static int hf_dlmap_mimo_dl_ir_harq_nsch = -1;
+static int hf_dlmap_mimo_dl_ir_harq_nep = -1;
+static int hf_dlmap_mimo_dl_ir_harq_spid = -1;
+static int hf_dlmap_mimo_dl_ir_harq_acid = -1;
+static int hf_dlmap_mimo_dl_ir_harq_ai_sn = -1;
+static int hf_dlmap_mimo_dl_ir_harq_cc_n_ack_channel = -1;
+static int hf_dlmap_mimo_dl_ir_harq_cc_mu_indicator = -1;
+static int hf_dlmap_mimo_dl_ir_harq_cc_dedicated_mimo_dl_control_indicator = -1;
+static int hf_dlmap_mimo_dl_ir_harq_cc_ack_disable = -1;
+static int hf_dlmap_mimo_dl_ir_harq_cc_duration = -1;
+static int hf_dlmap_mimo_dl_ir_harq_cc_diuc = -1;
+static int hf_dlmap_mimo_dl_ir_harq_cc_repetition_coding_indication = -1;
+static int hf_dlmap_mimo_dl_ir_harq_cc_acid = -1;
+static int hf_dlmap_mimo_dl_ir_harq_cc_ai_sn = -1;
+static int hf_dlmap_mimo_dl_ir_harq_cc_spid = -1;
+static int hf_dlmap_mimo_dl_stc_harq_n_ack_channel = -1;
+static int hf_dlmap_mimo_dl_stc_harq_tx_count = -1;
+static int hf_dlmap_mimo_dl_stc_harq_duration = -1;
+static int hf_dlmap_mimo_dl_stc_harq_sub_burst_offset_indication = -1;
+static int hf_dlmap_mimo_dl_stc_harq_sub_burst_offset = -1;
+static int hf_dlmap_mimo_dl_stc_harq_ack_disable = -1;
+static int hf_dlmap_mimo_dl_stc_harq_dedicated_mimo_dl_control_indicator = -1;
+static int hf_dlmap_mimo_dl_stc_harq_diuc = -1;
+static int hf_dlmap_mimo_dl_stc_harq_repetition_coding_indication = -1;
+static int hf_dlmap_mimo_dl_stc_harq_acid = -1;
+static int hf_dlmap_mbs_map_extended_2_diuc = -1;
+static int hf_dlmap_mbs_map_mbs_zone_identifier = -1;
+static int hf_dlmap_mbs_map_macro_diversity_enhanced = -1;
+static int hf_dlmap_mbs_map_permutation = -1;
+static int hf_dlmap_mbs_map_dl_permbase = -1;
+static int hf_dlmap_mbs_map_prbs_id = -1;
+static int hf_dlmap_mbs_map_ofdma_symbol_offset = -1;
+static int hf_dlmap_mbs_map_diuc_change_indication = -1;
+static int hf_dlmap_mbs_map_boosting = -1;
+static int hf_dlmap_mbs_map_diuc = -1;
+static int hf_dlmap_mbs_map_num_subchannels = -1;
+static int hf_dlmap_mbs_map_num_ofdma_symbols = -1;
+static int hf_dlmap_mbs_map_repetition_coding_indication = -1;
+static int hf_dlmap_mbs_map_cid = -1;
+static int hf_dlmap_mbs_map_ofdma_symbols_offset = -1;
+static int hf_dlmap_mbs_map_subchannel_offset = -1;
+static int hf_dlmap_mbs_map_slc_3_indication = -1;
+static int hf_dlmap_mbs_map_next_mbs_map_ie_frame_offset = -1;
+static int hf_dlmap_skip_extended_2_diuc = -1;
+static int hf_dlmap_skip_mode = -1;
+static int hf_dlmap_harq_dl_map_extended_2_diuc = -1;
+static int hf_dlmap_harq_dl_map_rcid_type = -1;
+static int hf_dlmap_harq_dl_map_boosting = -1;
+static int hf_dlmap_harq_dl_map_region_id_use_indicator = -1;
+static int hf_dlmap_harq_dl_map_ofdma_symbol_offset = -1;
+static int hf_dlmap_harq_dl_map_subchannel_offset = -1;
+static int hf_dlmap_harq_dl_map_number_of_ofdma_symbols = -1;
+static int hf_dlmap_harq_dl_map_number_of_subchannels = -1;
+static int hf_dlmap_harq_dl_map_rectangular_sub_burst_indicator = -1;
+static int hf_dlmap_harq_dl_map_region_id = -1;
+static int hf_dlmap_harq_dl_map_mode = -1;
+static int hf_dlmap_harq_dl_map_sub_burst_ie_length = -1;
+static int hf_dlmap_harq_dl_map_reserved_mode = -1;
+static int hf_dlmap_harq_ack_bitmap_data = -1;
+static int hf_dlmap_enhanced_dl_map_extended_2_diuc = -1;
+static int hf_dlmap_enhanced_dl_map_num_assignment = -1;
+static int hf_dlmap_enhanced_dl_map_n_cid = -1;
+static int hf_dlmap_enhanced_dl_map_cid = -1;
+static int hf_dlmap_enhanced_dl_map_diuc = -1;
+static int hf_dlmap_enhanced_dl_map_boosting = -1;
+static int hf_dlmap_enhanced_dl_map_repetition_coding_indication = -1;
+static int hf_dlmap_enhanced_dl_map_region_id = -1;
+static int hf_dlmap_aas_sdma_dl_extended_2_diuc = -1;
+static int hf_dlmap_aas_sdma_dl_rcid_type = -1;
+static int hf_dlmap_aas_sdma_dl_num_burst_region = -1;
+static int hf_dlmap_aas_sdma_dl_ofdma_symbol_offset = -1;
+static int hf_dlmap_aas_sdma_dl_subchannel_offset = -1;
+static int hf_dlmap_aas_sdma_dl_num_ofdma_triple_symbols = -1;
+static int hf_dlmap_aas_sdma_dl_num_subchannels = -1;
+static int hf_dlmap_aas_sdma_dl_number_of_users = -1;
+static int hf_dlmap_aas_sdma_dl_encoding_mode = -1;
+static int hf_dlmap_aas_sdma_dl_cqich_allocation = -1;
+static int hf_dlmap_aas_sdma_dl_ackch_allocation = -1;
+static int hf_dlmap_aas_sdma_dl_pilot_pattern_modifier = -1;
+static int hf_dlmap_aas_sdma_dl_preamble_modifier_index = -1;
+static int hf_dlmap_aas_sdma_dl_pilot_pattern = -1;
+static int hf_dlmap_aas_sdma_dl_diuc = -1;
+static int hf_dlmap_aas_sdma_dl_repetition_coding_indication = -1;
+static int hf_dlmap_aas_sdma_dl_ack_ch_index = -1;
+static int hf_dlmap_aas_sdma_dl_acid = -1;
+static int hf_dlmap_aas_sdma_dl_ai_sn = -1;
+static int hf_dlmap_aas_sdma_dl_nep = -1;
+static int hf_dlmap_aas_sdma_dl_nsch = -1;
+static int hf_dlmap_aas_sdma_dl_spid = -1;
+static int hf_dlmap_aas_sdma_dl_allocation_index = -1;
+static int hf_dlmap_aas_sdma_dl_period = -1;
+static int hf_dlmap_aas_sdma_dl_frame_offset = -1;
+static int hf_dlmap_aas_sdma_dl_duration = -1;
+static int hf_dlmap_channel_measurement_channel_nr = -1;
+static int hf_dlmap_channel_measurement_ofdma_symbol_offset = -1;
+static int hf_dlmap_channel_measurement_cid = -1;
+static int hf_dlmap_stc_zone_ofdma_symbol_offset = -1;
+static int hf_dlmap_stc_zone_permutations = -1;
+static int hf_dlmap_stc_zone_use_all_sc_indicator = -1;
+static int hf_dlmap_stc_zone_stc = -1;
+static int hf_dlmap_stc_zone_matrix_indicator = -1;
+static int hf_dlmap_stc_zone_dl_permbase = -1;
+static int hf_dlmap_stc_zone_prbs_id = -1;
+static int hf_dlmap_stc_zone_amc_type = -1;
+static int hf_dlmap_stc_zone_midamble_presence = -1;
+static int hf_dlmap_stc_zone_midamble_boosting = -1;
+static int hf_dlmap_stc_zone_2_3_antenna_select = -1;
+static int hf_dlmap_stc_zone_dedicated_pilots = -1;
+static int hf_dlmap_aas_dl_ofdma_symbol_offset = -1;
+static int hf_dlmap_aas_dl_permutation = -1;
+static int hf_dlmap_aas_dl_dl_permbase = -1;
+static int hf_dlmap_aas_dl_downlink_preamble_config = -1;
+static int hf_dlmap_aas_dl_preamble_type = -1;
+static int hf_dlmap_aas_dl_prbs_id = -1;
+static int hf_dlmap_aas_dl_diversity_map = -1;
+static int hf_dlmap_data_location_another_bs_segment = -1;
+static int hf_dlmap_data_location_another_bs_used_subchannels = -1;
+static int hf_dlmap_data_location_another_bs_diuc = -1;
+static int hf_dlmap_data_location_another_bs_frame_advance = -1;
+static int hf_dlmap_data_location_another_bs_ofdma_symbol_offset = -1;
+static int hf_dlmap_data_location_another_bs_subchannel_offset = -1;
+static int hf_dlmap_data_location_another_bs_boosting = -1;
+static int hf_dlmap_data_location_another_bs_preamble_index = -1;
+static int hf_dlmap_data_location_another_bs_num_ofdma_symbols = -1;
+static int hf_dlmap_data_location_another_bs_num_subchannels = -1;
+static int hf_dlmap_data_location_another_bs_repetition_coding_indication = -1;
+static int hf_dlmap_data_location_another_bs_cid = -1;
+static int hf_dlmap_harq_map_pointer_diuc = -1;
+static int hf_dlmap_harq_map_pointer_num_slots = -1;
+static int hf_dlmap_harq_map_pointer_repetition_coding_indication = -1;
+static int hf_dlmap_harq_map_pointer_map_version = -1;
+static int hf_dlmap_harq_map_pointer_idle_users = -1;
+static int hf_dlmap_harq_map_pointer_sleep_users = -1;
+static int hf_dlmap_harq_map_pointer_cid_mask_length = -1;
+static int hf_dlmap_phymod_dl_preamble_modifier_type = -1;
+static int hf_dlmap_phymod_dl_preamble_frequency_shift_index = -1;
+static int hf_dlmap_phymod_dl_preamble_time_shift_index = -1;
+static int hf_dlmap_phymod_dl_pilot_pattern_modifier = -1;
+static int hf_dlmap_phymod_dl_pilot_pattern_index = -1;
+static int hf_dlmap_broadcast_ctrl_ptr_dcd_ucd_transmission_frame = -1;
+static int hf_dlmap_broadcast_ctrl_ptr_skip_broadcast_system_update = -1;
+static int hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_type = -1;
+static int hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_transmission_frame = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_cid = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_diuc = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_segment = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_boosting = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_idcell = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_dl_permbase = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_prbs_id = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_repetition_coding_indication = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_used_subchannels = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_ofdma_symbol_offset = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_num_ofdma_symbols = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_subchannel_offset = -1;
+static int hf_dlmap_dl_pusc_burst_allocation_num_subchannels = -1;
+static int hf_dlmap_pusc_asca_alloc_diuc = -1;
+static int hf_dlmap_pusc_asca_alloc_short_basic_cid = -1;
+static int hf_dlmap_pusc_asca_alloc_ofdma_symbol_offset = -1;
+static int hf_dlmap_pusc_asca_alloc_subchannel_offset = -1;
+static int hf_dlmap_pusc_asca_alloc_num_ofdma_symbols = -1;
+static int hf_dlmap_pusc_asca_alloc_num_symbols = -1;
+static int hf_dlmap_pusc_asca_alloc_repetition_coding_information = -1;
+static int hf_dlmap_pusc_asca_alloc_permutation_id = -1;
+static int hf_dlmap_reduced_aas_num_ie = -1;
+static int hf_dlmap_reduced_aas_periodicity = -1;
+static int hf_dlmap_reduced_aas_cid_included = -1;
+static int hf_dlmap_reduced_aas_dcd_count_included = -1;
+static int hf_dlmap_reduced_aas_phy_modification_included = -1;
+static int hf_dlmap_reduced_aas_cqich_control_indicator = -1;
+static int hf_dlmap_reduced_aas_encoding_mode = -1;
+static int hf_dlmap_reduced_aas_separate_mcs_enabled = -1;
+static int hf_dlmap_reduced_aas_duration = -1;
+static int hf_dlmap_reduced_aas_diuc = -1;
+static int hf_dlmap_reduced_aas_repetition_coding_indication = -1;
+static int hf_dlmap_reduced_aas_cid = -1;
+static int hf_dlmap_reduced_aas_allocation_index = -1;
+static int hf_dlmap_reduced_aas_report_period = -1;
+static int hf_dlmap_reduced_aas_frame_offset = -1;
+static int hf_dlmap_reduced_aas_report_duration = -1;
+static int hf_dlmap_reduced_aas_cqi_measurement_type = -1;
+static int hf_dlmap_reduced_aas_dcd_count = -1;
+static int hf_dlmap_reduced_aas_preamble_select = -1;
+static int hf_dlmap_reduced_aas_preamble_shift_index = -1;
+static int hf_dlmap_reduced_aas_pilot_pattern_modifier = -1;
+static int hf_dlmap_reduced_aas_pilot_pattern_index = -1;
+static int hf_dlmap_reduced_aas_dl_frame_offset = -1;
+static int hf_dlmap_reduced_aas_zone_symbol_offset = -1;
+static int hf_dlmap_reduced_aas_ofdma_symbol_offset = -1;
+static int hf_dlmap_reduced_aas_subchannel_offset = -1;
+static int hf_dlmap_reduced_aas_num_ofdma_triple_symbol = -1;
+static int hf_dlmap_reduced_aas_num_subchannels = -1;
+static int hf_dlmap_reduced_aas_num_ofdma_symbols = -1;
+static int hf_dlmap_reduced_aas_diuc_nep = -1;
+static int hf_dlmap_reduced_aas_dl_harq_ack_bitmap = -1;
+static int hf_dlmap_reduced_aas_ack_allocation_index = -1;
+static int hf_dlmap_reduced_aas_acid = -1;
+static int hf_dlmap_reduced_aas_ai_sn = -1;
+static int hf_dlmap_reduced_aas_nsch = -1;
+static int hf_dlmap_reduced_aas_spid = -1;
+
+
+
+static expert_field ei_dlmap_not_implemented = EI_INIT;
/********************************************************************
* DL-MAP Miscellaneous IEs and TLVs
@@ -339,24 +626,23 @@ gint RCID_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb, gin
tree = proto_tree_add_subtree(diuc_tree, tvb, BITHI(bit, length), ett_286j, &ti, "RCID_IE");
if (RCID_Type_lcl == 0) {
- XBIT(cid, 16, "CID");
+ XBIT_HF_VALUE(cid, 16, hf_dlmap_rcid_ie_cid);
} else {
- proto_tree_add_text(tree, tvb, BITHI(bit,1), "Prefix: %d", Prefix);
- bit++;
+ XBIT_HF_VALUE(Prefix, 1, hf_dlmap_rcid_ie_prefix);
if (Prefix == 1) {
/* RCID 11 */
- XBIT(cid, 11, "CID11");
+ XBIT_HF_VALUE(cid, 11, hf_dlmap_rcid_ie_cid11);
} else {
if (RCID_Type_lcl == 1) {
/* RCID 11 */
- XBIT(cid, 11, "CID11");
+ XBIT_HF_VALUE(cid, 11, hf_dlmap_rcid_ie_cid11);
} else if (RCID_Type_lcl == 2) {
/* RCID 7 */
- XBIT(cid, 7, "CID7");
+ XBIT_HF_VALUE(cid, 7, hf_dlmap_rcid_ie_cid7);
} else if (RCID_Type_lcl == 3) {
/* RCID 3 */
- XBIT(cid, 3, "CID3");
+ XBIT_HF_VALUE(cid, 3, hf_dlmap_rcid_ie_cid3);
}
}
}
@@ -385,34 +671,31 @@ static gint Dedicated_DL_Control_IE(proto_tree *diuc_tree, gint offset, gint len
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(nib, length+1), ett_286i, NULL, "Dedicated_DL_Control_IE");
- proto_tree_add_text(tree, tvb, NIBHI(nib,1), "Length: %d", length);
- nib++;
- nibble = TVB_NIB_NIBBLE(nib, tvb);
- proto_tree_add_text(tree, tvb, NIBHI(nib,1), "Control Header: %d", nibble);
- nib++;
+ VNIB(length, 1, hf_dlmap_dedicated_dl_control_length);
+ VNIB(nibble, 1, hf_dlmap_dedicated_dl_control_control_header);
+
if ((nibble & 1) == 1) {
nibble = TVB_NIB_NIBBLE(nib, tvb);
- proto_tree_add_text(tree, tvb, NIBHI(nib,1), "Num SDMA Layers: %d", (nibble >> 2) & 0x3);
+ proto_tree_add_uint(tree, hf_dlmap_dedicated_dl_control_num_sdma_layers, tvb, NIBHI(nib,1), (nibble >> 2) & 0x3);
/* Bit padding */
if ((nib*4)+2 < (offset+length)*4) {
len = ((offset + length - nib) * 4) - 2;
- proto_tree_add_text(tree, tvb, BITHI(nib*4, len), "Reserved bits");
+ proto_tree_add_bytes_format(tree, hf_reserved, tvb, BITHI(nib*4, len), NULL, "Reserved bits");
}
} else {
/* Nibble padding */
if (nib < offset+length) {
len = (offset + length) - nib;
- proto_tree_add_text(tree, tvb, NIBHI(nib,len), "Reserved bits");
+ proto_tree_add_bytes_format(tree, hf_reserved, tvb, NIBHI(nib,len), NULL, "Reserved bits");
}
}
return (length + 1);
}
-static gint Dedicated_MIMO_DL_Control_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint Dedicated_MIMO_DL_Control_IE(proto_tree *diuc_tree, gint offset, gint length _U_, tvbuff_t *tvb)
{
/* offset of IE in bits, length is variable */
gint bit;
- gint data;
proto_tree *tree;
gint mci, cqi, cmi, matrix = 0, pad, CQICH_num, mimo_mode;
gint j;
@@ -422,32 +705,32 @@ static gint Dedicated_MIMO_DL_Control_IE(proto_tree *diuc_tree, gint offset, gin
/* 8.4.5.3.21 table 286t */
tree = proto_tree_add_subtree(diuc_tree, tvb, BITHI(bit, 1), ett_286t, NULL, "Dedicated MIMO DL Control IE");
- XBIT(length, 5, "Length (nibbles)");
- XBIT(mci, 1, "Control Header (MIMO Control Info)");
- XBIT(cqi, 1, "Control Header (CQI Control Info)");
- XBIT(cmi, 1, "Control Header (Closed MIMO Control Info)");
- XBIT(N_layer, 2, "N_layer");
+ XBIT_HF_VALUE(length, 5, hf_dlmap_dedicated_mimo_dl_control_length);
+ XBIT_HF_VALUE(mci, 1, hf_dlmap_dedicated_mimo_dl_control_control_header_mimo_control_info);
+ XBIT_HF_VALUE(cqi, 1, hf_dlmap_dedicated_mimo_dl_control_control_header_cqi_control_info);
+ XBIT_HF_VALUE(cmi, 1, hf_dlmap_dedicated_mimo_dl_control_control_header_closed_mimo_control_info);
+ XBIT_HF_VALUE(N_layer, 2, hf_dlmap_dedicated_mimo_dl_control_n_layer);
/* MIMO Control Info */
if (mci == 1) {
- XBIT(matrix, 2, "Matrix");
+ XBIT_HF_VALUE(matrix, 2, hf_dlmap_dedicated_mimo_dl_control_matrix);
if (STC_Zone_Dedicated_Pilots == 1) {
- XBIT(data, 2, "Num_Beamformed_Streams");
+ XBIT_HF(2, hf_dlmap_dedicated_mimo_dl_control_num_beamformed_streams);
}
}
/* CQICH Control Info */
if (cqi == 1) {
- XBIT(data, 3, "Period");
- XBIT(data, 3, "Frame Offset");
- XBIT(data, 4, "Duration");
+ XBIT_HF(3, hf_dlmap_dedicated_mimo_dl_control_period);
+ XBIT_HF(3, hf_dlmap_dedicated_mimo_dl_control_frame_offset);
+ XBIT_HF(4, hf_dlmap_dedicated_mimo_dl_control_duration);
for (j = 0; j < N_layer; j++) {
- XBIT(data, 6, "Allocation Index");
+ XBIT_HF(6, hf_dlmap_dedicated_mimo_dl_control_allocation_index);
}
- XBIT(CQICH_num, 2, "CQICH_Num");
+ XBIT_HF_VALUE(CQICH_num, 2, hf_dlmap_dedicated_mimo_dl_control_cqich_num);
for (j = 0; j < CQICH_num; j++) {
- XBIT(data, 3, "Feedback type");
- XBIT(data, 6, "Allocation index");
+ XBIT_HF(3, hf_dlmap_dedicated_mimo_dl_control_feedback_type);
+ XBIT_HF(6, hf_dlmap_dedicated_mimo_dl_control_allocation_index);
}
}
@@ -459,20 +742,20 @@ static gint Dedicated_MIMO_DL_Control_IE(proto_tree *diuc_tree, gint offset, gin
mimo_mode = STC_Zone_Matrix;
}
if (mimo_mode == 0 || mimo_mode == 1) {
- XBIT(data, 3, "Antenna Grouping Index");
+ XBIT_HF(3, hf_dlmap_dedicated_mimo_dl_control_antenna_grouping_index);
} else if (mimo_mode == 2) {
- XBIT(data, 2, "Num_stream");
- XBIT(data, 3, "Antenna Selection Index");
+ XBIT_HF(2, hf_dlmap_dedicated_mimo_dl_control_num_stream);
+ XBIT_HF(3, hf_dlmap_dedicated_mimo_dl_control_antenna_selection_index);
} else if (mimo_mode == 3) {
- XBIT(data, 2, "Num_stream");
- XBIT(data, 6, "Codebook Precoding Index");
+ XBIT_HF(2, hf_dlmap_dedicated_mimo_dl_control_num_stream);
+ XBIT_HF(6, hf_dlmap_dedicated_mimo_dl_control_codebook_precoding_index);
}
}
/* padding to nibble */
pad = BIT_PADDING(bit,4);
if(pad){
- proto_tree_add_text(tree, tvb, BITHI(bit,pad), "Padding: %d bits", pad);
+ proto_tree_add_bytes_format_value(tree, hf_padding, tvb, BITHI(bit,pad), NULL, "%d bits", pad);
bit += pad;
}
@@ -484,9 +767,8 @@ static gint DL_HARQ_Chase_sub_burst_IE(proto_tree *diuc_tree, gint offset, gint
/* 8.4.5.3.21 DL_HARQ_Chase_sub_burst_IE */
/* offset of IE in nibbles, length is variable */
gint bit;
- gint data;
proto_tree *tree;
- gint nsub, ddci, dur, sbi, res, diuc, rci, ind, per, ofs;
+ gint nsub, ddci, dur, sbi;
gint j;
bit = NIB_TO_BIT(offset);
@@ -494,33 +776,33 @@ static gint DL_HARQ_Chase_sub_burst_IE(proto_tree *diuc_tree, gint offset, gint
/* 8.4.5.3.21 table 286m */
tree = proto_tree_add_subtree(diuc_tree, tvb, BITHI(bit, length), ett_286m, NULL, "DL_HARQ_Chase_sub_burst_IE");
- XBIT(nsub, 4, "N sub burst[ISI]");
- XBIT(data, 4, "N ACK channel");
+ XBIT_HF_VALUE(nsub, 4, hf_dlmap_n_sub_burst_isi);
+ XBIT_HF(4, hf_dlmap_harq_chase_n_ack_channel);
nsub += 1;
for (j = 0; j < nsub; j++) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
- XBIT(dur, 10, "Duration");
- XBIT(sbi, 1, "Sub-Burst DIUC Indicator");
- XBIT(res, 1, "Reserved");
+ XBIT_HF_VALUE(dur, 10, hf_dlmap_harq_chase_duration);
+ XBIT_HF_VALUE(sbi, 1, hf_dlmap_harq_chase_sub_burst_diuc_indicator);
+ XBIT_HF(1, hf_dlmap_reserved_uint);
if (sbi == 1) {
- XBIT(diuc, 4, "DIUC");
- XBIT(rci, 2, "Repetition Coding Indication");
- XBIT(res, 2, "Reserved");
+ XBIT_HF(4, hf_dlmap_harq_chase_diuc);
+ XBIT_HF(2, hf_dlmap_harq_chase_repetition_coding_indication);
+ XBIT_HF(2, hf_dlmap_reserved_uint);
}
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
- XBIT(data, 1, "ACK disable");
- XBIT(ddci, 2, "Dedicated DL Control Indicator");
+ XBIT_HF(4, hf_dlmap_harq_chase_acid);
+ XBIT_HF(1, hf_dlmap_harq_chase_ai_sn);
+ XBIT_HF(1, hf_dlmap_harq_chase_ack_disable);
+ XBIT_HF_VALUE(ddci, 2, hf_dlmap_harq_chase_dedicated_dl_control_indicator);
if ((ddci & 1) == 1) {
- XBIT(dur, 4, "Duration (d)");
+ XBIT_HF_VALUE(dur, 4, hf_dlmap_harq_chase_duration);
if (dur != 0) {
- XBIT(ind, 6, "Allocation Index");
- XBIT(per, 3, "Period (p)");
- XBIT(ofs, 3, "Frame offset");
+ XBIT_HF(6, hf_dlmap_harq_chase_allocation_index);
+ XBIT_HF(3, hf_dlmap_harq_chase_period);
+ XBIT_HF(3, hf_dlmap_harq_chase_frame_offset);
}
}
@@ -529,7 +811,7 @@ static gint DL_HARQ_Chase_sub_burst_IE(proto_tree *diuc_tree, gint offset, gint
}
}
- /* proto_tree_add_text(tree, tvb, BITHI(bit,4), "(DL HARQ Chase sub-burst IE)"); */
+ /* XBIT_HF(data, 4, "(DL HARQ Chase sub-burst IE)"); */
return (BIT_TO_NIB(bit) - offset);
}
@@ -540,7 +822,7 @@ static gint DL_HARQ_IR_CTC_sub_burst_IE(proto_tree *diuc_tree, gint offset, gint
guint data;
proto_tree *tree;
proto_item *generic_item = NULL;
- gint nsub, ddci, dur, ind, per, ofs;
+ gint nsub, ddci, dur;
gint j;
guint32 calculated_crc;
@@ -549,29 +831,29 @@ static gint DL_HARQ_IR_CTC_sub_burst_IE(proto_tree *diuc_tree, gint offset, gint
/* 8.4.5.3.21 table 286n */
tree = proto_tree_add_subtree(diuc_tree, tvb, BITHI(bit, 4), ett_286n, NULL, "DL HARQ IR CTC sub-burst IE");
- XBIT(nsub, 4, "N sub burst[ISI]");
- XBIT(data, 4, "N ACK channel");
+ XBIT_HF_VALUE(nsub, 4, hf_dlmap_n_sub_burst_isi);
+ XBIT_HF(4, hf_dlmap_harq_ir_ctc_n_ack_channel);
nsub += 1;
for (j = 0; j < nsub; j++) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
- XBIT(data, 4, "N(EP)");
- XBIT(data, 4, "N(SCH)");
- XBIT(data, 2, "SPID");
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
- XBIT(data, 1, "ACK disable");
- XBIT(data, 2, "Reserved");
- XBIT(ddci, 2, "Dedicated DL Control Indicator");
+ XBIT_HF(4, hf_dlmap_harq_ir_ctc_nep);
+ XBIT_HF(4, hf_dlmap_harq_ir_ctc_nsch);
+ XBIT_HF(2, hf_dlmap_harq_ir_ctc_spid);
+ XBIT_HF(4, hf_dlmap_harq_ir_ctc_acid);
+ XBIT_HF(1, hf_dlmap_harq_ir_ctc_ai_sn);
+ XBIT_HF(1, hf_dlmap_harq_ir_ctc_ack_disable);
+ XBIT_HF(2, hf_dlmap_reserved_uint);
+ XBIT_HF_VALUE(ddci, 2, hf_dlmap_harq_ir_ctc_dedicated_dl_control_indicator);
if ((ddci & 1) == 1) {
- XBIT(dur, 4, "Duration (d)");
+ XBIT_HF_VALUE(dur, 4, hf_dlmap_harq_ir_ctc_duration);
if (dur != 0) {
- XBIT(ind, 6, "Allocation Index");
- XBIT(per, 3, "Period (p)");
- XBIT(ofs, 3, "Frame offset");
+ XBIT_HF(6, hf_dlmap_harq_ir_ctc_allocation_index);
+ XBIT_HF(3, hf_dlmap_harq_ir_ctc_period);
+ XBIT_HF(3, hf_dlmap_harq_ir_ctc_frame_offset);
}
}
if ((ddci & 2) == 2) {
@@ -583,7 +865,7 @@ static gint DL_HARQ_IR_CTC_sub_burst_IE(proto_tree *diuc_tree, gint offset, gint
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16(tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -603,7 +885,7 @@ static gint DL_HARQ_IR_CC_sub_burst_IE(proto_tree *diuc_tree, gint offset, gint
gint data;
proto_tree *tree;
proto_item *generic_item = NULL;
- gint nsub, sbdi, ddci, dur, ind, per, ofs;
+ gint nsub, sbdi, ddci, dur;
gint j;
guint16 calculated_crc;
@@ -612,37 +894,37 @@ static gint DL_HARQ_IR_CC_sub_burst_IE(proto_tree *diuc_tree, gint offset, gint
/* 8.4.5.3.21 table 286o */
tree = proto_tree_add_subtree(diuc_tree, tvb, BITHI(bit, 4), ett_286o, NULL, "DL HARQ IR CC sub-burst IE");
- XBIT(nsub, 4, "N sub burst[ISI]");
- XBIT(data, 4, "N ACK channel");
+ XBIT_HF_VALUE(nsub, 4, hf_dlmap_n_sub_burst_isi);
+ XBIT_HF(4, hf_dlmap_harq_ir_cc_n_ack_channel);
nsub += 1;
for (j = 0; j < nsub; j++) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type) / 4;
- XBIT(data, 10, "Duration");
- XBIT(sbdi, 1, "Sub-Burst DIUC Indicator");
- XBIT(data, 1, "Reserved");
+ XBIT_HF(10, hf_dlmap_harq_ir_cc_duration);
+ XBIT_HF_VALUE(sbdi, 1, hf_dlmap_harq_ir_cc_sub_burst_diuc_indicator);
+ XBIT_HF(1, hf_dlmap_reserved_uint);
if (sbdi) {
- XBIT(data, 4, "DIUC");
- XBIT(data, 2, "Repetition Coding Indication");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(4, hf_dlmap_harq_ir_cc_diuc);
+ XBIT_HF(2, hf_dlmap_harq_ir_cc_repetition_coding_indication);
+ XBIT_HF(2, hf_dlmap_reserved_uint);
}
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
- XBIT(data, 2, "SPID");
- XBIT(data, 1, "ACK disable");
- XBIT(ddci, 2, "Dedicated DL Control Indicator");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(4, hf_dlmap_harq_ir_cc_acid);
+ XBIT_HF(1, hf_dlmap_harq_ir_cc_ai_sn);
+ XBIT_HF(2, hf_dlmap_harq_ir_cc_spid);
+ XBIT_HF(1, hf_dlmap_harq_ir_cc_ack_disable);
+ XBIT_HF_VALUE(ddci, 2, hf_dlmap_harq_ir_cc_dedicated_dl_control_indicator);
+ XBIT_HF(2, hf_dlmap_reserved_uint);
if (ddci & 1) {
- XBIT(dur, 4, "Duration (d)");
+ XBIT_HF_VALUE(dur, 4, hf_dlmap_harq_ir_cc_duration);
if (dur != 0) {
- XBIT(ind, 6, "Allocation Index");
- XBIT(per, 3, "Period (p)");
- XBIT(ofs, 3, "Frame offset");
+ XBIT_HF(6, hf_dlmap_harq_ir_cc_allocation_index);
+ XBIT_HF(3, hf_dlmap_harq_ir_cc_period);
+ XBIT_HF(3, hf_dlmap_harq_ir_cc_frame_offset);
}
}
if ((ddci & 2) == 2) {
@@ -654,7 +936,7 @@ static gint DL_HARQ_IR_CC_sub_burst_IE(proto_tree *diuc_tree, gint offset, gint
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16(tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -683,37 +965,37 @@ static gint MIMO_DL_Chase_HARQ_sub_burst_IE(proto_tree *diuc_tree, gint offset,
/* 8.4.5.3.21 table 286p */
tree = proto_tree_add_subtree(diuc_tree, tvb, BITHI(bit, 1), ett_286p, NULL, "MIMO DL Chase HARQ sub-burst IE");
- XBIT(nsub, 4, "N sub burst[ISI]");
- XBIT(data, 6, "N ACK channel");
+ XBIT_HF_VALUE(nsub, 4, hf_dlmap_n_sub_burst_isi);
+ XBIT_HF(6, hf_dlmap_mimo_dl_chase_harq_n_ack_channel);
nsub += 1;
for (j = 0; j < nsub; j++) {
- XBIT(mui, 1, "MU Indicator");
- XBIT(dci, 1, "Dedicated MIMO DL Control Indicator");
- XBIT(akd, 1, "ACK Disable");
+ XBIT_HF_VALUE(mui, 1, hf_dlmap_mimo_dl_chase_harq_mu_indicator);
+ XBIT_HF_VALUE(dci, 1, hf_dlmap_mimo_dl_chase_harq_dedicated_mimo_dl_control_indicator);
+ XBIT_HF_VALUE(akd, 1, hf_dlmap_mimo_dl_chase_harq_ack_disable);
if (mui == 0) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
}
if (dci == 1) {
bit += Dedicated_MIMO_DL_Control_IE(tree, bit, length, tvb);
}
- XBIT(data, 10, "Duration");
+ XBIT_HF(10, hf_dlmap_mimo_dl_chase_harq_duration);
for (i = 0; i < N_layer; i++) {
if (mui == 1) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
}
- XBIT(data, 4, "DIUC");
- XBIT(data, 2, "Repetition Coding Indication");
+ XBIT_HF(4, hf_dlmap_mimo_dl_chase_harq_diuc);
+ XBIT_HF(2, hf_dlmap_mimo_dl_chase_harq_repetition_coding_indication);
if (akd == 0) {
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
+ XBIT_HF(4, hf_dlmap_mimo_dl_chase_harq_acid);
+ XBIT_HF(1, hf_dlmap_mimo_dl_chase_harq_ai_sn);
}
}
}
/* Padding to nibble */
data = BIT_PADDING(bit, 4);
if (data) {
- proto_tree_add_text(tree, tvb, BITHI(bit,data), "Padding: %d bits", data);
+ proto_tree_add_bytes_format_value(tree, hf_padding, tvb, BITHI(bit,data), NULL, "%d bits", data);
bit += data;
}
@@ -721,7 +1003,7 @@ static gint MIMO_DL_Chase_HARQ_sub_burst_IE(proto_tree *diuc_tree, gint offset,
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16(tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -750,30 +1032,30 @@ static gint MIMO_DL_IR_HARQ_sub_burst_IE(proto_tree *diuc_tree, gint offset, gin
/* 8.4.5.3.21 table 286q */
tree = proto_tree_add_subtree(diuc_tree, tvb, BITHI(bit, 4), ett_286q, NULL, "MIMO DL IR HARQ sub-burst IE");
- XBIT(nsub, 4, "N sub burst[ISI]");
- XBIT(data, 6, "N ACK channel");
+ XBIT_HF_VALUE(nsub, 4, hf_dlmap_n_sub_burst_isi);
+ XBIT_HF(6, hf_dlmap_mimo_dl_ir_harq_n_ack_channel);
nsub += 1;
for (j = 0; j < nsub; j++) {
- XBIT(mui, 1, "MU Indicator");
- XBIT(dci, 1, "Dedicated MIMO DL Control Indicator");
- XBIT(akd, 1, "ACK Disable");
+ XBIT_HF_VALUE(mui, 1, hf_dlmap_mimo_dl_ir_harq_mu_indicator);
+ XBIT_HF_VALUE(dci, 1, hf_dlmap_mimo_dl_ir_harq_dedicated_mimo_dl_control_indicator);
+ XBIT_HF_VALUE(akd, 1, hf_dlmap_mimo_dl_ir_harq_ack_disable);
if (mui == 0) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
}
if (dci == 1) {
bit += Dedicated_MIMO_DL_Control_IE(tree, bit, length, tvb);
}
- XBIT(data, 4, "N(SCH)");
+ XBIT_HF(4, hf_dlmap_mimo_dl_ir_harq_nsch);
for (i = 0; i < N_layer; i++) {
if (mui == 1) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
}
- XBIT(data, 4, "N(EP)");
+ XBIT_HF(4, hf_dlmap_mimo_dl_ir_harq_nep);
if (akd) {
- XBIT(data, 2, "SPID");
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
+ XBIT_HF(2, hf_dlmap_mimo_dl_ir_harq_spid);
+ XBIT_HF(4, hf_dlmap_mimo_dl_ir_harq_acid);
+ XBIT_HF(1, hf_dlmap_mimo_dl_ir_harq_ai_sn);
}
}
}
@@ -782,7 +1064,7 @@ static gint MIMO_DL_IR_HARQ_sub_burst_IE(proto_tree *diuc_tree, gint offset, gin
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16(tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -811,31 +1093,31 @@ static gint MIMO_DL_IR_HARQ_for_CC_sub_burst_IE(proto_tree *diuc_tree, gint offs
/* 8.4.5.3.21 table 286r */
tree = proto_tree_add_subtree(diuc_tree, tvb, BITHI(bit, 1), ett_286r, NULL, "MIMO DL IR HARQ for CC sub-burst IE");
- XBIT(nsub, 4, "N sub burst[ISI]");
- XBIT(data, 6, "N ACK channel");
+ XBIT_HF_VALUE(nsub, 4, hf_dlmap_n_sub_burst_isi);
+ XBIT_HF(6, hf_dlmap_mimo_dl_ir_harq_cc_n_ack_channel);
nsub += 1;
for (j = 0; j < nsub; j++) {
- XBIT(mui, 1, "MU Indicator");
- XBIT(dci, 1, "Dedicated MIMO DL Control Indicator");
- XBIT(akd, 1, "ACK Disable");
+ XBIT_HF_VALUE(mui, 1, hf_dlmap_mimo_dl_ir_harq_cc_mu_indicator);
+ XBIT_HF_VALUE(dci, 1, hf_dlmap_mimo_dl_ir_harq_cc_dedicated_mimo_dl_control_indicator);
+ XBIT_HF_VALUE(akd, 1, hf_dlmap_mimo_dl_ir_harq_cc_ack_disable);
if (mui == 0) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
}
if (dci == 1) {
bit += Dedicated_MIMO_DL_Control_IE(tree, bit, length, tvb);
}
- XBIT(data, 10, "Duration");
+ XBIT_HF(10, hf_dlmap_mimo_dl_ir_harq_cc_duration);
for (i = 0; i < N_layer; i++) {
if (mui == 1) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
}
- XBIT(data, 4, "DIUC");
- XBIT(data, 2, "Repetition Coding Indication");
+ XBIT_HF(4, hf_dlmap_mimo_dl_ir_harq_cc_diuc);
+ XBIT_HF(2, hf_dlmap_mimo_dl_ir_harq_cc_repetition_coding_indication);
if (akd == 0) {
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
- XBIT(data, 2, "SPID");
+ XBIT_HF(4, hf_dlmap_mimo_dl_ir_harq_cc_acid);
+ XBIT_HF(1, hf_dlmap_mimo_dl_ir_harq_cc_ai_sn);
+ XBIT_HF(2, hf_dlmap_mimo_dl_ir_harq_cc_spid);
}
}
}
@@ -844,7 +1126,7 @@ static gint MIMO_DL_IR_HARQ_for_CC_sub_burst_IE(proto_tree *diuc_tree, gint offs
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16(tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -873,30 +1155,30 @@ static gint MIMO_DL_STC_HARQ_sub_burst_IE(proto_tree *diuc_tree, gint offset, gi
/* 8.4.5.3.21 table 286s */
tree = proto_tree_add_subtree(diuc_tree, tvb, BITHI(bit, 1), ett_286s, NULL, "MIMO DL STC HARQ sub-burst IE");
- XBIT(nsub, 4, "N sub burst[ISI]");
- XBIT(data, 6, "N ACK channel");
+ XBIT_HF_VALUE(nsub, 4, hf_dlmap_n_sub_burst_isi);
+ XBIT_HF(6, hf_dlmap_mimo_dl_stc_harq_n_ack_channel);
nsub += 1;
for (j = 0; j < nsub; j++) {
- XBIT(txc, 2, "TX Count");
- XBIT(data, 10, "Duration");
- XBIT(sbi, 1, "Sub-burst offset indication");
- XBIT(data, 3, "Reserved");
+ XBIT_HF_VALUE(txc, 2, hf_dlmap_mimo_dl_stc_harq_tx_count);
+ XBIT_HF(10, hf_dlmap_mimo_dl_stc_harq_duration);
+ XBIT_HF_VALUE(sbi, 1, hf_dlmap_mimo_dl_stc_harq_sub_burst_offset_indication);
+ XBIT_HF(3, hf_dlmap_reserved_uint);
if (sbi == 1) {
- XBIT(data, 8, "Sub-burst offset");
+ XBIT_HF(8, hf_dlmap_mimo_dl_stc_harq_sub_burst_offset);
}
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
- XBIT(akd, 1, "ACK Disable");
+ XBIT_HF_VALUE(akd, 1, hf_dlmap_mimo_dl_stc_harq_ack_disable);
if (txc == 0) {
- XBIT(dmci, 1, "Dedicated MIMO DL Control Indicator");
+ XBIT_HF_VALUE(dmci, 1, hf_dlmap_mimo_dl_stc_harq_dedicated_mimo_dl_control_indicator);
if (dmci == 1) {
bit += Dedicated_MIMO_DL_Control_IE(tree, bit, length, tvb);
}
- XBIT(data, 4, "DIUC");
- XBIT(data, 2, "Repetition coding Indication");
+ XBIT_HF(4, hf_dlmap_mimo_dl_stc_harq_diuc);
+ XBIT_HF(2, hf_dlmap_mimo_dl_stc_harq_repetition_coding_indication);
}
if (akd == 0) {
- XBIT(data, 4, "ACID");
+ XBIT_HF(4, hf_dlmap_mimo_dl_stc_harq_acid);
}
}
@@ -904,7 +1186,7 @@ static gint MIMO_DL_STC_HARQ_sub_burst_IE(proto_tree *diuc_tree, gint offset, gi
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16(tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -935,50 +1217,50 @@ static gint MBS_MAP_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286a, NULL, "MBS_MAP_IE");
- XBIT(data, 4, "Extended-2 DIUC");
+ XBIT_HF(4, hf_dlmap_mbs_map_extended_2_diuc);
VBIT(data, 8, hf_dlmap_ie_length);
- XBIT(data, 7, "MBS Zone identifier");
- XBIT(mde, 1, "Macro diversity enhanced");
+ XBIT_HF(7, hf_dlmap_mbs_map_mbs_zone_identifier);
+ XBIT_HF_VALUE(mde, 1, hf_dlmap_mbs_map_macro_diversity_enhanced);
if (mde == 1)
{
- XBIT(data, 2, "Permutation");
- XBIT(data, 5, "DL_PermBase");
- XBIT(data, 2, "PRBS_ID");
- XBIT(data, 7, "OFDMA_Symbol_Offset");
- XBIT(dci, 1, "DIUC_change_indication");
- XBIT(data, 3, "Reserved");
+ XBIT_HF(2, hf_dlmap_mbs_map_permutation);
+ XBIT_HF(5, hf_dlmap_mbs_map_dl_permbase);
+ XBIT_HF(2, hf_dlmap_mbs_map_prbs_id);
+ XBIT_HF(7, hf_dlmap_mbs_map_ofdma_symbol_offset);
+ XBIT_HF_VALUE(dci, 1, hf_dlmap_mbs_map_diuc_change_indication);
+ XBIT_HF(3, hf_dlmap_reserved_uint);
if (dci == 1) {
- XBIT(data, 3, "Reserved");
- XBIT(data, 3, "Boosting");
- XBIT(data, 4, "DIUC");
- XBIT(data, 6, "No. Subchannels");
- XBIT(data, 6, "No. OFDMA Symbols");
- XBIT(data, 2, "Repetition Coding Indication");
+ XBIT_HF(3, hf_dlmap_reserved_uint);
+ XBIT_HF(3, hf_dlmap_mbs_map_boosting);
+ XBIT_HF(4, hf_dlmap_mbs_map_diuc);
+ XBIT_HF(6, hf_dlmap_mbs_map_num_subchannels);
+ XBIT_HF(6, hf_dlmap_mbs_map_num_ofdma_symbols);
+ XBIT_HF(2, hf_dlmap_mbs_map_repetition_coding_indication);
}
} else {
- XBIT(data, 4, "DIUC");
- XBIT(data, 16, "CID");
- XBIT(data, 8, "OFDMA Symbols Offset");
- XBIT(data, 6, "Subchannel offset");
- XBIT(data, 3, "Boosting");
- XBIT(s3i, 1, "SLC_3_indication");
- XBIT(data, 6, "No. OFDMA Symbols");
- XBIT(data, 6, "No. Subchannels");
- XBIT(data, 2, "Repetition Coding Indication");
+ XBIT_HF(4, hf_dlmap_mbs_map_diuc);
+ XBIT_HF(16, hf_dlmap_mbs_map_cid);
+ XBIT_HF(8, hf_dlmap_mbs_map_ofdma_symbols_offset);
+ XBIT_HF(6, hf_dlmap_mbs_map_subchannel_offset);
+ XBIT_HF(3, hf_dlmap_mbs_map_boosting);
+ XBIT_HF_VALUE(s3i, 1, hf_dlmap_mbs_map_slc_3_indication);
+ XBIT_HF(6, hf_dlmap_mbs_map_num_ofdma_symbols);
+ XBIT_HF(6, hf_dlmap_mbs_map_num_subchannels);
+ XBIT_HF(2, hf_dlmap_mbs_map_repetition_coding_indication);
if (s3i == 1) {
- XBIT(data, 8, "Next MBS_MAP_IE frame offset");
+ XBIT_HF(8, hf_dlmap_mbs_map_next_mbs_map_ie_frame_offset);
}
}
data = BIT_PADDING(bit, 4);
if (data) {
- proto_tree_add_text(tree, tvb, BITHI(bit,data), "Padding: %d bits", data);
+ proto_tree_add_bytes_format_value(tree, hf_padding, tvb, BITHI(bit,data), NULL, "%d bits", data);
bit += data;
}
return BIT_TO_NIB(bit);
}
-static gint HO_Anchor_Active_DL_MAP_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint HO_Anchor_Active_DL_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* DL-MAP Extended-2 IE = 1 */
/* 8.4.5.3.14 [2] HO_Anchor_Active_DL-MAP_IE TODO 1.1 */
@@ -991,13 +1273,13 @@ static gint HO_Anchor_Active_DL_MAP_IE(proto_tree *diuc_tree, gint offset, gint
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286c, NULL, "HO_Anchor_Active_DL_MAP_IE");
- XNIB(data, 1, "Extended-2 DIUC");
+ VNIB(data, 1, hf_dlmap_ie_diuc_ext2);
VNIB(data, 2, hf_dlmap_ie_length);
- proto_tree_add_text(diuc_tree, tvb, NIBHI(nib, length-3), "(not implemented)");
+ proto_tree_add_expert(diuc_tree, pinfo, &ei_dlmap_not_implemented, tvb, NIBHI(nib, length-3));
return nib;
}
-static gint HO_Active_Anchor_DL_MAP_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint HO_Active_Anchor_DL_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* DL-MAP Extended-2 IE = 2 */
/* 8.4.5.3.15 HO_Active_Anchor_DL_MAP_IE TODO 1.1 */
@@ -1010,13 +1292,13 @@ static gint HO_Active_Anchor_DL_MAP_IE(proto_tree *diuc_tree, gint offset, gint
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286d, NULL, "HO_Active_Anchor_DL_MAP_IE");
- XNIB(data, 1, "Extended-2 DIUC");
+ VNIB(data, 1, hf_dlmap_ie_diuc_ext2);
VNIB(data, 2, hf_dlmap_ie_length);
- proto_tree_add_text(diuc_tree, tvb, NIBHI(nib, length-3), "(not implemented)");
+ proto_tree_add_expert(diuc_tree, pinfo, &ei_dlmap_not_implemented, tvb, NIBHI(nib, length-3));
return nib;
}
-static gint HO_CID_Translation_MAP_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint HO_CID_Translation_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* DL-MAP Extended-2 IE = 3 */
/* 8.4.5.3.16 HO_CID_Translation_MAP_IE TODO 1.1 */
@@ -1029,13 +1311,13 @@ static gint HO_CID_Translation_MAP_IE(proto_tree *diuc_tree, gint offset, gint l
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286e, NULL, "CID_Translation_MAP_IE");
- XNIB(data, 1, "Extended-2 DIUC");
+ VNIB(data, 1, hf_dlmap_ie_diuc_ext2);
VNIB(data, 2, hf_dlmap_ie_length);
- proto_tree_add_text(diuc_tree, tvb, NIBHI(nib, length-3), "(not implemented)");
+ proto_tree_add_expert(diuc_tree, pinfo, &ei_dlmap_not_implemented, tvb, NIBHI(nib, length-3));
return nib;
}
-static gint MIMO_in_another_BS_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint MIMO_in_another_BS_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* DL-MAP Extended-2 IE = 4 */
/* 8.4.5.3.17 [2] MIMO_in_another_BS_IE (not implemented)*/
@@ -1048,13 +1330,13 @@ static gint MIMO_in_another_BS_IE(proto_tree *diuc_tree, gint offset, gint lengt
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286f, NULL, "MIMO_in_another_BS_IE");
- XNIB(data, 1, "Extended-2 DIUC");
+ VNIB(data, 1, hf_dlmap_ie_diuc_ext2);
VNIB(data, 2, hf_dlmap_ie_length);
- proto_tree_add_text(diuc_tree, tvb, NIBHI(nib, length-3), "(not implemented)");
+ proto_tree_add_expert(diuc_tree, pinfo, &ei_dlmap_not_implemented, tvb, NIBHI(nib, length-3));
return nib;
}
-static gint Macro_MIMO_DL_Basic_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint Macro_MIMO_DL_Basic_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* dl-map extended-2 ie = 5 */
/* 8.4.5.3.18 [2] Macro-MIMO_DL_Basic_IE (not implemented) */
@@ -1067,9 +1349,9 @@ static gint Macro_MIMO_DL_Basic_IE(proto_tree *diuc_tree, gint offset, gint leng
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286g, NULL, "Macro_MIMO_DL_Basic_IE");
- XNIB(data, 1, "Extended-2 DIUC");
+ VNIB(data, 1, hf_dlmap_ie_diuc_ext2);
VNIB(data, 2, hf_dlmap_ie_length);
- proto_tree_add_text(diuc_tree, tvb, NIBHI(nib, length-3), "(not implemented)");
+ proto_tree_add_expert(diuc_tree, pinfo, &ei_dlmap_not_implemented, tvb, NIBHI(nib, length-3));
return nib;
}
@@ -1086,11 +1368,11 @@ static gint Skip_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *t
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286k, NULL, "Skip_IE");
- XBIT(data, 4, "Extended-2 DIUC");
+ XBIT_HF(4, hf_dlmap_skip_extended_2_diuc);
VBIT(data, 8, hf_dlmap_ie_length);
- XBIT(data, 1, "Mode");
- XBIT(data, 7, "Reserved");
+ XBIT_HF(1, hf_dlmap_skip_mode);
+ XBIT_HF(7, hf_dlmap_reserved_uint);
return BIT_TO_NIB(bit);
}
@@ -1101,7 +1383,6 @@ static gint HARQ_DL_MAP_IE(proto_tree *diuc_tree, gint offset, gint length, tvbu
/* 8.4.5.3.21 [2] HARQ_DL_MAP_IE */
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
- gint data;
proto_tree *tree;
gint len, lastbit, rui, mode, sub_len, pad;
@@ -1109,39 +1390,39 @@ static gint HARQ_DL_MAP_IE(proto_tree *diuc_tree, gint offset, gint length, tvbu
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286l, NULL, "HARQ_DL_MAP_IE");
- XBIT(data, 4, "Extended-2 DIUC");
+ XBIT_HF(4, hf_dlmap_harq_dl_map_extended_2_diuc);
VBIT(len, 2, hf_dlmap_ie_length);
- XBIT(RCID_Type, 2, "RCID_Type");
- XBIT(data, 2, "Reserved");
+ XBIT_HF_VALUE(RCID_Type, 2, hf_dlmap_harq_dl_map_rcid_type);
+ XBIT_HF(2, hf_dlmap_reserved_uint);
/* while data remains */
length = NIB_TO_BIT(length);
/* Subtract extra nibble to be sure to stop in time. */
lastbit = bit + BYTE_TO_BIT(len) - 14 - 4;
while (bit < lastbit) {
- XBIT(data, 3, "Boosting");
- XBIT(rui, 1, "Region_ID use indicator");
+ XBIT_HF(3, hf_dlmap_harq_dl_map_boosting);
+ XBIT_HF_VALUE(rui, 1, hf_dlmap_harq_dl_map_region_id_use_indicator);
if (rui == 0) {
- XBIT(data, 8, "OFDMA symbol offset");
- XBIT(data, 7, "Subchannel offset");
- XBIT(data, 7, "Number of OFDMA symbols");
- XBIT(data, 7, "Number of subchannels");
+ XBIT_HF(8, hf_dlmap_harq_dl_map_ofdma_symbol_offset);
+ XBIT_HF(7, hf_dlmap_harq_dl_map_subchannel_offset);
+ XBIT_HF(7, hf_dlmap_harq_dl_map_number_of_ofdma_symbols);
+ XBIT_HF(7, hf_dlmap_harq_dl_map_number_of_subchannels);
if (include_cor2_changes)
{
- XBIT(data, 1, "Rectangular Sub-Burst Indicator"); /* Implemented: "Rectangular Sub-Burst Indicator" field added */
- XBIT(data, 2, "Reserved"); /* and "Reserved" field resized from 3 bits to 2 bits */
+ XBIT_HF(1, hf_dlmap_harq_dl_map_rectangular_sub_burst_indicator); /* Implemented: "Rectangular Sub-Burst Indicator" field added */
+ XBIT_HF(2, hf_dlmap_reserved_uint); /* and "Reserved" field resized from 3 bits to 2 bits */
}
else
{
- XBIT(data, 3, "Reserved");
+ XBIT_HF(3, hf_dlmap_reserved_uint);
}
} else {
- XBIT(data, 8, "Region_ID");
+ XBIT_HF(8, hf_dlmap_harq_dl_map_region_id);
}
- XBIT(mode, 4, "Mode");
- XBIT(sub_len, 8, "Sub-burst IE Length");
+ XBIT_HF_VALUE(mode, 4, hf_dlmap_harq_dl_map_mode);
+ XBIT_HF_VALUE(sub_len, 8, hf_dlmap_harq_dl_map_sub_burst_ie_length);
/* 8.4.5.3.21 */
/* length of these are variable, each returns length in nibbles */
@@ -1160,7 +1441,7 @@ static gint HARQ_DL_MAP_IE(proto_tree *diuc_tree, gint offset, gint length, tvbu
} else if (mode == 6) {
MIMO_DL_STC_HARQ_sub_burst_IE(tree, BIT_TO_NIB(bit), length, tvb);
} else {
- proto_tree_add_text(tree, tvb, BITHI(bit,1), "(reserved Mode)");
+ proto_tree_add_bits_item(tree, hf_dlmap_harq_dl_map_reserved_mode, tvb, bit, 1, ENC_BIG_ENDIAN);
break; /* cannot continue */
}
bit += NIB_TO_BIT(sub_len);
@@ -1168,7 +1449,7 @@ static gint HARQ_DL_MAP_IE(proto_tree *diuc_tree, gint offset, gint length, tvbu
pad = NIB_TO_BIT(offset) + length - bit;
if (pad) {
- proto_tree_add_text(tree, tvb, BITHI(bit,pad), "Padding: %d bits",pad);
+ proto_tree_add_bytes_format_value(tree, hf_padding, tvb, BITHI(bit,pad), NULL, "%d bits",pad);
bit += pad;
}
@@ -1188,10 +1469,10 @@ static gint HARQ_ACK_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286u, NULL, "HARQ_ACK_IE");
- XNIB(data, 1, "Extended-2 DIUC");
+ VNIB(data, 1, hf_dlmap_ie_diuc_ext2);
VNIB(data, 2, hf_dlmap_ie_length);
- proto_tree_add_text(diuc_tree, tvb, NIBHI(nib,length-3), "(bitmap data)");
+ proto_tree_add_item(diuc_tree, hf_dlmap_harq_ack_bitmap_data, tvb, NIBHI(nib,length-3), ENC_NA);
return nib;
}
@@ -1211,27 +1492,27 @@ static gint Enhanced_DL_MAP_IE(proto_tree *diuc_tree, gint offset, gint length,
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286v, NULL, "Enhanced_DL-MAP_IE");
- XBIT(data, 4, "Extended-2 DIUC");
+ XBIT_HF(4, hf_dlmap_enhanced_dl_map_extended_2_diuc);
VBIT(data, 8, hf_dlmap_ie_length);
- XBIT(numass, 4, "Num_Assignment");
+ XBIT_HF_VALUE(numass, 4, hf_dlmap_enhanced_dl_map_num_assignment);
for (i = 0; i < numass; i++) {
if (INC_CID == 1) {
- XBIT(n_cid, 8, "N_CID");
+ XBIT_HF_VALUE(n_cid, 8, hf_dlmap_enhanced_dl_map_n_cid);
for (n = 0; n < n_cid; n++) {
- XBIT(data, 16, "CID");
+ XBIT_HF(16, hf_dlmap_enhanced_dl_map_cid);
}
}
- XBIT(data, 4, "DIUC");
- XBIT(data, 3, "Boosting");
- XBIT(data, 2, "Repetition Coding Indication");
- XBIT(data, 8, "Region_ID");
- XBIT(data, 3, "Reserved");
+ XBIT_HF(4, hf_dlmap_enhanced_dl_map_diuc);
+ XBIT_HF(3, hf_dlmap_enhanced_dl_map_boosting);
+ XBIT_HF(2, hf_dlmap_enhanced_dl_map_repetition_coding_indication);
+ XBIT_HF(8, hf_dlmap_enhanced_dl_map_region_id);
+ XBIT_HF(3, hf_dlmap_reserved_uint);
}
return BIT_TO_NIB(bit);
}
-static gint Closed_loop_MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint Closed_loop_MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* DL-MAP Extended-2 IE = 0xA */
/* 8.4.5.3.24 Closed-loop MIMO DL Enhanced IE (not implemented) */
@@ -1244,9 +1525,9 @@ static gint Closed_loop_MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, gint offset,
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286w, NULL, "CL_MIMO_DL_Enhanced_IE");
- XNIB(data, 1, "Extended-2 DIUC");
+ VNIB(data, 1, hf_dlmap_ie_diuc_ext2);
VNIB(data, 2, hf_dlmap_ie_length);
- proto_tree_add_text(diuc_tree, tvb, NIBHI(nib, length-3), "(not implemented)");
+ proto_tree_add_expert(diuc_tree, pinfo, &ei_dlmap_not_implemented, tvb, NIBHI(nib, length-3));
return nib;
}
@@ -1267,92 +1548,92 @@ static gint AAS_SDMA_DL_IE(proto_tree *diuc_tree, gint offset, gint length, tvbu
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286y, NULL, "AAS_SDMA_DL_IE");
- XBIT(data, 4, "Extended-2 DIUC");
+ XBIT_HF(4, hf_dlmap_aas_sdma_dl_extended_2_diuc);
VBIT(data, 8, hf_dlmap_ie_length);
- XBIT(RCID_Type, 2, "RCID_Type");
- XBIT(num_region, 4, "Num_Burst_Region");
- XBIT(data, 2, "Reserved");
+ XBIT_HF_VALUE(RCID_Type, 2, hf_dlmap_aas_sdma_dl_rcid_type);
+ XBIT_HF_VALUE(num_region, 4, hf_dlmap_aas_sdma_dl_num_burst_region);
+ XBIT_HF(2, hf_dlmap_reserved_uint);
for (i = 0; i < num_region; i++) {
- XBIT(data, 8, "OFDMA Symbol Offset");
+ XBIT_HF(8, hf_dlmap_aas_sdma_dl_ofdma_symbol_offset);
if (zone_permut == 0) {
- XBIT(data, 8, "Subchannel offset");
- XBIT(data, 5, "No. OFDMA triple symbols");
- XBIT(data, 6, "No. subchannels");
+ XBIT_HF(8, hf_dlmap_aas_sdma_dl_subchannel_offset);
+ XBIT_HF(5, hf_dlmap_aas_sdma_dl_num_ofdma_triple_symbols);
+ XBIT_HF(6, hf_dlmap_aas_sdma_dl_num_subchannels);
} else {
- XBIT(data, 6, "Subchannel offset");
- XBIT(data, 7, "No. OFDMA triple symbols");
- XBIT(data, 6, "No. subchannels");
+ XBIT_HF(6, hf_dlmap_aas_sdma_dl_subchannel_offset);
+ XBIT_HF(7, hf_dlmap_aas_sdma_dl_num_ofdma_triple_symbols);
+ XBIT_HF(6, hf_dlmap_aas_sdma_dl_num_subchannels);
}
- XBIT(num_users, 3, "Number of Users");
- XBIT(data, 2, "Reserved");
+ XBIT_HF_VALUE(num_users, 3, hf_dlmap_aas_sdma_dl_number_of_users);
+ XBIT_HF(2, hf_dlmap_reserved_uint);
for (j = 0; j < num_users; j++) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
- XBIT(encoding_mode, 2, "Encoding Mode");
- XBIT(cqich_alloc, 1, "CQICH Allocation");
- XBIT(ackch_alloc, 1, "ACKCH Allocation");
- XBIT(pilot_pattern, 1, "Pilot Pattern Modifier");
+ XBIT_HF_VALUE(encoding_mode, 2, hf_dlmap_aas_sdma_dl_encoding_mode);
+ XBIT_HF_VALUE(cqich_alloc, 1, hf_dlmap_aas_sdma_dl_cqich_allocation);
+ XBIT_HF_VALUE(ackch_alloc, 1, hf_dlmap_aas_sdma_dl_ackch_allocation);
+ XBIT_HF_VALUE(pilot_pattern, 1, hf_dlmap_aas_sdma_dl_pilot_pattern_modifier);
if (aas_preamble) {
- XBIT(data, 4, "Preamble Modifier Index");
+ XBIT_HF(4, hf_dlmap_aas_sdma_dl_preamble_modifier_index);
}
if (pilot_pattern) {
- XBIT(data, 2, "Pilot Pattern");
- XBIT(data, 1, "Reserved");
+ XBIT_HF(2, hf_dlmap_aas_sdma_dl_pilot_pattern);
+ XBIT_HF(1, hf_dlmap_reserved_uint);
} else {
- XBIT(data, 3, "Reserved");
+ XBIT_HF(3, hf_dlmap_reserved_uint);
}
if (encoding_mode == 0x0) {
- XBIT(data, 4, "DIUC");
- XBIT(data, 2, "Repetition Coding Indication");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(4, hf_dlmap_aas_sdma_dl_diuc);
+ XBIT_HF(2, hf_dlmap_aas_sdma_dl_repetition_coding_indication);
+ XBIT_HF(2, hf_dlmap_reserved_uint);
}
if (encoding_mode == 0x1) {
if (ackch_alloc) {
- XBIT(data, 5, "ACK CH Index");
+ XBIT_HF(5, hf_dlmap_aas_sdma_dl_ack_ch_index);
} else {
- XBIT(data, 1, "Reserved");
+ XBIT_HF(1, hf_dlmap_reserved_uint);
}
- XBIT(data, 4, "DIUC");
- XBIT(data, 2, "Repetition Coding Indication");
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
+ XBIT_HF(4, hf_dlmap_aas_sdma_dl_diuc);
+ XBIT_HF(2, hf_dlmap_aas_sdma_dl_repetition_coding_indication);
+ XBIT_HF(4, hf_dlmap_aas_sdma_dl_acid);
+ XBIT_HF(1, hf_dlmap_aas_sdma_dl_ai_sn);
}
if (encoding_mode == 0x2) {
if (ackch_alloc) {
- XBIT(data, 5, "ACK CH Index");
+ XBIT_HF(5, hf_dlmap_aas_sdma_dl_ack_ch_index);
} else {
- XBIT(data, 1, "Reserved");
+ XBIT_HF(1, hf_dlmap_reserved_uint);
}
- XBIT(data, 4, "N(EP)");
- XBIT(data, 4, "N(SCH)");
- XBIT(data, 2, "SPID");
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
+ XBIT_HF(4, hf_dlmap_aas_sdma_dl_nep);
+ XBIT_HF(4, hf_dlmap_aas_sdma_dl_nsch);
+ XBIT_HF(2, hf_dlmap_aas_sdma_dl_spid);
+ XBIT_HF(4, hf_dlmap_aas_sdma_dl_acid);
+ XBIT_HF(1, hf_dlmap_aas_sdma_dl_ai_sn);
}
if (encoding_mode == 0x3) {
if (ackch_alloc) {
- XBIT(data, 5, "ACK CH Index");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(5, hf_dlmap_aas_sdma_dl_ack_ch_index);
+ XBIT_HF(2, hf_dlmap_reserved_uint);
} else {
- XBIT(data, 3, "Reserved");
+ XBIT_HF(3, hf_dlmap_reserved_uint);
}
- XBIT(data, 4, "DIUC");
- XBIT(data, 2, "Repetition Coding Indication");
- XBIT(data, 2, "SPID");
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
+ XBIT_HF(4, hf_dlmap_aas_sdma_dl_diuc);
+ XBIT_HF(2, hf_dlmap_aas_sdma_dl_repetition_coding_indication);
+ XBIT_HF(2, hf_dlmap_aas_sdma_dl_spid);
+ XBIT_HF(4, hf_dlmap_aas_sdma_dl_acid);
+ XBIT_HF(1, hf_dlmap_aas_sdma_dl_ai_sn);
}
if (cqich_alloc) {
- XBIT(data, 6, "Allocation Index");
- XBIT(data, 3, "Period (p)");
- XBIT(data, 3, "Frame offset");
- XBIT(data, 4, "Duration (d)");
+ XBIT_HF(6, hf_dlmap_aas_sdma_dl_allocation_index);
+ XBIT_HF(3, hf_dlmap_aas_sdma_dl_period);
+ XBIT_HF(3, hf_dlmap_aas_sdma_dl_frame_offset);
+ XBIT_HF(4, hf_dlmap_aas_sdma_dl_duration);
}
}
}
data = BIT_PADDING(bit,4);
/* Should this be an optional field? Or do we want it, even if it has a length of zero? */
- proto_tree_add_text(tree, tvb, BITHI(bit,data), "Padding: %d bits", data);
+ proto_tree_add_bytes_format_value(tree, hf_padding, tvb, BITHI(bit,data), NULL, "%d bits", data);
bit += data;
return BIT_TO_NIB(bit);
@@ -1380,11 +1661,9 @@ static gint Channel_Measurement_IE(proto_tree *diuc_tree, gint offset, gint leng
VNIB(data, 1, hf_dlmap_ie_diuc_ext);
VNIB(data, 1, hf_dlmap_ie_length);
- XNIB(data, 2, "Channel Nr");
- XNIB(data, 2, "OFDMA Symbol Offset");
- data = TVB_NIB_WORD(nib, tvb);
- proto_tree_add_text(tree, tvb, NIBHI(nib,4), "CID: %d", data);
- nib += 4;
+ VNIB(data, 2, hf_dlmap_channel_measurement_channel_nr);
+ VNIB(data, 2, hf_dlmap_channel_measurement_ofdma_symbol_offset);
+ VNIB(data, 4, hf_dlmap_channel_measurement_cid);
return nib;
}
@@ -1406,19 +1685,19 @@ static gint STC_Zone_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_
VBIT(data, 4, hf_dlmap_ie_diuc_ext);
VBIT(data, 4, hf_dlmap_ie_length);
- XBIT(data, 8, "OFDMA Symbol Offset");
- XBIT(data, 2, "Permutations");
- XBIT(data, 1, "Use All SC indicator");
- XBIT(data, 2, "STC");
- XBIT(STC_Zone_Matrix, 2, "Matrix indicator");
- XBIT(data, 5, "DL_PermBase");
- XBIT(data, 2, "PRBS_ID");
- XBIT(data, 2, "AMC type");
- XBIT(data, 1, "Midamble Presence");
- XBIT(data, 1, "Midamble Boosting");
- XBIT(data, 1, "2/3 antenna select");
- XBIT(STC_Zone_Dedicated_Pilots, 1, "Dedicated Pilots");
- XBIT(data, 4, "Reserved");
+ XBIT_HF(8, hf_dlmap_stc_zone_ofdma_symbol_offset);
+ XBIT_HF(2, hf_dlmap_stc_zone_permutations);
+ XBIT_HF(1, hf_dlmap_stc_zone_use_all_sc_indicator);
+ XBIT_HF(2, hf_dlmap_stc_zone_stc);
+ XBIT_HF_VALUE(STC_Zone_Matrix, 2, hf_dlmap_stc_zone_matrix_indicator);
+ XBIT_HF(5, hf_dlmap_stc_zone_dl_permbase);
+ XBIT_HF(2, hf_dlmap_stc_zone_prbs_id);
+ XBIT_HF(2, hf_dlmap_stc_zone_amc_type);
+ XBIT_HF(1, hf_dlmap_stc_zone_midamble_presence);
+ XBIT_HF(1, hf_dlmap_stc_zone_midamble_boosting);
+ XBIT_HF(1, hf_dlmap_stc_zone_2_3_antenna_select);
+ XBIT_HF_VALUE(STC_Zone_Dedicated_Pilots, 1, hf_dlmap_stc_zone_dedicated_pilots);
+ XBIT_HF(4, hf_dlmap_reserved_uint);
return BIT_TO_NIB(bit);
}
@@ -1439,14 +1718,14 @@ static gint AAS_DL_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t
VBIT(data, 4, hf_dlmap_ie_diuc_ext);
VBIT(data, 4, hf_dlmap_ie_length);
- XBIT(data, 8, "OFDMA Symbol Offset");
- XBIT(data, 3, "Permutation");
- XBIT(data, 6, "DL_PermBase");
- XBIT(data, 2, "Downlink_preamble_config");
- XBIT(data, 1, "Preamble type");
- XBIT(data, 2, "PRBS_ID");
- XBIT(data, 1, "Diversity Map");
- XBIT(data, 1, "Reserved");
+ XBIT_HF(8, hf_dlmap_aas_dl_ofdma_symbol_offset);
+ XBIT_HF(3, hf_dlmap_aas_dl_permutation);
+ XBIT_HF(6, hf_dlmap_aas_dl_dl_permbase);
+ XBIT_HF(2, hf_dlmap_aas_dl_downlink_preamble_config);
+ XBIT_HF(1, hf_dlmap_aas_dl_preamble_type);
+ XBIT_HF(2, hf_dlmap_aas_dl_prbs_id);
+ XBIT_HF(1, hf_dlmap_aas_dl_diversity_map);
+ XBIT_HF(1, hf_dlmap_reserved_uint);
return BIT_TO_NIB(bit);
}
@@ -1467,19 +1746,19 @@ static gint Data_location_in_another_BS_IE(proto_tree *diuc_tree, gint offset, g
VBIT(data, 4, hf_dlmap_ie_diuc_ext);
VBIT(data, 4, hf_dlmap_ie_length);
- XBIT(data, 2, "Segment");
- XBIT(data, 6, "Used subchannels");
- XBIT(data, 4, "DIUC");
- XBIT(data, 3, "Frame Advance");
- XBIT(data, 1, "Reserved");
- XBIT(data, 8, "OFDMA Symbol Offset");
- XBIT(data, 6, "Subchannel Offset");
- XBIT(data, 3, "Boosting");
- XBIT(data, 7, "Preamble Index");
- XBIT(data, 8, "No. OFDMA Symbols");
- XBIT(data, 6, "No. Subchannels");
- XBIT(data, 2, "Repetition Coding Indication");
- XBIT(data, 16, "CID");
+ XBIT_HF(2, hf_dlmap_data_location_another_bs_segment);
+ XBIT_HF(6, hf_dlmap_data_location_another_bs_used_subchannels);
+ XBIT_HF(4, hf_dlmap_data_location_another_bs_diuc);
+ XBIT_HF(3, hf_dlmap_data_location_another_bs_frame_advance);
+ XBIT_HF(1, hf_dlmap_reserved_uint);
+ XBIT_HF(8, hf_dlmap_data_location_another_bs_ofdma_symbol_offset);
+ XBIT_HF(6, hf_dlmap_data_location_another_bs_subchannel_offset);
+ XBIT_HF(3, hf_dlmap_data_location_another_bs_boosting);
+ XBIT_HF(7, hf_dlmap_data_location_another_bs_preamble_index);
+ XBIT_HF(8, hf_dlmap_data_location_another_bs_num_ofdma_symbols);
+ XBIT_HF(6, hf_dlmap_data_location_another_bs_num_subchannels);
+ XBIT_HF(2, hf_dlmap_data_location_another_bs_repetition_coding_indication);
+ XBIT_HF(16, hf_dlmap_data_location_another_bs_cid);
return BIT_TO_NIB(bit);
}
@@ -1505,7 +1784,7 @@ static gint CID_Switch_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuf
return nib;
}
-static gint MIMO_DL_Basic_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint MIMO_DL_Basic_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* DL-MAP Extended IE = 5 */
/* 8.4.5.3.8 MIMO_DL_Basic_IE (not implemented) */
@@ -1518,13 +1797,13 @@ static gint MIMO_DL_Basic_IE(proto_tree *diuc_tree, gint offset, gint length, tv
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_283, NULL, "MIMO_DL_Basic_IE");
- XNIB(data, 1, "Extended-2 DIUC");
+ VNIB(data, 1, hf_dlmap_ie_diuc_ext2);
VNIB(data, 2, hf_dlmap_ie_length);
- proto_tree_add_text(diuc_tree, tvb, NIBHI(nib, length-2), "(not implemented)");
+ proto_tree_add_expert(diuc_tree, pinfo, &ei_dlmap_not_implemented, tvb, NIBHI(nib, length-2));
return nib;
}
-static gint MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* DL-MAP Extended IE = 6 */
/* 8.4.5.3.9 MIMO_DL_Enhanced_IE (not implemented) */
@@ -1537,9 +1816,9 @@ static gint MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, gint offset, gint length,
tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_284, NULL, "MIMO_DL_Enhanced_IE");
- XNIB(data, 1, "Extended-2 DIUC");
+ VNIB(data, 1, hf_dlmap_ie_diuc_ext2);
VNIB(data, 2, hf_dlmap_ie_length);
- proto_tree_add_text(diuc_tree, tvb, NIBHI(nib, length-2), "(not implemented)");
+ proto_tree_add_expert(diuc_tree, pinfo, &ei_dlmap_not_implemented, tvb, NIBHI(nib, length-2));
return nib;
}
@@ -1551,7 +1830,7 @@ static gint HARQ_Map_Pointer_IE(proto_tree *diuc_tree, gint offset, gint length,
gint bit;
gint data;
proto_tree *tree;
- gint length_in_bits, rep, map, diuc, slots, idle, sleep, mask_len;
+ gint length_in_bits, map, mask_len;
bit = NIB_TO_BIT(offset);
@@ -1562,29 +1841,29 @@ static gint HARQ_Map_Pointer_IE(proto_tree *diuc_tree, gint offset, gint length,
length_in_bits = NIB_TO_BIT(length-1);
while (bit < length_in_bits) {
- XBIT(diuc, 4, "DIUC");
- XBIT(slots, 8, "No. Slots");
- XBIT(rep, 2, "Repetition Coding Indication");
- XBIT(map, 2, "Map Version");
+ XBIT_HF(4, hf_dlmap_harq_map_pointer_diuc);
+ XBIT_HF(8, hf_dlmap_harq_map_pointer_num_slots);
+ XBIT_HF(2, hf_dlmap_harq_map_pointer_repetition_coding_indication);
+ XBIT_HF_VALUE(map, 2, hf_dlmap_harq_map_pointer_map_version);
if (map == 2) {
- XBIT(idle, 1, "Idle users");
- XBIT(sleep, 1, "Sleep users");
- XBIT(mask_len, 2, "CID Mask Length");
+ XBIT_HF(1, hf_dlmap_harq_map_pointer_idle_users);
+ XBIT_HF(1, hf_dlmap_harq_map_pointer_sleep_users);
+ XBIT_HF_VALUE(mask_len, 2, hf_dlmap_harq_map_pointer_cid_mask_length);
if (mask_len == 0) {
/* 12 bits */
- proto_tree_add_text(diuc_tree, tvb, BITHI(bit,12), "CID Mask: 12 bits");
+ proto_tree_add_bytes_format_value(diuc_tree, hf_cid_mask, tvb, BITHI(bit,12), NULL, "12 bits");
bit += 12;
} else if (mask_len == 1) {
/* 20 bits */
- proto_tree_add_text(diuc_tree, tvb, BITHI(bit,20), "CID Mask: 20 bits");
+ proto_tree_add_bytes_format_value(diuc_tree, hf_cid_mask, tvb, BITHI(bit,20), NULL, "20 bits");
bit += 20;
} else if (mask_len == 2) {
/* 36 bits */
- proto_tree_add_text(diuc_tree, tvb, BITHI(bit,36), "CID Mask: 36 bits");
+ proto_tree_add_bytes_format_value(diuc_tree, hf_cid_mask, tvb, BITHI(bit,36), NULL, "36 bits");
bit += 36;
} else if (mask_len == 3) {
/* 52 bits */
- proto_tree_add_text(diuc_tree, tvb, BITHI(bit,52), "CID Mask: 52 bits");
+ proto_tree_add_bytes_format_value(diuc_tree, hf_cid_mask, tvb, BITHI(bit,52), NULL, "52 bits");
bit += 52;
}
}
@@ -1609,14 +1888,14 @@ static gint PHYMOD_DL_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff
VBIT(data, 4, hf_dlmap_ie_diuc_ext);
VBIT(data, 4, hf_dlmap_ie_length);
- XBIT(pmt, 1, "Preamble Modifier Type");
+ XBIT_HF_VALUE(pmt, 1, hf_dlmap_phymod_dl_preamble_modifier_type);
if (pmt == 0) {
- XBIT(data, 4, "Preamble frequency shift index");
+ XBIT_HF(4, hf_dlmap_phymod_dl_preamble_frequency_shift_index);
} else {
- XBIT(data, 4, "Preamble Time Shift Index");
+ XBIT_HF(4, hf_dlmap_phymod_dl_preamble_time_shift_index);
}
- XBIT(data, 1, "Pilot Pattern Modifier");
- XBIT(data, 2, "Pilot Pattern Index");
+ XBIT_HF(1, hf_dlmap_phymod_dl_pilot_pattern_modifier);
+ XBIT_HF(2, hf_dlmap_phymod_dl_pilot_pattern_index);
return BIT_TO_NIB(bit);
}
@@ -1638,11 +1917,11 @@ static gint Broadcast_Control_Pointer_IE(proto_tree *diuc_tree, gint offset, gin
VBIT(data, 4, hf_dlmap_ie_diuc_ext);
VBIT(data, 4, hf_dlmap_ie_length);
- XBIT(data, 7, "DCD_UCD Transmission Frame");
- XBIT(skip, 1, "Skip Broadcast_System_Update");
+ XBIT_HF(7, hf_dlmap_broadcast_ctrl_ptr_dcd_ucd_transmission_frame);
+ XBIT_HF_VALUE(skip, 1, hf_dlmap_broadcast_ctrl_ptr_skip_broadcast_system_update);
if (skip == 0) {
- XBIT(data, 1, "Broadcast_System_Update_Type");
- XBIT(data, 7, "Broadcast_System_Update_Transmission_Frame");
+ XBIT_HF(1, hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_type);
+ XBIT_HF(7, hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_transmission_frame);
}
return BIT_TO_NIB(bit);
}
@@ -1663,21 +1942,21 @@ static gint DL_PUSC_Burst_Allocation_in_Other_Segment_IE(proto_tree *diuc_tree,
VBIT(data, 4, hf_dlmap_ie_diuc_ext);
VBIT(data, 4, hf_dlmap_ie_length);
- XBIT(data, 16, "CID");
- XBIT(data, 4, "DIUC");
- XBIT(data, 2, "Segment");
- XBIT(data, 3, "Boosting");
- XBIT(data, 5, "IDcell");
- XBIT(data, 5, "DL_PermBase");
- XBIT(data, 2, "PRBS_ID");
- XBIT(data, 2, "Repetition coding indication");
- XBIT(data, 6, "Used Subchannels");
- XBIT(data, 8, "OFDMA symbol offset");
- XBIT(data, 1, "Reserved");
- XBIT(data, 7, "# OFDMA symbols");
- XBIT(data, 6, "Subchannel offset");
- XBIT(data, 6, "# subchannels");
- XBIT(data, 7, "Reserved");
+ XBIT_HF(16, hf_dlmap_dl_pusc_burst_allocation_cid);
+ XBIT_HF(4, hf_dlmap_dl_pusc_burst_allocation_diuc);
+ XBIT_HF(2, hf_dlmap_dl_pusc_burst_allocation_segment);
+ XBIT_HF(3, hf_dlmap_dl_pusc_burst_allocation_boosting);
+ XBIT_HF(5, hf_dlmap_dl_pusc_burst_allocation_idcell);
+ XBIT_HF(5, hf_dlmap_dl_pusc_burst_allocation_dl_permbase);
+ XBIT_HF(2, hf_dlmap_dl_pusc_burst_allocation_prbs_id);
+ XBIT_HF(2, hf_dlmap_dl_pusc_burst_allocation_repetition_coding_indication);
+ XBIT_HF(6, hf_dlmap_dl_pusc_burst_allocation_used_subchannels);
+ XBIT_HF(8, hf_dlmap_dl_pusc_burst_allocation_ofdma_symbol_offset);
+ XBIT_HF(1, hf_dlmap_reserved_uint);
+ XBIT_HF(7, hf_dlmap_dl_pusc_burst_allocation_num_ofdma_symbols);
+ XBIT_HF(6, hf_dlmap_dl_pusc_burst_allocation_subchannel_offset);
+ XBIT_HF(6, hf_dlmap_dl_pusc_burst_allocation_num_subchannels);
+ XBIT_HF(7, hf_dlmap_reserved_uint);
return BIT_TO_NIB(bit);
}
@@ -1696,15 +1975,15 @@ static gint PUSC_ASCA_Alloc_IE(proto_tree *diuc_tree, gint offset, gint length,
VBIT(data, 4, hf_dlmap_ie_diuc_ext);
VBIT(data, 4, hf_dlmap_ie_length);
- XBIT(data, 4, "DIUC");
- XBIT(data, 12, "Short Basic CID");
- XBIT(data, 8, "OFDMA Symbol offset");
- XBIT(data, 6, "Subchannel offset");
- XBIT(data, 7, "# OFDMA Symbols");
- XBIT(data, 6, "# Symbols");
- XBIT(data, 2, "Repetition Coding Information");
- XBIT(data, 4, "Permutation ID");
- XBIT(data, 7, "Reserved");
+ XBIT_HF(4, hf_dlmap_pusc_asca_alloc_diuc);
+ XBIT_HF(12, hf_dlmap_pusc_asca_alloc_short_basic_cid);
+ XBIT_HF(8, hf_dlmap_pusc_asca_alloc_ofdma_symbol_offset);
+ XBIT_HF(6, hf_dlmap_pusc_asca_alloc_subchannel_offset);
+ XBIT_HF(7, hf_dlmap_pusc_asca_alloc_num_ofdma_symbols);
+ XBIT_HF(6, hf_dlmap_pusc_asca_alloc_num_symbols);
+ XBIT_HF(2, hf_dlmap_pusc_asca_alloc_repetition_coding_information);
+ XBIT_HF(4, hf_dlmap_pusc_asca_alloc_permutation_id);
+ XBIT_HF(7, hf_dlmap_reserved_uint);
return BIT_TO_NIB(bit);
}
@@ -1756,9 +2035,9 @@ static gint UL_interference_and_noise_level_IE(proto_tree *diuc_tree, gint offse
* DL-MAP Plugin
*******************************************************************/
-extern gint wimax_decode_ulmapc(proto_tree *base_tree, gint offset, gint length, tvbuff_t *tvb);
+extern gint wimax_decode_ulmapc(proto_tree *base_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb);
-static gint dissect_dlmap_ie(proto_tree *ie_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint dissect_dlmap_ie(proto_tree *ie_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* decode a single DL-MAP IE and return the
* length of the IE in nibbles
@@ -1805,23 +2084,23 @@ static gint dissect_dlmap_ie(proto_tree *ie_tree, gint offset, gint length, tvbu
break;
case 0x01:
/* 8.4.5.3.14 HO_Anchor_Active_DL-MAP_IE */
- nibble = HO_Anchor_Active_DL_MAP_IE(tree, nibble, len, tvb);
+ nibble = HO_Anchor_Active_DL_MAP_IE(tree, pinfo, nibble, len, tvb);
break;
case 0x02:
/* 8.4.5.3.15 HO_Active_Anchor_DL_MAP_IE */
- nibble = HO_Active_Anchor_DL_MAP_IE(tree, nibble, len, tvb);
+ nibble = HO_Active_Anchor_DL_MAP_IE(tree, pinfo, nibble, len, tvb);
break;
case 0x03:
/* 8.4.5.3.16 HO_CID_Translation_MAP_IE */
- nibble = HO_CID_Translation_MAP_IE(tree, nibble, len, tvb);
+ nibble = HO_CID_Translation_MAP_IE(tree, pinfo, nibble, len, tvb);
break;
case 0x04:
/* 8.4.5.3.17 MIMO_in_another_BS_IE */
- nibble = MIMO_in_another_BS_IE(tree, nibble, len, tvb);
+ nibble = MIMO_in_another_BS_IE(tree, pinfo, nibble, len, tvb);
break;
case 0x05:
/* 8.4.5.3.18 Macro-MIMO_DL_Basic_IE */
- nibble = Macro_MIMO_DL_Basic_IE(tree, nibble, len, tvb);
+ nibble = Macro_MIMO_DL_Basic_IE(tree, pinfo, nibble, len, tvb);
break;
case 0x06:
/* 8.4.5.3.20.2 Skip_IE */
@@ -1841,13 +2120,13 @@ static gint dissect_dlmap_ie(proto_tree *ie_tree, gint offset, gint length, tvbu
break;
case 0x0a:
/* 8.4.5.3.24 Closed-loop MIMO DL Enhanced IE */
- nibble = Closed_loop_MIMO_DL_Enhanced_IE(tree, nibble, len, tvb);
+ nibble = Closed_loop_MIMO_DL_Enhanced_IE(tree, pinfo, nibble, len, tvb);
break;
case 0x0b:
- nibble = MIMO_DL_Basic_IE(tree, nibble, len, tvb);
+ nibble = MIMO_DL_Basic_IE(tree, pinfo, nibble, len, tvb);
break;
case 0x0c:
- nibble = MIMO_DL_Enhanced_IE(tree, nibble, len, tvb);
+ nibble = MIMO_DL_Enhanced_IE(tree, pinfo, nibble, len, tvb);
break;
case 0x0e:
@@ -1855,7 +2134,7 @@ static gint dissect_dlmap_ie(proto_tree *ie_tree, gint offset, gint length, tvbu
break;
default:
- proto_tree_add_text(tree, tvb, NIBHI(nibble,len), "(reserved Extended-2 DIUC: %d)", ext2_diuc);
+ proto_tree_add_bytes_format(tree, hf_dlmap_ie_reserved_extended2_duic, tvb, NIBHI(nibble,len), NULL, "(reserved Extended-2 DIUC: %d)", ext2_diuc);
nibble += len;
break;
@@ -1925,7 +2204,7 @@ static gint dissect_dlmap_ie(proto_tree *ie_tree, gint offset, gint length, tvbu
break;
default:
- proto_tree_add_text(tree, tvb, NIBHI(nibble,len), "(reserved Extended DIUC: %d)", ext_diuc);
+ proto_tree_add_bytes_format(tree, hf_dlmap_ie_reserved_extended_duic, tvb, NIBHI(nibble,len), NULL, "(reserved Extended DIUC: %d)", ext_diuc);
nibble += len;
break;
}
@@ -2000,7 +2279,7 @@ static gint dissect_dlmap_ie(proto_tree *ie_tree, gint offset, gint length, tvbu
}
-static void dissect_mac_mgmt_msg_dlmap_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *base_tree)
+static void dissect_mac_mgmt_msg_dlmap_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tree)
{
/* 6.3.2.3.2 [2] DL-MAP table 16 */
guint offset = 0;
@@ -2042,11 +2321,11 @@ static void dissect_mac_mgmt_msg_dlmap_decoder(tvbuff_t *tvb, packet_info *pinfo
nib = BYTE_TO_NIB(offset);
while (nib < ((tvb_len*2)-1)) {
- nib += dissect_dlmap_ie(ie_tree, nib, tvb_len * 2, tvb);
+ nib += dissect_dlmap_ie(ie_tree, pinfo, nib, tvb_len * 2, tvb);
}
pad = NIB_PADDING(nib);
if (pad) {
- proto_tree_add_text(dlmap_tree, tvb, NIBHI(nib,1), "Padding nibble");
+ proto_tree_add_bytes_format(dlmap_tree, hf_padding, tvb, NIBHI(nib,1), NULL, "Padding nibble");
nib++;
}
}
@@ -2115,11 +2394,11 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre
/* length = BYTE_TO_NIB(mac_len - (int)sizeof(mac_crc) - 1); */ /* convert length to nibbles */
while (dl_ie_count--) {
- nib += dissect_dlmap_ie(ie_tree, nib, tvb_len * 2, tvb);
+ nib += dissect_dlmap_ie(ie_tree, pinfo, nib, tvb_len * 2, tvb);
}
pad = NIB_PADDING(nib);
if (pad) {
- proto_tree_add_text(tree, tvb, NIBHI(nib,1), "Padding nibble");
+ proto_tree_add_bytes_format(tree, hf_padding, tvb, NIBHI(nib,1), NULL, "Padding nibble");
nib++;
}
}
@@ -2137,7 +2416,7 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Compressed UL-MAP");
/* subtract 8 from lennib (CRC) */
- wimax_decode_ulmapc(base_tree, nib, lennib - 8, tvb);
+ wimax_decode_ulmapc(base_tree, pinfo, nib, lennib - 8, tvb);
}
/* CRC is always appended */
@@ -2165,7 +2444,7 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre
extern gint dissect_ulmap_ie(proto_tree *ie_tree, gint offset, gint length, tvbuff_t *tvb);
extern gint wimax_decode_ulmap_reduced_aas(proto_tree *ie_tree, gint offset, gint length, tvbuff_t *tvb);
-gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *base_tree)
+gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tree)
{
/* decode a SUB-DL-UL-MAP message 6.3.2.3.60 and return the length in bytes */
/* first three bits are 0x7, which following a compressed DL map indicates this message */
@@ -2208,7 +2487,7 @@ gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
/* DL-MAP IEs */
ie_tree = proto_tree_add_subtree(tree, tvb, NIBHI(nib,1), ett_109x_dl, NULL, "DL-MAP IEs");
for (i = 0; i < numie; i++) {
- nib += dissect_dlmap_ie(ie_tree, nib, lennib - nib, tvb);
+ nib += dissect_dlmap_ie(ie_tree, pinfo, nib, lennib - nib, tvb);
}
data = TVB_NIB_BYTE(nib,tvb);
@@ -2227,13 +2506,13 @@ gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
/* padding */
if (nib & 1) {
- proto_tree_add_text(tree, tvb, NIBHI(nib,1), "Padding Nibble");
+ proto_tree_add_bytes_format(tree, hf_padding, tvb, NIBHI(nib,1), NULL, "Padding Nibble");
nib++;
}
/* CRC-16 is always appended */
data = TVB_NIB_WORD(nib, tvb);
- generic_item = proto_tree_add_text(tree, tvb, NIBHI(nib,4), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_crc16, tvb, NIBHI(nib,4), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16(tvb_get_ptr(tvb, 0, NIB_TO_BYTE(nib)), NIB_TO_BYTE(nib));
if (data != calculated_crc)
@@ -2278,87 +2557,87 @@ gint wimax_decode_dlmap_reduced_aas(tvbuff_t *tvb, packet_info *pinfo _U_, proto
VBIT(data, 1, hf_308a_rsv);
if (mult) {
- XBIT(numie, 8, "NUM IE");
+ XBIT_HF_VALUE(numie, 8, hf_dlmap_reduced_aas_num_ie);
}
for (i = 0; i < numie; i++) {
- XBIT(data, 2, "Periodicity");
- XBIT(cidi, 1, "CID Included");
- XBIT(dcdi, 1, "DCD Count Included");
- XBIT(phyi, 1, "PHY modification included");
- XBIT(cqci, 1, "CQICH control indicator");
- XBIT(data, 2, "Encoding Mode");
- XBIT(smcs, 1, "Separate MCS Enabled");
+ XBIT_HF(2, hf_dlmap_reduced_aas_periodicity);
+ XBIT_HF_VALUE(cidi, 1, hf_dlmap_reduced_aas_cid_included);
+ XBIT_HF_VALUE(dcdi, 1, hf_dlmap_reduced_aas_dcd_count_included);
+ XBIT_HF_VALUE(phyi, 1, hf_dlmap_reduced_aas_phy_modification_included);
+ XBIT_HF_VALUE(cqci, 1, hf_dlmap_reduced_aas_cqich_control_indicator);
+ XBIT_HF(2, hf_dlmap_reduced_aas_encoding_mode);
+ XBIT_HF_VALUE(smcs, 1, hf_dlmap_reduced_aas_separate_mcs_enabled);
if (smcs) {
- XBIT(data,10, "Duration");
- XBIT(data, 4, "DIUC");
- XBIT(data, 2, "Repetition Coding Indication");
+ XBIT_HF(10, hf_dlmap_reduced_aas_duration);
+ XBIT_HF(4, hf_dlmap_reduced_aas_diuc);
+ XBIT_HF(2, hf_dlmap_reduced_aas_repetition_coding_indication);
}
if (cidi) {
- XBIT(data,16, "CID");
+ XBIT_HF(16, hf_dlmap_reduced_aas_cid);
}
if (cqci) {
- XBIT(data, 6, "Allocation Index");
- XBIT(data, 3, "Report Period");
- XBIT(data, 3, "Frame Offset");
- XBIT(data, 4, "Report Duration");
- XBIT(data, 2, "CQI Measurement Type");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(6, hf_dlmap_reduced_aas_allocation_index);
+ XBIT_HF(3, hf_dlmap_reduced_aas_report_period);
+ XBIT_HF(3, hf_dlmap_reduced_aas_frame_offset);
+ XBIT_HF(4, hf_dlmap_reduced_aas_report_duration);
+ XBIT_HF(2, hf_dlmap_reduced_aas_cqi_measurement_type);
+ XBIT_HF(2, hf_dlmap_reserved_uint);
}
if (dcdi) {
- XBIT(data, 8, "DCD Count");
+ XBIT_HF(8, hf_dlmap_reduced_aas_dcd_count);
}
if (phyi) {
- XBIT(data, 1, "Preamble Select");
- XBIT(data, 4, "Preamble Shift Index");
- XBIT(data, 1, "Pilot Pattern Modifier");
- XBIT(data, 2, "Pilot Pattern Index");
+ XBIT_HF(1, hf_dlmap_reduced_aas_preamble_select);
+ XBIT_HF(4, hf_dlmap_reduced_aas_preamble_shift_index);
+ XBIT_HF(1, hf_dlmap_reduced_aas_pilot_pattern_modifier);
+ XBIT_HF(2, hf_dlmap_reduced_aas_pilot_pattern_index);
}
- XBIT(data, 3, "DL Frame Offset");
+ XBIT_HF(3, hf_dlmap_reduced_aas_dl_frame_offset);
if (fusc) {
- XBIT(data, 8, "Zone Symbol Offset");
+ XBIT_HF(8, hf_dlmap_reduced_aas_zone_symbol_offset);
}
- XBIT(data, 8, "OFDMA Symbol Offset");
+ XBIT_HF(8, hf_dlmap_reduced_aas_ofdma_symbol_offset);
if (tusc) {
- XBIT(data, 8, "Subchannel Offset");
- XBIT(data, 5, "No. OFDMA triple symbol");
- XBIT(data, 6, "No. subchannels");
+ XBIT_HF(8, hf_dlmap_reduced_aas_subchannel_offset);
+ XBIT_HF(5, hf_dlmap_reduced_aas_num_ofdma_triple_symbol);
+ XBIT_HF(6, hf_dlmap_reduced_aas_num_subchannels);
} else {
- XBIT(data, 6, "Subchannel Offset");
- XBIT(data, 7, "No. OFDMA symbols");
- XBIT(data, 6, "No. subchannels");
+ XBIT_HF(6, hf_dlmap_reduced_aas_subchannel_offset);
+ XBIT_HF(7, hf_dlmap_reduced_aas_num_ofdma_symbols);
+ XBIT_HF(6, hf_dlmap_reduced_aas_num_subchannels);
}
- XBIT(data, 4, "DIUC/N(EP)");
+ XBIT_HF(4, hf_dlmap_reduced_aas_diuc_nep);
if (harq) {
- XBIT(data, 1, "DL HARQ ACK bitmap");
- XBIT(data, 6, "ACK Allocation Index");
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
+ XBIT_HF(1, hf_dlmap_reduced_aas_dl_harq_ack_bitmap);
+ XBIT_HF(6, hf_dlmap_reduced_aas_ack_allocation_index);
+ XBIT_HF(4, hf_dlmap_reduced_aas_acid);
+ XBIT_HF(1, hf_dlmap_reduced_aas_ai_sn);
if (ir_type) {
- XBIT(data, 4, "N(SCH)");
- XBIT(data, 2, "SPID");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(4, hf_dlmap_reduced_aas_nsch);
+ XBIT_HF(2, hf_dlmap_reduced_aas_spid);
+ XBIT_HF(2, hf_dlmap_reserved_uint);
}
}
- XBIT(data, 2, "Repetition Coding Indication");
+ XBIT_HF(2, hf_dlmap_reduced_aas_repetition_coding_indication);
if (ulmap_appended) {
/* offset and length are in bits */
bit += wimax_decode_ulmap_reduced_aas(tree, offset, length*8, tvb);
}
- XBIT(data, 3, "Reserved");
+ XBIT_HF(3, hf_dlmap_reserved_uint);
}
/* padding */
pad = BIT_PADDING(bit,8);
if (pad) {
- proto_tree_add_text(tree, tvb, BITHI(bit,pad), "Padding: %d bits",pad);
+ proto_tree_add_bytes_format_value(tree, hf_padding, tvb, BITHI(bit,pad), NULL, "%d bits",pad);
bit += pad;
}
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16(tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -2442,6 +2721,27 @@ void proto_register_mac_mgmt_msg_dlmap(void)
}
},
{
+ &hf_dlmap_ie_diuc_ext2,
+ {
+ "Extended-2 DIUC", "wmx.dlmap.ie.ext2_diuc",
+ FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_dlmap_ie_reserved_extended2_duic,
+ {
+ "Reserved Extended-2 DIUC", "wmx.dlmap.ie.ext2_diuc_reserved",
+ FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_dlmap_ie_reserved_extended_duic,
+ {
+ "Reserved Extended DIUC", "wmx.dlmap.ie.ext_diuc_reserved",
+ FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
&hf_dlmap_ie_length,
{
"Length", "wmx.dlmap.ie.length",
@@ -2811,7 +3111,313 @@ void proto_register_mac_mgmt_msg_dlmap(void)
"CRC", "wmx.compress_dlmap_crc",
FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL
}
- }
+ },
+ {
+ &hf_crc16,
+ {
+ "CRC-16", "wmx.dlmap.crc16",
+ FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_padding,
+ {
+ "Padding", "wmx.dlmap.padding",
+ FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_cid_mask,
+ {
+ "CID Mask", "wmx.dlmap.cid_mask",
+ FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_reserved,
+ {
+ "Reserved", "wmx.dlmap.reserved",
+ FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
+ /* Generated via "one time" script to help create filterable fields */
+ { &hf_dlmap_rcid_ie_cid, { "CID", "wmx.dlmap.rcid_ie.cid", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_rcid_ie_prefix, { "Prefix", "wmx.dlmap.rcid_ie.prefix", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_rcid_ie_cid11, { "CID11", "wmx.dlmap.rcid_ie.cid11", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_rcid_ie_cid7, { "CID7", "wmx.dlmap.rcid_ie.cid7", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_rcid_ie_cid3, { "CID3", "wmx.dlmap.rcid_ie.cid3", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_dl_control_length, { "Length", "wmx.dlmap.dedicated_dl_control.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_dl_control_control_header, { "Control Header", "wmx.dlmap.dedicated_dl_control.control_header", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_dl_control_num_sdma_layers, { "Num SDMA Layers", "wmx.dlmap.dedicated_dl_control.num_sdma_layers", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_length, { "Length (nibbles)", "wmx.dlmap.dedicated_mimo_dl_control.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_control_header_mimo_control_info, { "Control Header (MIMO Control Info)", "wmx.dlmap.dedicated_mimo_dl_control.control_header_mimo_control_info", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_control_header_cqi_control_info, { "Control Header (CQI Control Info)", "wmx.dlmap.dedicated_mimo_dl_control.control_header_cqi_control_info", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_control_header_closed_mimo_control_info, { "Control Header (Closed MIMO Control Info)", "wmx.dlmap.dedicated_mimo_dl_control.control_header_closed_mimo_control_info", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_n_layer, { "N_layer", "wmx.dlmap.dedicated_mimo_dl_control.n_layer", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_matrix, { "Matrix", "wmx.dlmap.dedicated_mimo_dl_control.matrix", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_num_beamformed_streams, { "Num_Beamformed_Streams", "wmx.dlmap.dedicated_mimo_dl_control.num_beamformed_streams", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_period, { "Period", "wmx.dlmap.dedicated_mimo_dl_control.period", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_frame_offset, { "Frame Offset", "wmx.dlmap.dedicated_mimo_dl_control.frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_duration, { "Duration", "wmx.dlmap.dedicated_mimo_dl_control.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_allocation_index, { "Allocation Index", "wmx.dlmap.dedicated_mimo_dl_control.allocation_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_cqich_num, { "CQICH_Num", "wmx.dlmap.dedicated_mimo_dl_control.cqich_num", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_feedback_type, { "Feedback type", "wmx.dlmap.dedicated_mimo_dl_control.feedback_type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_antenna_grouping_index, { "Antenna Grouping Index", "wmx.dlmap.dedicated_mimo_dl_control.antenna_grouping_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_num_stream, { "Num_stream", "wmx.dlmap.dedicated_mimo_dl_control.num_stream", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_antenna_selection_index, { "Antenna Selection Index", "wmx.dlmap.dedicated_mimo_dl_control.antenna_selection_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dedicated_mimo_dl_control_codebook_precoding_index, { "Codebook Precoding Index", "wmx.dlmap.dedicated_mimo_dl_control.codebook_precoding_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_n_sub_burst_isi, { "N sub burst[ISI]", "wmx.dlmap.n_sub_burst_isi", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_chase_n_ack_channel, { "N ACK channel", "wmx.dlmap.harq_chase.n_ack_channel", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_chase_duration, { "Duration", "wmx.dlmap.harq_chase.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_chase_sub_burst_diuc_indicator, { "Sub-Burst DIUC Indicator", "wmx.dlmap.harq_chase.sub_burst_diuc_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reserved_uint, { "Reserved", "wmx.dlmap.reserved.uint", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_chase_diuc, { "DIUC", "wmx.dlmap.harq_chase.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_chase_repetition_coding_indication, { "Repetition Coding Indication", "wmx.dlmap.harq_chase.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_chase_acid, { "ACID", "wmx.dlmap.harq_chase.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_chase_ai_sn, { "AI_SN", "wmx.dlmap.harq_chase.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_chase_ack_disable, { "ACK disable", "wmx.dlmap.harq_chase.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_chase_dedicated_dl_control_indicator, { "Dedicated DL Control Indicator", "wmx.dlmap.harq_chase.dedicated_dl_control_indicator", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_chase_allocation_index, { "Allocation Index", "wmx.dlmap.harq_chase.allocation_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_chase_period, { "Period (p)", "wmx.dlmap.harq_chase.period", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_chase_frame_offset, { "Frame offset", "wmx.dlmap.harq_chase.frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_ctc_n_ack_channel, { "N ACK channel", "wmx.dlmap.harq_ir_ctc.n_ack_channel", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_ctc_nep, { "N(EP)", "wmx.dlmap.harq_ir_ctc.n_ep", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_ctc_nsch, { "N(SCH)", "wmx.dlmap.harq_ir_ctc.n_sch", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_ctc_spid, { "SPID", "wmx.dlmap.harq_ir_ctc.spid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_ctc_acid, { "ACID", "wmx.dlmap.harq_ir_ctc.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_ctc_ai_sn, { "AI_SN", "wmx.dlmap.harq_ir_ctc.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_ctc_ack_disable, { "ACK disable", "wmx.dlmap.harq_ir_ctc.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_ctc_dedicated_dl_control_indicator, { "Dedicated DL Control Indicator", "wmx.dlmap.harq_ir_ctc.dedicated_dl_control_indicator", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_ctc_duration, { "Duration (d)", "wmx.dlmap.harq_ir_ctc.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_ctc_allocation_index, { "Allocation Index", "wmx.dlmap.harq_ir_ctc.allocation_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_ctc_period, { "Period (p)", "wmx.dlmap.harq_ir_ctc.period", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_ctc_frame_offset, { "Frame offset", "wmx.dlmap.harq_ir_ctc.frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_n_ack_channel, { "N ACK channel", "wmx.dlmap.harq_ir_cc.n_ack_channel", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_duration, { "Duration", "wmx.dlmap.harq_ir_cc.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_sub_burst_diuc_indicator, { "Sub-Burst DIUC Indicator", "wmx.dlmap.harq_ir_cc.sub_burst_diuc_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_diuc, { "DIUC", "wmx.dlmap.harq_ir_cc.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_repetition_coding_indication, { "Repetition Coding Indication", "wmx.dlmap.harq_ir_cc.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_acid, { "ACID", "wmx.dlmap.harq_ir_cc.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_ai_sn, { "AI_SN", "wmx.dlmap.harq_ir_cc.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_spid, { "SPID", "wmx.dlmap.harq_ir_cc.spid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_ack_disable, { "ACK disable", "wmx.dlmap.harq_ir_cc.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_dedicated_dl_control_indicator, { "Dedicated DL Control Indicator", "wmx.dlmap.harq_ir_cc.dedicated_dl_control_indicator", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_allocation_index, { "Allocation Index", "wmx.dlmap.harq_ir_cc.allocation_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_period, { "Period (p)", "wmx.dlmap.harq_ir_cc.period", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ir_cc_frame_offset, { "Frame offset", "wmx.dlmap.harq_ir_cc.frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_chase_harq_n_ack_channel, { "N ACK channel", "wmx.dlmap.mimo_dl_chase_harq.n_ack_channel", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_chase_harq_mu_indicator, { "MU Indicator", "wmx.dlmap.mimo_dl_chase_harq.mu_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_chase_harq_dedicated_mimo_dl_control_indicator, { "Dedicated MIMO DL Control Indicator", "wmx.dlmap.mimo_dl_chase_harq.dedicated_mimo_dl_control_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_chase_harq_ack_disable, { "ACK Disable", "wmx.dlmap.mimo_dl_chase_harq.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_chase_harq_duration, { "Duration", "wmx.dlmap.mimo_dl_chase_harq.duration", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_chase_harq_diuc, { "DIUC", "wmx.dlmap.mimo_dl_chase_harq.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_chase_harq_repetition_coding_indication, { "Repetition Coding Indication", "wmx.dlmap.mimo_dl_chase_harq.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_chase_harq_acid, { "ACID", "wmx.dlmap.mimo_dl_chase_harq.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_chase_harq_ai_sn, { "AI_SN", "wmx.dlmap.mimo_dl_chase_harq.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_n_ack_channel, { "N ACK channel", "wmx.dlmap.mimo_dl_ir_harq.n_ack_channel", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_mu_indicator, { "MU Indicator", "wmx.dlmap.mimo_dl_ir_harq.mu_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_dedicated_mimo_dl_control_indicator, { "Dedicated MIMO DL Control Indicator", "wmx.dlmap.mimo_dl_ir_harq.dedicated_mimo_dl_control_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_ack_disable, { "ACK Disable", "wmx.dlmap.mimo_dl_ir_harq.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_nsch, { "N(SCH)", "wmx.dlmap.mimo_dl_ir_harq.n_sch", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_nep, { "N(EP)", "wmx.dlmap.mimo_dl_ir_harq.n_ep", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_spid, { "SPID", "wmx.dlmap.mimo_dl_ir_harq.spid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_acid, { "ACID", "wmx.dlmap.mimo_dl_ir_harq.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_ai_sn, { "AI_SN", "wmx.dlmap.mimo_dl_ir_harq.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_cc_n_ack_channel, { "N ACK channel", "wmx.dlmap.mimo_dl_ir_harq_cc.n_ack_channel", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_cc_mu_indicator, { "MU Indicator", "wmx.dlmap.mimo_dl_ir_harq_cc.mu_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_cc_dedicated_mimo_dl_control_indicator, { "Dedicated MIMO DL Control Indicator", "wmx.dlmap.mimo_dl_ir_harq_cc.dedicated_mimo_dl_control_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_cc_ack_disable, { "ACK Disable", "wmx.dlmap.mimo_dl_ir_harq_cc.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_cc_duration, { "Duration", "wmx.dlmap.mimo_dl_ir_harq_cc.duration", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_cc_diuc, { "DIUC", "wmx.dlmap.mimo_dl_ir_harq_cc.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_cc_repetition_coding_indication, { "Repetition Coding Indication", "wmx.dlmap.mimo_dl_ir_harq_cc.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_cc_acid, { "ACID", "wmx.dlmap.mimo_dl_ir_harq_cc.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_cc_ai_sn, { "AI_SN", "wmx.dlmap.mimo_dl_ir_harq_cc.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_ir_harq_cc_spid, { "SPID", "wmx.dlmap.mimo_dl_ir_harq_cc.spid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_stc_harq_n_ack_channel, { "N ACK channel", "wmx.dlmap.mimo_dl_stc_harq.n_ack_channel", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_stc_harq_tx_count, { "TX Count", "wmx.dlmap.mimo_dl_stc_harq.tx_count", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_stc_harq_duration, { "Duration", "wmx.dlmap.mimo_dl_stc_harq.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_stc_harq_sub_burst_offset_indication, { "Sub-burst offset indication", "wmx.dlmap.mimo_dl_stc_harq.sub_burst_offset_indication", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_stc_harq_sub_burst_offset, { "Sub-burst offset", "wmx.dlmap.mimo_dl_stc_harq.sub_burst_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_stc_harq_ack_disable, { "ACK Disable", "wmx.dlmap.mimo_dl_stc_harq.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_stc_harq_dedicated_mimo_dl_control_indicator, { "Dedicated MIMO DL Control Indicator", "wmx.dlmap.mimo_dl_stc_harq.dedicated_mimo_dl_control_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_stc_harq_diuc, { "DIUC", "wmx.dlmap.mimo_dl_stc_harq.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_stc_harq_repetition_coding_indication, { "Repetition coding Indication", "wmx.dlmap.mimo_dl_stc_harq.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mimo_dl_stc_harq_acid, { "ACID", "wmx.dlmap.mimo_dl_stc_harq.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_extended_2_diuc, { "Extended-2 DIUC", "wmx.dlmap.mbs_map.extended_2_diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_mbs_zone_identifier, { "MBS Zone identifier", "wmx.dlmap.mbs_map.mbs_zone_identifier", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_macro_diversity_enhanced, { "Macro diversity enhanced", "wmx.dlmap.mbs_map.macro_diversity_enhanced", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_permutation, { "Permutation", "wmx.dlmap.mbs_map.permutation", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_dl_permbase, { "DL_PermBase", "wmx.dlmap.mbs_map.dl_permbase", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_prbs_id, { "PRBS_ID", "wmx.dlmap.mbs_map.prbs_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_ofdma_symbol_offset, { "OFDMA_Symbol_Offset", "wmx.dlmap.mbs_map.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_diuc_change_indication, { "DIUC_change_indication", "wmx.dlmap.mbs_map.diuc_change_indication", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_boosting, { "Boosting", "wmx.dlmap.mbs_map.boosting", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_diuc, { "DIUC", "wmx.dlmap.mbs_map.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_num_subchannels, { "No. Subchannels", "wmx.dlmap.mbs_map.num_subchannels", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_num_ofdma_symbols, { "No. OFDMA Symbols", "wmx.dlmap.mbs_map.num_ofdma_symbols", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_repetition_coding_indication, { "Repetition Coding Indication", "wmx.dlmap.mbs_map.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_cid, { "CID", "wmx.dlmap.mbs_map.cid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_ofdma_symbols_offset, { "OFDMA Symbols Offset", "wmx.dlmap.mbs_map.ofdma_symbols_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_subchannel_offset, { "Subchannel offset", "wmx.dlmap.mbs_map.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_slc_3_indication, { "SLC_3_indication", "wmx.dlmap.mbs_map.slc_3_indication", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_mbs_map_next_mbs_map_ie_frame_offset, { "Next MBS_MAP_IE frame offset", "wmx.dlmap.mbs_map.next_mbs_map_ie_frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_skip_extended_2_diuc, { "Extended-2 DIUC", "wmx.dlmap.skip.extended_2_diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_skip_mode, { "Mode", "wmx.dlmap.skip.mode", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_extended_2_diuc, { "Extended-2 DIUC", "wmx.dlmap.harq_dl_map.extended_2_diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_rcid_type, { "RCID_Type", "wmx.dlmap.harq_dl_map.rcid_type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_boosting, { "Boosting", "wmx.dlmap.harq_dl_map.boosting", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_region_id_use_indicator, { "Region_ID use indicator", "wmx.dlmap.harq_dl_map.region_id_use_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_ofdma_symbol_offset, { "OFDMA symbol offset", "wmx.dlmap.harq_dl_map.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_subchannel_offset, { "Subchannel offset", "wmx.dlmap.harq_dl_map.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_number_of_ofdma_symbols, { "Number of OFDMA symbols", "wmx.dlmap.harq_dl_map.number_of_ofdma_symbols", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_number_of_subchannels, { "Number of subchannels", "wmx.dlmap.harq_dl_map.number_of_subchannels", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_rectangular_sub_burst_indicator, { "Rectangular Sub-Burst Indicator", "wmx.dlmap.harq_dl_map.rectangular_sub_burst_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_region_id, { "Region_ID", "wmx.dlmap.harq_dl_map.region_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_mode, { "Mode", "wmx.dlmap.harq_dl_map.mode", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_sub_burst_ie_length, { "Sub-burst IE Length", "wmx.dlmap.harq_dl_map.sub_burst_ie_length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_dl_map_reserved_mode, { "Reserved Mode", "wmx.dlmap.harq_dl_map.reserved_mode", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_ack_bitmap_data, { "Bitmap data", "wmx.dlmap.harq_ack.bitmap_data", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_enhanced_dl_map_extended_2_diuc, { "Extended-2 DIUC", "wmx.dlmap.enhanced_dl_map.extended_2_diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_enhanced_dl_map_num_assignment, { "Num_Assignment", "wmx.dlmap.enhanced_dl_map.num_assignment", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_enhanced_dl_map_n_cid, { "N_CID", "wmx.dlmap.enhanced_dl_map.n_cid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_enhanced_dl_map_cid, { "CID", "wmx.dlmap.enhanced_dl_map.cid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_enhanced_dl_map_diuc, { "DIUC", "wmx.dlmap.enhanced_dl_map.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_enhanced_dl_map_boosting, { "Boosting", "wmx.dlmap.enhanced_dl_map.boosting", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_enhanced_dl_map_repetition_coding_indication, { "Repetition Coding Indication", "wmx.dlmap.enhanced_dl_map.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_enhanced_dl_map_region_id, { "Region_ID", "wmx.dlmap.enhanced_dl_map.region_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_extended_2_diuc, { "Extended-2 DIUC", "wmx.dlmap.aas_sdma_dl.extended_2_diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_rcid_type, { "RCID_Type", "wmx.dlmap.aas_sdma_dl.rcid_type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_num_burst_region, { "Num_Burst_Region", "wmx.dlmap.aas_sdma_dl.num_burst_region", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_ofdma_symbol_offset, { "OFDMA Symbol Offset", "wmx.dlmap.aas_sdma_dl.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_subchannel_offset, { "Subchannel offset", "wmx.dlmap.aas_sdma_dl.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_num_ofdma_triple_symbols, { "No. OFDMA triple symbols", "wmx.dlmap.aas_sdma_dl.num_ofdma_triple_symbols", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_num_subchannels, { "No. subchannels", "wmx.dlmap.aas_sdma_dl.num_subchannels", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_number_of_users, { "Number of Users", "wmx.dlmap.aas_sdma_dl.number_of_users", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_encoding_mode, { "Encoding Mode", "wmx.dlmap.aas_sdma_dl.encoding_mode", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_cqich_allocation, { "CQICH Allocation", "wmx.dlmap.aas_sdma_dl.cqich_allocation", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_ackch_allocation, { "ACKCH Allocation", "wmx.dlmap.aas_sdma_dl.ackch_allocation", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_pilot_pattern_modifier, { "Pilot Pattern Modifier", "wmx.dlmap.aas_sdma_dl.pilot_pattern_modifier", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_preamble_modifier_index, { "Preamble Modifier Index", "wmx.dlmap.aas_sdma_dl.preamble_modifier_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_pilot_pattern, { "Pilot Pattern", "wmx.dlmap.aas_sdma_dl.pilot_pattern", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_diuc, { "DIUC", "wmx.dlmap.aas_sdma_dl.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_repetition_coding_indication, { "Repetition Coding Indication", "wmx.dlmap.aas_sdma_dl.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_ack_ch_index, { "ACK CH Index", "wmx.dlmap.aas_sdma_dl.ack_ch_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_acid, { "ACID", "wmx.dlmap.aas_sdma_dl.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_ai_sn, { "AI_SN", "wmx.dlmap.aas_sdma_dl.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_nep, { "N(EP)", "wmx.dlmap.aas_sdma_dl.n_ep", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_nsch, { "N(SCH)", "wmx.dlmap.aas_sdma_dl.n_sch", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_spid, { "SPID", "wmx.dlmap.aas_sdma_dl.spid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_allocation_index, { "Allocation Index", "wmx.dlmap.aas_sdma_dl.allocation_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_period, { "Period (p)", "wmx.dlmap.aas_sdma_dl.period", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_frame_offset, { "Frame offset", "wmx.dlmap.aas_sdma_dl.frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_sdma_dl_duration, { "Duration (d)", "wmx.dlmap.aas_sdma_dl.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_channel_measurement_channel_nr, { "Channel Nr", "wmx.dlmap.channel_measurement.channel_nr", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_channel_measurement_ofdma_symbol_offset, { "OFDMA Symbol Offset", "wmx.dlmap.channel_measurement.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_channel_measurement_cid, { "CID", "wmx.dlmap.channel_measurement.cid", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_stc_zone_ofdma_symbol_offset, { "OFDMA Symbol Offset", "wmx.dlmap.stc_zone.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_stc_zone_permutations, { "Permutations", "wmx.dlmap.stc_zone.permutations", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_stc_zone_use_all_sc_indicator, { "Use All SC indicator", "wmx.dlmap.stc_zone.use_all_sc_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_stc_zone_stc, { "STC", "wmx.dlmap.stc_zone.stc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_stc_zone_matrix_indicator, { "Matrix indicator", "wmx.dlmap.stc_zone.matrix_indicator", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_stc_zone_dl_permbase, { "DL_PermBase", "wmx.dlmap.stc_zone.dl_permbase", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_stc_zone_prbs_id, { "PRBS_ID", "wmx.dlmap.stc_zone.prbs_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_stc_zone_amc_type, { "AMC type", "wmx.dlmap.stc_zone.amc_type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_stc_zone_midamble_presence, { "Midamble Presence", "wmx.dlmap.stc_zone.midamble_presence", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_stc_zone_midamble_boosting, { "Midamble Boosting", "wmx.dlmap.stc_zone.midamble_boosting", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_stc_zone_2_3_antenna_select, { "2/3 antenna select", "wmx.dlmap.stc_zone.2_3_antenna_select", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_stc_zone_dedicated_pilots, { "Dedicated Pilots", "wmx.dlmap.stc_zone.dedicated_pilots", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_dl_ofdma_symbol_offset, { "OFDMA Symbol Offset", "wmx.dlmap.aas_dl.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_dl_permutation, { "Permutation", "wmx.dlmap.aas_dl.permutation", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_dl_dl_permbase, { "DL_PermBase", "wmx.dlmap.aas_dl.dl_permbase", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_dl_downlink_preamble_config, { "Downlink_preamble_config", "wmx.dlmap.aas_dl.downlink_preamble_config", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_dl_preamble_type, { "Preamble type", "wmx.dlmap.aas_dl.preamble_type", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_dl_prbs_id, { "PRBS_ID", "wmx.dlmap.aas_dl.prbs_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_aas_dl_diversity_map, { "Diversity Map", "wmx.dlmap.aas_dl.diversity_map", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_data_location_another_bs_segment, { "Segment", "wmx.dlmap.data_location_another_bs.segment", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_data_location_another_bs_used_subchannels, { "Used subchannels", "wmx.dlmap.data_location_another_bs.used_subchannels", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_data_location_another_bs_diuc, { "DIUC", "wmx.dlmap.data_location_another_bs.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_data_location_another_bs_frame_advance, { "Frame Advance", "wmx.dlmap.data_location_another_bs.frame_advance", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_data_location_another_bs_ofdma_symbol_offset, { "OFDMA Symbol Offset", "wmx.dlmap.data_location_another_bs.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_data_location_another_bs_subchannel_offset, { "Subchannel Offset", "wmx.dlmap.data_location_another_bs.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_data_location_another_bs_boosting, { "Boosting", "wmx.dlmap.data_location_another_bs.boosting", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_data_location_another_bs_preamble_index, { "Preamble Index", "wmx.dlmap.data_location_another_bs.preamble_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_data_location_another_bs_num_ofdma_symbols, { "No. OFDMA Symbols", "wmx.dlmap.data_location_another_bs.num_ofdma_symbols", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_data_location_another_bs_num_subchannels, { "No. Subchannels", "wmx.dlmap.data_location_another_bs.num_subchannels", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_data_location_another_bs_repetition_coding_indication, { "Repetition Coding Indication", "wmx.dlmap.data_location_another_bs.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_data_location_another_bs_cid, { "CID", "wmx.dlmap.data_location_another_bs.cid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_map_pointer_diuc, { "DIUC", "wmx.dlmap.harq_map_pointer.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_map_pointer_num_slots, { "No. Slots", "wmx.dlmap.harq_map_pointer.num_slots", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_map_pointer_repetition_coding_indication, { "Repetition Coding Indication", "wmx.dlmap.harq_map_pointer.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_map_pointer_map_version, { "Map Version", "wmx.dlmap.harq_map_pointer.map_version", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_map_pointer_idle_users, { "Idle users", "wmx.dlmap.harq_map_pointer.idle_users", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_map_pointer_sleep_users, { "Sleep users", "wmx.dlmap.harq_map_pointer.sleep_users", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_harq_map_pointer_cid_mask_length, { "CID Mask Length", "wmx.dlmap.harq_map_pointer.cid_mask_length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_phymod_dl_preamble_modifier_type, { "Preamble Modifier Type", "wmx.dlmap.phymod_dl.preamble_modifier_type", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_phymod_dl_preamble_frequency_shift_index, { "Preamble frequency shift index", "wmx.dlmap.phymod_dl.preamble_frequency_shift_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_phymod_dl_preamble_time_shift_index, { "Preamble Time Shift Index", "wmx.dlmap.phymod_dl.preamble_time_shift_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_phymod_dl_pilot_pattern_modifier, { "Pilot Pattern Modifier", "wmx.dlmap.phymod_dl.pilot_pattern_modifier", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_phymod_dl_pilot_pattern_index, { "Pilot Pattern Index", "wmx.dlmap.phymod_dl.pilot_pattern_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_broadcast_ctrl_ptr_dcd_ucd_transmission_frame, { "DCD_UCD Transmission Frame", "wmx.dlmap.broadcast_ctrl_ptr.dcd_ucd_transmission_frame", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_broadcast_ctrl_ptr_skip_broadcast_system_update, { "Skip Broadcast_System_Update", "wmx.dlmap.broadcast_ctrl_ptr.skip_broadcast_system_update", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_type, { "Broadcast_System_Update_Type", "wmx.dlmap.broadcast_ctrl_ptr.broadcast_system_update_type", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_transmission_frame, { "Broadcast_System_Update_Transmission_Frame", "wmx.dlmap.broadcast_ctrl_ptr.broadcast_system_update_transmission_frame", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_cid, { "CID", "wmx.dlmap.dl_pusc_burst_allocation.cid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_diuc, { "DIUC", "wmx.dlmap.dl_pusc_burst_allocation.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_segment, { "Segment", "wmx.dlmap.dl_pusc_burst_allocation.segment", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_boosting, { "Boosting", "wmx.dlmap.dl_pusc_burst_allocation.boosting", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_idcell, { "IDcell", "wmx.dlmap.dl_pusc_burst_allocation.idcell", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_dl_permbase, { "DL_PermBase", "wmx.dlmap.dl_pusc_burst_allocation.dl_permbase", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_prbs_id, { "PRBS_ID", "wmx.dlmap.dl_pusc_burst_allocation.prbs_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_repetition_coding_indication, { "Repetition coding indication", "wmx.dlmap.dl_pusc_burst_allocation.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_used_subchannels, { "Used Subchannels", "wmx.dlmap.dl_pusc_burst_allocation.used_subchannels", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_ofdma_symbol_offset, { "OFDMA symbol offset", "wmx.dlmap.dl_pusc_burst_allocation.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_num_ofdma_symbols, { "# OFDMA symbols", "wmx.dlmap.dl_pusc_burst_allocation.num_ofdma_symbols", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_subchannel_offset, { "Subchannel offset", "wmx.dlmap.dl_pusc_burst_allocation.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_dl_pusc_burst_allocation_num_subchannels, { "# subchannels", "wmx.dlmap.dl_pusc_burst_allocation.num_subchannels", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_pusc_asca_alloc_diuc, { "DIUC", "wmx.dlmap.pusc_asca_alloc.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_pusc_asca_alloc_short_basic_cid, { "Short Basic CID", "wmx.dlmap.pusc_asca_alloc.short_basic_cid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_pusc_asca_alloc_ofdma_symbol_offset, { "OFDMA Symbol offset", "wmx.dlmap.pusc_asca_alloc.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_pusc_asca_alloc_subchannel_offset, { "Subchannel offset", "wmx.dlmap.pusc_asca_alloc.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_pusc_asca_alloc_num_ofdma_symbols, { "# OFDMA Symbols", "wmx.dlmap.pusc_asca_alloc.num_ofdma_symbols", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_pusc_asca_alloc_num_symbols, { "# Symbols", "wmx.dlmap.pusc_asca_alloc.num_symbols", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_pusc_asca_alloc_repetition_coding_information, { "Repetition Coding Information", "wmx.dlmap.pusc_asca_alloc.repetition_coding_information", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_pusc_asca_alloc_permutation_id, { "Permutation ID", "wmx.dlmap.pusc_asca_alloc.permutation_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_num_ie, { "NUM IE", "wmx.dlmap.reduced_aas.num_ie", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_periodicity, { "Periodicity", "wmx.dlmap.reduced_aas.periodicity", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_cid_included, { "CID Included", "wmx.dlmap.reduced_aas.cid_included", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_dcd_count_included, { "DCD Count Included", "wmx.dlmap.reduced_aas.dcd_count_included", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_phy_modification_included, { "PHY modification included", "wmx.dlmap.reduced_aas.phy_modification_included", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_cqich_control_indicator, { "CQICH control indicator", "wmx.dlmap.reduced_aas.cqich_control_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_encoding_mode, { "Encoding Mode", "wmx.dlmap.reduced_aas.encoding_mode", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_separate_mcs_enabled, { "Separate MCS Enabled", "wmx.dlmap.reduced_aas.separate_mcs_enabled", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_duration, { "Duration", "wmx.dlmap.reduced_aas.duration", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_diuc, { "DIUC", "wmx.dlmap.reduced_aas.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_repetition_coding_indication, { "Repetition Coding Indication", "wmx.dlmap.reduced_aas.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_cid, { "CID", "wmx.dlmap.reduced_aas.cid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_allocation_index, { "Allocation Index", "wmx.dlmap.reduced_aas.allocation_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_report_period, { "Report Period", "wmx.dlmap.reduced_aas.report_period", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_frame_offset, { "Frame Offset", "wmx.dlmap.reduced_aas.frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_report_duration, { "Report Duration", "wmx.dlmap.reduced_aas.report_duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_cqi_measurement_type, { "CQI Measurement Type", "wmx.dlmap.reduced_aas.cqi_measurement_type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_dcd_count, { "DCD Count", "wmx.dlmap.reduced_aas.dcd_count", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_preamble_select, { "Preamble Select", "wmx.dlmap.reduced_aas.preamble_select", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_preamble_shift_index, { "Preamble Shift Index", "wmx.dlmap.reduced_aas.preamble_shift_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_pilot_pattern_modifier, { "Pilot Pattern Modifier", "wmx.dlmap.reduced_aas.pilot_pattern_modifier", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_pilot_pattern_index, { "Pilot Pattern Index", "wmx.dlmap.reduced_aas.pilot_pattern_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_dl_frame_offset, { "DL Frame Offset", "wmx.dlmap.reduced_aas.dl_frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_zone_symbol_offset, { "Zone Symbol Offset", "wmx.dlmap.reduced_aas.zone_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_ofdma_symbol_offset, { "OFDMA Symbol Offset", "wmx.dlmap.reduced_aas.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_subchannel_offset, { "Subchannel Offset", "wmx.dlmap.reduced_aas.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_num_ofdma_triple_symbol, { "No. OFDMA triple symbol", "wmx.dlmap.reduced_aas.num_ofdma_triple_symbol", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_num_subchannels, { "No. subchannels", "wmx.dlmap.reduced_aas.num_subchannels", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_num_ofdma_symbols, { "No. OFDMA symbols", "wmx.dlmap.reduced_aas.num_ofdma_symbols", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_diuc_nep, { "DIUC/N(EP)", "wmx.dlmap.reduced_aas.diuc_nep", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_dl_harq_ack_bitmap, { "DL HARQ ACK bitmap", "wmx.dlmap.reduced_aas.dl_harq_ack_bitmap", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_ack_allocation_index, { "ACK Allocation Index", "wmx.dlmap.reduced_aas.ack_allocation_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_acid, { "ACID", "wmx.dlmap.reduced_aas.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_ai_sn, { "AI_SN", "wmx.dlmap.reduced_aas.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_nsch, { "N(SCH)", "wmx.dlmap.reduced_aas.nsch", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_dlmap_reduced_aas_spid, { "SPID", "wmx.dlmap.reduced_aas.spid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
};
/* Setup protocol subtree array */
@@ -2867,14 +3473,22 @@ void proto_register_mac_mgmt_msg_dlmap(void)
&ett_308a,
};
- proto_mac_mgmt_msg_dlmap_decoder = proto_register_protocol (
+ static ei_register_info ei[] = {
+ { &ei_dlmap_not_implemented, { "wmx.dlmap.not_implemented", PI_UNDECODED, PI_WARN, "Not implemented", EXPFILL }},
+ };
+
+ expert_module_t* expert_mac_mgmt_msg_dlmap;
+
+ proto_mac_mgmt_msg_dlmap_decoder = proto_register_protocol (
"WiMax DLMAP Messages", /* name */
"WiMax DLMAP", /* short name */
"wmx.dlmap" /* abbrev */
);
- proto_register_field_array(proto_mac_mgmt_msg_dlmap_decoder, hf, array_length(hf));
- proto_register_subtree_array(ett, array_length(ett));
+ proto_register_field_array(proto_mac_mgmt_msg_dlmap_decoder, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
+ expert_mac_mgmt_msg_dlmap = expert_register_protocol(proto_mac_mgmt_msg_dlmap_decoder);
+ expert_register_field_array(expert_mac_mgmt_msg_dlmap, ei, array_length(ei));
}
void proto_reg_handoff_mac_mgmt_msg_dlmap(void)
diff --git a/plugins/wimax/msg_sbc.c b/plugins/wimax/msg_sbc.c
index cd61a0d9bf..218224e4cc 100644
--- a/plugins/wimax/msg_sbc.c
+++ b/plugins/wimax/msg_sbc.c
@@ -66,6 +66,11 @@ static gint hf_sbc_mac_pdu_piggybacked = -1;
static gint hf_sbc_mac_pdu_fsn = -1;
static gint hf_sbc_mac_pdu_rsvd = -1;
static gint hf_sbc_max_transmit_power = -1;
+static gint hf_sbc_bpsk = -1;
+static gint hf_sbc_qpsk = -1;
+static gint hf_sbc_qam16 = -1;
+static gint hf_sbc_qam64 = -1;
+static gint hf_sbc_current_transmitted_power = -1;
static gint hf_sbc_ss_fft_sizes = -1;
static gint hf_sbc_ss_fft_256 = -1;
static gint hf_sbc_ss_fft_2048 = -1;
@@ -205,7 +210,7 @@ static gint hf_sbc_tlv_t_176 = -1;
static gint hf_sbc_tlv_t_176_bit0 = -1;
static gint hf_sbc_tlv_t_176_bit1 = -1;
static gint hf_sbc_tlv_t_176_bit2 = -1;
-static gint hf_sbc_tlv_t_176_bit2_cor2 = -1;
+/* static gint hf_sbc_tlv_t_176_bit2_cor2 = -1; */
static gint hf_sbc_tlv_t_176_bit3 = -1;
static gint hf_sbc_tlv_t_176_bit4 = -1;
static gint hf_sbc_tlv_t_176_bit5 = -1;
@@ -616,10 +621,10 @@ static void sbc_tlv_decoder(tlv_info_t* tlv_info, int ett, proto_tree* sbc_tree,
power_qpsk = (gfloat)(tvb_get_guint8(tvb, (offset + 1)) - 128) / 2;
power_qam16 = (gfloat)(tvb_get_guint8(tvb, (offset + 2)) - 128) / 2;
power_qam64 = (gfloat)(tvb_get_guint8(tvb, (offset + 3)) - 128) / 2;
- proto_tree_add_text(tlv_tree, tvb, offset, 1, "BPSK: %.2f dBm", (gdouble)power_bpsk);
- proto_tree_add_text(tlv_tree, tvb, (offset + 1), 1, "QPSK: %.2f dBm", (gdouble)power_qpsk);
- proto_tree_add_text(tlv_tree, tvb, (offset + 2), 1, "QAM16: %.2f dBm", (gdouble)power_qam16);
- proto_tree_add_text(tlv_tree, tvb, (offset + 3), 1, "QAM64: %.2f dBm", (gdouble)power_qam64);
+ proto_tree_add_float_format_value(tlv_tree, hf_sbc_bpsk, tvb, offset, 1, power_bpsk, "%.2f dBm", (gdouble)power_bpsk);
+ proto_tree_add_float_format_value(tlv_tree, hf_sbc_qpsk, tvb, (offset + 1), 1, power_qpsk, "%.2f dBm", (gdouble)power_qpsk);
+ proto_tree_add_float_format_value(tlv_tree, hf_sbc_qam16, tvb, (offset + 2), 1, power_qam16, "%.2f dBm", (gdouble)power_qam16);
+ proto_tree_add_float_format_value(tlv_tree, hf_sbc_qam64, tvb, (offset + 3), 1, power_qam64, "%.2f dBm", (gdouble)power_qam64);
break;
case SBC_REQ_CURR_TRANSMITTED_POWER:
/* add TLV subtree */
@@ -628,7 +633,7 @@ static void sbc_tlv_decoder(tlv_info_t* tlv_info, int ett, proto_tree* sbc_tree,
/* display the detail meanings of the TLV value */
value = tvb_get_guint8(tvb, offset);
current_power = (gfloat)(value - 128) / 2;
- proto_tree_add_text(tlv_tree, tvb, offset, 1, "Current Transmitted Power: %.2f dBm (Value: 0x%x)", (gdouble)current_power, value);
+ proto_tree_add_float_format_value(tlv_tree, hf_sbc_current_transmitted_power, tvb, offset, 1, current_power, "%.2f dBm (Value: 0x%x)", (gdouble)current_power, value);
break;
case SBC_SS_FFT_SIZES:
/* add TLV subtree */
@@ -1585,6 +1590,7 @@ void proto_register_mac_mgmt_msg_sbc(void)
FT_BOOLEAN, 24, TFS(&tfs_supported), 0x4, NULL, HFILL
}
},
+#if 0
{
&hf_sbc_tlv_t_176_bit2_cor2,
{
@@ -1592,6 +1598,7 @@ void proto_register_mac_mgmt_msg_sbc(void)
FT_BOOLEAN, 24, TFS(&tfs_supported), 0x4, NULL, HFILL
}
},
+#endif
{
&hf_sbc_tlv_t_176_bit3,
{
@@ -1921,6 +1928,41 @@ void proto_register_mac_mgmt_msg_sbc(void)
FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL
}
},
+ {
+ &hf_sbc_bpsk,
+ {
+ "BPSK", "wmx.sbc.bpsk",
+ FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_sbc_qpsk,
+ {
+ "QPSK", "wmx.sbc.qpsk",
+ FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_sbc_qam16,
+ {
+ "QAM16", "wmx.sbc.qam16",
+ FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_sbc_qam64,
+ {
+ "QAM64", "wmx.sbc.qam64",
+ FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_sbc_current_transmitted_power,
+ {
+ "Current Transmitted Power", "wmx.sbc.current_transmitted_power",
+ FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
{ /* 11.8.3.7.5 - 2 bytes */
&hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_a,
{
diff --git a/plugins/wimax/msg_ucd.c b/plugins/wimax/msg_ucd.c
index 391307bb35..5a73fe8b23 100644
--- a/plugins/wimax/msg_ucd.c
+++ b/plugins/wimax/msg_ucd.c
@@ -68,7 +68,7 @@ static gint hf_ucd_tlv_t_159_band_amc_allocation_threshold = -1;
static gint hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap = -1;
static gint hf_ucd_tlv_t_160_band_amc_release_threshold = -1;
static gint hf_ucd_tlv_t_161_band_amc_allocation_timer = -1;
-static gint hf_ucd_tlv_t_162_band_amc_release_timer = -1;
+/* static gint hf_ucd_tlv_t_162_band_amc_release_timer = -1; */
static gint hf_ucd_tlv_t_163_band_status_report_max_period = -1;
static gint hf_ucd_tlv_t_164_band_amc_retry_timer = -1;
static gint hf_ucd_tlv_t_171_harq_ack_delay_dl_burst = -1;
@@ -96,7 +96,7 @@ static gint hf_ucd_tlv_t_196_tx_power_report_a_p_avg = -1;
static gint hf_ucd_tlv_t_196_tx_power_report_threshold_icqch = -1;
static gint hf_ucd_tlv_t_196_tx_power_report_interval_icqch = -1;
static gint hf_ucd_tlv_t_196_tx_power_report_a_p_avg_icqch = -1;
-static gint hf_ucd_tlv_t_197_normalized_cn_channel_sounding = -1;
+/* static gint hf_ucd_tlv_t_197_normalized_cn_channel_sounding = -1; */
static gint hf_ucd_tlv_t_202_uplink_burst_profile_for_multiple_fec_types = -1;
static gint hf_ucd_tlv_t_203_ul_pusc_subchannel_rotation = -1;
static gint hf_ucd_tlv_t_205_relative_power_offset_ul_harq_burst = -1;
@@ -119,6 +119,11 @@ static gint hf_ucd_bandwidth_backoff_start = -1;
static gint hf_ucd_bandwidth_backoff_end = -1;
static gint hf_ucd_periodic_ranging_backoff_start = -1;
static gint hf_ucd_periodic_ranging_backoff_end = -1;
+static gint hf_ucd_config_change_count = -1;
+static gint hf_ucd_ranging_backoff_start = -1;
+static gint hf_ucd_ranging_backoff_end = -1;
+static gint hf_ucd_request_backoff_start = -1;
+static gint hf_ucd_request_backoff_end = -1;
/* static gint hf_ucd_unknown_type = -1; */
static gint hf_ucd_invalid_tlv = -1;
@@ -223,49 +228,41 @@ static void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo,
{ /* we are being asked for details */
proto_item *ucd_item;
proto_tree *ucd_tree;
- guint ucd_config_change_count;
guint ucd_ranging_backoff_start;
guint ucd_ranging_backoff_end;
guint ucd_request_backoff_start;
guint ucd_request_backoff_end;
- /* Get the tvb reported length */
tvb_len = tvb_reported_length(tvb);
/* display MAC payload type UCD */
ucd_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_ucd_decoder, tvb, offset, -1, "Uplink Channel Descriptor (UCD)");
- /* add MAC UCD subtree */
ucd_tree = proto_item_add_subtree(ucd_item, ett_mac_mgmt_msg_ucd_decoder);
+
/* Decode and display the Uplink Channel Descriptor (UCD) */
- /* get the Configuration Change Count */
- ucd_config_change_count = tvb_get_guint8(tvb, offset);
/* display the Configuration Change Count */
- proto_tree_add_text(ucd_tree, tvb, offset, 1, "Configuration Change Count: %u", ucd_config_change_count);
- /* move to next field */
+ proto_tree_add_item(ucd_tree, hf_ucd_config_change_count, tvb, offset, 1, ENC_NA);
offset++;
+
/* get the ranging backoff start */
ucd_ranging_backoff_start = tvb_get_guint8(tvb, offset);
- /* display the ranging backoff start */
- proto_tree_add_text(ucd_tree, tvb, offset, 1, "Ranging Backoff Start: 2^%u = %u", ucd_ranging_backoff_start, (1 << ucd_ranging_backoff_start));
- /* move to next field */
+ proto_tree_add_uint_format_value(ucd_tree, hf_ucd_ranging_backoff_start, tvb, offset, 1, (1 << ucd_ranging_backoff_start), "2^%u = %u", ucd_ranging_backoff_start, (1 << ucd_ranging_backoff_start));
offset++;
+
/* get the ranging backoff end */
ucd_ranging_backoff_end = tvb_get_guint8(tvb, offset);
- /* display the ranging backoff end */
- proto_tree_add_text(ucd_tree, tvb, offset, 1, "Ranging Backoff End: 2^%u = %u", ucd_ranging_backoff_end, (1 << ucd_ranging_backoff_end));
- /* move to next field */
+ proto_tree_add_uint_format_value(ucd_tree, hf_ucd_ranging_backoff_end, tvb, offset, 1, (1 << ucd_ranging_backoff_end), "2^%u = %u", ucd_ranging_backoff_end, (1 << ucd_ranging_backoff_end));
offset++;
+
/* get the request backoff start */
ucd_request_backoff_start = tvb_get_guint8(tvb, offset);
- /* display the request backoff start */
- proto_tree_add_text(ucd_tree, tvb, offset, 1, "Request Backoff Start: 2^%u = %u", ucd_request_backoff_start, (1 << ucd_request_backoff_start));
- /* move to next field */
+ proto_tree_add_uint_format_value(ucd_tree, hf_ucd_request_backoff_start, tvb, offset, 1, (1 << ucd_request_backoff_start), "2^%u = %u", ucd_request_backoff_start, (1 << ucd_request_backoff_start));
offset++;
+
/* get the request backoff end */
ucd_request_backoff_end = tvb_get_guint8(tvb, offset);
- /* display the request backoff end */
- proto_tree_add_text(ucd_tree, tvb, offset, 1, "Request Backoff End: 2^%u = %u", ucd_request_backoff_end, (1 << ucd_request_backoff_end));
- /* move to next field */
+ proto_tree_add_uint_format_value(ucd_tree, hf_ucd_request_backoff_end, tvb, offset, 1, (1 << ucd_request_backoff_end), "2^%u = %u", ucd_request_backoff_end, (1 << ucd_request_backoff_end));
offset++;
+
while(offset < tvb_len)
{
/* get the TLV information */
@@ -726,6 +723,7 @@ void proto_register_mac_mgmt_msg_ucd(void)
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL
}
},
+#if 0
{
&hf_ucd_tlv_t_162_band_amc_release_timer,
{
@@ -733,6 +731,7 @@ void proto_register_mac_mgmt_msg_ucd(void)
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL
}
},
+#endif
{
&hf_ucd_tlv_t_164_band_amc_retry_timer,
{
@@ -890,6 +889,7 @@ void proto_register_mac_mgmt_msg_ucd(void)
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL
}
},
+#if 0
{
&hf_ucd_tlv_t_197_normalized_cn_channel_sounding,
{
@@ -897,6 +897,7 @@ void proto_register_mac_mgmt_msg_ucd(void)
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL
}
},
+#endif
{
&hf_ucd_tlv_t_177_normalized_cn_override2,
{
@@ -1195,6 +1196,41 @@ void proto_register_mac_mgmt_msg_ucd(void)
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
}
},
+ {
+ &hf_ucd_config_change_count,
+ {
+ "Configuration Change Count", "wmx.ucd.config_change_count",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
+ }
+ },
+ {
+ &hf_ucd_ranging_backoff_start,
+ {
+ "Ranging Backoff Start", "wmx.ucd.ranging_backoff_start",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
+ }
+ },
+ {
+ &hf_ucd_ranging_backoff_end,
+ {
+ "Ranging Backoff End", "wmx.ucd.ranging_backoff_end",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
+ }
+ },
+ {
+ &hf_ucd_request_backoff_start,
+ {
+ "Request Backoff Start", "wmx.ucd.request_backoff_start",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
+ }
+ },
+ {
+ &hf_ucd_request_backoff_end,
+ {
+ "Request Backoff End", "wmx.ucd.request_backoff_end",
+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
+ }
+ },
};
/* Setup protocol subtree array */
diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c
index 289f903740..0ef69a14e9 100644
--- a/plugins/wimax/msg_ulmap.c
+++ b/plugins/wimax/msg_ulmap.c
@@ -29,6 +29,7 @@
#include "config.h"
#include <epan/packet.h>
+#include <epan/expert.h>
#include "crc.h"
#include "wimax_mac.h"
#include "wimax_bits.h"
@@ -40,19 +41,22 @@ void proto_reg_handoff_mac_mgmt_msg_ulmap(void);
#define MAC_MGMT_MSG_ULMAP 3
-#define XBIT(var, bits, desc) \
- do { \
- var = TVB_BIT_BITS(bit, tvb, bits); \
- proto_tree_add_text(tree, tvb, BITHI(bit, bits), desc ": %d", var); \
- bit += bits; \
- } while(0)
+#define XBIT_HF(bits, hf) \
+ proto_tree_add_bits_item(tree, hf, tvb, bit, bits, ENC_BIG_ENDIAN); bit += bits;
-#define XNIB(var, nibs, desc) \
- do { \
- var = TVB_NIB_NIBS(nib, tvb, nibs); \
- proto_tree_add_text(tree, tvb, NIBHI(nib, nibs), desc ": %d", var); \
- nib += nibs; \
- } while(0)
+#define XBIT_HF_VALUE(var, bits, hf) \
+ do { \
+ var = TVB_BIT_BITS(bit, tvb, bits); \
+ proto_tree_add_bits_item(tree, hf, tvb, bit, bits, ENC_BIG_ENDIAN); \
+ bit += bits; \
+ } while(0)
+
+#define VNIB(var, nibs, hf) \
+ do { \
+ var = TVB_NIB_NIBS(nib, tvb, nibs); \
+ proto_tree_add_uint(tree, hf, tvb, NIBHI(nib, nibs), var); \
+ nib += nibs; \
+ } while(0)
/* from msg_ucd.c */
extern guint cqich_id_size; /* Set for CQICH_Alloc_IE */
@@ -207,6 +211,11 @@ 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; */
@@ -221,6 +230,7 @@ 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;
@@ -251,6 +261,293 @@ 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_padding = -1;
+
+/* 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;
/* This gets called each time a capture file is loaded. */
void init_wimax_globals(void)
@@ -273,7 +570,6 @@ static gint Dedicated_UL_Control_IE(proto_tree *uiuc_tree, gint offset, gint len
/* 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;
- gint data;
proto_item *tree;
gint sdma;
@@ -281,11 +577,11 @@ static gint Dedicated_UL_Control_IE(proto_tree *uiuc_tree, gint offset, gint len
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302r, NULL, "Dedicated_UL_Control_IE");
- XBIT(data, 4, "Length");
- XBIT(sdma, 4, "Control Header");
+ XBIT_HF(4, hf_ulmap_dedicated_ul_control_length);
+ XBIT_HF_VALUE(sdma, 4, hf_ulmap_dedicated_ul_control_control_header);
if ((sdma & 1) == 1) {
- XBIT(data, 2, "Num SDMA layers");
- XBIT(data, 2, "Pilot Pattern");
+ XBIT_HF(2, hf_ulmap_dedicated_ul_control_num_sdma_layers);
+ XBIT_HF(2, hf_ulmap_dedicated_ul_control_pilot_pattern);
}
return (bit - offset); /* length in bits */
}
@@ -295,15 +591,14 @@ static gint Dedicated_MIMO_UL_Control_IE(proto_tree *uiuc_tree, gint offset, gin
/* 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;
- gint data;
proto_item *tree;
bit = offset;
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302s, NULL, "Dedicated_MIMO_UL_Control_IE");
- XBIT(data, 2, "Matrix");
- XBIT(N_layer, 2, "N_layer");
+ XBIT_HF(2, hf_ulmap_dedicated_mimo_ul_control_matrix);
+ XBIT_HF_VALUE(N_layer, 2, hf_ulmap_dedicated_mimo_ul_control_n_layer);
return (bit - offset); /* length in bits */
}
@@ -315,7 +610,6 @@ static gint UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint
/* 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;
- gint data;
proto_item *tree;
/*proto_item *generic_item = NULL;*/
gint duci;
@@ -326,24 +620,24 @@ static gint UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint
tree = proto_tree_add_subtree(uiuc_tree, tvb, BITHI(offset,length), ett_302k, NULL, "UL_HARQ_Chase_Sub_Burst_IE");
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
- XBIT(duci, 1, "Dedicated UL Control Indicator");
+ XBIT_HF_VALUE(duci, 1, hf_ulmap_harq_chase_dedicated_ul_control_indicator);
if (duci == 1) {
bit += Dedicated_UL_Control_IE(tree, bit, length, tvb);
}
- XBIT(data, 4, "UIUC");
- XBIT(data, 2, "Repetition Coding Indication");
- XBIT(data,10, "Duration");
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
- XBIT(data, 1, "ACK_disable");
- XBIT(data, 1, "Reserved");
+ XBIT_HF(4, hf_ulmap_harq_chase_uiuc);
+ XBIT_HF(2, hf_ulmap_harq_chase_repetition_coding_indication);
+ XBIT_HF(10, hf_ulmap_harq_chase_duration);
+ XBIT_HF(4, hf_ulmap_harq_chase_acid);
+ XBIT_HF(1, hf_ulmap_harq_chase_ai_sn);
+ XBIT_HF(1, hf_ulmap_harq_chase_ack_disable);
+ XBIT_HF(1, hf_ulmap_reserved_uint);
#if 0
if (include_cor2_changes)
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_ulmap_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -362,7 +656,6 @@ static gint UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint
/* 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;
- gint data;
proto_item *tree;
/*proto_item *generic_item = NULL;*/
gint duci;
@@ -373,24 +666,24 @@ static gint UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302l, NULL, "UL_HARQ_IR_CTC_Sub_Burst_IE");
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
- XBIT(duci, 1, "Dedicated UL Control Indicator");
+ XBIT_HF_VALUE(duci, 1, hf_ulmap_harq_ir_ctc_dedicated_ul_control_indicator);
if (duci == 1) {
bit += Dedicated_UL_Control_IE(tree, bit, length, tvb);
}
- XBIT(data, 4, "N(EP)");
- XBIT(data, 4, "N(SCH)");
- XBIT(data, 2, "SPID");
- XBIT(data, 4, "ACIN");
- XBIT(data, 1, "AI_SN");
- XBIT(data, 1, "ACK_disable");
- XBIT(data, 3, "Reserved");
+ XBIT_HF(4, hf_ulmap_harq_ir_ctc_nep);
+ XBIT_HF(4, hf_ulmap_harq_ir_ctc_nsch);
+ XBIT_HF(2, hf_ulmap_harq_ir_ctc_spid);
+ XBIT_HF(4, hf_ulmap_harq_ir_ctc_acin);
+ XBIT_HF(1, hf_ulmap_harq_ir_ctc_ai_sn);
+ XBIT_HF(1, hf_ulmap_harq_ir_ctc_ack_disable);
+ XBIT_HF(3, hf_ulmap_reserved_uint);
#if 0
if (include_cor2_changes)
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_ulmap_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -409,7 +702,6 @@ static gint UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint
/* 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;
- gint data;
proto_item *tree;
/*proto_item *generic_item = NULL;*/
gint duci;
@@ -420,25 +712,25 @@ static gint UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302m, NULL, "UL_HARQ_IR_CC_Sub_Burst_IE");
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
- XBIT(duci, 1, "Dedicated UL Control Indicator");
+ XBIT_HF_VALUE(duci, 1, hf_ulmap_harq_ir_cc_dedicated_ul_control_indicator);
if (duci == 1) {
bit += Dedicated_UL_Control_IE(tree, bit, length, tvb);
}
- XBIT(data, 4, "UIUC");
- XBIT(data, 2, "Repetition Coding Indication");
- XBIT(data,10, "Duration");
- XBIT(data, 2, "SPID");
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
- XBIT(data, 1, "ACK_disable");
- XBIT(data, 3, "Reserved");
+ XBIT_HF(4, hf_ulmap_harq_ir_cc_uiuc);
+ XBIT_HF(2, hf_ulmap_harq_ir_cc_repetition_coding_indication);
+ XBIT_HF(10, hf_ulmap_harq_ir_cc_duration);
+ XBIT_HF(2, hf_ulmap_harq_ir_cc_spid);
+ XBIT_HF(4, hf_ulmap_harq_ir_cc_acid);
+ XBIT_HF(1, hf_ulmap_harq_ir_cc_ai_sn);
+ XBIT_HF(1, hf_ulmap_harq_ir_cc_ack_disable);
+ XBIT_HF(3, hf_ulmap_reserved_uint);
#if 0
if (include_cor2_changes)
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_ulmap_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -457,7 +749,6 @@ static gint MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset,
/* 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;
- gint data;
proto_item *tree;
/*proto_item *generic_item = NULL;*/
gint muin,dmci,ackd,i;
@@ -467,27 +758,27 @@ static gint MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset,
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302n, NULL, "MIMO_UL_Chase_HARQ_Sub_Burst_IE");
- XBIT(muin, 1, "MU indicator");
- XBIT(dmci, 1, "Dedicated MIMO ULControl Indicator");
- XBIT(ackd, 1, "ACK Disable");
+ XBIT_HF_VALUE(muin, 1, hf_ulmap_mimo_ul_chase_harq_mu_indicator);
+ XBIT_HF_VALUE(dmci, 1, hf_ulmap_mimo_ul_chase_harq_dedicated_mimo_ulcontrol_indicator);
+ XBIT_HF_VALUE(ackd, 1, hf_ulmap_mimo_ul_chase_harq_ack_disable);
if (muin == 0) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
if (dmci) {
bit += Dedicated_MIMO_UL_Control_IE(tree, bit, length, tvb);
}
} else {
- XBIT(data, 1, "Matrix");
+ XBIT_HF(1, hf_ulmap_mimo_ul_chase_harq_matrix);
}
- XBIT(data, 10, "Duration");
+ XBIT_HF(10, hf_ulmap_mimo_ul_chase_harq_duration);
for (i = 0; i < N_layer; i++) {
if (muin == 1) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
}
- XBIT(data, 4, "UIUC");
- XBIT(data, 2, "Repetition Coding Indication");
+ XBIT_HF(4, hf_ulmap_mimo_ul_chase_harq_uiuc);
+ XBIT_HF(2, hf_ulmap_mimo_ul_chase_harq_repetition_coding_indication);
if (ackd == 0) {
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
+ XBIT_HF(4, hf_ulmap_mimo_ul_chase_harq_acid);
+ XBIT_HF(1, hf_ulmap_mimo_ul_chase_harq_ai_sn);
}
}
@@ -496,7 +787,7 @@ static gint MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset,
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_ulmap_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -515,7 +806,6 @@ static gint MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi
/* 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;
- gint data;
proto_item *tree;
/*proto_item *generic_item = NULL;*/
gint muin,dmci,ackd,i;
@@ -525,27 +815,27 @@ static gint MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302o, NULL, "MIMO_UL_IR_HARQ__Sub_Burst_IE");
- XBIT(muin, 1, "MU indicator");
- XBIT(dmci, 1, "Dedicated MIMO UL Control Indicator");
- XBIT(ackd, 1, "ACK Disable");
+ XBIT_HF_VALUE(muin, 1, hf_ulmap_mimo_ul_ir_harq_mu_indicator);
+ XBIT_HF_VALUE(dmci, 1, hf_ulmap_mimo_ul_ir_harq_dedicated_mimo_ul_control_indicator);
+ XBIT_HF_VALUE(ackd, 1, hf_ulmap_mimo_ul_ir_harq_ack_disable);
if (muin == 0) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
if (dmci) {
bit += Dedicated_MIMO_UL_Control_IE(tree, bit, length, tvb);
}
} else {
- XBIT(data, 1, "Matrix");
+ XBIT_HF(1, hf_ulmap_mimo_ul_ir_harq_matrix);
}
- XBIT(data, 4, "N(SCH)");
+ XBIT_HF(4, hf_ulmap_mimo_ul_ir_harq_nsch);
for (i = 0; i < N_layer; i++) {
if (muin == 1) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
}
- XBIT(data, 4, "N(EP)");
+ XBIT_HF(4, hf_ulmap_mimo_ul_ir_harq_nep);
if (ackd == 0) {
- XBIT(data, 2, "SPID");
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
+ XBIT_HF(2, hf_ulmap_mimo_ul_ir_harq_spid);
+ XBIT_HF(4, hf_ulmap_mimo_ul_ir_harq_acid);
+ XBIT_HF(1, hf_ulmap_mimo_ul_ir_harq_ai_sn);
}
}
@@ -554,7 +844,7 @@ static gint MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_ulmap_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -573,7 +863,6 @@ static gint MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, gint off
/* 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;
- gint data;
proto_item *tree;
/*proto_item *generic_item = NULL;*/
gint muin,dmci,ackd,i;
@@ -583,28 +872,28 @@ static gint MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, gint off
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302p, NULL, "MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE");
- XBIT(muin, 1, "MU indicator");
- XBIT(dmci, 1, "Dedicated MIMO UL Control Indicator");
- XBIT(ackd, 1, "ACK Disable");
+ XBIT_HF_VALUE(muin, 1, hf_ulmap_mimo_ul_ir_harq_cc_mu_indicator);
+ XBIT_HF_VALUE(dmci, 1, hf_ulmap_mimo_ul_ir_harq_cc_dedicated_mimo_ul_control_indicator);
+ XBIT_HF_VALUE(ackd, 1, hf_ulmap_mimo_ul_ir_harq_cc_ack_disable);
if (muin == 0) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
if (dmci) {
bit += Dedicated_MIMO_UL_Control_IE(tree, bit, length, tvb);
}
} else {
- XBIT(data, 1, "Matrix");
+ XBIT_HF(1, hf_ulmap_mimo_ul_ir_harq_cc_matrix);
}
- XBIT(data, 10, "Duration");
+ XBIT_HF(10, hf_ulmap_mimo_ul_ir_harq_cc_duration);
for (i = 0; i < N_layer; i++) {
if (muin == 1) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
}
- XBIT(data, 4, "UIUC");
- XBIT(data, 2, "Repetition Coding Indication");
+ XBIT_HF(4, hf_ulmap_mimo_ul_ir_harq_cc_uiuc);
+ XBIT_HF(2, hf_ulmap_mimo_ul_ir_harq_cc_repetition_coding_indication);
if (ackd == 0) {
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
- XBIT(data, 2, "SPID");
+ XBIT_HF(4, hf_ulmap_mimo_ul_ir_harq_cc_acid);
+ XBIT_HF(1, hf_ulmap_mimo_ul_ir_harq_cc_ai_sn);
+ XBIT_HF(2, hf_ulmap_mimo_ul_ir_harq_cc_spid);
}
}
@@ -613,7 +902,7 @@ static gint MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, gint off
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_ulmap_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -632,7 +921,6 @@ static gint MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi
/* 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;
- gint data;
proto_item *tree;
/*proto_item *generic_item = NULL;*/
gint ackd,txct,sboi;
@@ -642,21 +930,21 @@ static gint MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302q, NULL, "MIMO_UL_STC_HARQ_Sub_Burst_IE");
- XBIT(txct, 2, "Tx count");
- XBIT(data, 10, "Duration");
- XBIT(sboi, 1, "Sub-burst offset indication");
- /*XBIT(muin, 1, "Reserved");*/
+ XBIT_HF_VALUE(txct, 2, hf_ulmap_mimo_ul_stc_harq_tx_count);
+ XBIT_HF(10, hf_ulmap_mimo_ul_stc_harq_duration);
+ XBIT_HF_VALUE(sboi, 1, hf_ulmap_mimo_ul_stc_harq_sub_burst_offset_indication);
+ /*XBIT_HF_VALUE(muin, 1, hf_ulmap_reserved_uint);*/
if (sboi == 1) {
- XBIT(data, 8, "Sub-burst offset");
+ XBIT_HF(8, hf_ulmap_mimo_ul_stc_harq_sub_burst_offset);
}
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
- XBIT(ackd, 1, "ACK Disable");
+ XBIT_HF_VALUE(ackd, 1, hf_ulmap_mimo_ul_stc_harq_ack_disable);
if (txct == 0) {
- XBIT(data, 4, "UIUC");
- XBIT(data, 2, "Repetition Coding Indication");
+ XBIT_HF(4, hf_ulmap_mimo_ul_stc_harq_uiuc);
+ XBIT_HF(2, hf_ulmap_mimo_ul_stc_harq_repetition_coding_indication);
}
if (ackd == 0) {
- XBIT(data, 4, "ACID");
+ XBIT_HF(4, hf_ulmap_mimo_ul_stc_harq_acid);
}
#if 0
@@ -664,7 +952,7 @@ static gint MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi
{
/* CRC-16 is always appended */
data = TVB_BIT_BITS(bit, tvb, 16);
- generic_item = proto_tree_add_text(tree, tvb, BITHI(bit,16), "CRC-16: 0x%04x",data);
+ generic_item = proto_tree_add_uint(tree, hf_ulmap_crc16, tvb, BITHI(bit,16), data);
/* calculate the CRC */
calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit));
if (data != calculated_crc)
@@ -696,11 +984,11 @@ static gint Power_Control_IE(proto_tree *uiuc_tree, gint offset, gint length, tv
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_292, NULL, "Power_Control_IE");
- XNIB(data, 1, "Extended UIUC");
- XNIB(data, 1, "Length");
+ VNIB(data, 1, hf_ulmap_ie_diuc_ext);
+ VNIB(data, 1, hf_ulmap_ie_length);
- XNIB(data, 2, "Power Control");
- XNIB(data, 2, "Power measurement frame");
+ VNIB(data, 2, hf_ulmap_power_control);
+ VNIB(data, 2, hf_ulmap_power_measurement_frame);
return nib;
}
@@ -711,6 +999,7 @@ static gint Mini_Subchannel_allocation_IE(proto_tree *uiuc_tree, gint offset, gi
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
gint data;
+ guint index;
proto_item *tree;
gint j, M;
const gint m_table[4] = { 2, 2, 3, 6 };
@@ -719,26 +1008,26 @@ static gint Mini_Subchannel_allocation_IE(proto_tree *uiuc_tree, gint offset, gi
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_295, NULL, "Mini_subchannel_allocation_IE");
- XBIT(data, 4, "Extended-2 UIUC");
- XBIT(data, 8, "Length");
+ XBIT_HF(4, hf_ulmap_mini_subcha_alloc_extended_2_uiuc);
+ XBIT_HF(8, hf_ulmap_mini_subcha_alloc_length);
- XBIT(data, 2, "Ctype");
- M = m_table[data];
- XBIT(data, 6, "Duration");
+ XBIT_HF_VALUE(index, 2, hf_ulmap_mini_subcha_alloc_ctype);
+ M = m_table[index];
+ XBIT_HF(6, hf_ulmap_mini_subcha_alloc_duration);
for (j = 0; j < M; j++) {
data = TVB_BIT_BITS(bit, tvb, 16);
- proto_tree_add_text(tree, tvb, BITHI(bit, 16), "CID(%d): %d", j, data);
+ proto_tree_add_uint_format(tree, hf_ulmap_mini_subcha_alloc_cid, tvb, BITHI(bit, 16), data, "CID(%d): %d", j, data);
bit += 16;
data = TVB_BIT_BITS(bit, tvb, 4);
- proto_tree_add_text(tree, tvb, BITHI(bit, 4), "UIUC(%d): %d", j, data);
+ proto_tree_add_uint_format(tree, hf_ulmap_mini_subcha_alloc_uiuc, tvb, BITHI(bit, 4), data, "UIUC(%d): %d", j, data);
bit += 4;
data = TVB_BIT_BITS(bit, tvb, 2);
- proto_tree_add_text(tree, tvb, BITHI(bit, 2), "Repetition(%d): %d", j, data);
+ proto_tree_add_uint_format(tree, hf_ulmap_mini_subcha_alloc_repetition, tvb, BITHI(bit, 2), data, "Repetition(%d): %d", j, data);
bit += 2;
}
if (M == 3) {
- XBIT(data, 4, "Padding");
+ XBIT_HF(4, hf_ulmap_mini_subcha_alloc_padding);
}
return BIT_TO_NIB(bit);
}
@@ -749,23 +1038,22 @@ static gint AAS_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t
/* 8.4.5.4.6 [2] AAS_UL_IE*/
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
- gint data;
proto_item *tree;
bit = NIB_TO_BIT(offset);
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_293, NULL, "AAS_UL_IE");
- XBIT(data, 4, "Extended UIUC");
- XBIT(data, 4, "Length");
+ XBIT_HF(4, hf_ulmap_aas_ul_extended_uiuc);
+ XBIT_HF(4, hf_ulmap_aas_ul_length);
- XBIT(data, 2, "Permutation");
- XBIT(data, 7, "UL_PermBase");
- XBIT(data, 8, "OFDMA symbol offset");
- XBIT(data, 8, "AAS zone length");
- XBIT(data, 2, "Uplink preamble config");
- XBIT(data, 1, "Preamble type");
- XBIT(data, 4, "Reserved");
+ XBIT_HF(2, hf_ulmap_aas_ul_permutation);
+ XBIT_HF(7, hf_ulmap_aas_ul_ul_permbase);
+ XBIT_HF(8, hf_ulmap_aas_ul_ofdma_symbol_offset);
+ XBIT_HF(8, hf_ulmap_aas_ul_aas_zone_length);
+ XBIT_HF(2, hf_ulmap_aas_ul_uplink_preamble_config);
+ XBIT_HF(1, hf_ulmap_aas_ul_preamble_type);
+ XBIT_HF(4, hf_ulmap_reserved_uint);
return BIT_TO_NIB(bit);
}
@@ -784,56 +1072,56 @@ static gint CQICH_Alloc_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbu
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_300, NULL, "CQICH_Alloc_IE");
- XBIT(data, 4, "Extended UIUC");
- XBIT(data, 4, "Length");
+ XBIT_HF(4, hf_ulmap_cqich_alloc_extended_uiuc);
+ XBIT_HF_VALUE(data, 4, hf_ulmap_cqich_alloc_length);
target = bit + BYTE_TO_BIT(data);
if (cqich_id_size == 0) {
- proto_tree_add_text(tree, tvb, BITHI(bit, 1), "CQICH_ID: n/a (size == 0 bits)");
+ proto_tree_add_uint_format_value(tree, hf_ulmap_cqich_alloc_cqich_id, tvb, BITHI(bit, 1), cqich_id_size, "n/a (size == 0 bits)");
} else {
/* variable from 0-9 bits */
data = TVB_BIT_BITS16(bit, tvb, cqich_id_size);
- proto_tree_add_text(tree, tvb, BITHI(bit, cqich_id_size), "CQICH_ID: %d (%d bits)", data, cqich_id_size);
+ proto_tree_add_uint_format_value(tree, hf_ulmap_cqich_alloc_cqich_id, tvb, BITHI(bit, cqich_id_size), data, "%d (%d bits)", data, cqich_id_size);
bit += cqich_id_size;
}
- XBIT(data, 6, "Allocation offset");
- XBIT(data, 2, "Period (p)");
- XBIT(data, 3, "Frame offset");
- XBIT(data, 3, "Duration (d)");
- XBIT(rci, 1, "Report configuration included");
+ XBIT_HF(6, hf_ulmap_cqich_alloc_allocation_offset);
+ XBIT_HF(2, hf_ulmap_cqich_alloc_period);
+ XBIT_HF(3, hf_ulmap_cqich_alloc_frame_offset);
+ XBIT_HF(3, hf_ulmap_cqich_alloc_duration);
+ XBIT_HF_VALUE(rci, 1, hf_ulmap_cqich_alloc_report_configuration_included);
if (rci)
{
- XBIT(ftype, 2, "Feedback Type");
- XBIT(rtype, 1, "Report type");
+ XBIT_HF_VALUE(ftype, 2, hf_ulmap_cqich_alloc_feedback_type);
+ XBIT_HF_VALUE(rtype, 1, hf_ulmap_cqich_alloc_report_type);
if (rtype == 0) {
- XBIT(data, 1, "CINR preamble report type");
+ XBIT_HF(1, hf_ulmap_cqich_alloc_cinr_preamble_report_type);
}
else {
- XBIT(zperm, 3, "Zone permutation");
- XBIT(data, 2, "Zone type");
- XBIT(data, 2, "Zone PRBS_ID");
+ XBIT_HF_VALUE(zperm, 3, hf_ulmap_cqich_alloc_zone_permutation);
+ XBIT_HF(2, hf_ulmap_cqich_alloc_zone_type);
+ XBIT_HF(2, hf_ulmap_cqich_alloc_zone_prbs_id);
if (zperm == 0 || zperm == 1) {
- XBIT(mgi, 1, "Major group indication");
+ XBIT_HF_VALUE(mgi, 1, hf_ulmap_cqich_alloc_major_group_indication);
if (mgi == 1) {
/* PUSC major group bitmap*/
- XBIT(data, 6, "PUSC Major group bitmap");
+ XBIT_HF(6, hf_ulmap_cqich_alloc_pusc_major_group_bitmap);
}
}
- XBIT(data, 1, "CINR zone measurement type");
+ XBIT_HF(1, hf_ulmap_cqich_alloc_cinr_zone_measurement_type);
}
if (ftype == 0) {
- XBIT(api, 1, "Averaging parameter included");
+ XBIT_HF_VALUE(api, 1, hf_ulmap_cqich_alloc_averaging_parameter_included);
if (api == 1) {
- XBIT(data, 4, "Averaging parameter");
+ XBIT_HF(4, hf_ulmap_cqich_alloc_averaging_parameter);
}
}
}
- XBIT(data, 2, "MIMO_permutation_feedback_cycle");
+ XBIT_HF(2, hf_ulmap_cqich_alloc_mimo_permutation_feedback_cycle);
pad = target - bit;
if (pad) {
- proto_tree_add_text(tree, tvb, BITHI(bit, pad), "Padding: %d bits", pad);
+ proto_tree_add_bytes_format_value(tree, hf_ulmap_padding, tvb, BITHI(bit, pad), NULL, "%d bits", pad);
bit += pad;
}
return BIT_TO_NIB(bit); /* Return position in nibbles. */
@@ -845,23 +1133,22 @@ static gint UL_Zone_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t
/* 8.4.5.4.7 [2] UL_Zone_IE */
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
- gint data;
proto_item *tree;
bit = NIB_TO_BIT(offset);
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_294, NULL, "UL_Zone_IE");
- XBIT(data, 4, "Extended UIUC");
- XBIT(data, 4, "Length");
+ XBIT_HF(4, hf_ulmap_zone_extended_uiuc);
+ XBIT_HF(4, hf_ulmap_zone_length);
- XBIT(data, 7, "OFDMA symbol offset");
- XBIT(data, 2, "Permutation");
- XBIT(data, 7, "UL_PermBase");
- XBIT(data, 2, "AMC type");
- XBIT(data, 1, "Use All SC indicator");
- XBIT(data, 1, "Disable subchannel rotation");
- XBIT(data, 4, "Reserved");
+ XBIT_HF(7, hf_ulmap_zone_ofdma_symbol_offset);
+ XBIT_HF(2, hf_ulmap_zone_permutation);
+ XBIT_HF(7, hf_ulmap_zone_ul_permbase);
+ XBIT_HF(2, hf_ulmap_zone_amc_type);
+ XBIT_HF(1, hf_ulmap_zone_use_all_sc_indicator);
+ XBIT_HF(1, hf_ulmap_zone_disable_subchannel_rotation);
+ XBIT_HF(4, hf_ulmap_reserved_uint);
return BIT_TO_NIB(bit);
}
@@ -871,7 +1158,6 @@ static gint PHYMOD_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff
/* 8.4.5.4.14 [2] PHYMOD_UL_IE */
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
- gint data;
proto_item *tree;
gint pmt;
@@ -879,21 +1165,21 @@ static gint PHYMOD_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302, NULL, "PHYMOD_UL_IE");
- XBIT(data, 4, "Extended UIUC");
- XBIT(data, 4, "Length");
+ XBIT_HF(4, hf_ulmap_phymod_ul_extended_uiuc);
+ XBIT_HF(4, hf_ulmap_phymod_ul_length);
- XBIT(pmt, 1, "Preamble Modifier Type");
+ XBIT_HF_VALUE(pmt, 1, hf_ulmap_phymod_ul_preamble_modifier_type);
if (pmt == 0) {
- XBIT(data, 4, "Preamble frequency shift index");
+ XBIT_HF(4, hf_ulmap_phymod_ul_preamble_frequency_shift_index);
} else {
- XBIT(data, 4, "Preamble Time Shift index");
+ XBIT_HF(4, hf_ulmap_phymod_ul_preamble_time_shift_index);
}
- XBIT(data, 1, "Pilot Pattern Modifier");
- XBIT(data, 2, "Pilot Pattern Index");
+ XBIT_HF(1, hf_ulmap_phymod_ul_pilot_pattern_modifier);
+ XBIT_HF(2, hf_ulmap_phymod_ul_pilot_pattern_index);
return BIT_TO_NIB(bit);
}
-static gint MIMO_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint MIMO_UL_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* UL-MAP Extended IE = 6 */
/* 8.4.5.4.11 MIMO_UL_Basic_IE (not implemented) */
@@ -906,9 +1192,9 @@ static gint MIMO_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_299, NULL, "MIMO_UL_Basic_IE");
- XNIB(data, 1, "Extended UIUC");
- XNIB(data, 1, "Length");
- proto_tree_add_text(tree, tvb, NIBHI(nib,length-2), "(not implemented)");
+ VNIB(data, 1, hf_ulmap_ie_diuc_ext);
+ VNIB(data, 1, hf_ulmap_ie_length);
+ proto_tree_add_expert(tree, pinfo, &ei_ulmap_not_implemented, tvb, NIBHI(nib,length-2));
return nib;
}
@@ -918,7 +1204,6 @@ static gint ULMAP_Fast_Tracking_IE(proto_tree *uiuc_tree, gint offset, gint leng
/* 8.4.5.4.22 [2] ULMAP_Fast_Tracking_IE */
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
- gint data;
proto_item *tree;
bit = NIB_TO_BIT(offset);
@@ -927,15 +1212,15 @@ static gint ULMAP_Fast_Tracking_IE(proto_tree *uiuc_tree, gint offset, gint leng
length = NIB_TO_BIT(length);
- XBIT(data, 4, "Extended UIUC");
- XBIT(data, 4, "Length");
+ XBIT_HF(4, hf_ulmap_fast_tracking_extended_uiuc);
+ XBIT_HF(4, hf_ulmap_fast_tracking_length);
- XBIT(data, 2, "Map Index");
- XBIT(data, 6, "Reserved");
+ XBIT_HF(2, hf_ulmap_fast_tracking_map_index);
+ XBIT_HF(6, hf_ulmap_reserved_uint);
while (bit < (length-7)) {
- XBIT(data, 3, "Power correction");
- XBIT(data, 3, "Frequency correction");
- XBIT(data, 2, "Time correction");
+ XBIT_HF(3, hf_ulmap_fast_tracking_power_correction);
+ XBIT_HF(3, hf_ulmap_fast_tracking_frequency_correction);
+ XBIT_HF(2, hf_ulmap_fast_tracking_time_correction);
}
return BIT_TO_NIB(bit);
}
@@ -946,24 +1231,23 @@ static gint UL_PUSC_Burst_Allocation_in_other_segment_IE(proto_tree *uiuc_tree,
/* 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;
- gint data;
proto_item *tree;
bit = NIB_TO_BIT(offset);
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302c, NULL, "UL_PUSC_Burst_Allocation_in_Other_Segment_IE");
- XBIT(data, 4, "Extended UIUC");
- XBIT(data, 4, "Length");
-
- XBIT(data, 4, "UIUC");
- XBIT(data, 2, "Segment");
- XBIT(data, 7, "UL_PermBase");
- XBIT(data, 8, "OFDMA symbol offset");
- XBIT(data, 6, "Subchannel offset");
- XBIT(data,10, "Duration");
- XBIT(data, 2, "Repetition coding indication");
- XBIT(data, 1, "Reserved");
+ XBIT_HF(4, hf_ulmap_pusc_burst_allocation_extended_uiuc);
+ XBIT_HF(4, hf_ulmap_pusc_burst_allocation_length);
+
+ XBIT_HF(4, hf_ulmap_pusc_burst_allocation_uiuc);
+ XBIT_HF(2, hf_ulmap_pusc_burst_allocation_segment);
+ XBIT_HF(7, hf_ulmap_pusc_burst_allocation_ul_permbase);
+ XBIT_HF(8, hf_ulmap_pusc_burst_allocation_ofdma_symbol_offset);
+ XBIT_HF(6, hf_ulmap_pusc_burst_allocation_subchannel_offset);
+ XBIT_HF(10, hf_ulmap_pusc_burst_allocation_duration);
+ XBIT_HF(2, hf_ulmap_pusc_burst_allocation_repetition_coding_indication);
+ XBIT_HF(1, hf_ulmap_reserved_uint);
return BIT_TO_NIB(bit);
}
@@ -973,7 +1257,6 @@ static gint Fast_Ranging_IE(proto_tree *uiuc_tree, gint offset, gint length, tvb
/* 8.4.5.4.21 [2] Fast_Ranging_IE */
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
- gint data;
proto_item *tree;
gint hidi;
@@ -981,22 +1264,21 @@ static gint Fast_Ranging_IE(proto_tree *uiuc_tree, gint offset, gint length, tvb
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302g, NULL, "Fast_Ranging_IE");
- XBIT(data, 4, "Extended UIUC");
- XBIT(data, 4, "Length");
+ XBIT_HF(4, hf_ulmap_fast_ranging_extended_uiuc);
+ XBIT_HF(4, hf_ulmap_fast_ranging_length);
- XBIT(hidi, 1, "HO_ID indicator");
- XBIT(data, 7, "Reserved");
+ XBIT_HF_VALUE(hidi, 1, hf_ulmap_fast_ranging_ho_id_indicator);
+ XBIT_HF(7, hf_ulmap_reserved_uint);
if (hidi == 1) {
- XBIT(data, 8, "HO_ID");
- /* XBIT(data, 40, "Reserved"); TODO */
+ XBIT_HF(8, hf_ulmap_fast_ranging_ho_id);
+ /* XBIT_HF(40, hf_ulmap_reserved_uint); TODO */
} else {
- /* XBIT(data, 48, "MAC address"); TODO */
- proto_tree_add_text(tree, tvb, BITHI(bit, 48), "MAC address");
+ proto_tree_add_item(tree, hf_ulmap_fast_ranging_mac_address, tvb, BITHI(bit, 48), ENC_NA);
bit += 48;
}
- XBIT(data, 4, "UIUC");
- XBIT(data,10, "Duration");
- XBIT(data, 2, "Repetition coding indication");
+ XBIT_HF(4, hf_ulmap_fast_ranging_uiuc);
+ XBIT_HF(10, hf_ulmap_fast_ranging_duration);
+ XBIT_HF(2, hf_ulmap_fast_ranging_repetition_coding_indication);
return BIT_TO_NIB(bit);
}
@@ -1006,19 +1288,18 @@ static gint UL_Allocation_Start_IE(proto_tree *uiuc_tree, gint offset, gint leng
/* 8.4.5.4.15 [2] UL_Allocation_Start_IE */
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
- gint data;
proto_item *tree;
bit = NIB_TO_BIT(offset);
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302a, NULL, "UL_Allocation_start_IE");
- XBIT(data, 4, "Extended UIUC");
- XBIT(data, 4, "Length");
+ XBIT_HF(4, hf_ulmap_allocation_start_extended_uiuc);
+ XBIT_HF(4, hf_ulmap_allocation_start_length);
- XBIT(data, 8, "OFDMA symbol offset");
- XBIT(data, 7, "Subchannel offset");
- XBIT(data, 1, "Reserved");
+ XBIT_HF(8, hf_ulmap_allocation_start_ofdma_symbol_offset);
+ XBIT_HF(7, hf_ulmap_allocation_start_subchannel_offset);
+ XBIT_HF(1, hf_ulmap_reserved_uint);
return BIT_TO_NIB(bit);
}
@@ -1043,43 +1324,43 @@ static gint CQICH_Enhanced_Allocation_IE(proto_tree *uiuc_tree, gint offset, gin
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302b, NULL, "CQICH_Enhanced_Alloc_IE");
- XBIT(data, 4, "Extended-2 UIUC");
- XBIT(data, 8, "Length");
+ XBIT_HF(4, hf_ulmap_cqich_enhanced_alloc_extended_2_uiuc);
+ XBIT_HF(8, hf_ulmap_cqich_enhanced_alloc_length);
if (cqich_id_size == 0) {
- proto_tree_add_text(tree, tvb, BITHI(bit, 1), "CQICH_ID: n/a (size == 0 bits)");
+ proto_tree_add_uint_format_value(tree, hf_ulmap_cqich_enhanced_alloc_cqich_id, tvb, BITHI(bit, 1), cqich_id_size, "n/a (size == 0 bits)");
} else {
/* variable from 0-9 bits */
data = TVB_BIT_BITS16(bit, tvb, cqich_id_size);
- proto_tree_add_text(tree, tvb, BITHI(bit, cqich_id_size), "CQICH_ID: %d (%d bits)", data, cqich_id_size);
+ proto_tree_add_uint_format_value(tree, hf_ulmap_cqich_enhanced_alloc_cqich_id, tvb, BITHI(bit, cqich_id_size), data, "%d (%d bits)", data, cqich_id_size);
bit += cqich_id_size;
}
- XBIT(data, 3, "Period (p)");
- XBIT(data, 3, "Frame offset");
- XBIT(data, 3, "Duration (d)");
- XBIT(cnum, 4, "CQICH_Num");
+ XBIT_HF(3, hf_ulmap_cqich_enhanced_alloc_period);
+ XBIT_HF(3, hf_ulmap_cqich_enhanced_alloc_frame_offset);
+ XBIT_HF(3, hf_ulmap_cqich_enhanced_alloc_duration);
+ XBIT_HF_VALUE(cnum, 4, hf_ulmap_cqich_enhanced_alloc_cqich_num);
cnum += 1;
for (i = 0; i < cnum; i++) {
- XBIT(data, 3, "Feedback Type");
- XBIT(data, 6, "Allocation Index");
- XBIT(data, 3, "CQICH Type");
- XBIT(data, 1, "STTD indication");
+ XBIT_HF(3, hf_ulmap_cqich_enhanced_alloc_feedback_type);
+ XBIT_HF(6, hf_ulmap_cqich_enhanced_alloc_allocation_index);
+ XBIT_HF(3, hf_ulmap_cqich_enhanced_alloc_cqich_type);
+ XBIT_HF(1, hf_ulmap_cqich_enhanced_alloc_sttd_indication);
}
- XBIT(bapm, 1, "Band_AMC_Precoding_Mode");
+ XBIT_HF_VALUE(bapm, 1, hf_ulmap_cqich_enhanced_alloc_band_amc_precoding_mode);
if (bapm == 1) {
- XBIT(data, 3, "Nr_Precoders_Feedback (=N)");
+ XBIT_HF(3, hf_ulmap_cqich_enhanced_alloc_nr_precoders_feedback);
}
pad = BIT_PADDING(bit,8);
if (pad) {
- proto_tree_add_text(tree, tvb, BITHI(bit, pad), "Padding: %d bits", pad);
+ proto_tree_add_bytes_format_value(tree, hf_ulmap_padding, tvb, BITHI(bit, pad), NULL, "%d bits", pad);
bit += pad;
}
return BIT_TO_NIB(bit);
}
-static gint HO_Anchor_Active_UL_MAP_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint HO_Anchor_Active_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* UL-MAP Extended-2 IE = 1 */
/* 8.4.5.4.18 [2] HO_Anchor_Active_UL_MAP_IE (not implemented) */
@@ -1092,13 +1373,13 @@ static gint HO_Anchor_Active_UL_MAP_IE(proto_tree *uiuc_tree, gint offset, gint
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302d, NULL, "HO_Anchor_Active_UL_MAP_IE");
- XNIB(data, 1, "Extended-2 UIUC");
- XNIB(data, 2, "Length");
- proto_tree_add_text(tree, tvb, NIBHI(nib,length-3), "(not implemented)");
+ VNIB(data, 1, hf_ulmap_ie_diuc_ext2);
+ VNIB(data, 2, hf_ulmap_ie_length);
+ proto_tree_add_expert(tree, pinfo, &ei_ulmap_not_implemented, tvb, NIBHI(nib,length-3));
return nib;
}
-static gint HO_Active_Anchor_UL_MAP_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint HO_Active_Anchor_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* UL-MAP Extended-2 IE = 2 */
/* 8.4.5.4.19 [2] HO_Active_Anchor_UL_MAP_IE (not implemented) */
@@ -1111,9 +1392,9 @@ static gint HO_Active_Anchor_UL_MAP_IE(proto_tree *uiuc_tree, gint offset, gint
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302e, NULL, "HO_Active_Anchor_UL_MAP_IE");
- XNIB(data, 1, "Extended-2 UIUC");
- XNIB(data, 2, "Length");
- proto_tree_add_text(tree, tvb, NIBHI(nib,length-3), "(not implemented)");
+ VNIB(data, 1, hf_ulmap_ie_diuc_ext2);
+ VNIB(data, 2, hf_ulmap_ie_length);
+ proto_tree_add_expert(tree, pinfo, &ei_ulmap_not_implemented, tvb, NIBHI(nib,length-3));
return nib;
}
@@ -1132,46 +1413,46 @@ static gint Anchor_BS_switch_IE(proto_tree *uiuc_tree, gint offset, gint length,
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302i, NULL, "Anchor_BS_switch_IE");
- XBIT(data, 4, "Extended-2 UIUC");
- XBIT(data, 8, "Length");
+ XBIT_HF(4, hf_ulmap_anchor_bs_switch_extended_2_uiuc);
+ XBIT_HF(8, hf_ulmap_anchor_bs_switch_length);
- XBIT(nbss, 4, "N_Anchor_BS_switch");
+ XBIT_HF_VALUE(nbss, 4, hf_ulmap_anchor_bs_switch_n_anchor_bs_switch);
for (i = 0; i < nbss; i++) {
- XBIT(data,12, "Reduced CID");
- XBIT(acod, 2, "Action Code");
+ XBIT_HF(12, hf_ulmap_anchor_bs_switch_reduced_cid);
+ XBIT_HF_VALUE(acod, 2, hf_ulmap_anchor_bs_switch_action_code);
if (acod == 1) {
- XBIT(data, 3, "Action Time (A)");
- XBIT(data, 3, "TEMP_BS_ID");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(3, hf_ulmap_anchor_bs_switch_action_time);
+ XBIT_HF(3, hf_ulmap_anchor_bs_switch_temp_bs_id);
+ XBIT_HF(2, hf_ulmap_reserved_uint);
}
if (acod == 0 || acod == 1) {
- XBIT(data, 1, "AK Change Indicator");
- XBIT(cqai, 1, "CQICH Allocation Indicator");
+ XBIT_HF(1, hf_ulmap_anchor_bs_switch_ak_change_indicator);
+ XBIT_HF_VALUE(cqai, 1, hf_ulmap_anchor_bs_switch_cqich_allocation_indicator);
if (cqai == 1) {
/* variable bits from 0-9 */
if (cqich_id_size == 0) {
- proto_tree_add_text(tree, tvb, BITHI(bit, 1), "CQICH_ID: n/a (size == 0 bits)");
+ proto_tree_add_uint_format_value(tree, hf_ulmap_anchor_bs_switch_cqich_id, tvb, BITHI(bit, 1), cqich_id_size, "n/a (size == 0 bits)");
} else {
data = TVB_BIT_BITS16(bit, tvb, cqich_id_size);
- proto_tree_add_text(tree, tvb, BITHI(bit, cqich_id_size),
- "CQICH_ID: %d (%d bits)", data, cqich_id_size);
+ proto_tree_add_uint_format_value(tree, hf_ulmap_anchor_bs_switch_cqich_id, tvb, BITHI(bit, cqich_id_size),
+ data, "%d (%d bits)", data, cqich_id_size);
bit += cqich_id_size;
}
- XBIT(data, 6, "Feedback channel offset");
- XBIT(data, 2, "Period (=p)");
- XBIT(data, 3, "Frame offset");
- XBIT(data, 3, "Duration (=d)");
- XBIT(data, 2, "MIMO_permutation_feedback_code");
+ XBIT_HF(6, hf_ulmap_anchor_bs_switch_feedback_channel_offset);
+ XBIT_HF(2, hf_ulmap_anchor_bs_switch_period);
+ XBIT_HF(3, hf_ulmap_anchor_bs_switch_frame_offset);
+ XBIT_HF(3, hf_ulmap_anchor_bs_switch_duration);
+ XBIT_HF(2, hf_ulmap_anchor_bs_switch_mimo_permutation_feedback_code);
pad = BIT_PADDING(bit,8);
if (pad) {
- proto_tree_add_text(tree, tvb, BITHI(bit,pad), "Reserved: %d bits", pad);
+ proto_tree_add_uint_format_value(tree, hf_ulmap_reserved, tvb, BITHI(bit,pad), 0, "%d bits", pad);
}
}
} else {
- XBIT(data, 2, "Reserved");
+ XBIT_HF(2, hf_ulmap_reserved_uint);
}
}
- XBIT(data, 4, "Reserved");
+ XBIT_HF(4, hf_ulmap_reserved_uint);
return BIT_TO_NIB(bit);
}
@@ -1182,105 +1463,104 @@ static gint UL_sounding_command_IE(proto_tree *uiuc_tree, gint offset, gint leng
/* see 8.4.6.2.7.1 */
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
- gint data;
proto_item *tree;
- gint stype, ssrf, srlf, iafb, pad, sept, nssym, ncid, amod;
+ gint stype, srlf, iafb, pad, sept, nssym, ncid, amod;
gint i, j;
bit = NIB_TO_BIT(offset);
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_315d, NULL, "UL_Sounding_Command_IE");
- XBIT(data, 4, "Extended-2 UIUC");
- XBIT(data, 8, "Length");
+ XBIT_HF(4, hf_ulmap_sounding_command_extended_2_uiuc);
+ XBIT_HF(8, hf_ulmap_sounding_command_length);
- XBIT(stype, 1, "Sounding_Type");
- XBIT(ssrf, 1, "Send Sounding Report Flag");
- XBIT(srlf, 1, "Sounding Relevance Flag");
+ XBIT_HF_VALUE(stype, 1, hf_ulmap_sounding_command_type);
+ XBIT_HF(1, hf_ulmap_sounding_command_send_sounding_report_flag);
+ XBIT_HF_VALUE(srlf, 1, hf_ulmap_sounding_command_relevance_flag);
if (srlf == 0) {
- XBIT(data, 1, "Sounding_Relevance");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(1, hf_ulmap_sounding_command_relevance);
+ XBIT_HF(2, hf_ulmap_reserved_uint);
} else {
- XBIT(data, 3, "Reserved");
+ XBIT_HF(3, hf_ulmap_reserved_uint);
}
- XBIT(iafb, 2, "Include additional feedback");
+ XBIT_HF_VALUE(iafb, 2, hf_ulmap_sounding_command_include_additional_feedback);
if (stype == 0) {
- XBIT(nssym, 3, "Num_Sounding_Symbols");
- XBIT(data, 1, "Reserved");
+ XBIT_HF_VALUE(nssym, 3, hf_ulmap_sounding_command_num_sounding_symbols);
+ XBIT_HF(1, hf_ulmap_reserved_uint);
for (i = 0; i < nssym; i++) {
- XBIT(sept, 1, "Separability Type");
+ XBIT_HF_VALUE(sept, 1, hf_ulmap_sounding_command_separability_type);
if (sept == 0) {
- XBIT(data, 3, "Max Cyclic Shift Index P");
- XBIT(data, 1, "Reserved");
+ XBIT_HF(3, hf_ulmap_sounding_command_max_cyclic_shift_index_p);
+ XBIT_HF(1, hf_ulmap_reserved_uint);
} else {
- XBIT(data, 3, "Decimation Value D");
- XBIT(data, 1, "Decimation offset randomization");
+ XBIT_HF(3, hf_ulmap_sounding_command_decimation_value);
+ XBIT_HF(1, hf_ulmap_sounding_command_decimation_offset_randomization);
}
- XBIT(data, 3, "Sounding symbol index");
- XBIT(ncid, 7, "Number of CIDs");
- XBIT(data, 1, "Reserved");
+ XBIT_HF(3, hf_ulmap_sounding_command_symbol_index);
+ XBIT_HF_VALUE(ncid, 7, hf_ulmap_sounding_command_number_of_cids);
+ XBIT_HF(1, hf_ulmap_reserved_uint);
for (j = 0; j < ncid; j++) {
- XBIT(data,12, "Shorted Basic CID");
- XBIT(data, 2, "Power Assignment Method");
- XBIT(data, 1, "Power boost");
- XBIT(data, 1, "Multi-Antenna Flag");
- XBIT(amod, 1, "Allocation Mode");
+ XBIT_HF(12, hf_ulmap_sounding_command_shorted_basic_cid);
+ XBIT_HF(2, hf_ulmap_sounding_command_power_assignment_method);
+ XBIT_HF(1, hf_ulmap_sounding_command_power_boost);
+ XBIT_HF(1, hf_ulmap_sounding_command_multi_antenna_flag);
+ XBIT_HF_VALUE(amod, 1, hf_ulmap_sounding_command_allocation_mode);
if (amod == 1) {
- XBIT(data,12, "Band bit map");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(12, hf_ulmap_sounding_command_band_bit_map);
+ XBIT_HF(2, hf_ulmap_reserved_uint);
} else {
- XBIT(data, 7, "Starting frequency band");
- XBIT(data, 7, "Number of frequency bands");
+ XBIT_HF(7, hf_ulmap_sounding_command_starting_frequency_band);
+ XBIT_HF(7, hf_ulmap_sounding_command_number_of_frequency_bands);
}
if (srlf == 1) {
- XBIT(data, 1, "Sounding_Relevance");
+ XBIT_HF(1, hf_ulmap_sounding_command_relevance);
} else {
- XBIT(data, 1, "Reserved");
+ XBIT_HF(1, hf_ulmap_reserved_uint);
}
if (sept == 0) {
- XBIT(data, 5, "Cyclic time shift index m");
+ XBIT_HF(5, hf_ulmap_sounding_command_cyclic_time_shift_index);
} else {
- XBIT(data, 6, "Decimation offset d");
+ XBIT_HF(6, hf_ulmap_sounding_command_decimation_offset);
if (iafb == 1) {
- XBIT(data, 1, "Use same symbol for additional feedback");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(1, hf_ulmap_sounding_command_use_same_symbol_for_additional_feedback);
+ XBIT_HF(2, hf_ulmap_reserved_uint);
} else {
- XBIT(data, 3, "Reserved");
+ XBIT_HF(3, hf_ulmap_reserved_uint);
}
}
- XBIT(data, 3, "Periodicity");
+ XBIT_HF(3, hf_ulmap_sounding_command_periodicity);
}
}
} else {
- XBIT(data, 3, "Permutation");
- XBIT(data, 6, "DL_PermBase");
- XBIT(nssym, 3, "Num_Sounding_symbols");
+ XBIT_HF(3, hf_ulmap_sounding_command_permutation);
+ XBIT_HF(6, hf_ulmap_sounding_command_dl_permbase);
+ XBIT_HF_VALUE(nssym, 3, hf_ulmap_sounding_command_num_sounding_symbols);
for (i = 0; i < nssym; i++) {
- XBIT(ncid, 7, "Number of CIDs");
- XBIT(data, 1, "Reserved");
+ XBIT_HF_VALUE(ncid, 7, hf_ulmap_sounding_command_number_of_cids);
+ XBIT_HF(1, hf_ulmap_reserved_uint);
for (j = 0; j < ncid; j++) {
- XBIT(data, 12, "Shortened basic CID");
+ XBIT_HF(12, hf_ulmap_sounding_command_shortened_basic_cid);
if (srlf) {
- XBIT(data, 1, "Sounding_Relevance");
- XBIT(data, 3, "Reserved");
+ XBIT_HF(1, hf_ulmap_sounding_command_relevance);
+ XBIT_HF(3, hf_ulmap_reserved_uint);
}
- XBIT(data, 7, "Subchannel offset");
- XBIT(data, 1, "Power boost");
- XBIT(data, 3, "Number of subchannels");
- XBIT(data, 3, "Periodicity");
- XBIT(data, 2, "Power assignment method");
+ XBIT_HF(7, hf_ulmap_sounding_command_subchannel_offset);
+ XBIT_HF(1, hf_ulmap_sounding_command_power_boost);
+ XBIT_HF(3, hf_ulmap_sounding_command_number_of_subchannels);
+ XBIT_HF(3, hf_ulmap_sounding_command_periodicity);
+ XBIT_HF(2, hf_ulmap_sounding_command_power_assignment_method);
}
}
}
pad = BIT_PADDING(bit,8);
if (pad) {
- proto_tree_add_text(tree, tvb, BITHI(bit,pad), "Padding: %d bits",pad);
+ proto_tree_add_bytes_format_value(tree, hf_ulmap_padding, tvb, BITHI(bit, pad), NULL, "%d bits", pad);
bit += pad;
}
return BIT_TO_NIB(bit);
}
-static gint MIMO_UL_Enhanced_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb)
+static gint MIMO_UL_Enhanced_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* UL-MAP Extended-2 IE = 6 */
/* 8.4.5.4.20 [2] MIMO_UL_Enhanced_IE (not implemented) */
@@ -1293,9 +1573,9 @@ static gint MIMO_UL_Enhanced_IE(proto_tree *uiuc_tree, gint offset, gint length,
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302f, NULL, "MIMO_UL_Enhanced_IE");
- XNIB(data, 1, "Extended-2 UIUC");
- XNIB(data, 2, "Length");
- proto_tree_add_text(tree, tvb, NIBHI(nib,length-3), "(not implemented)");
+ VNIB(data, 1, hf_ulmap_ie_diuc_ext2);
+ VNIB(data, 2, hf_ulmap_ie_length);
+ proto_tree_add_expert(tree, pinfo, &ei_ulmap_not_implemented, tvb, NIBHI(nib,length-3));
return nib;
}
@@ -1305,7 +1585,6 @@ static gint HARQ_ULMAP_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuf
/* 8.4.5.4.24 HARQ_ULMAP_IE */
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
- gint data;
proto_item *tree;
gint bitlength;
gint lastbit;
@@ -1317,21 +1596,21 @@ static gint HARQ_ULMAP_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuf
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302j, NULL, "HARQ_ULMAP_IE");
- XBIT(data, 4, "Extended-2 UIUC");
- XBIT(data, 8, "Length");
+ XBIT_HF(4, hf_ulmap_harq_ulmap_extended_2_uiuc);
+ XBIT_HF(8, hf_ulmap_harq_ulmap_length);
- XBIT(RCID_Type, 2, "RCID_Type");
- XBIT(data, 2, "Reserved");
+ XBIT_HF_VALUE(RCID_Type, 2, hf_ulmap_harq_ulmap_rcid_type);
+ XBIT_HF(2, hf_ulmap_reserved_uint);
lastbit = bit + bitlength -16 - 4;
while (bit < lastbit) {
- XBIT(mode, 3, "Mode");
- XBIT(alsi, 1, "Allocation Start Indication");
+ XBIT_HF_VALUE(mode, 3, hf_ulmap_harq_ulmap_mode);
+ XBIT_HF_VALUE(alsi, 1, hf_ulmap_harq_ulmap_allocation_start_indication);
if (alsi == 1) {
- XBIT(data, 8, "OFDMA Symbol offset");
- XBIT(data, 7, "Subchannel offset");
- XBIT(data, 1, "Reserved");
+ XBIT_HF(8, hf_ulmap_harq_ulmap_ofdma_symbol_offset);
+ XBIT_HF(7, hf_ulmap_harq_ulmap_subchannel_offset);
+ XBIT_HF(1, hf_ulmap_reserved_uint);
}
- XBIT(nsub, 4, "N sub Burst");
+ XBIT_HF_VALUE(nsub, 4, hf_ulmap_harq_ulmap_n_sub_burst);
nsub++;
for (i = 0; i < nsub; i++) {
if (mode == 0) {
@@ -1354,7 +1633,7 @@ static gint HARQ_ULMAP_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuf
pad = NIB_TO_BIT(offset) + bitlength - bit;
if (pad) {
- proto_tree_add_text(tree, tvb, BITHI(bit,pad), "Padding: %d bits",pad);
+ proto_tree_add_bytes_format_value(tree, hf_ulmap_padding, tvb, BITHI(bit, pad), NULL, "%d bits", pad);
bit += pad;
}
return BIT_TO_NIB(bit);
@@ -1366,20 +1645,19 @@ static gint HARQ_ACKCH_Region_Allocation_IE(proto_tree *uiuc_tree, gint offset,
/* 8.4.5.4.25 [2] HARQ_ACKCH_Region_Allocation_IE */
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
- gint data;
proto_item *tree;
bit = NIB_TO_BIT(offset);
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302t, NULL, "HARQ_ACKCH_Region_IE");
- XBIT(data, 4, "Extended-2 UIUC");
- XBIT(data, 8, "Length");
+ XBIT_HF(4, hf_ulmap_harq_ackch_region_alloc_extended_2_uiuc);
+ XBIT_HF(8, hf_ulmap_harq_ackch_region_alloc_length);
- XBIT(data, 8, "OFDMA Symbol Offset");
- XBIT(data, 7, "Subchannel Offset");
- XBIT(data, 5, "No. OFDMA Symbols");
- XBIT(data, 4, "No. Subchannels");
+ XBIT_HF(8, hf_ulmap_harq_ackch_region_alloc_ofdma_symbol_offset);
+ XBIT_HF(7, hf_ulmap_harq_ackch_region_alloc_subchannel_offset);
+ XBIT_HF(5, hf_ulmap_harq_ackch_region_alloc_num_ofdma_symbols);
+ XBIT_HF(4, hf_ulmap_harq_ackch_region_alloc_num_subchannels);
return BIT_TO_NIB(bit);
}
@@ -1389,7 +1667,6 @@ static gint AAS_SDMA_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbu
/* 8.4.5.4.27 [2] AAS_SDMA_UL_IE */
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
- gint data;
proto_item *tree;
gint nreg, pad, user, encm, ppmd, padj;
gint aasp = 0; /* TODO AAS UL preamble used */
@@ -1399,59 +1676,59 @@ static gint AAS_SDMA_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbu
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302u, NULL, "AAS_SDMA_UL_IE");
- XBIT(data, 4, "Extended-2 UIUC");
- XBIT(data, 8, "Length");
+ XBIT_HF(4, hf_ulmap_aas_sdma_extended_2_uiuc);
+ XBIT_HF(8, hf_ulmap_aas_sdma_length);
- XBIT(RCID_Type, 2, "RCID_Type");
- XBIT(nreg, 4, "Num Burst Region");
- XBIT(data, 2, "Reserved");
+ XBIT_HF_VALUE(RCID_Type, 2, hf_ulmap_aas_sdma_rcid_type);
+ XBIT_HF_VALUE(nreg, 4, hf_ulmap_aas_sdma_num_burst_region);
+ XBIT_HF(2, hf_ulmap_reserved_uint);
for (ii = 0; ii < nreg; ii++) {
- XBIT(data,12, "Slot offset");
- XBIT(data,10, "Slot duration");
- XBIT(user, 3, "Number of users");
- XBIT(data, 3, "Reserved");
+ XBIT_HF(12, hf_ulmap_aas_sdma_slot_offset);
+ XBIT_HF(10, hf_ulmap_aas_sdma_slot_duration);
+ XBIT_HF_VALUE(user, 3, hf_ulmap_aas_sdma_number_of_users);
+ XBIT_HF(3, hf_ulmap_reserved_uint);
for (jj = 0; jj < user; jj++) {
bit += RCID_IE(tree, bit, length, tvb, RCID_Type);
- XBIT(encm, 2, "Encoding Mode");
- XBIT(padj, 1, "Power Adjust");
- XBIT(ppmd, 1, "Pilot Pattern Modifier");
+ XBIT_HF_VALUE(encm, 2, hf_ulmap_aas_sdma_encoding_mode);
+ XBIT_HF_VALUE(padj, 1, hf_ulmap_aas_sdma_power_adjust);
+ XBIT_HF_VALUE(ppmd, 1, hf_ulmap_aas_sdma_pilot_pattern_modifier);
if (aasp) {
- XBIT(data, 4, "Preamble Modifier Index");
+ XBIT_HF(4, hf_ulmap_aas_sdma_preamble_modifier_index);
}
if (ppmd) {
- XBIT(data, 2, "Pilot Pattern");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(2, hf_ulmap_aas_sdma_pilot_pattern);
+ XBIT_HF(2, hf_ulmap_reserved_uint);
}
if (encm == 0) {
- XBIT(data, 4, "DIUC");
- XBIT(data, 2, "Repetition Coding Indication");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(4, hf_ulmap_aas_sdma_diuc);
+ XBIT_HF(2, hf_ulmap_aas_sdma_repetition_coding_indication);
+ XBIT_HF(2, hf_ulmap_reserved_uint);
}
if (encm == 1) {
- XBIT(data, 4, "DIUC");
- XBIT(data, 2, "Repetition Coding Indication");
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
- XBIT(data, 1, "Reserved");
+ XBIT_HF(4, hf_ulmap_aas_sdma_diuc);
+ XBIT_HF(2, hf_ulmap_aas_sdma_repetition_coding_indication);
+ XBIT_HF(4, hf_ulmap_aas_sdma_acid);
+ XBIT_HF(1, hf_ulmap_aas_sdma_ai_sn);
+ XBIT_HF(1, hf_ulmap_reserved_uint);
}
if (encm == 2) {
- XBIT(data, 4, "N(EP)");
- XBIT(data, 4, "N(SCH)");
- XBIT(data, 2, "SPID");
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
- XBIT(data, 1, "Reserved");
+ XBIT_HF(4, hf_ulmap_aas_sdma_nep);
+ XBIT_HF(4, hf_ulmap_aas_sdma_nsch);
+ XBIT_HF(2, hf_ulmap_aas_sdma_spid);
+ XBIT_HF(4, hf_ulmap_aas_sdma_acid);
+ XBIT_HF(1, hf_ulmap_aas_sdma_ai_sn);
+ XBIT_HF(1, hf_ulmap_reserved_uint);
}
if (encm == 3) {
- XBIT(data, 4, "DIUC");
- XBIT(data, 2, "Repetition Coding Indication");
- XBIT(data, 2, "SPID");
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
- XBIT(data, 3, "Reserved");
+ XBIT_HF(4, hf_ulmap_aas_sdma_diuc);
+ XBIT_HF(2, hf_ulmap_aas_sdma_repetition_coding_indication);
+ XBIT_HF(2, hf_ulmap_aas_sdma_spid);
+ XBIT_HF(4, hf_ulmap_aas_sdma_acid);
+ XBIT_HF(1, hf_ulmap_aas_sdma_ai_sn);
+ XBIT_HF(3, hf_ulmap_reserved_uint);
}
if (padj) {
- XBIT(data, 8, "Power Adjustment");
+ XBIT_HF(8, hf_ulmap_aas_sdma_power_adjustment);
}
}
@@ -1459,7 +1736,7 @@ static gint AAS_SDMA_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbu
pad = BIT_PADDING(bit,8);
if (pad) {
- proto_tree_add_text(tree, tvb, BITHI(bit, pad), "Padding: %d bits", pad);
+ proto_tree_add_bytes_format_value(tree, hf_ulmap_padding, tvb, BITHI(bit, pad), NULL, "%d bits", pad);
bit += pad;
}
return BIT_TO_NIB(bit);
@@ -1471,7 +1748,6 @@ static gint Feedback_Polling_IE(proto_tree *uiuc_tree, gint offset, gint length,
/* 8.4.5.4.28 [2] Feedback_Polling_IE */
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
- gint data;
proto_item *tree;
gint nalloc, dula, pad, adur;
gint i;
@@ -1480,31 +1756,31 @@ static gint Feedback_Polling_IE(proto_tree *uiuc_tree, gint offset, gint length,
tree = proto_tree_add_subtree(uiuc_tree, tvb, NIBHI(offset, length), ett_302v, NULL, "Feedback_Polling_IE");
- XBIT(data, 4, "Extended-2 UIUC");
- XBIT(data, 8, "Length");
+ XBIT_HF(4, hf_ulmap_feedback_polling_extended_2_uiuc);
+ XBIT_HF(8, hf_ulmap_feedback_polling_length);
- XBIT(nalloc, 4, "Num_Allocation");
- XBIT(dula, 1, "Dedicated UL Allocation included");
- XBIT(data, 3, "Reserved");
+ XBIT_HF_VALUE(nalloc, 4, hf_ulmap_feedback_polling_num_allocation);
+ XBIT_HF_VALUE(dula, 1, hf_ulmap_feedback_polling_dedicated_ul_allocation_included);
+ XBIT_HF(3, hf_ulmap_reserved_uint);
for (i = 0; i < nalloc; i++) {
- XBIT(data,16, "Basic CID");
- XBIT(adur, 3, "Allocation Duration (d)");
+ XBIT_HF(16, hf_ulmap_feedback_polling_basic_cid);
+ XBIT_HF_VALUE(adur, 3, hf_ulmap_feedback_polling_allocation_duration);
if (adur != 0) {
- XBIT(data, 4, "Feedback type");
- XBIT(data, 3, "Frame Offset");
- XBIT(data, 2, "Period (p)");
+ XBIT_HF(4, hf_ulmap_feedback_polling_type);
+ XBIT_HF(3, hf_ulmap_feedback_polling_frame_offset);
+ XBIT_HF(2, hf_ulmap_feedback_polling_period);
if (dula == 1) {
- XBIT(data, 4, "UIUC");
- XBIT(data, 8, "OFDMA Symbol Offset");
- XBIT(data, 7, "Subchannel offset");
- XBIT(data, 3, "Duration");
- XBIT(data, 2, "Repetition coding indication");
+ XBIT_HF(4, hf_ulmap_feedback_polling_uiuc);
+ XBIT_HF(8, hf_ulmap_feedback_polling_ofdma_symbol_offset);
+ XBIT_HF(7, hf_ulmap_feedback_polling_subchannel_offset);
+ XBIT_HF(3, hf_ulmap_feedback_polling_duration);
+ XBIT_HF(2, hf_ulmap_feedback_polling_repetition_coding_indication);
}
}
}
pad = BIT_PADDING(bit,8);
if (pad) {
- proto_tree_add_text(tree, tvb, BITHI(bit, pad), "Padding: %d bits", pad);
+ proto_tree_add_bytes_format_value(tree, hf_ulmap_padding, tvb, BITHI(bit, pad), NULL, "%d bits", pad);
bit += pad;
}
return BIT_TO_NIB(bit);
@@ -1515,7 +1791,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, gint offset, gint length _U_, tvbuff_t *tvb)
+gint dissect_ulmap_ie( proto_tree *ie_tree, packet_info* pinfo, gint offset, gint length _U_, tvbuff_t *tvb)
{
/* decode a single UL-MAP IE and return the
* length of the IE in nibbles
@@ -1583,11 +1859,11 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, gint offset, gint length _U_, tvbuff
break;
case 0x01:
/* 8.4.5.4.18 HO_Anchor_Active_UL_MAP_IE */
- nibble = HO_Anchor_Active_UL_MAP_IE(tree, nibble, len, tvb);
+ nibble = HO_Anchor_Active_UL_MAP_IE(tree, pinfo, nibble, len, tvb);
break;
case 0x02:
/* 8.4.5.4.19 HO_Active_Anchor_UL_MAP_IE */
- nibble = HO_Active_Anchor_UL_MAP_IE(tree, nibble, len, tvb);
+ nibble = HO_Active_Anchor_UL_MAP_IE(tree, pinfo, nibble, len, tvb);
break;
case 0x03:
/* 8.4.5.4.23 Anchor_BS_switch_IE */
@@ -1599,7 +1875,7 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, gint offset, gint length _U_, tvbuff
break;
case 0x06:
/* 8.4.5.4.20 MIMO_UL_Enhanced_IE */
- nibble = MIMO_UL_Enhanced_IE(tree, nibble, len, tvb);
+ nibble = MIMO_UL_Enhanced_IE(tree, pinfo, nibble, len, tvb);
break;
case 0x07:
/* 8.4.5.4.24 HARQ_ULMAP_IE */
@@ -1619,8 +1895,8 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, gint offset, gint length _U_, tvbuff
break;
default:
- proto_tree_add_text(tree, tvb, NIBHI(nibble, len), "(reserved Extended-2 UIUC: %d)", ext2_uiuc);
- nibble += len;
+ proto_tree_add_bytes_format(tree, hf_ulmap_ie_reserved_extended2_duic, tvb, NIBHI(nibble, len), NULL, "(reserved Extended-2 UIUC: %d)", ext2_uiuc);
+ nibble += len;
break;
}
@@ -1748,7 +2024,7 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, gint offset, gint length _U_, tvbuff
break;
case 0x06:
/* 8.4.5.4.11 MIMO_UL_IE */
- nibble = MIMO_UL_IE(tree, nibble, len, tvb);
+ nibble = MIMO_UL_IE(tree, pinfo, nibble, len, tvb);
break;
case 0x07:
/* 8.4.5.4.22 ULMAP_Fast_Tracking_IE */
@@ -1767,8 +2043,8 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, gint offset, gint length _U_, tvbuff
nibble = UL_Allocation_Start_IE(tree, nibble, len, tvb);
break;
default:
- proto_tree_add_text(tree, tvb, NIBHI(nibble,len), "(reserved Extended UIUC: %d)", ext_uiuc);
- nibble += len;
+ proto_tree_add_bytes_format_value(tree, hf_ulmap_ie_reserved_extended_duic, tvb, NIBHI(nibble,len), NULL, "(reserved Extended UIUC: %d)", ext_uiuc);
+ nibble += len;
break;
}
}
@@ -1794,7 +2070,7 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, gint offset, gint length _U_, tvbuff
if (aas_or_amc) {
data = TVB_NIB_BITS12(nibble, tvb);
- proto_tree_add_text(tree, tvb, NIBHI(nibble,3), "Slot offset: %d", data);
+ proto_tree_add_uint(tree, hf_ulmap_uiuc10_slot_offset, tvb, NIBHI(nibble,3), data);
nibble += 3;
}
}
@@ -1836,17 +2112,17 @@ static void dissect_mac_mgmt_msg_ulmap_decoder(tvbuff_t *tvb, packet_info *pinfo
/* length = BYTE_TO_NIB(length); */ /* convert length to nibbles */
nib = BYTE_TO_NIB(offset);
while (nib < ((tvb_len*2)-1)) {
- nib += dissect_ulmap_ie(ie_tree, nib, tvb_len*2, tvb);
+ nib += dissect_ulmap_ie(ie_tree, pinfo, nib, tvb_len*2, tvb);
}
pad = NIB_PADDING(nib);
if (pad) {
- proto_tree_add_text(ulmap_tree, tvb, NIBHI(nib,1), "Padding nibble");
+ proto_tree_add_bytes_format(ulmap_tree, hf_ulmap_padding, tvb, NIBHI(nib,1), NULL, "Padding nibble");
nib++;
}
}
/*gint wimax_decode_ulmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)*/
-gint wimax_decode_ulmapc(proto_tree *base_tree, gint offset, gint length, tvbuff_t *tvb)
+gint wimax_decode_ulmapc(proto_tree *base_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* 8.4.5.6.2 [2] Compressed UL-MAP */
/* returns length in nibbles */
@@ -1875,12 +2151,12 @@ gint wimax_decode_ulmapc(proto_tree *base_tree, gint offset, gint length, tvbuff
ie_tree = proto_tree_add_subtree_format(tree, tvb, NIBHI(nib,length-nib), ett_306_ul, NULL, "UL-MAP IEs (%u bytes)", NIB_ADDR(length-nib));
while (nib < length-1) {
- nib += dissect_ulmap_ie(ie_tree, nib, length-nib, tvb);
+ nib += dissect_ulmap_ie(ie_tree, pinfo, nib, length-nib, tvb);
}
/* padding */
if (nib & 1) {
- proto_tree_add_text(tree, tvb, NIBHI(nib,1), "Padding Nibble");
+ proto_tree_add_bytes_format(tree, hf_ulmap_padding, tvb, NIBHI(nib,1), NULL, "Padding nibble");
nib++;
}
@@ -1898,63 +2174,63 @@ gint wimax_decode_ulmap_reduced_aas(proto_tree *base_tree, gint offset, gint len
gint bit;
guint data;
proto_tree *tree;
- gint azci, azpi, umii, phmi, powi, fbck;
+ gint azci, azpi, umii, phmi, powi;
bit = offset;
tree = proto_tree_add_subtree(base_tree, tvb, BITHI(bit,length), ett_308b, NULL, "Reduced_AAS_Private_UL_MAP");
/* Decode and display the Reduced AAS private UL-MAP */
- XBIT(azci, 1, "AAS zone configuration included");
- XBIT(azpi, 1, "AAS zone position included");
- XBIT(umii, 1, "UL-MAP information included");
- XBIT(phmi, 1, "PHY modification included");
- XBIT(powi, 1, "Power Control included");
- XBIT(fbck, 2, "Include Feedback Header");
- XBIT(data, 2, "Encoding Mode");
+ XBIT_HF_VALUE(azci, 1, hf_ulmap_reduced_aas_aas_zone_configuration_included);
+ XBIT_HF_VALUE(azpi, 1, hf_ulmap_reduced_aas_aas_zone_position_included);
+ XBIT_HF_VALUE(umii, 1, hf_ulmap_reduced_aas_ul_map_information_included);
+ XBIT_HF_VALUE(phmi, 1, hf_ulmap_reduced_aas_phy_modification_included);
+ XBIT_HF_VALUE(powi, 1, hf_ulmap_reduced_aas_power_control_included);
+ XBIT_HF(2, hf_ulmap_reduced_aas_include_feedback_header);
+ XBIT_HF(2, hf_ulmap_reduced_aas_encoding_mode);
if (azci) {
- XBIT(data, 2, "Permutation");
- XBIT(data, 7, "UL_PermBase");
- XBIT(data, 2, "Preamble Indication");
- XBIT(data, 5, "Padding");
+ XBIT_HF(2, hf_ulmap_reduced_aas_permutation);
+ XBIT_HF(7, hf_ulmap_reduced_aas_ul_permbase);
+ XBIT_HF(2, hf_ulmap_reduced_aas_preamble_indication);
+ XBIT_HF(5, hf_ulmap_reduced_aas_padding);
}
if (azpi) {
- XBIT(data, 8, "Zone Symbol Offset");
- XBIT(data, 8, "Zone Length");
+ XBIT_HF(8, hf_ulmap_reduced_aas_zone_symbol_offset);
+ XBIT_HF(8, hf_ulmap_reduced_aas_zone_length);
}
if (umii) {
- XBIT(data, 8, "UCD Count");
+ XBIT_HF(8, hf_ulmap_reduced_aas_ucd_count);
data = TVB_BIT_BITS64(bit,tvb,32);
- proto_tree_add_text(tree, tvb, BITHI(bit,32), "Private Map Allocation Start Time: %u",data);
+ proto_tree_add_uint64(tree, hf_ulmap_reduced_aas_private_map_alloc_start_time, tvb, BITHI(bit,32), data);
bit += 32;
}
if (phmi) {
- XBIT(data, 1, "Preamble Select");
- XBIT(data, 4, "Preamble Shift Index");
- XBIT(data, 1, "Pilot Pattern Modifier");
+ XBIT_HF(1, hf_ulmap_reduced_aas_preamble_select);
+ XBIT_HF(4, hf_ulmap_reduced_aas_preamble_shift_index);
+ XBIT_HF(1, hf_ulmap_reduced_aas_pilot_pattern_modifier);
data = TVB_BIT_BITS32(bit,tvb,22);
- proto_tree_add_text(tree, tvb, BITHI(bit,22), "Pilot Pattern Index: %u",data);
+ proto_tree_add_uint64(tree, hf_ulmap_reduced_aas_pilot_pattern_index, tvb, BITHI(bit,22), data);
bit += 22;
}
if (powi) {
- XBIT(data, 8, "Power Control");
+ XBIT_HF(8, hf_ulmap_reduced_aas_power_control);
}
- XBIT(data, 3, "UL Frame Offset");
- XBIT(data,12, "Slot Offset");
- XBIT(data,10, "Slot Duration");
- XBIT(data, 4, "UIUC / N(EP)");
+ XBIT_HF(3, hf_ulmap_reduced_aas_ul_frame_offset);
+ XBIT_HF(12, hf_ulmap_reduced_aas_slot_offset);
+ XBIT_HF(10, hf_ulmap_reduced_aas_slot_duration);
+ XBIT_HF(4, hf_ulmap_reduced_aas_uiuc_nep);
if (harq) {
- XBIT(data, 4, "ACID");
- XBIT(data, 1, "AI_SN");
- XBIT(data, 3, "Reserved");
+ XBIT_HF(4, hf_ulmap_reduced_aas_acid);
+ XBIT_HF(1, hf_ulmap_reduced_aas_ai_sn);
+ XBIT_HF(3, hf_ulmap_reserved_uint);
if (ir_type) {
- XBIT(data, 4, "N(SCH)");
- XBIT(data, 2, "SPID");
- XBIT(data, 2, "Reserved");
+ XBIT_HF(4, hf_ulmap_reduced_aas_nsch);
+ XBIT_HF(2, hf_ulmap_reduced_aas_spid);
+ XBIT_HF(2, hf_ulmap_reserved_uint);
}
}
- XBIT(data, 2, "Repetition Coding Indication");
+ XBIT_HF(2, hf_ulmap_reduced_aas_repetition_coding_indication);
return (bit - offset); /* length in bits */
}
@@ -2006,6 +2282,41 @@ void proto_register_mac_mgmt_msg_ulmap(void)
}
},
{
+ &hf_ulmap_ie_diuc_ext,
+ {
+ "Extended DIUC", "wmx.ulmap.ie.ext_diuc",
+ FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_ulmap_ie_diuc_ext2,
+ {
+ "Extended-2 DIUC", "wmx.ulmap.ie.ext2_diuc",
+ FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_ulmap_ie_length,
+ {
+ "Length", "wmx.ilmap.ie.length",
+ FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_ulmap_ie_reserved_extended2_duic,
+ {
+ "Reserved Extended-2 DIUC", "wmx.ulmap.ie.ext2_diuc_reserved",
+ FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
+ &hf_ulmap_ie_reserved_extended_duic,
+ {
+ "Reserved Extended DIUC", "wmx.ulmap.ie.ext_diuc_reserved",
+ FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
&hf_ulmap_reserved,
{
"Reserved", "wmx.ulmap.rsv",
@@ -2122,11 +2433,18 @@ void proto_register_mac_mgmt_msg_ulmap(void)
{
&hf_ulmap_uiuc10_rep,
{
- "Repetition Coding indication", "wmx.ulmap.uiuc12.rep",
+ "Repetition Coding indication", "wmx.ulmap.uiuc10.rep",
FT_UINT16, BASE_DEC, NULL, 0x0030, NULL, HFILL
}
},
{
+ &hf_ulmap_uiuc10_slot_offset,
+ {
+ "Slot offset", "wmx.ulmap.uiuc10.slot_offset",
+ FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL
+ }
+ },
+ {
&hf_ulmap_uiuc12_subofs,
{
"Subchannel Offset", "wmx.ulmap.uiuc12.subofs",
@@ -2168,6 +2486,22 @@ void proto_register_mac_mgmt_msg_ulmap(void)
FT_UINT32, BASE_DEC, NULL, 0x00000001, NULL, HFILL
}
},
+#if 0
+ {
+ &hf_ulmap_crc16,
+ {
+ "CRC-16", "wmx.ulmap.crc16",
+ FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL
+ }
+ },
+#endif
+ {
+ &hf_ulmap_padding,
+ {
+ "Padding", "wmx.ulmap.padding",
+ FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
+ }
+ },
{
&hf_ulmap_uiuc13_subofs,
{
@@ -2266,8 +2600,290 @@ void proto_register_mac_mgmt_msg_ulmap(void)
"Length", "wmx.ulmap.uiuc15.len",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL
}
- }
+ },
#endif
+ /* Generated via "one time" script to help create filterable fields */
+ { &hf_ulmap_dedicated_ul_control_length, { "Length", "wmx.ulmap.dedicated_ul_control.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_dedicated_ul_control_control_header, { "Control Header", "wmx.ulmap.dedicated_ul_control.control_header", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_dedicated_ul_control_num_sdma_layers, { "Num SDMA layers", "wmx.ulmap.dedicated_ul_control.num_sdma_layers", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_dedicated_ul_control_pilot_pattern, { "Pilot Pattern", "wmx.ulmap.dedicated_ul_control.pilot_pattern", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_dedicated_mimo_ul_control_matrix, { "Matrix", "wmx.ulmap.dedicated_mimo_ul_control.matrix", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_dedicated_mimo_ul_control_n_layer, { "N_layer", "wmx.ulmap.dedicated_mimo_ul_control.n_layer", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_chase_dedicated_ul_control_indicator, { "Dedicated UL Control Indicator", "wmx.ulmap.harq_chase.dedicated_ul_control_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_chase_uiuc, { "UIUC", "wmx.ulmap.harq_chase.uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_chase_repetition_coding_indication, { "Repetition Coding Indication", "wmx.ulmap.harq_chase.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_chase_duration, { "Duration", "wmx.ulmap.harq_chase.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_chase_acid, { "ACID", "wmx.ulmap.harq_chase.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_chase_ai_sn, { "AI_SN", "wmx.ulmap.harq_chase.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_chase_ack_disable, { "ACK_disable", "wmx.ulmap.harq_chase.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reserved_uint, { "Reserved", "wmx.ulmap.reserved.uint", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_ctc_dedicated_ul_control_indicator, { "Dedicated UL Control Indicator", "wmx.ulmap.harq_ir_ctc.dedicated_ul_control_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_ctc_nep, { "N(EP)", "wmx.ulmap.harq_ir_ctc.nep", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_ctc_nsch, { "N(SCH)", "wmx.ulmap.harq_ir_ctc.nsch", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_ctc_spid, { "SPID", "wmx.ulmap.harq_ir_ctc.spid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_ctc_acin, { "ACIN", "wmx.ulmap.harq_ir_ctc.acin", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_ctc_ai_sn, { "AI_SN", "wmx.ulmap.harq_ir_ctc.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_ctc_ack_disable, { "ACK_disable", "wmx.ulmap.harq_ir_ctc.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_cc_dedicated_ul_control_indicator, { "Dedicated UL Control Indicator", "wmx.ulmap.harq_ir_cc.dedicated_ul_control_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_cc_uiuc, { "UIUC", "wmx.ulmap.harq_ir_cc.uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_cc_repetition_coding_indication, { "Repetition Coding Indication", "wmx.ulmap.harq_ir_cc.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_cc_duration, { "Duration", "wmx.ulmap.harq_ir_cc.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_cc_spid, { "SPID", "wmx.ulmap.harq_ir_cc.spid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_cc_acid, { "ACID", "wmx.ulmap.harq_ir_cc.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_cc_ai_sn, { "AI_SN", "wmx.ulmap.harq_ir_cc.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ir_cc_ack_disable, { "ACK_disable", "wmx.ulmap.harq_ir_cc.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_chase_harq_mu_indicator, { "MU indicator", "wmx.ulmap.mimo_ul_chase_harq.mu_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_chase_harq_dedicated_mimo_ulcontrol_indicator, { "Dedicated MIMO ULControl Indicator", "wmx.ulmap.mimo_ul_chase_harq.dedicated_mimo_ulcontrol_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_chase_harq_ack_disable, { "ACK Disable", "wmx.ulmap.mimo_ul_chase_harq.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_chase_harq_matrix, { "Matrix", "wmx.ulmap.mimo_ul_chase_harq.matrix", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_chase_harq_duration, { "Duration", "wmx.ulmap.mimo_ul_chase_harq.duration", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_chase_harq_uiuc, { "UIUC", "wmx.ulmap.mimo_ul_chase_harq.uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_chase_harq_repetition_coding_indication, { "Repetition Coding Indication", "wmx.ulmap.mimo_ul_chase_harq.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_chase_harq_acid, { "ACID", "wmx.ulmap.mimo_ul_chase_harq.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_chase_harq_ai_sn, { "AI_SN", "wmx.ulmap.mimo_ul_chase_harq.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_mu_indicator, { "MU indicator", "wmx.ulmap.mimo_ul_ir_harq.mu_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_dedicated_mimo_ul_control_indicator, { "Dedicated MIMO UL Control Indicator", "wmx.ulmap.mimo_ul_ir_harq.dedicated_mimo_ul_control_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_ack_disable, { "ACK Disable", "wmx.ulmap.mimo_ul_ir_harq.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_matrix, { "Matrix", "wmx.ulmap.mimo_ul_ir_harq.matrix", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_nsch, { "N(SCH)", "wmx.ulmap.mimo_ul_ir_harq.nsch", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_nep, { "N(EP)", "wmx.ulmap.mimo_ul_ir_harq.nep", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_spid, { "SPID", "wmx.ulmap.mimo_ul_ir_harq.spid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_acid, { "ACID", "wmx.ulmap.mimo_ul_ir_harq.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_ai_sn, { "AI_SN", "wmx.ulmap.mimo_ul_ir_harq.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_cc_mu_indicator, { "MU indicator", "wmx.ulmap.mimo_ul_ir_harq_cc.mu_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_cc_dedicated_mimo_ul_control_indicator, { "Dedicated MIMO UL Control Indicator", "wmx.ulmap.mimo_ul_ir_harq_cc.dedicated_mimo_ul_control_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_cc_ack_disable, { "ACK Disable", "wmx.ulmap.mimo_ul_ir_harq_cc.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_cc_matrix, { "Matrix", "wmx.ulmap.mimo_ul_ir_harq_cc.matrix", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_cc_duration, { "Duration", "wmx.ulmap.mimo_ul_ir_harq_cc.duration", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_cc_uiuc, { "UIUC", "wmx.ulmap.mimo_ul_ir_harq_cc.uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_cc_repetition_coding_indication, { "Repetition Coding Indication", "wmx.ulmap.mimo_ul_ir_harq_cc.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_cc_acid, { "ACID", "wmx.ulmap.mimo_ul_ir_harq_cc.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_cc_ai_sn, { "AI_SN", "wmx.ulmap.mimo_ul_ir_harq_cc.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_ir_harq_cc_spid, { "SPID", "wmx.ulmap.mimo_ul_ir_harq_cc.spid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_stc_harq_tx_count, { "Tx count", "wmx.ulmap.mimo_ul_stc_harq.tx_count", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_stc_harq_duration, { "Duration", "wmx.ulmap.mimo_ul_stc_harq.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_stc_harq_sub_burst_offset_indication, { "Sub-burst offset indication", "wmx.ulmap.mimo_ul_stc_harq.sub_burst_offset_indication", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_stc_harq_sub_burst_offset, { "Sub-burst offset", "wmx.ulmap.mimo_ul_stc_harq.sub_burst_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_stc_harq_ack_disable, { "ACK Disable", "wmx.ulmap.mimo_ul_stc_harq.ack_disable", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_stc_harq_uiuc, { "UIUC", "wmx.ulmap.mimo_ul_stc_harq.uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_stc_harq_repetition_coding_indication, { "Repetition Coding Indication", "wmx.ulmap.mimo_ul_stc_harq.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mimo_ul_stc_harq_acid, { "ACID", "wmx.ulmap.mimo_ul_stc_harq.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_power_control, { "Power Control", "wmx.ulmap.power_control", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_power_measurement_frame, { "Power measurement frame", "wmx.ulmap.power_measurement_frame", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mini_subcha_alloc_extended_2_uiuc, { "Extended-2 UIUC", "wmx.ulmap.mini_subcha_alloc.extended_2_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mini_subcha_alloc_length, { "Length", "wmx.ulmap.mini_subcha_alloc.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mini_subcha_alloc_ctype, { "Ctype", "wmx.ulmap.mini_subcha_alloc.ctype", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mini_subcha_alloc_duration, { "Duration", "wmx.ulmap.mini_subcha_alloc.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mini_subcha_alloc_cid, { "CID", "wmx.ulmap.mini_subcha_alloc.cid", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mini_subcha_alloc_uiuc, { "UIUC", "wmx.ulmap.mini_subcha_alloc.uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mini_subcha_alloc_repetition, { "Repetition", "wmx.ulmap.mini_subcha_alloc.repetition", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_mini_subcha_alloc_padding, { "Padding", "wmx.ulmap.mini_subcha_alloc.padding", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_ul_extended_uiuc, { "Extended UIUC", "wmx.ulmap.aas_ul.extended_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_ul_length, { "Length", "wmx.ulmap.aas_ul.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_ul_permutation, { "Permutation", "wmx.ulmap.aas_ul.permutation", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_ul_ul_permbase, { "UL_PermBase", "wmx.ulmap.aas_ul.ul_permbase", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_ul_ofdma_symbol_offset, { "OFDMA symbol offset", "wmx.ulmap.aas_ul.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_ul_aas_zone_length, { "AAS zone length", "wmx.ulmap.aas_ul.aas_zone_length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_ul_uplink_preamble_config, { "Uplink preamble config", "wmx.ulmap.aas_ul.uplink_preamble_config", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_ul_preamble_type, { "Preamble type", "wmx.ulmap.aas_ul.preamble_type", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_extended_uiuc, { "Extended UIUC", "wmx.ulmap.cqich_alloc.extended_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_length, { "Length", "wmx.ulmap.cqich_alloc.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_cqich_id, { "CQICH_ID", "wmx.ulmap.cqich_alloc.cqich_id", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_allocation_offset, { "Allocation offset", "wmx.ulmap.cqich_alloc.allocation_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_period, { "Period (p)", "wmx.ulmap.cqich_alloc.period", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_frame_offset, { "Frame offset", "wmx.ulmap.cqich_alloc.frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_duration, { "Duration (d)", "wmx.ulmap.cqich_alloc.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_report_configuration_included, { "Report configuration included", "wmx.ulmap.cqich_alloc.report_configuration_included", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_feedback_type, { "Feedback Type", "wmx.ulmap.cqich_alloc.feedback_type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_report_type, { "Report type", "wmx.ulmap.cqich_alloc.report_type", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_cinr_preamble_report_type, { "CINR preamble report type", "wmx.ulmap.cqich_alloc.cinr_preamble_report_type", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_zone_permutation, { "Zone permutation", "wmx.ulmap.cqich_alloc.zone_permutation", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_zone_type, { "Zone type", "wmx.ulmap.cqich_alloc.zone_type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_zone_prbs_id, { "Zone PRBS_ID", "wmx.ulmap.cqich_alloc.zone_prbs_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_major_group_indication, { "Major group indication", "wmx.ulmap.cqich_alloc.major_group_indication", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_pusc_major_group_bitmap, { "PUSC Major group bitmap", "wmx.ulmap.cqich_alloc.pusc_major_group_bitmap", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_cinr_zone_measurement_type, { "CINR zone measurement type", "wmx.ulmap.cqich_alloc.cinr_zone_measurement_type", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_averaging_parameter_included, { "Averaging parameter included", "wmx.ulmap.cqich_alloc.averaging_parameter_included", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_averaging_parameter, { "Averaging parameter", "wmx.ulmap.cqich_alloc.averaging_parameter", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_alloc_mimo_permutation_feedback_cycle, { "MIMO_permutation_feedback_cycle", "wmx.ulmap.cqich_alloc.mimo_permutation_feedback_cycle", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_zone_extended_uiuc, { "Extended UIUC", "wmx.ulmap.zone.extended_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_zone_length, { "Length", "wmx.ulmap.zone.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_zone_ofdma_symbol_offset, { "OFDMA symbol offset", "wmx.ulmap.zone.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_zone_permutation, { "Permutation", "wmx.ulmap.zone.permutation", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_zone_ul_permbase, { "UL_PermBase", "wmx.ulmap.zone.ul_permbase", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_zone_amc_type, { "AMC type", "wmx.ulmap.zone.amc_type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_zone_use_all_sc_indicator, { "Use All SC indicator", "wmx.ulmap.zone.use_all_sc_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_zone_disable_subchannel_rotation, { "Disable subchannel rotation", "wmx.ulmap.zone.disable_subchannel_rotation", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_phymod_ul_extended_uiuc, { "Extended UIUC", "wmx.ulmap.phymod_ul.extended_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_phymod_ul_length, { "Length", "wmx.ulmap.phymod_ul.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_phymod_ul_preamble_modifier_type, { "Preamble Modifier Type", "wmx.ulmap.phymod_ul.preamble_modifier_type", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_phymod_ul_preamble_frequency_shift_index, { "Preamble frequency shift index", "wmx.ulmap.phymod_ul.preamble_frequency_shift_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_phymod_ul_preamble_time_shift_index, { "Preamble Time Shift index", "wmx.ulmap.phymod_ul.preamble_time_shift_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_phymod_ul_pilot_pattern_modifier, { "Pilot Pattern Modifier", "wmx.ulmap.phymod_ul.pilot_pattern_modifier", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_phymod_ul_pilot_pattern_index, { "Pilot Pattern Index", "wmx.ulmap.phymod_ul.pilot_pattern_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_tracking_extended_uiuc, { "Extended UIUC", "wmx.ulmap.fast_tracking.extended_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_tracking_length, { "Length", "wmx.ulmap.fast_tracking.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_tracking_map_index, { "Map Index", "wmx.ulmap.fast_tracking.map_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_tracking_power_correction, { "Power correction", "wmx.ulmap.fast_tracking.power_correction", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_tracking_frequency_correction, { "Frequency correction", "wmx.ulmap.fast_tracking.frequency_correction", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_tracking_time_correction, { "Time correction", "wmx.ulmap.fast_tracking.time_correction", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_pusc_burst_allocation_extended_uiuc, { "Extended UIUC", "wmx.ulmap.pusc_burst_allocation.extended_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_pusc_burst_allocation_length, { "Length", "wmx.ulmap.pusc_burst_allocation.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_pusc_burst_allocation_uiuc, { "UIUC", "wmx.ulmap.pusc_burst_allocation.uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_pusc_burst_allocation_segment, { "Segment", "wmx.ulmap.pusc_burst_allocation.segment", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_pusc_burst_allocation_ul_permbase, { "UL_PermBase", "wmx.ulmap.pusc_burst_allocation.ul_permbase", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_pusc_burst_allocation_ofdma_symbol_offset, { "OFDMA symbol offset", "wmx.ulmap.pusc_burst_allocation.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_pusc_burst_allocation_subchannel_offset, { "Subchannel offset", "wmx.ulmap.pusc_burst_allocation.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_pusc_burst_allocation_duration, { "Duration", "wmx.ulmap.pusc_burst_allocation.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_pusc_burst_allocation_repetition_coding_indication, { "Repetition coding indication", "wmx.ulmap.pusc_burst_allocation.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_ranging_extended_uiuc, { "Extended UIUC", "wmx.ulmap.fast_ranging.extended_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_ranging_length, { "Length", "wmx.ulmap.fast_ranging.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_ranging_ho_id_indicator, { "HO_ID indicator", "wmx.ulmap.fast_ranging.ho_id_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_ranging_ho_id, { "HO_ID", "wmx.ulmap.fast_ranging.ho_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_ranging_mac_address, { "MAC address", "wmx.ulmap.fast_ranging.mac_address", FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_ranging_uiuc, { "UIUC", "wmx.ulmap.fast_ranging.uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_ranging_duration, { "Duration", "wmx.ulmap.fast_ranging.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_fast_ranging_repetition_coding_indication, { "Repetition coding indication", "wmx.ulmap.fast_ranging.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_allocation_start_extended_uiuc, { "Extended UIUC", "wmx.ulmap.allocation_start.extended_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_allocation_start_length, { "Length", "wmx.ulmap.allocation_start.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_allocation_start_ofdma_symbol_offset, { "OFDMA symbol offset", "wmx.ulmap.allocation_start.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_allocation_start_subchannel_offset, { "Subchannel offset", "wmx.ulmap.allocation_start.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_extended_2_uiuc, { "Extended-2 UIUC", "wmx.ulmap.cqich_enhanced_alloc.extended_2_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_length, { "Length", "wmx.ulmap.cqich_enhanced_alloc.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_cqich_id, { "CQICH_ID", "wmx.ulmap.cqich_enhanced_alloc.cqich_id", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_period, { "Period (p)", "wmx.ulmap.cqich_enhanced_alloc.period", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_frame_offset, { "Frame offset", "wmx.ulmap.cqich_enhanced_alloc.frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_duration, { "Duration (d)", "wmx.ulmap.cqich_enhanced_alloc.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_cqich_num, { "CQICH_Num", "wmx.ulmap.cqich_enhanced_alloc.cqich_num", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_feedback_type, { "Feedback Type", "wmx.ulmap.cqich_enhanced_alloc.feedback_type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_allocation_index, { "Allocation Index", "wmx.ulmap.cqich_enhanced_alloc.allocation_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_cqich_type, { "CQICH Type", "wmx.ulmap.cqich_enhanced_alloc.cqich_type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_sttd_indication, { "STTD indication", "wmx.ulmap.cqich_enhanced_alloc.sttd_indication", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_band_amc_precoding_mode, { "Band_AMC_Precoding_Mode", "wmx.ulmap.cqich_enhanced_alloc.band_amc_precoding_mode", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_cqich_enhanced_alloc_nr_precoders_feedback, { "Nr_Precoders_Feedback (=N)", "wmx.ulmap.cqich_enhanced_alloc.nr_precoders_feedback", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_extended_2_uiuc, { "Extended-2 UIUC", "wmx.ulmap.anchor_bs_switch.extended_2_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_length, { "Length", "wmx.ulmap.anchor_bs_switch.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_n_anchor_bs_switch, { "N_Anchor_BS_switch", "wmx.ulmap.anchor_bs_switch.n_anchor_bs_switch", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_reduced_cid, { "Reduced CID", "wmx.ulmap.anchor_bs_switch.reduced_cid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_action_code, { "Action Code", "wmx.ulmap.anchor_bs_switch.action_code", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_action_time, { "Action Time (A)", "wmx.ulmap.anchor_bs_switch.action_time", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_temp_bs_id, { "TEMP_BS_ID", "wmx.ulmap.anchor_bs_switch.temp_bs_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_ak_change_indicator, { "AK Change Indicator", "wmx.ulmap.anchor_bs_switch.ak_change_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_cqich_allocation_indicator, { "CQICH Allocation Indicator", "wmx.ulmap.anchor_bs_switch.cqich_allocation_indicator", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_feedback_channel_offset, { "Feedback channel offset", "wmx.ulmap.anchor_bs_switch.feedback_channel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_cqich_id, { "CQICH_ID", "wmx.ulmap.anchor_bs_switch.cqich_id", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_period, { "Period (=p)", "wmx.ulmap.anchor_bs_switch.period", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_frame_offset, { "Frame offset", "wmx.ulmap.anchor_bs_switch.frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_duration, { "Duration (=d)", "wmx.ulmap.anchor_bs_switch.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_anchor_bs_switch_mimo_permutation_feedback_code, { "MIMO_permutation_feedback_code", "wmx.ulmap.anchor_bs_switch.mimo_permutation_feedback_code", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_extended_2_uiuc, { "Extended-2 UIUC", "wmx.ulmap.sounding_command.extended_2_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_length, { "Length", "wmx.ulmap.sounding_command.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_type, { "Sounding_Type", "wmx.ulmap.sounding_command.sounding_command.type", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_send_sounding_report_flag, { "Send Sounding Report Flag", "wmx.ulmap.sounding_command.send_sounding_report_flag", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_relevance_flag, { "Sounding Relevance Flag", "wmx.ulmap.sounding_command.relevance_flag", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_relevance, { "Sounding_Relevance", "wmx.ulmap.sounding_command.sounding_relevance", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_include_additional_feedback, { "Include additional feedback", "wmx.ulmap.sounding_command.include_additional_feedback", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_num_sounding_symbols, { "Num_Sounding_Symbols", "wmx.ulmap.sounding_command.num_sounding_symbols", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_separability_type, { "Separability Type", "wmx.ulmap.sounding_command.separability_type", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_max_cyclic_shift_index_p, { "Max Cyclic Shift Index P", "wmx.ulmap.sounding_command.max_cyclic_shift_index_p", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_decimation_value, { "Decimation Value D", "wmx.ulmap.sounding_command.decimation_value", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_decimation_offset_randomization, { "Decimation offset randomization", "wmx.ulmap.sounding_command.decimation_offset_randomization", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_symbol_index, { "Sounding symbol index", "wmx.ulmap.sounding_command.sounding_command.symbol_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_number_of_cids, { "Number of CIDs", "wmx.ulmap.sounding_command.number_of_cids", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_shorted_basic_cid, { "Shorted Basic CID", "wmx.ulmap.sounding_command.shorted_basic_cid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_power_assignment_method, { "Power Assignment Method", "wmx.ulmap.sounding_command.power_assignment_method", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_power_boost, { "Power boost", "wmx.ulmap.sounding_command.power_boost", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_multi_antenna_flag, { "Multi-Antenna Flag", "wmx.ulmap.sounding_command.multi_antenna_flag", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_allocation_mode, { "Allocation Mode", "wmx.ulmap.sounding_command.allocation_mode", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_band_bit_map, { "Band bit map", "wmx.ulmap.sounding_command.band_bit_map", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_starting_frequency_band, { "Starting frequency band", "wmx.ulmap.sounding_command.starting_frequency_band", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_number_of_frequency_bands, { "Number of frequency bands", "wmx.ulmap.sounding_command.number_of_frequency_bands", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_cyclic_time_shift_index, { "Cyclic time shift index m", "wmx.ulmap.sounding_command.cyclic_time_shift_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_decimation_offset, { "Decimation offset d", "wmx.ulmap.sounding_command.decimation_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_use_same_symbol_for_additional_feedback, { "Use same symbol for additional feedback", "wmx.ulmap.sounding_command.use_same_symbol_for_additional_feedback", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_periodicity, { "Periodicity", "wmx.ulmap.sounding_command.periodicity", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_permutation, { "Permutation", "wmx.ulmap.sounding_command.permutation", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_dl_permbase, { "DL_PermBase", "wmx.ulmap.sounding_command.dl_permbase", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_shortened_basic_cid, { "Shortened basic CID", "wmx.ulmap.sounding_command.shortened_basic_cid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_subchannel_offset, { "Subchannel offset", "wmx.ulmap.sounding_command.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_sounding_command_number_of_subchannels, { "Number of subchannels", "wmx.ulmap.sounding_command.number_of_subchannels", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ulmap_extended_2_uiuc, { "Extended-2 UIUC", "wmx.ulmap.harq_ulmap.extended_2_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ulmap_length, { "Length", "wmx.ulmap.harq_ulmap.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ulmap_rcid_type, { "RCID_Type", "wmx.ulmap.harq_ulmap.rcid_type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ulmap_mode, { "Mode", "wmx.ulmap.harq_ulmap.mode", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ulmap_allocation_start_indication, { "Allocation Start Indication", "wmx.ulmap.harq_ulmap.allocation_start_indication", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ulmap_ofdma_symbol_offset, { "OFDMA Symbol offset", "wmx.ulmap.harq_ulmap.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ulmap_subchannel_offset, { "Subchannel offset", "wmx.ulmap.harq_ulmap.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ulmap_n_sub_burst, { "N sub Burst", "wmx.ulmap.harq_ulmap.n_sub_burst", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ackch_region_alloc_extended_2_uiuc, { "Extended-2 UIUC", "wmx.ulmap.harq_ackch_region_alloc.extended_2_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ackch_region_alloc_length, { "Length", "wmx.ulmap.harq_ackch_region_alloc.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ackch_region_alloc_ofdma_symbol_offset, { "OFDMA Symbol Offset", "wmx.ulmap.harq_ackch_region_alloc.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ackch_region_alloc_subchannel_offset, { "Subchannel Offset", "wmx.ulmap.harq_ackch_region_alloc.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ackch_region_alloc_num_ofdma_symbols, { "No. OFDMA Symbols", "wmx.ulmap.harq_ackch_region_alloc.num_ofdma_symbols", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_harq_ackch_region_alloc_num_subchannels, { "No. Subchannels", "wmx.ulmap.harq_ackch_region_alloc.num_subchannels", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_extended_2_uiuc, { "Extended-2 UIUC", "wmx.ulmap.aas_sdma.extended_2_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_length, { "Length", "wmx.ulmap.aas_sdma.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_rcid_type, { "RCID_Type", "wmx.ulmap.aas_sdma.rcid_type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_num_burst_region, { "Num Burst Region", "wmx.ulmap.aas_sdma.num_burst_region", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_slot_offset, { "Slot offset", "wmx.ulmap.aas_sdma.slot_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_slot_duration, { "Slot duration", "wmx.ulmap.aas_sdma.slot_duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_number_of_users, { "Number of users", "wmx.ulmap.aas_sdma.number_of_users", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_encoding_mode, { "Encoding Mode", "wmx.ulmap.aas_sdma.encoding_mode", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_power_adjust, { "Power Adjust", "wmx.ulmap.aas_sdma.power_adjust", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_pilot_pattern_modifier, { "Pilot Pattern Modifier", "wmx.ulmap.aas_sdma.pilot_pattern_modifier", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_preamble_modifier_index, { "Preamble Modifier Index", "wmx.ulmap.aas_sdma.preamble_modifier_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_pilot_pattern, { "Pilot Pattern", "wmx.ulmap.aas_sdma.pilot_pattern", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_diuc, { "DIUC", "wmx.ulmap.aas_sdma.diuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_repetition_coding_indication, { "Repetition Coding Indication", "wmx.ulmap.aas_sdma.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_acid, { "ACID", "wmx.ulmap.aas_sdma.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_ai_sn, { "AI_SN", "wmx.ulmap.aas_sdma.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_nep, { "N(EP)", "wmx.ulmap.aas_sdma.nep", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_nsch, { "N(SCH)", "wmx.ulmap.aas_sdma.nsch", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_spid, { "SPID", "wmx.ulmap.aas_sdma.spid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_aas_sdma_power_adjustment, { "Power Adjustment", "wmx.ulmap.aas_sdma.power_adjustment", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_feedback_polling_extended_2_uiuc, { "Extended-2 UIUC", "wmx.ulmap.feedback_polling.extended_2_uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_feedback_polling_length, { "Length", "wmx.ulmap.feedback_polling.length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_feedback_polling_num_allocation, { "Num_Allocation", "wmx.ulmap.feedback_polling.num_allocation", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_feedback_polling_dedicated_ul_allocation_included, { "Dedicated UL Allocation included", "wmx.ulmap.feedback_polling.dedicated_ul_allocation_included", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_feedback_polling_basic_cid, { "Basic CID", "wmx.ulmap.feedback_polling.basic_cid", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &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_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 }},
+ { &hf_ulmap_feedback_polling_duration, { "Duration", "wmx.ulmap.feedback_polling.duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_feedback_polling_repetition_coding_indication, { "Repetition coding indication", "wmx.ulmap.feedback_polling.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_aas_zone_configuration_included, { "AAS zone configuration included", "wmx.ulmap.reduced_aas.aas_zone_configuration_included", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_aas_zone_position_included, { "AAS zone position included", "wmx.ulmap.reduced_aas.aas_zone_position_included", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_ul_map_information_included, { "UL-MAP information included", "wmx.ulmap.reduced_aas.ul_map_information_included", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_phy_modification_included, { "PHY modification included", "wmx.ulmap.reduced_aas.phy_modification_included", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_power_control_included, { "Power Control included", "wmx.ulmap.reduced_aas.power_control_included", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_include_feedback_header, { "Include Feedback Header", "wmx.ulmap.reduced_aas.include_feedback_header", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_encoding_mode, { "Encoding Mode", "wmx.ulmap.reduced_aas.encoding_mode", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_permutation, { "Permutation", "wmx.ulmap.reduced_aas.permutation", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_ul_permbase, { "UL_PermBase", "wmx.ulmap.reduced_aas.ul_permbase", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_preamble_indication, { "Preamble Indication", "wmx.ulmap.reduced_aas.preamble_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_padding, { "Padding", "wmx.ulmap.reduced_aas.padding", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_zone_symbol_offset, { "Zone Symbol Offset", "wmx.ulmap.reduced_aas.zone_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_zone_length, { "Zone Length", "wmx.ulmap.reduced_aas.zone_length", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_ucd_count, { "UCD Count", "wmx.ulmap.reduced_aas.ucd_count", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_private_map_alloc_start_time, { "Private Map Allocation Start Time", "wmx.ulmap.reduced_aas.private_map_alloc_start_time", FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_pilot_pattern_index, { "Pilot Pattern Index", "wmx.ulmap.reduced_aas.pilot_pattern_index", FT_UINT64, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_preamble_select, { "Preamble Select", "wmx.ulmap.reduced_aas.preamble_select", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_preamble_shift_index, { "Preamble Shift Index", "wmx.ulmap.reduced_aas.preamble_shift_index", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_pilot_pattern_modifier, { "Pilot Pattern Modifier", "wmx.ulmap.reduced_aas.pilot_pattern_modifier", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_power_control, { "Power Control", "wmx.ulmap.reduced_aas.power_control", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_ul_frame_offset, { "UL Frame Offset", "wmx.ulmap.reduced_aas.ul_frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_slot_offset, { "Slot Offset", "wmx.ulmap.reduced_aas.slot_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_slot_duration, { "Slot Duration", "wmx.ulmap.reduced_aas.slot_duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_uiuc_nep, { "UIUC / N(EP)", "wmx.ulmap.reduced_aas.uiuc_nep", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_acid, { "ACID", "wmx.ulmap.reduced_aas.acid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_ai_sn, { "AI_SN", "wmx.ulmap.reduced_aas.ai_sn", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_nsch, { "N(SCH)", "wmx.ulmap.reduced_aas.nsch", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_spid, { "SPID", "wmx.ulmap.reduced_aas.spid", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+ { &hf_ulmap_reduced_aas_repetition_coding_indication, { "Repetition Coding Indication", "wmx.ulmap.reduced_aas.repetition_coding_indication", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }},
};
/* Setup protocol subtree array */
@@ -2321,6 +2937,12 @@ void proto_register_mac_mgmt_msg_ulmap(void)
&ett_315d,
};
+ static ei_register_info ei[] = {
+ { &ei_ulmap_not_implemented, { "wmx.ulmap.not_implemented", PI_UNDECODED, PI_WARN, "Not implemented", EXPFILL }},
+ };
+
+ expert_module_t* expert_mac_mgmt_msg_ulmap;
+
proto_mac_mgmt_msg_ulmap_decoder = proto_register_protocol (
"WiMax ULMAP Messages", /* name */
"WiMax ULMAP", /* short name */
@@ -2329,6 +2951,8 @@ void proto_register_mac_mgmt_msg_ulmap(void)
proto_register_field_array(proto_mac_mgmt_msg_ulmap_decoder, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
+ expert_mac_mgmt_msg_ulmap = expert_register_protocol(proto_mac_mgmt_msg_ulmap_decoder);
+ expert_register_field_array(expert_mac_mgmt_msg_ulmap, ei, array_length(ei));
}
void proto_reg_handoff_mac_mgmt_msg_ulmap(void)
diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c
index 7aa972087e..3c3300068c 100644
--- a/plugins/wimax/wimax_utils.c
+++ b/plugins/wimax/wimax_utils.c
@@ -31,6 +31,7 @@
#include "config.h"
#include <epan/packet.h>
+#include <epan/expert.h>
#include "wimax_tlv.h"
#include "wimax_mac.h"
@@ -689,6 +690,8 @@ static gint hf_common_tlv_vendor_specific_length_size = -1;
static gint hf_common_tlv_vendor_specific_value = -1;
static gint hf_common_current_transmitted_power = -1;
+static expert_field ei_common_tlv_info = EI_INIT;
+
/* Register WiMax Utility Routines */
void proto_register_wimax_utility_decoders(void)
{
@@ -1682,6 +1685,12 @@ void proto_register_wimax_utility_decoders(void)
#endif
};
+ static ei_register_info ei[] = {
+ { &ei_common_tlv_info, { "wmx.common_tlv.invalid", PI_PROTOCOL, PI_WARN, "Invalid TLV info", EXPFILL }},
+ };
+
+ expert_module_t* expert_wimax_utility;
+
if(proto_wimax_utility_decoders == -1)
{
proto_wimax_utility_decoders = proto_register_protocol (
@@ -1698,6 +1707,8 @@ void proto_register_wimax_utility_decoders(void)
proto_register_field_array(proto_wimax_utility_decoders, hf_snp, array_length(hf_snp));
proto_register_field_array(proto_wimax_utility_decoders, hf_pkm, array_length(hf_pkm));
proto_register_field_array(proto_wimax_utility_decoders, hf_common_tlv, array_length(hf_common_tlv));
+ expert_wimax_utility = expert_register_protocol(proto_wimax_utility_decoders);
+ expert_register_field_array(expert_wimax_utility, ei, array_length(ei));
eap_handle = find_dissector("eap");
}
@@ -3217,7 +3228,7 @@ void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo
if(tvb_len < 2)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Vendor Specific Info");
- proto_tree_add_text(tree, tvb, 0, tvb_len, "Invalid TLV info");
+ proto_tree_add_expert(tree, pinfo, &ei_common_tlv_info, tvb, 0, tvb_len);
return;
}
/* process Vendor Specific Information (11.1.6) */
@@ -3260,7 +3271,7 @@ void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo
proto_tree_add_item(tree, hf_common_tlv_vendor_specific_length_size, tvb, (offset + 1), 1, ENC_BIG_ENDIAN);
if(get_tlv_size_of_length(&tlv_info))
{ /* display the multiple byte TLV length */
- proto_tree_add_text(tree, tvb, (offset + 2), get_tlv_size_of_length(&tlv_info), "Vendor Specific Length: %u", get_tlv_size_of_length(&tlv_info));
+ proto_tree_add_uint(tree, hf_common_tlv_vendor_specific_length, tvb, (offset + 2), 1, get_tlv_size_of_length(&tlv_info));
}
else
{ /* length = 0 */
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 21:57:37 +0000