aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/epan/wimaxmacphy/packet-wimaxmacphy.c')
-rw-r--r--plugins/epan/wimaxmacphy/packet-wimaxmacphy.c588
1 files changed, 288 insertions, 300 deletions
diff --git a/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c
index 2084d64e3a..d2015941e9 100644
--- a/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c
+++ b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c
@@ -20,274 +20,275 @@
/* Initialize the protocol and registered fields */
-static int proto_wimaxmacphy = -1;
-static int hf_wimaxmacphy_hdr_phy_entity_id = -1;
-static int hf_wimaxmacphy_hdr_message_segmentation = -1;
-static int hf_wimaxmacphy_hdr_message_type = -1;
-static int hf_wimaxmacphy_unknown = -1;
-static int hf_wimaxmacphy_prim_length_of_txvector = -1;
-static int hf_wimaxmacphy_prim_length_of_rxvector = -1;
-static int hf_wimaxmacphy_prim_status = -1;
-static int hf_wimaxmacphy_prim_txstart_indication_status = -1;
-static int hf_wimaxmacphy_prim_reserved1 = -1;
-static int hf_wimaxmacphy_prim_reserved2 = -1;
-static int hf_wimaxmacphy_prim_reserved3 = -1;
-static int hf_wimaxmacphy_prim_reserved4 = -1;
-static int hf_wimaxmacphy_prim_reserved5 = -1;
-static int hf_wimaxmacphy_prim_next_frame_number = -1;
-static int hf_wimaxmacphy_prim_extended_frame_number = -1;
-static int hf_wimaxmacphy_prim_current_frame_number_lsn = -1;
-static int hf_wimaxmacphy_prim_initial_frame_number = -1;
-static int hf_wimaxmacphy_prim_dl_zone_number = -1;
-static int hf_wimaxmacphy_prim_sub_burst_burst_split_point = -1;
-static int hf_wimaxmacphy_prim_dl_sub_burst_burst_number = -1;
-static int hf_wimaxmacphy_prim_phy_sdu = -1;
-static int hf_wimaxmacphy_prim_phy_request = -1;
-static int hf_wimaxmacphy_prim_requested_aas_calibration_zone_size = -1;
-static int hf_wimaxmacphy_prim_requested_aas_calibration_zone_alloc = -1;
-static int hf_wimaxmacphy_prim_number_of_consecutive_frames_with_aas = -1;
-static int hf_wimaxmacphy_prim_frame_number = -1;
-static int hf_wimaxmacphy_prim_issid = -1;
-static int hf_wimaxmacphy_prim_integrity = -1;
-static int hf_wimaxmacphy_prim_number_of_bytes_received = -1;
-static int hf_wimaxmacphy_prim_rssi_per_subcarrier_level = -1;
-static int hf_wimaxmacphy_prim_cinr = -1;
-static int hf_wimaxmacphy_prim_power_offset = -1;
-static int hf_wimaxmacphy_prim_current_frame_number_msn = -1;
-static int hf_wimaxmacphy_prim_acid_for_harq_data_bursts = -1;
-static int hf_wimaxmacphy_prim_indication_type = -1;
-static int hf_wimaxmacphy_prim_zone_permutation_type = -1;
-static int hf_wimaxmacphy_prim_update_aas_handle_in_mac = -1;
-static int hf_wimaxmacphy_prim_aas_handle = -1;
-static int hf_wimaxmacphy_prim_time_deviation = -1;
-static int hf_wimaxmacphy_prim_frequency_deviation = -1;
-static int hf_wimaxmacphy_prim_phy_aas_report_present = -1;
-static int hf_wimaxmacphy_prim_number_of_affected_ss = -1;
-static int hf_wimaxmacphy_prim_zonexid = -1;
-static int hf_wimaxmacphy_prim_cdma_code = -1;
-static int hf_wimaxmacphy_prim_cdma_symbol = -1;
-static int hf_wimaxmacphy_prim_cdma_subchannel = -1;
-static int hf_wimaxmacphy_prim_harq_ack_issid = -1;
-static int hf_wimaxmacphy_prim_harq_ack_acid = -1;
-static int hf_wimaxmacphy_prim_harq_ack_reserved1 = -1;
-static int hf_wimaxmacphy_prim_harq_ack_ack_valid = -1;
-static int hf_wimaxmacphy_prim_harq_ack_unnamed = -1;
-static int hf_wimaxmacphy_prim_harq_ack_reserved2 = -1;
-static int hf_wimaxmacphy_prim_fast_issid = -1;
-static int hf_wimaxmacphy_prim_fast_cqich_id = -1;
-static int hf_wimaxmacphy_prim_fast_feedback_type_coding = -1;
-static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit0 = -1;
-static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit1 = -1;
-static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit2 = -1;
-static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit3 = -1;
-static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit4 = -1;
-static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit5 = -1;
-static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit6 = -1;
-static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit7 = -1;
-static int hf_wimaxmacphy_prim_fast_feedback_valid = -1;
-static int hf_wimaxmacphy_prim_fast_feedback_sub_type = -1;
-static int hf_wimaxmacphy_prim_fast_reserved = -1;
-static int hf_wimaxmacphy_prim_fast_feedback_value = -1;
-static int hf_wimaxmacphy_subframe_subframe_type = -1;
-static int hf_wimaxmacphy_subframe_frame_number = -1;
-static int hf_wimaxmacphy_subframe_downlink_reserved1 = -1;
-static int hf_wimaxmacphy_subframe_phy_sap_version_number = -1;
-static int hf_wimaxmacphy_subframe_downlink_reserved2 = -1;
-static int hf_wimaxmacphy_subframe_allocation_start_time = -1;
-static int hf_wimaxmacphy_number_of_zone_descriptors = -1;
-static int hf_wimaxmacphy_zone_padding = -1;
-static int hf_wimaxmacphy_dl_zone_type = -1;
-static int hf_wimaxmacphy_ul_zone_type = -1;
-static int hf_wimaxmacphy_zone_number = -1;
-static int hf_wimaxmacphy_zone_start_symbol_offset = -1;
-static int hf_wimaxmacphy_zone_end_symbol_offset = -1;
-static int hf_wimaxmacphy_dl_zone_permutation_type = -1;
-static int hf_wimaxmacphy_ul_zone_permutation_type = -1;
-static int hf_wimaxmacphy_dl_zone_use_all_subchannels_indicator = -1;
-static int hf_wimaxmacphy_ul_zone_use_all_subchannels_indicator = -1;
-static int hf_wimaxmacphy_ul_zone_disable_pusc_subchannel_rotation = -1;
-static int hf_wimaxmacphy_zone_dl_perm_base = -1;
-static int hf_wimaxmacphy_zone_ul_perm_base = -1;
-static int hf_wimaxmacphy_zone_prbs_id = -1;
-static int hf_wimaxmacphy_zone_agc_range_extension = -1;
-static int hf_wimaxmacphy_zone_dedicated_pilots = -1;
-static int hf_wimaxmacphy_zone_reserved = -1;
-static int hf_wimaxmacphy_zone_stc_type = -1;
-static int hf_wimaxmacphy_zone_matrix_indicator = -1;
-static int hf_wimaxmacphy_zone_midamble_presence = -1;
-static int hf_wimaxmacphy_zone_midamble_boosting = -1;
-static int hf_wimaxmacphy_zone_preamble_configuration = -1;
-static int hf_wimaxmacphy_zone_sdma_supported_indication = -1;
-static int hf_wimaxmacphy_zone_preamble_type = -1;
-static int hf_wimaxmacphy_dl_zone_aas_reserved = -1;
-static int hf_wimaxmacphy_ul_zone_aas_reserved = -1;
-static int hf_wimaxmacphy_number_of_burst_descriptors = -1;
-static int hf_wimaxmacphy_burst_padding = -1;
-static int hf_wimaxmacphy_dl_burst_type = -1;
-static int hf_wimaxmacphy_ul_burst_type = -1;
-static int hf_wimaxmacphy_burst_type_extension = -1;
-static int hf_wimaxmacphy_burst_number = -1;
-static int hf_wimaxmacphy_burst_modulation_fec_code_type = -1;
-static int hf_wimaxmacphy_burst_data_length = -1;
-static int hf_wimaxmacphy_burst_ofdma_symbol_offset = -1;
-static int hf_wimaxmacphy_burst_subchannel_offset = -1;
-static int hf_wimaxmacphy_burst_boosting = -1;
-static int hf_wimaxmacphy_burst_reserved = -1;
-static int hf_wimaxmacphy_burst_repetition_coding_indication = -1;
-static int hf_wimaxmacphy_burst_issid = -1;
-static int hf_wimaxmacphy_burst_aas_handle = -1;
-static int hf_wimaxmacphy_dl_burst_map_number_of_slots = -1;
-static int hf_wimaxmacphy_dl_burst_map_reserved = -1;
-static int hf_wimaxmacphy_dl_burst_normal_number_of_symbols = -1;
-static int hf_wimaxmacphy_dl_burst_normal_number_of_subchannels = -1;
-static int hf_wimaxmacphy_dl_burst_normal_aas_handle = -1;
-static int hf_wimaxmacphy_ul_burst_normal_number_of_slots = -1;
-static int hf_wimaxmacphy_ul_burst_normal_reserved = -1;
-static int hf_wimaxmacphy_burst_papr_number_of_symbols = -1;
-static int hf_wimaxmacphy_burst_papr_number_of_subchannels = -1;
-static int hf_wimaxmacphy_burst_papr_reserved = -1;
-static int hf_wimaxmacphy_ul_burst_papr_unnamed = -1;
-static int hf_wimaxmacphy_ul_burst_harq_ack_number_of_symbols = -1;
-static int hf_wimaxmacphy_ul_burst_harq_ack_number_of_subchannels = -1;
-static int hf_wimaxmacphy_ul_burst_harq_ack_reserved = -1;
-static int hf_wimaxmacphy_ul_burst_fast_number_of_symbols = -1;
-static int hf_wimaxmacphy_ul_burst_fast_number_of_subchannels = -1;
-static int hf_wimaxmacphy_ul_burst_fast_reserved = -1;
-static int hf_wimaxmacphy_ul_burst_initial_number_of_symbols = -1;
-static int hf_wimaxmacphy_ul_burst_initial_number_of_subchannels = -1;
-static int hf_wimaxmacphy_ul_burst_initial_ranging_method = -1;
-static int hf_wimaxmacphy_ul_burst_initial_reserved1 = -1;
-static int hf_wimaxmacphy_ul_burst_initial_zone_xid = -1;
-static int hf_wimaxmacphy_ul_burst_initial_reserved2 = -1;
-static int hf_wimaxmacphy_ul_burst_periodic_number_of_symbols = -1;
-static int hf_wimaxmacphy_ul_burst_periodic_number_of_subchannels = -1;
-static int hf_wimaxmacphy_ul_burst_periodic_ranging_method = -1;
-static int hf_wimaxmacphy_ul_burst_periodic_reserved1 = -1;
-static int hf_wimaxmacphy_ul_burst_periodic_zone_xid = -1;
-static int hf_wimaxmacphy_ul_burst_periodic_reserved2 = -1;
-static int hf_wimaxmacphy_ul_burst_sounding_number_of_symbols = -1;
-static int hf_wimaxmacphy_ul_burst_sounding_number_of_subchannels = -1;
-static int hf_wimaxmacphy_ul_burst_sounding_type = -1;
-static int hf_wimaxmacphy_ul_burst_sounding_separability_type = -1;
-static int hf_wimaxmacphy_ul_burst_sounding_max_cyclic_shift_indx = -1;
-static int hf_wimaxmacphy_ul_burst_sounding_decimation_value = -1;
-static int hf_wimaxmacphy_ul_burst_sounding_decimation_offset_rand = -1;
-static int hf_wimaxmacphy_ul_burst_sounding_reserved = -1;
-static int hf_wimaxmacphy_ul_burst_noise_number_of_symbols = -1;
-static int hf_wimaxmacphy_ul_burst_noise_number_of_subchannels = -1;
-static int hf_wimaxmacphy_ul_burst_noise_reserved = -1;
-static int hf_wimaxmacphy_burst_opt_aas_preamble_modifier_type = -1;
-static int hf_wimaxmacphy_burst_opt_aas_preamble_shift_index = -1;
-static int hf_wimaxmacphy_burst_opt_aas_reserved = -1;
-static int hf_wimaxmacphy_burst_opt_mimo_matrix_indicator = -1;
-static int hf_wimaxmacphy_burst_opt_mimo_layer_index = -1;
-static int hf_wimaxmacphy_dl_burst_opt_mimo_reserved = -1;
-static int hf_wimaxmacphy_ul_burst_opt_mimo_matrix_indicator = -1;
-static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns = -1;
-static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit0 = -1;
-static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit1 = -1;
-static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit2 = -1;
-static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit3 = -1;
-static int hf_wimaxmacphy_ul_burst_opt_mimo_collaborative = -1;
-static int hf_wimaxmacphy_ul_burst_opt_mimo_antenna_unnamed = -1;
-static int hf_wimaxmacphy_number_of_sub_burst_descriptors = -1;
-static int hf_wimaxmacphy_sub_burst_padding = -1;
-static int hf_wimaxmacphy_dl_sub_burst_type = -1;
-static int hf_wimaxmacphy_ul_sub_burst_type = -1;
-static int hf_wimaxmacphy_sub_burst_number = -1;
-static int hf_wimaxmacphy_sub_burst_symbol_offset = -1;
-static int hf_wimaxmacphy_sub_burst_subchannel_offset = -1;
-static int hf_wimaxmacphy_sub_burst_number_of_slots = -1;
-static int hf_wimaxmacphy_sub_burst_reserved1 = -1;
-static int hf_wimaxmacphy_sub_burst_reserved2 = -1;
-static int hf_wimaxmacphy_sub_burst_modulation_fec_code_type = -1;
-static int hf_wimaxmacphy_sub_burst_issid = -1;
-static int hf_wimaxmacphy_sub_burst_aas_handle = -1;
-static int hf_wimaxmacphy_sub_burst_boosting = -1;
-static int hf_wimaxmacphy_sub_burst_repetition_coding_indication = -1;
-static int hf_wimaxmacphy_sub_burst_data_length = -1;
-static int hf_wimaxmacphy_sub_burst_harq_chase_harq_channel_id = -1;
-static int hf_wimaxmacphy_sub_burst_harq_chase_harq_sequence_number = -1;
-static int hf_wimaxmacphy_sub_burst_harq_chase_flush_unnamed = -1;
-static int hf_wimaxmacphy_sub_burst_harq_chase_reserved = -1;
-static int hf_wimaxmacphy_sub_burst_mimo_chase_harq_channel_id = -1;
-static int hf_wimaxmacphy_sub_burst_mimo_chase_harq_sequence_number = -1;
-static int hf_wimaxmacphy_sub_burst_mimo_chase_flush_unnamed = -1;
-static int hf_wimaxmacphy_sub_burst_mimo_chase_layer_index = -1;
-static int hf_wimaxmacphy_ul_sub_burst_ctype = -1;
-static int hf_wimaxmacphy_ul_sub_burst_mini_subchannel_index = -1;
-static int hf_wimaxmacphy_ul_sub_burst_mini_reserved = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit0 = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit1 = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit2 = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit3 = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit4 = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit5 = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit6 = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit7 = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_reserved1 = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_sub_type = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_cqich_id = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_reserved2 = -1;
-static int hf_wimaxmacphy_ul_sub_burst_feedback_slot_offset = -1;
-static int hf_wimaxmacphy_ul_sub_burst_harq_ack_acid = -1;
-static int hf_wimaxmacphy_ul_sub_burst_harq_ack_reserved = -1;
-static int hf_wimaxmacphy_ul_sub_burst_sounding_symbol_index = -1;
-static int hf_wimaxmacphy_ul_sub_burst_sounding_power_assignment = -1;
-static int hf_wimaxmacphy_ul_sub_burst_sounding_power_boost = -1;
-static int hf_wimaxmacphy_ul_sub_burst_sounding_allocation_mode = -1;
-static int hf_wimaxmacphy_ul_sub_burst_sounding_start_freq_band = -1;
-static int hf_wimaxmacphy_ul_sub_burst_sounding_num_freq_bands = -1;
-static int hf_wimaxmacphy_ul_sub_burst_sounding_band_bit_map = -1;
-static int hf_wimaxmacphy_ul_sub_burst_sounding_cyclic_time_shift = -1;
-static int hf_wimaxmacphy_ul_sub_burst_sounding_decimation_offset = -1;
-static int hf_wimaxmacphy_ul_sub_burst_sounding_reserved = -1;
-static int hf_wimaxmacphy_ul_sub_burst_mimo_chase_matrix = -1;
+static dissector_handle_t wimaxmacphy_handle;
+static int proto_wimaxmacphy;
+static int hf_wimaxmacphy_hdr_phy_entity_id;
+static int hf_wimaxmacphy_hdr_message_segmentation;
+static int hf_wimaxmacphy_hdr_message_type;
+static int hf_wimaxmacphy_unknown;
+static int hf_wimaxmacphy_prim_length_of_txvector;
+static int hf_wimaxmacphy_prim_length_of_rxvector;
+static int hf_wimaxmacphy_prim_status;
+static int hf_wimaxmacphy_prim_txstart_indication_status;
+static int hf_wimaxmacphy_prim_reserved1;
+static int hf_wimaxmacphy_prim_reserved2;
+static int hf_wimaxmacphy_prim_reserved3;
+static int hf_wimaxmacphy_prim_reserved4;
+static int hf_wimaxmacphy_prim_reserved5;
+static int hf_wimaxmacphy_prim_next_frame_number;
+static int hf_wimaxmacphy_prim_extended_frame_number;
+static int hf_wimaxmacphy_prim_current_frame_number_lsn;
+static int hf_wimaxmacphy_prim_initial_frame_number;
+static int hf_wimaxmacphy_prim_dl_zone_number;
+static int hf_wimaxmacphy_prim_sub_burst_burst_split_point;
+static int hf_wimaxmacphy_prim_dl_sub_burst_burst_number;
+static int hf_wimaxmacphy_prim_phy_sdu;
+static int hf_wimaxmacphy_prim_phy_request;
+static int hf_wimaxmacphy_prim_requested_aas_calibration_zone_size;
+static int hf_wimaxmacphy_prim_requested_aas_calibration_zone_alloc;
+static int hf_wimaxmacphy_prim_number_of_consecutive_frames_with_aas;
+static int hf_wimaxmacphy_prim_frame_number;
+static int hf_wimaxmacphy_prim_issid;
+static int hf_wimaxmacphy_prim_integrity;
+static int hf_wimaxmacphy_prim_number_of_bytes_received;
+static int hf_wimaxmacphy_prim_rssi_per_subcarrier_level;
+static int hf_wimaxmacphy_prim_cinr;
+static int hf_wimaxmacphy_prim_power_offset;
+static int hf_wimaxmacphy_prim_current_frame_number_msn;
+static int hf_wimaxmacphy_prim_acid_for_harq_data_bursts;
+static int hf_wimaxmacphy_prim_indication_type;
+static int hf_wimaxmacphy_prim_zone_permutation_type;
+static int hf_wimaxmacphy_prim_update_aas_handle_in_mac;
+static int hf_wimaxmacphy_prim_aas_handle;
+static int hf_wimaxmacphy_prim_time_deviation;
+static int hf_wimaxmacphy_prim_frequency_deviation;
+static int hf_wimaxmacphy_prim_phy_aas_report_present;
+static int hf_wimaxmacphy_prim_number_of_affected_ss;
+static int hf_wimaxmacphy_prim_zonexid;
+static int hf_wimaxmacphy_prim_cdma_code;
+static int hf_wimaxmacphy_prim_cdma_symbol;
+static int hf_wimaxmacphy_prim_cdma_subchannel;
+static int hf_wimaxmacphy_prim_harq_ack_issid;
+static int hf_wimaxmacphy_prim_harq_ack_acid;
+static int hf_wimaxmacphy_prim_harq_ack_reserved1;
+static int hf_wimaxmacphy_prim_harq_ack_ack_valid;
+static int hf_wimaxmacphy_prim_harq_ack_unnamed;
+static int hf_wimaxmacphy_prim_harq_ack_reserved2;
+static int hf_wimaxmacphy_prim_fast_issid;
+static int hf_wimaxmacphy_prim_fast_cqich_id;
+static int hf_wimaxmacphy_prim_fast_feedback_type_coding;
+static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit0;
+static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit1;
+static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit2;
+static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit3;
+static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit4;
+static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit5;
+static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit6;
+static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit7;
+static int hf_wimaxmacphy_prim_fast_feedback_valid;
+static int hf_wimaxmacphy_prim_fast_feedback_sub_type;
+static int hf_wimaxmacphy_prim_fast_reserved;
+static int hf_wimaxmacphy_prim_fast_feedback_value;
+static int hf_wimaxmacphy_subframe_subframe_type;
+static int hf_wimaxmacphy_subframe_frame_number;
+static int hf_wimaxmacphy_subframe_downlink_reserved1;
+static int hf_wimaxmacphy_subframe_phy_sap_version_number;
+static int hf_wimaxmacphy_subframe_downlink_reserved2;
+static int hf_wimaxmacphy_subframe_allocation_start_time;
+static int hf_wimaxmacphy_number_of_zone_descriptors;
+static int hf_wimaxmacphy_zone_padding;
+static int hf_wimaxmacphy_dl_zone_type;
+static int hf_wimaxmacphy_ul_zone_type;
+static int hf_wimaxmacphy_zone_number;
+static int hf_wimaxmacphy_zone_start_symbol_offset;
+static int hf_wimaxmacphy_zone_end_symbol_offset;
+static int hf_wimaxmacphy_dl_zone_permutation_type;
+static int hf_wimaxmacphy_ul_zone_permutation_type;
+static int hf_wimaxmacphy_dl_zone_use_all_subchannels_indicator;
+static int hf_wimaxmacphy_ul_zone_use_all_subchannels_indicator;
+static int hf_wimaxmacphy_ul_zone_disable_pusc_subchannel_rotation;
+static int hf_wimaxmacphy_zone_dl_perm_base;
+static int hf_wimaxmacphy_zone_ul_perm_base;
+static int hf_wimaxmacphy_zone_prbs_id;
+static int hf_wimaxmacphy_zone_agc_range_extension;
+static int hf_wimaxmacphy_zone_dedicated_pilots;
+static int hf_wimaxmacphy_zone_reserved;
+static int hf_wimaxmacphy_zone_stc_type;
+static int hf_wimaxmacphy_zone_matrix_indicator;
+static int hf_wimaxmacphy_zone_midamble_presence;
+static int hf_wimaxmacphy_zone_midamble_boosting;
+static int hf_wimaxmacphy_zone_preamble_configuration;
+static int hf_wimaxmacphy_zone_sdma_supported_indication;
+static int hf_wimaxmacphy_zone_preamble_type;
+static int hf_wimaxmacphy_dl_zone_aas_reserved;
+static int hf_wimaxmacphy_ul_zone_aas_reserved;
+static int hf_wimaxmacphy_number_of_burst_descriptors;
+static int hf_wimaxmacphy_burst_padding;
+static int hf_wimaxmacphy_dl_burst_type;
+static int hf_wimaxmacphy_ul_burst_type;
+static int hf_wimaxmacphy_burst_type_extension;
+static int hf_wimaxmacphy_burst_number;
+static int hf_wimaxmacphy_burst_modulation_fec_code_type;
+static int hf_wimaxmacphy_burst_data_length;
+static int hf_wimaxmacphy_burst_ofdma_symbol_offset;
+static int hf_wimaxmacphy_burst_subchannel_offset;
+static int hf_wimaxmacphy_burst_boosting;
+static int hf_wimaxmacphy_burst_reserved;
+static int hf_wimaxmacphy_burst_repetition_coding_indication;
+static int hf_wimaxmacphy_burst_issid;
+static int hf_wimaxmacphy_burst_aas_handle;
+static int hf_wimaxmacphy_dl_burst_map_number_of_slots;
+static int hf_wimaxmacphy_dl_burst_map_reserved;
+static int hf_wimaxmacphy_dl_burst_normal_number_of_symbols;
+static int hf_wimaxmacphy_dl_burst_normal_number_of_subchannels;
+static int hf_wimaxmacphy_dl_burst_normal_aas_handle;
+static int hf_wimaxmacphy_ul_burst_normal_number_of_slots;
+static int hf_wimaxmacphy_ul_burst_normal_reserved;
+static int hf_wimaxmacphy_burst_papr_number_of_symbols;
+static int hf_wimaxmacphy_burst_papr_number_of_subchannels;
+static int hf_wimaxmacphy_burst_papr_reserved;
+static int hf_wimaxmacphy_ul_burst_papr_unnamed;
+static int hf_wimaxmacphy_ul_burst_harq_ack_number_of_symbols;
+static int hf_wimaxmacphy_ul_burst_harq_ack_number_of_subchannels;
+static int hf_wimaxmacphy_ul_burst_harq_ack_reserved;
+static int hf_wimaxmacphy_ul_burst_fast_number_of_symbols;
+static int hf_wimaxmacphy_ul_burst_fast_number_of_subchannels;
+static int hf_wimaxmacphy_ul_burst_fast_reserved;
+static int hf_wimaxmacphy_ul_burst_initial_number_of_symbols;
+static int hf_wimaxmacphy_ul_burst_initial_number_of_subchannels;
+static int hf_wimaxmacphy_ul_burst_initial_ranging_method;
+static int hf_wimaxmacphy_ul_burst_initial_reserved1;
+static int hf_wimaxmacphy_ul_burst_initial_zone_xid;
+static int hf_wimaxmacphy_ul_burst_initial_reserved2;
+static int hf_wimaxmacphy_ul_burst_periodic_number_of_symbols;
+static int hf_wimaxmacphy_ul_burst_periodic_number_of_subchannels;
+static int hf_wimaxmacphy_ul_burst_periodic_ranging_method;
+static int hf_wimaxmacphy_ul_burst_periodic_reserved1;
+static int hf_wimaxmacphy_ul_burst_periodic_zone_xid;
+static int hf_wimaxmacphy_ul_burst_periodic_reserved2;
+static int hf_wimaxmacphy_ul_burst_sounding_number_of_symbols;
+static int hf_wimaxmacphy_ul_burst_sounding_number_of_subchannels;
+static int hf_wimaxmacphy_ul_burst_sounding_type;
+static int hf_wimaxmacphy_ul_burst_sounding_separability_type;
+static int hf_wimaxmacphy_ul_burst_sounding_max_cyclic_shift_indx;
+static int hf_wimaxmacphy_ul_burst_sounding_decimation_value;
+static int hf_wimaxmacphy_ul_burst_sounding_decimation_offset_rand;
+static int hf_wimaxmacphy_ul_burst_sounding_reserved;
+static int hf_wimaxmacphy_ul_burst_noise_number_of_symbols;
+static int hf_wimaxmacphy_ul_burst_noise_number_of_subchannels;
+static int hf_wimaxmacphy_ul_burst_noise_reserved;
+static int hf_wimaxmacphy_burst_opt_aas_preamble_modifier_type;
+static int hf_wimaxmacphy_burst_opt_aas_preamble_shift_index;
+static int hf_wimaxmacphy_burst_opt_aas_reserved;
+static int hf_wimaxmacphy_burst_opt_mimo_matrix_indicator;
+static int hf_wimaxmacphy_burst_opt_mimo_layer_index;
+static int hf_wimaxmacphy_dl_burst_opt_mimo_reserved;
+static int hf_wimaxmacphy_ul_burst_opt_mimo_matrix_indicator;
+static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns;
+static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit0;
+static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit1;
+static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit2;
+static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit3;
+static int hf_wimaxmacphy_ul_burst_opt_mimo_collaborative;
+static int hf_wimaxmacphy_ul_burst_opt_mimo_antenna_unnamed;
+static int hf_wimaxmacphy_number_of_sub_burst_descriptors;
+static int hf_wimaxmacphy_sub_burst_padding;
+static int hf_wimaxmacphy_dl_sub_burst_type;
+static int hf_wimaxmacphy_ul_sub_burst_type;
+static int hf_wimaxmacphy_sub_burst_number;
+static int hf_wimaxmacphy_sub_burst_symbol_offset;
+static int hf_wimaxmacphy_sub_burst_subchannel_offset;
+static int hf_wimaxmacphy_sub_burst_number_of_slots;
+static int hf_wimaxmacphy_sub_burst_reserved1;
+static int hf_wimaxmacphy_sub_burst_reserved2;
+static int hf_wimaxmacphy_sub_burst_modulation_fec_code_type;
+static int hf_wimaxmacphy_sub_burst_issid;
+static int hf_wimaxmacphy_sub_burst_aas_handle;
+static int hf_wimaxmacphy_sub_burst_boosting;
+static int hf_wimaxmacphy_sub_burst_repetition_coding_indication;
+static int hf_wimaxmacphy_sub_burst_data_length;
+static int hf_wimaxmacphy_sub_burst_harq_chase_harq_channel_id;
+static int hf_wimaxmacphy_sub_burst_harq_chase_harq_sequence_number;
+static int hf_wimaxmacphy_sub_burst_harq_chase_flush_unnamed;
+static int hf_wimaxmacphy_sub_burst_harq_chase_reserved;
+static int hf_wimaxmacphy_sub_burst_mimo_chase_harq_channel_id;
+static int hf_wimaxmacphy_sub_burst_mimo_chase_harq_sequence_number;
+static int hf_wimaxmacphy_sub_burst_mimo_chase_flush_unnamed;
+static int hf_wimaxmacphy_sub_burst_mimo_chase_layer_index;
+static int hf_wimaxmacphy_ul_sub_burst_ctype;
+static int hf_wimaxmacphy_ul_sub_burst_mini_subchannel_index;
+static int hf_wimaxmacphy_ul_sub_burst_mini_reserved;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit0;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit1;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit2;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit3;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit4;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit5;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit6;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit7;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_reserved1;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_sub_type;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_cqich_id;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_reserved2;
+static int hf_wimaxmacphy_ul_sub_burst_feedback_slot_offset;
+static int hf_wimaxmacphy_ul_sub_burst_harq_ack_acid;
+static int hf_wimaxmacphy_ul_sub_burst_harq_ack_reserved;
+static int hf_wimaxmacphy_ul_sub_burst_sounding_symbol_index;
+static int hf_wimaxmacphy_ul_sub_burst_sounding_power_assignment;
+static int hf_wimaxmacphy_ul_sub_burst_sounding_power_boost;
+static int hf_wimaxmacphy_ul_sub_burst_sounding_allocation_mode;
+static int hf_wimaxmacphy_ul_sub_burst_sounding_start_freq_band;
+static int hf_wimaxmacphy_ul_sub_burst_sounding_num_freq_bands;
+static int hf_wimaxmacphy_ul_sub_burst_sounding_band_bit_map;
+static int hf_wimaxmacphy_ul_sub_burst_sounding_cyclic_time_shift;
+static int hf_wimaxmacphy_ul_sub_burst_sounding_decimation_offset;
+static int hf_wimaxmacphy_ul_sub_burst_sounding_reserved;
+static int hf_wimaxmacphy_ul_sub_burst_mimo_chase_matrix;
/* Initialize the subtree pointers */
-static gint ett_wimaxmacphy = -1;
-static gint ett_wimaxmacphy_primitive = -1;
-static gint ett_wimaxmacphy_prim_harq_ack = -1;
-static gint ett_wimaxmacphy_prim_fast_feedback = -1;
-static gint ett_wimaxmacphy_prim_fast_feedback_type_coding = -1;
-static gint ett_wimaxmacphy_dl_zone_descriptor = -1;
-static gint ett_wimaxmacphy_dl_zone_stc = -1;
-static gint ett_wimaxmacphy_dl_zone_aas = -1;
-static gint ett_wimaxmacphy_dl_burst_descriptor = -1;
-static gint ett_wimaxmacphy_dl_burst_map = -1;
-static gint ett_wimaxmacphy_dl_burst_normal = -1;
-static gint ett_wimaxmacphy_dl_burst_papr = -1;
-static gint ett_wimaxmacphy_dl_sub_burst_descriptor = -1;
-static gint ett_wimaxmacphy_dl_sub_burst_harq_chase = -1;
-static gint ett_wimaxmacphy_dl_sub_burst_mimo_chase = -1;
-static gint ett_wimaxmacphy_dl_burst_opt_aas = -1;
-static gint ett_wimaxmacphy_dl_burst_opt_mimo = -1;
-static gint ett_wimaxmacphy_ul_zone_descriptor = -1;
-static gint ett_wimaxmacphy_ul_zone_aas = -1;
-static gint ett_wimaxmacphy_ul_burst_descriptor = -1;
-static gint ett_wimaxmacphy_ul_burst_harq_ack = -1;
-static gint ett_wimaxmacphy_ul_burst_fast_feedback = -1;
-static gint ett_wimaxmacphy_ul_burst_initial_ranging = -1;
-static gint ett_wimaxmacphy_ul_burst_periodic_ranging = -1;
-static gint ett_wimaxmacphy_ul_burst_papr_safety_zone = -1;
-static gint ett_wimaxmacphy_ul_burst_sounding_zone = -1;
-static gint ett_wimaxmacphy_ul_burst_noise_floor = -1;
-static gint ett_wimaxmacphy_ul_burst_normal_data = -1;
-static gint ett_wimaxmacphy_ul_burst_opt_aas = -1;
-static gint ett_wimaxmacphy_ul_burst_opt_mimo = -1;
-static gint ett_wimaxmacphy_ul_sub_burst_descriptor = -1;
-static gint ett_wimaxmacphy_ul_pilot_patterns = -1;
-static gint ett_wimaxmacphy_ul_feedback_type_coding = -1;
-static gint ett_wimaxmacphy_ul_sub_burst_mini_subchannel = -1;
-static gint ett_wimaxmacphy_ul_sub_burst_fast_feedback = -1;
-static gint ett_wimaxmacphy_ul_sub_burst_harq_ack = -1;
-static gint ett_wimaxmacphy_ul_sub_burst_sounding_signal = -1;
-static gint ett_wimaxmacphy_ul_sub_burst_harq_chase = -1;
-static gint ett_wimaxmacphy_ul_sub_burst_mimo_chase = -1;
-static gint ett_wimaxmacphy_ul_sub_burst_sub_allocation_specific = -1;
-
-static expert_field ei_wimaxmacphy_unknown = EI_INIT;
+static gint ett_wimaxmacphy;
+static gint ett_wimaxmacphy_primitive;
+static gint ett_wimaxmacphy_prim_harq_ack;
+static gint ett_wimaxmacphy_prim_fast_feedback;
+static gint ett_wimaxmacphy_prim_fast_feedback_type_coding;
+static gint ett_wimaxmacphy_dl_zone_descriptor;
+static gint ett_wimaxmacphy_dl_zone_stc;
+static gint ett_wimaxmacphy_dl_zone_aas;
+static gint ett_wimaxmacphy_dl_burst_descriptor;
+static gint ett_wimaxmacphy_dl_burst_map;
+static gint ett_wimaxmacphy_dl_burst_normal;
+static gint ett_wimaxmacphy_dl_burst_papr;
+static gint ett_wimaxmacphy_dl_sub_burst_descriptor;
+static gint ett_wimaxmacphy_dl_sub_burst_harq_chase;
+static gint ett_wimaxmacphy_dl_sub_burst_mimo_chase;
+static gint ett_wimaxmacphy_dl_burst_opt_aas;
+static gint ett_wimaxmacphy_dl_burst_opt_mimo;
+static gint ett_wimaxmacphy_ul_zone_descriptor;
+static gint ett_wimaxmacphy_ul_zone_aas;
+static gint ett_wimaxmacphy_ul_burst_descriptor;
+static gint ett_wimaxmacphy_ul_burst_harq_ack;
+static gint ett_wimaxmacphy_ul_burst_fast_feedback;
+static gint ett_wimaxmacphy_ul_burst_initial_ranging;
+static gint ett_wimaxmacphy_ul_burst_periodic_ranging;
+static gint ett_wimaxmacphy_ul_burst_papr_safety_zone;
+static gint ett_wimaxmacphy_ul_burst_sounding_zone;
+static gint ett_wimaxmacphy_ul_burst_noise_floor;
+static gint ett_wimaxmacphy_ul_burst_normal_data;
+static gint ett_wimaxmacphy_ul_burst_opt_aas;
+static gint ett_wimaxmacphy_ul_burst_opt_mimo;
+static gint ett_wimaxmacphy_ul_sub_burst_descriptor;
+static gint ett_wimaxmacphy_ul_pilot_patterns;
+static gint ett_wimaxmacphy_ul_feedback_type_coding;
+static gint ett_wimaxmacphy_ul_sub_burst_mini_subchannel;
+static gint ett_wimaxmacphy_ul_sub_burst_fast_feedback;
+static gint ett_wimaxmacphy_ul_sub_burst_harq_ack;
+static gint ett_wimaxmacphy_ul_sub_burst_sounding_signal;
+static gint ett_wimaxmacphy_ul_sub_burst_harq_chase;
+static gint ett_wimaxmacphy_ul_sub_burst_mimo_chase;
+static gint ett_wimaxmacphy_ul_sub_burst_sub_allocation_specific;
+
+static expert_field ei_wimaxmacphy_unknown;
/* PHY SAP message header size */
#define WIMAXMACPHY_HEADER_SIZE 2
@@ -2659,7 +2660,7 @@ proto_register_wimaxmacphy(void)
{
"Initial Frame Number (from PHY)",
"wimaxmacphy.prim_initial_frame_number",
- FT_UINT8,
+ FT_UINT24,
BASE_DEC,
NULL,
0x0,
@@ -2761,8 +2762,7 @@ proto_register_wimaxmacphy(void)
{
&hf_wimaxmacphy_prim_number_of_consecutive_frames_with_aas,
{
- "Number of consecutive frames with AAS Calibration Zone"
- " allocation",
+ "Number of consecutive frames with AAS Calibration Zone allocation",
"wimaxmacphy.prim_number_of_consecutive_frames_with_aas",
FT_UINT8,
BASE_DEC,
@@ -2868,10 +2868,10 @@ proto_register_wimaxmacphy(void)
{
"Current Frame Number (lsb)",
"wimaxmacphy.prim_current_frame_number",
- FT_UINT8,
+ FT_UINT16,
BASE_DEC,
NULL,
- 0xf0,
+ 0x00f0,
NULL,
HFILL
}
@@ -2881,10 +2881,10 @@ proto_register_wimaxmacphy(void)
{
"ACID for HARQ data bursts",
"wimaxmacphy.prim_acid_for_harq_data_bursts",
- FT_UINT8,
+ FT_UINT16,
BASE_DEC,
NULL,
- 0x0f,
+ 0x000f,
NULL,
HFILL
}
@@ -3206,10 +3206,9 @@ proto_register_wimaxmacphy(void)
{
"Feedback sub-type",
"wimaxmacphy.prim_fast_feedback_sub_type",
- FT_UINT8,
+ FT_UINT16,
BASE_DEC,
- VALS(
- wimaxmacphy_prim_fast_feedback_sub_type_vals),
+ VALS(wimaxmacphy_prim_fast_feedback_sub_type_vals),
0x7000,
NULL,
HFILL
@@ -3402,7 +3401,7 @@ proto_register_wimaxmacphy(void)
{
"Number of Zone Descriptors",
"wimaxmacphy.number_of_zone_descriptors",
- FT_UINT8,
+ FT_UINT24,
BASE_DEC,
NULL,
0x0,
@@ -3547,8 +3546,7 @@ proto_register_wimaxmacphy(void)
"wimaxmacphy.zone_disable_pusc_subchannel_rotation",
FT_UINT8,
BASE_DEC,
- VALS(
- wimaxmacphy_ul_zone_disable_pusc_subchannel_rotation_vals),
+ VALS(wimaxmacphy_ul_zone_disable_pusc_subchannel_rotation_vals),
0x0f,
NULL,
HFILL
@@ -3951,8 +3949,7 @@ proto_register_wimaxmacphy(void)
{
&hf_wimaxmacphy_dl_burst_map_number_of_slots,
{
- "Number of slots (duration) after repetition code is"
- " applied",
+ "Number of slots (duration) after repetition code is applied",
"wimaxmacphy.burst_map_number_of_slots",
FT_UINT16,
BASE_DEC,
@@ -4424,8 +4421,7 @@ proto_register_wimaxmacphy(void)
"wimaxmacphy.burst_sounding_max_cyclic_shift_indx",
FT_UINT8,
BASE_DEC,
- VALS(
- wimaxmacphy_ul_burst_sounding_max_cyclic_shift_indx_vals),
+ VALS(wimaxmacphy_ul_burst_sounding_max_cyclic_shift_indx_vals),
0x0,
NULL,
HFILL
@@ -4451,8 +4447,7 @@ proto_register_wimaxmacphy(void)
"wimaxmacphy.burst_sounding_decimation_offset_rand",
FT_UINT8,
BASE_DEC,
- VALS(
- wimaxmacphy_ul_burst_sounding_decimation_offset_rand_vals),
+ VALS(wimaxmacphy_ul_burst_sounding_decimation_offset_rand_vals),
0x0,
NULL,
HFILL
@@ -4864,7 +4859,7 @@ proto_register_wimaxmacphy(void)
{
&hf_wimaxmacphy_sub_burst_harq_chase_harq_channel_id,
{
- "HARQ channeld id (ACID)",
+ "HARQ channel id (ACID)",
"wimaxmacphy.sub_burst_harq_chase_harq_channel_id",
FT_UINT8,
BASE_DEC,
@@ -5191,10 +5186,10 @@ proto_register_wimaxmacphy(void)
{
"ACID",
"wimaxmacphy.sub_burst_harq_ack_acid",
- FT_UINT8,
+ FT_UINT32,
BASE_DEC,
NULL,
- 0xf0,
+ 0x000000f0,
NULL,
HFILL
}
@@ -5207,7 +5202,7 @@ proto_register_wimaxmacphy(void)
FT_UINT32,
BASE_HEX,
NULL,
- 0x0fff,
+ 0x00000fff,
NULL,
HFILL
}
@@ -5232,8 +5227,7 @@ proto_register_wimaxmacphy(void)
"wimaxmacphy.sub_burst_sounding_power_assignment_method",
FT_UINT8,
BASE_HEX,
- VALS(
- wimaxmacphy_ul_sub_burst_sounding_power_assignment_vals),
+ VALS(wimaxmacphy_ul_sub_burst_sounding_power_assignment_vals),
0x0,
NULL,
HFILL
@@ -5259,8 +5253,7 @@ proto_register_wimaxmacphy(void)
"wimaxmacphy.sub_burst_sounding_allocation_mode",
FT_UINT8,
BASE_DEC,
- VALS(
- wimaxmacphy_ul_sub_burst_sounding_allocation_mode_vals),
+ VALS(wimaxmacphy_ul_sub_burst_sounding_allocation_mode_vals),
0x0,
NULL,
HFILL
@@ -5410,10 +5403,8 @@ proto_register_wimaxmacphy(void)
expert_module_t* expert_wimaxmacphy;
/* Register the protocol name and description */
- proto_wimaxmacphy = proto_register_protocol(
- "WiMAX MAC-PHY over Ethernet",
- "WiMAX MAC-PHY",
- "wimaxmacphy");
+ proto_wimaxmacphy = proto_register_protocol("WiMAX MAC-PHY over Ethernet", "WiMAX MAC-PHY", "wimaxmacphy");
+ wimaxmacphy_handle = register_dissector("wimaxmacphy", dissect_wimaxmacphy, proto_wimaxmacphy);
/* Required function calls to register the header fields and subtrees
* used */
@@ -5426,9 +5417,6 @@ proto_register_wimaxmacphy(void)
void
proto_reg_handoff_wimaxmacphy(void)
{
- dissector_handle_t wimaxmacphy_handle;
-
- wimaxmacphy_handle = create_dissector_handle(dissect_wimaxmacphy, proto_wimaxmacphy);
dissector_add_for_decode_as_with_preference("udp.port", wimaxmacphy_handle);
}