From Kovarththanan Rajaratnam:

Move header field info declarations into function scope.

This is the first step. Another patch will be submitted which actually scrubs
the header field info declarations (remove empty blurbs, etc.)

svn path=/trunk/; revision=28797

1 files changed, 590 insertions, 591 deletions

diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
index 5d6d7a4614..ee2170c85e 100644
--- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
+++ b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
@@ -209,232 +209,6 @@ static gint hf_culmap_num_subchannels_1 = -1;
 static gint hf_culmap_reserved_type = -1;
 static gint hf_culmap_reserved_type_1 = -1;
 
-/* Compact UL-MAP IE display */
-static hf_register_info hf_compact_ulmap[] =
-{
-	{
-		&hf_culmap_ul_map_type,
-		{"UL-MAP Type", "wmx.compact_ulmap.ul_map_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_ul_map_type_1,
-		{"UL-MAP Type", "wmx.compact_ulmap.ul_map_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK_1, "", HFILL}
-	},
-	{
-		&hf_culmap_reserved,
-		{"Reserved", "wmx.compact_ulmap.reserved", FT_UINT8, BASE_HEX, NULL, UL_MAP_RESERVED_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_reserved_1,
-		{"Reserved", "wmx.compact_ulmap.reserved", FT_UINT8, BASE_HEX, NULL, UL_MAP_RESERVED_MASK_1, "", HFILL}
-	},
-	{
-		&hf_culmap_nep_code,
-		{"Nep Code", "wmx.compact_ulmap.nep_code", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_nep_code_1,
-		{"Nep Code", "wmx.compact_ulmap.nep_code", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_nsch_code,
-		{"Nsch Code", "wmx.compact_ulmap.nsch_code", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_nsch_code_1,
-		{"Nsch Code", "wmx.compact_ulmap.nsch_code", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_shortened_uiuc,
-		{"Shortened UIUC", "wmx.compact_ulmap.shortened_uiuc", FT_UINT8, BASE_HEX, NULL, SHORTENED_UIUC_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_companded_sc,
-		{"Companded SC", "wmx.compact_ulmap.companded_sc", FT_UINT8, BASE_HEX, NULL, COMPANDED_SC_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_shortened_uiuc_1,
-		{"Shortened UIUC", "wmx.compact_ulmap.shortened_uiuc", FT_UINT16, BASE_HEX, NULL, SHORTENED_UIUC_MASK_1, "", HFILL}
-	},
-	{
-		&hf_culmap_companded_sc_1,
-		{"Companded SC", "wmx.compact_ulmap.companded_sc", FT_UINT16, BASE_HEX, NULL, COMPANDED_SC_MASK_1, "", HFILL}
-	},
-	{
-		&hf_culmap_num_bands,
-		{"Number Of Bands", "wmx.compact_ulmap.num_bands", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_num_bands_1,
-		{"Number Of Bands", "wmx.compact_ulmap.num_bands", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_band_index,
-		{"Band Index", "wmx.compact_ulmap.band_index", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
-	},
-	{
-		&hf_culmap_nb_bitmap,
-		{"Number Of Bits For Band BITMAP", "wmx.compact_ulmap.nb_bitmap", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_nb_bitmap_1,
-		{"Number Of Bits For Band BITMAP", "wmx.compact_ulmap.nb_bitmap", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_allocation_mode,
-		{"Allocation Mode", "wmx.compact_ulmap.allocation_mode", FT_UINT8, BASE_DEC, VALS(vals_allocation_modes), ALLOCATION_MODE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_allocation_mode_1,
-		{"Allocation Mode", "wmx.compact_ulmap.allocation_mode", FT_UINT8, BASE_DEC, VALS(vals_allocation_modes), ALLOCATION_MODE_MASK_1, "", HFILL}
-	},
-	{
-		&hf_culmap_allocation_mode_rsvd,
-		{"Reserved", "wmx.compact_ulmap.allocation_mode_rsvd", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL}
-	},
-	{
-		&hf_culmap_allocation_mode_rsvd_1,
-		{"Reserved", "wmx.compact_ulmap.allocation_mode_rsvd", FT_UINT8, BASE_DEC, NULL, 0x03, "", HFILL}
-	},
-	{
-		&hf_culmap_num_subchannels,
-		{"Number Of Subchannels", "wmx.compact_ulmap.num_subchannels", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
-	},
-	{
-		&hf_culmap_num_subchannels_1,
-		{"Number Of Subchannels", "wmx.compact_ulmap.num_subchannels", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_bin_offset,
-		{"BIN Offset", "wmx.compact_ulmap.bin_offset", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
-	},
-	{
-		&hf_culmap_bin_offset_1,
-		{"BIN Offset", "wmx.compact_ulmap.bin_offset", FT_UINT16, BASE_HEX, NULL, MIDDLE_BYTE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc,
-		{"UIUC", "wmx.compact_ulmap.uiuc", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_1,
-		{"UIUC", "wmx.compact_ulmap.uiuc", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_ofdma_symbol_offset,
-		{"OFDMA Symbol Offset", "wmx.compact_ulmap.uiuc_ofdma_symbol_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_ofdma_symbol_offset_1,
-		{"OFDMA Symbol Offset", "wmx.compact_ulmap.uiuc_ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_subchannel_offset_7,
-		{"Subchannel Offset", "wmx.compact_ulmap.uiuc_subchannel_offset", FT_UINT24, BASE_DEC, NULL, 0xFE0000, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_num_of_ofdma_symbols_7,
-		{"Number Of OFDMA Symbols", "wmx.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT24, BASE_DEC, NULL, 0x01FC00, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_num_of_subchannels_7,
-		{"Number Of Subchannels", "wmx.compact_ulmap.uiuc_num_of_subchannels", FT_UINT24, BASE_DEC, NULL, 0x0003F8, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_ranging_method,
-		{"Ranging Method", "wmx.compact_ulmap.uiuc_ranging_method", FT_UINT24, BASE_DEC, NULL, 0x000006, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_reserved,
-		{"Reserved", "wmx.compact_ulmap.uiuc_reserved", FT_UINT24, BASE_HEX, NULL, 0x000001, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_subchannel_offset_7_1,
-		{"Subchannel Offset", "wmx.compact_ulmap.uiuc_subchannel_offset", FT_UINT32, BASE_DEC, NULL, 0x00FE0000, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_num_of_ofdma_symbols_7_1,
-		{"Number Of OFDMA Symbols", "wmx.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT32, BASE_DEC, NULL, 0x0001FC00, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_num_of_subchannels_7_1,
-		{"Number Of Subchannels", "wmx.compact_ulmap.uiuc_num_of_subchannels", FT_UINT32, BASE_DEC, NULL, 0x000003F80, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_ranging_method_1,
-		{"Ranging Method", "wmx.compact_ulmap.uiuc_ranging_method", FT_UINT32, BASE_DEC, NULL, 0x00000006, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_reserved_1,
-		{"Reserved", "wmx.compact_ulmap.uiuc_reserved", FT_UINT32, BASE_HEX, NULL, 0x00000001, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_repetition_coding_indication,
-		{"Repetition Coding Indication", "wmx.compact_ulmap.uiuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(vals_repetitions), ALLOCATION_MODE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_repetition_coding_indication_1,
-		{"Repetition Coding Indication", "wmx.compact_ulmap.uiuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(vals_repetitions), ALLOCATION_MODE_MASK_1, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_reserved1,
-		{"Reserved", "wmx.compact_ulmap.uiuc_reserved1", FT_UINT8, BASE_HEX, NULL, 0x30, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_reserved11_1,
-		{"Reserved", "wmx.compact_ulmap.uiuc_reserved1", FT_UINT8, BASE_HEX, NULL, 0x03, "", HFILL}
-	},
-
-	{
-		&hf_culmap_uiuc_subchannel_offset,
-		{"Subchannel Offset", "wmx.compact_ulmap.uiuc_subchannel_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_subchannel_offset_1,
-		{"Subchannel Offset", "wmx.compact_ulmap.uiuc_subchannel_offset", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_num_of_ofdma_symbols,
-		{"Number Of OFDMA Symbols", "wmx.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_num_of_ofdma_symbols_1,
-		{"Number Of OFDMA Symbols", "wmx.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_num_of_subchannels,
-		{"Number Of Subchannels", "wmx.compact_ulmap.uiuc_num_of_subchannels", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
-	},
-	{
-		&hf_culmap_uiuc_num_of_subchannels_1,
-		{"Number Of Subchannels", "wmx.compact_ulmap.uiuc_num_of_subchannels", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_harq_region_change_indication,
-		{"HARQ Region Change Indication", "wmx.compact_ulmap.harq_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x10, "", HFILL}
-	},
-	{
-		&hf_culmap_harq_region_change_indication_1,
-		{"HARQ Region Change Indication", "wmx.compact_ulmap.harq_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x01, "", HFILL}
-	},
-	{
-		&hf_culmap_cqi_region_change_indication,
-		{"CQI Region Change Indication", "wmx.compact_ulmap.cqi_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x10, "", HFILL}
-	},
-	{
-		&hf_culmap_cqi_region_change_indication_1,
-		{"CQI Region Change Indication", "wmx.compact_ulmap.cqi_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x01, "", HFILL}
-	},
-	{
-		&hf_culmap_reserved_type,
-		{"UL-MAP Reserved Type", "wmx.compact_ulmap.reserved_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_reserved_type_1,
-		{"UL-MAP Reserved Type", "wmx.compact_ulmap.reserved_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK_1, "", HFILL}
-	}
-};
-
 /* display indexies */
 static gint hf_rcid_ie_prefix = -1;
 static gint hf_rcid_ie_prefix_1 = -1;
@@ -460,59 +234,6 @@ static gint hf_rcid_ie_cid11_3 = -1;
 #define WIMAX_RCID_IE_CID11_MASK             0x7FF0
 #define WIMAX_RCID_IE_CID11_MASK_1           0x07FF
 
-/* HARQ MAP Reduced CID IE display */
-static hf_register_info hf_rcid[] =
-{
-	{
-		&hf_rcid_ie_normal_cid,
-		{"Normal CID", "wmx.harq_map.rcid_ie.normal_cid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
-	},
-	{
-		&hf_rcid_ie_normal_cid_1,
-		{"Normal CID", "wmx.harq_map.rcid_ie.normal_cid", FT_UINT24, BASE_HEX, NULL, WIMAX_RCID_IE_NORMAL_CID_MASK_1, "", HFILL}
-	},
-	{
-		&hf_rcid_ie_prefix,
-		{"Prefix", "wmx.harq_map.rcid_ie.prefix", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_PREFIX_MASK, "", HFILL}
-	},
-	{
-		&hf_rcid_ie_prefix_1,
-		{"Prefix", "wmx.harq_map.rcid_ie.prefix", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_PREFIX_MASK_1, "", HFILL}
-	},
-	{
-		&hf_rcid_ie_cid3,
-		{"3 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid3", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID3_MASK, "", HFILL}
-	},
-	{
-		&hf_rcid_ie_cid3_1,
-		{"3 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid3", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID3_MASK_1, "", HFILL}
-	},
-	{
-		&hf_rcid_ie_cid7,
-		{"7 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid7", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID7_MASK, "", HFILL}
-	},
-	{
-		&hf_rcid_ie_cid7_1,
-		{"7 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid7", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID7_MASK_1, "", HFILL}
-	},
-	{
-		&hf_rcid_ie_cid11,
-		{"11 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK, "", HFILL}
-	},
-	{
-		&hf_rcid_ie_cid11_1,
-		{"11 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK_1, "", HFILL}
-	},
-	{
-		&hf_rcid_ie_cid11_2,
-		{"11 LSB Of Multicast, AAS or Broadcast CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK, "", HFILL}
-	},
-	{
-		&hf_rcid_ie_cid11_3,
-		{"11 LSB Of Multicast, AAS or Broadcast CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK_1, "", HFILL}
-	}
-};
-
 /* HARQ MAP HARQ Control IE display indexies */
 static gint hf_harq_control_ie_prefix = -1;
 static gint hf_harq_control_ie_ai_sn = -1;
@@ -537,51 +258,6 @@ static gint hf_harq_control_ie_reserved_1 = -1;
 #define WIMAX_HARQ_CONTROL_IE_ACID_MASK_1      0x00F0
 #define WIMAX_HARQ_CONTROL_IE_RESERVED_MASK_1  0x0700
 
-/* HARQ MAP HARQ Control IE display */
-static hf_register_info hf_harq_control[] =
-{
-	{
-		&hf_harq_control_ie_prefix,
-		{"Prefix", "wmx.harq_map.harq_control_ie.prefix", FT_BOOLEAN, 8, TFS(&tfs_prefix), WIMAX_HARQ_CONTROL_IE_PREFIX_MASK, "", HFILL}
-	},
-	{
-		&hf_harq_control_ie_ai_sn,
-		{"HARQ ID Sequence Number(AI_SN)", "wmx.harq_map.harq_control_ie.ai_sn", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_AI_SN_MASK, "", HFILL}
-	},
-	{
-		&hf_harq_control_ie_spid,
-		{"Subpacket ID (SPID)", "wmx.harq_map.harq_control_ie.spid", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_SPID_MASK, "", HFILL}
-	},
-	{
-		&hf_harq_control_ie_acid,
-		{"HARQ CH ID (ACID)", "wmx.harq_map.harq_control_ie.acid", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_ACID_MASK, "", HFILL}
-	},
-	{
-		&hf_harq_control_ie_reserved,
-		{"Reserved", "wmx.harq_map.harq_control_ie.reserved", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_RESERVED_MASK, "", HFILL}
-	},
-	{
-		&hf_harq_control_ie_prefix_1,
-		{"Prefix", "wmx.harq_map.harq_control_ie.prefix", FT_BOOLEAN, 16, TFS(&tfs_prefix), WIMAX_HARQ_CONTROL_IE_PREFIX_MASK_1, "", HFILL}
-	},
-	{
-		&hf_harq_control_ie_ai_sn_1,
-		{"HARQ ID Sequence Number(AI_SN)", "wmx.harq_map.harq_control_ie.ai_sn", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_AI_SN_MASK_1, "", HFILL}
-	},
-	{
-		&hf_harq_control_ie_spid_1,
-		{"Subpacket ID (SPID)", "wmx.harq_map.harq_control_ie.spid", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_SPID_MASK_1, "", HFILL}
-	},
-	{
-		&hf_harq_control_ie_acid_1,
-		{"HARQ CH ID (ACID)", "wmx.harq_map.harq_control_ie.acid", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_ACID_MASK_1, "", HFILL}
-	},
-	{
-		&hf_harq_control_ie_reserved_1,
-		{"Reserved", "wmx.harq_map.harq_control_ie.reserved", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_RESERVED_MASK_1, "", HFILL}
-	}
-};
-
 /* Extension Type */
 #define EXTENSION_TYPE_MASK         0xE000
 #define EXTENSION_TYPE_MASK_1       0x0E00
@@ -604,58 +280,6 @@ static gint hf_culmap_extension_time_diversity_mbs_1 = -1;
 static gint hf_culmap_extension_harq_mode_1 = -1;
 static gint hf_culmap_extension_unknown_sub_type_1 = -1;
 
-static hf_register_info hf_extension_type[] =
-{
-	{
-		&hf_culmap_extension_type,
-		{"UL-MAP Type", "wmx.extension_type.ul_map_type", FT_UINT16, BASE_DEC, NULL, EXTENSION_TYPE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_extension_type_1,
-		{"UL-MAP Type", "wmx.extension_type.ul_map_type", FT_UINT16, BASE_DEC, NULL, EXTENSION_TYPE_MASK_1, "", HFILL}
-	},
-	{
-		&hf_culmap_extension_subtype,
-		{"Extension Subtype", "wmx.extension_type.subtype", FT_UINT16, BASE_DEC, NULL, EXTENSION_SUBTYPE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_extension_subtype_1,
-		{"Extension Subtype", "wmx.extension_type.subtype", FT_UINT16, BASE_DEC, NULL, EXTENSION_SUBTYPE_MASK_1, "", HFILL}
-	},
-	{
-		&hf_culmap_extension_length,
-		{"Extension Length", "wmx.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_extension_length_1,
-		{"Extension Length", "wmx.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK_1, "", HFILL}
-	},
-	{
-		&hf_culmap_extension_time_diversity_mbs,
-		{"Time Diversity MBS", "wmx.extension_type.time_diversity_mbs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
-	},
-	{
-		&hf_culmap_extension_time_diversity_mbs_1,
-		{"Time Diversity MBS", "wmx.extension_type.time_diversity_mbs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
-	},
-	{
-		&hf_culmap_extension_harq_mode_1,
-		{"HARQ Mode Switch", "wmx.extension_type.harq_mode", FT_UINT16, BASE_HEX, NULL, 0x000F, "", HFILL}
-	},
-	{
-		&hf_culmap_extension_harq_mode,
-		{"HARQ Mode Switch", "wmx.extension_type.harq_mode", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
-	},
-	{
-		&hf_culmap_extension_unknown_sub_type,
-		{"Unknown Extension Subtype", "wmx.extension_type.unknown_sub_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
-	},
-	{
-		&hf_culmap_extension_unknown_sub_type_1,
-		{"Unknown Extension Subtype", "wmx.extension_type.unknown_sub_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
-	}
-};
-
 /* UL-MAP CDMA Allocation IE */
 #define CDMA_ALLOCATION_DURATION_MASK               0xFC00
 #define CDMA_ALLOCATION_UIUC_MASK                   0x03C0
@@ -691,75 +315,6 @@ static gint hf_cdma_allocation_ranging_symbol_1 = -1;
 static gint hf_cdma_allocation_ranging_subchannel_1 = -1;
 static gint hf_cdma_allocation_bw_req_1 = -1;
 
-static hf_register_info hf_cdma_allocation[] =
-{
-	{	/* display the Duration */
-		&hf_cdma_allocation_duration,
-		{"Duration", "wmx.cdma_allocation.duration", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_DURATION_MASK, "", HFILL}
-	},
-	{	/* display the UIUC */
-		&hf_cdma_allocation_uiuc,
-		{"UIUC For Transmission", "wmx.cdma_allocation.uiuc", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_UIUC_MASK, "", HFILL}
-	},
-	{	/* display the Repetition Coding Indication */
-		&hf_cdma_allocation_repetition,
-		{"Repetition Coding Indication", "wmx.cdma_allocation.allocation_repetition", FT_UINT16, BASE_DEC, VALS(vals_repetitions), CDMA_ALLOCATION_REPETITION_CODE_MASK, "", HFILL}
-	},
-	{	/* display the Frame Number Index */
-		&hf_cdma_allocation_frame_number_index,
-		{"Frame Number Index (LSBs of relevant frame number)", "wmx.cdma_allocation.frame_number_index", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_FRAME_NUMBER_INDEX_MASK, "", HFILL}
-	},
-	{	/* display the Ranging Code */
-		&hf_cdma_allocation_ranging_code,
-		{"Ranging Code", "wmx.cdma_allocation.ranging_code", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
-	},
-	{	/* display the Ranging Symbol */
-		&hf_cdma_allocation_ranging_symbol,
-		{"Ranging Symbol", "wmx.cdma_allocation.ranging_symbol", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
-	},
-	{	/* display the Ranging Subchannel */
-		&hf_cdma_allocation_ranging_subchannel,
-		{"Ranging Subchannel", "wmx.cdma_allocation.ranging_subchannel", FT_UINT8, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_SUBCHANNEL_MASK, "", HFILL}
-	},
-	{	/* display the BW Request Mandatory */
-		&hf_cdma_allocation_bw_req,
-		{"BW Request Mandatory", "wmx.cdma_allocation.bw_req", FT_BOOLEAN, 8, TFS(&tfs_yes_no_ie), CDMA_ALLOCATION_BW_REQUEST_MANDATORY_MASK, "", HFILL}
-	},
-	{	/* display the Duration */
-		&hf_cdma_allocation_duration_1,
-		{"Duration", "wmx.cdma_allocation.duration", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_DURATION_MASK_1, "", HFILL}
-	},
-	{	/* display the UIUC */
-		&hf_cdma_allocation_uiuc_1,
-		{"UIUC For Transmission", "wmx.cdma_allocation.uiuc", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_UIUC_MASK_1, "", HFILL}
-	},
-	{	/* display the Repetition Coding Indication */
-		&hf_cdma_allocation_repetition_1,
-		{"Repetition Coding Indication", "wmx.cdma_allocation.allocation_repetition", FT_UINT16, BASE_DEC, VALS(vals_repetitions), CDMA_ALLOCATION_REPETITION_CODE_MASK_1, "", HFILL}
-	},
-	{	/* display the Frame Number Index */
-		&hf_cdma_allocation_frame_number_index_1,
-		{"Frame Number Index (LSBs of relevant frame number)", "wmx.cdma_allocation.frame_number_index", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_FRAME_NUMBER_INDEX_MASK_1, "", HFILL}
-	},
-	{	/* display the Ranging Code */
-		&hf_cdma_allocation_ranging_code_1,
-		{"Ranging Code", "wmx.cdma_allocation.ranging_code", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_CODE_MASK_1, "", HFILL}
-	},
-	{	/* display the Ranging Symbol */
-		&hf_cdma_allocation_ranging_symbol_1,
-		{"Ranging Symbol", "wmx.cdma_allocation.ranging_symbol", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_SYMBOL_MASK_1, "", HFILL}
-	},
-	{	/* display the Ranging Subchannel */
-		&hf_cdma_allocation_ranging_subchannel_1,
-		{"Ranging Subchannel", "wmx.cdma_allocation.ranging_subchannel", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_SUBCHANNEL_MASK_1, "", HFILL}
-	},
-	{	/* display the BW Request Mandatory */
-		&hf_cdma_allocation_bw_req_1,
-		{"BW Request Mandatory", "wmx.cdma_allocation.bw_req", FT_BOOLEAN, 32, TFS(&tfs_yes_no_ie), CDMA_ALLOCATION_BW_REQUEST_MANDATORY_MASK_1, "", HFILL}
-	}
-};
-
-
 /* UL-MAP Extended UIUCs (table 290a) */
 #define MINI_SUBCHANNEL_CTYPE_MASK           0xC0
 #define MINI_SUBCHANNEL_CTYPE_MASK_16        0x0C00
@@ -817,158 +372,602 @@ static gint hf_extended_uiuc_ie_fast_ranging = -1;
 static gint hf_extended_uiuc_ie_ul_allocation_start = -1;
 static gint hf_extended_uiuc_ie_unknown_uiuc = -1;
 
-static hf_register_info hf_extended_uiuc[] =
+/* Register Wimax Compact UL-MAP IE Protocol */
+void proto_register_wimax_compact_ulmap_ie(void)
 {
-	{	/* 8.4.5.4.4 Extended UIUC */
-		&hf_extended_uiuc_ie_uiuc,
-		{"Extended UIUC", "wmx.extended_uiuc_ie.uiuc", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL }
-	},
-	{	/* 8.4.5.4.4 Extended UIUC */
-		&hf_extended_uiuc_ie_uiuc_1,
-		{"Extended UIUC", "wmx.extended_uiuc_ie.uiuc", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL }
-	},
-	{	/* 8.4.5.4.4 IE Length */
-		&hf_extended_uiuc_ie_length,
-		{"Length", "wmx.extended_uiuc_ie.length", FT_UINT8, BASE_DEC, NULL, MSB_NIBBLE_MASK, "", HFILL }
-	},
-	{	/* 8.4.5.4.4 IE Length */
-		&hf_extended_uiuc_ie_length_1,
-		{"Length", "wmx.extended_uiuc_ie.length", FT_UINT24, BASE_DEC, NULL, LSB_NIBBLE_MASK, "", HFILL }
-	},
-	{	/* 8.4.5.4.5 Power Control IE */
-		&hf_extended_uiuc_ie_power_control,
-		{"Power Control", "wmx.extended_uiuc_ie.power_control", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-	{	/* 8.4.5.4.5 Power Control IE */
-		&hf_extended_uiuc_ie_power_control_24,
-		{"Power Control", "wmx.extended_uiuc_ie.power_control", FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_power_measurement_frame,
-		{"Power Measurement Frame", "wmx.extended_uiuc_ie.power_measurement_frame", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_power_measurement_frame_24,
-		{"Power Measurement Frame", "wmx.extended_uiuc_ie.power_measurement_frame", FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-	{	/* 8.4.5.4.8 Mini Subchannel Allocation IE */
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_ctype,
-		{"C Type", "wmx.extended_uiuc_ie.mini_subchannel_alloc.ctype", FT_UINT8, BASE_HEX, VALS(vals_ctypes), MINI_SUBCHANNEL_CTYPE_MASK, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_ctype_16,
-		{"C Type", "wmx.extended_uiuc_ie.mini_subchannel_alloc.ctype", FT_UINT16, BASE_HEX, VALS(vals_ctypes), MINI_SUBCHANNEL_CTYPE_MASK_16, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_duration,
-		{"Duration", "wmx.extended_uiuc_ie.mini_subchannel_alloc.duration", FT_UINT8, BASE_DEC, NULL, MINI_SUBCHANNEL_DURATION_MASK, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_duration_16,
-		{"Duration", "wmx.extended_uiuc_ie.mini_subchannel_alloc.duration", FT_UINT16, BASE_DEC, NULL, MINI_SUBCHANNEL_DURATION_MASK_16, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_cid,
-		{"CID", "wmx.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc,
-		{"UIUC", "wmx.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_repetition,
-		{"Repetition", "wmx.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_cid_1,
-		{"CID", "wmx.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK_1, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_1,
-		{"UIUC", "wmx.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK_1, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_1,
-		{"Repetition", "wmx.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK_1, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_cid_2,
-		{"CID", "wmx.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK_2, "", HFILL }
-	},
+	/* Compact UL-MAP IE display */
+	static hf_register_info hf_compact_ulmap[] =
 	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_2,
-		{"UIUC", "wmx.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK_2, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_2,
-		{"Repetition", "wmx.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK_2, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_cid_3,
-		{"CID", "wmx.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK_3, "", HFILL }
-	},
-	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_3,
-		{"UIUC", "wmx.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK_2, "", HFILL }
-	},
+		{
+			&hf_culmap_ul_map_type,
+			{"UL-MAP Type", "wmx.compact_ulmap.ul_map_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_ul_map_type_1,
+			{"UL-MAP Type", "wmx.compact_ulmap.ul_map_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK_1, "", HFILL}
+		},
+		{
+			&hf_culmap_reserved,
+			{"Reserved", "wmx.compact_ulmap.reserved", FT_UINT8, BASE_HEX, NULL, UL_MAP_RESERVED_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_reserved_1,
+			{"Reserved", "wmx.compact_ulmap.reserved", FT_UINT8, BASE_HEX, NULL, UL_MAP_RESERVED_MASK_1, "", HFILL}
+		},
+		{
+			&hf_culmap_nep_code,
+			{"Nep Code", "wmx.compact_ulmap.nep_code", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_nep_code_1,
+			{"Nep Code", "wmx.compact_ulmap.nep_code", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_nsch_code,
+			{"Nsch Code", "wmx.compact_ulmap.nsch_code", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_nsch_code_1,
+			{"Nsch Code", "wmx.compact_ulmap.nsch_code", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_shortened_uiuc,
+			{"Shortened UIUC", "wmx.compact_ulmap.shortened_uiuc", FT_UINT8, BASE_HEX, NULL, SHORTENED_UIUC_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_companded_sc,
+			{"Companded SC", "wmx.compact_ulmap.companded_sc", FT_UINT8, BASE_HEX, NULL, COMPANDED_SC_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_shortened_uiuc_1,
+			{"Shortened UIUC", "wmx.compact_ulmap.shortened_uiuc", FT_UINT16, BASE_HEX, NULL, SHORTENED_UIUC_MASK_1, "", HFILL}
+		},
+		{
+			&hf_culmap_companded_sc_1,
+			{"Companded SC", "wmx.compact_ulmap.companded_sc", FT_UINT16, BASE_HEX, NULL, COMPANDED_SC_MASK_1, "", HFILL}
+		},
+		{
+			&hf_culmap_num_bands,
+			{"Number Of Bands", "wmx.compact_ulmap.num_bands", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_num_bands_1,
+			{"Number Of Bands", "wmx.compact_ulmap.num_bands", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_band_index,
+			{"Band Index", "wmx.compact_ulmap.band_index", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+		},
+		{
+			&hf_culmap_nb_bitmap,
+			{"Number Of Bits For Band BITMAP", "wmx.compact_ulmap.nb_bitmap", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_nb_bitmap_1,
+			{"Number Of Bits For Band BITMAP", "wmx.compact_ulmap.nb_bitmap", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_allocation_mode,
+			{"Allocation Mode", "wmx.compact_ulmap.allocation_mode", FT_UINT8, BASE_DEC, VALS(vals_allocation_modes), ALLOCATION_MODE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_allocation_mode_1,
+			{"Allocation Mode", "wmx.compact_ulmap.allocation_mode", FT_UINT8, BASE_DEC, VALS(vals_allocation_modes), ALLOCATION_MODE_MASK_1, "", HFILL}
+		},
+		{
+			&hf_culmap_allocation_mode_rsvd,
+			{"Reserved", "wmx.compact_ulmap.allocation_mode_rsvd", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL}
+		},
+		{
+			&hf_culmap_allocation_mode_rsvd_1,
+			{"Reserved", "wmx.compact_ulmap.allocation_mode_rsvd", FT_UINT8, BASE_DEC, NULL, 0x03, "", HFILL}
+		},
+		{
+			&hf_culmap_num_subchannels,
+			{"Number Of Subchannels", "wmx.compact_ulmap.num_subchannels", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+		},
+		{
+			&hf_culmap_num_subchannels_1,
+			{"Number Of Subchannels", "wmx.compact_ulmap.num_subchannels", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_bin_offset,
+			{"BIN Offset", "wmx.compact_ulmap.bin_offset", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+		},
+		{
+			&hf_culmap_bin_offset_1,
+			{"BIN Offset", "wmx.compact_ulmap.bin_offset", FT_UINT16, BASE_HEX, NULL, MIDDLE_BYTE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc,
+			{"UIUC", "wmx.compact_ulmap.uiuc", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_1,
+			{"UIUC", "wmx.compact_ulmap.uiuc", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_ofdma_symbol_offset,
+			{"OFDMA Symbol Offset", "wmx.compact_ulmap.uiuc_ofdma_symbol_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_ofdma_symbol_offset_1,
+			{"OFDMA Symbol Offset", "wmx.compact_ulmap.uiuc_ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_subchannel_offset_7,
+			{"Subchannel Offset", "wmx.compact_ulmap.uiuc_subchannel_offset", FT_UINT24, BASE_DEC, NULL, 0xFE0000, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_num_of_ofdma_symbols_7,
+			{"Number Of OFDMA Symbols", "wmx.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT24, BASE_DEC, NULL, 0x01FC00, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_num_of_subchannels_7,
+			{"Number Of Subchannels", "wmx.compact_ulmap.uiuc_num_of_subchannels", FT_UINT24, BASE_DEC, NULL, 0x0003F8, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_ranging_method,
+			{"Ranging Method", "wmx.compact_ulmap.uiuc_ranging_method", FT_UINT24, BASE_DEC, NULL, 0x000006, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_reserved,
+			{"Reserved", "wmx.compact_ulmap.uiuc_reserved", FT_UINT24, BASE_HEX, NULL, 0x000001, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_subchannel_offset_7_1,
+			{"Subchannel Offset", "wmx.compact_ulmap.uiuc_subchannel_offset", FT_UINT32, BASE_DEC, NULL, 0x00FE0000, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_num_of_ofdma_symbols_7_1,
+			{"Number Of OFDMA Symbols", "wmx.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT32, BASE_DEC, NULL, 0x0001FC00, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_num_of_subchannels_7_1,
+			{"Number Of Subchannels", "wmx.compact_ulmap.uiuc_num_of_subchannels", FT_UINT32, BASE_DEC, NULL, 0x000003F80, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_ranging_method_1,
+			{"Ranging Method", "wmx.compact_ulmap.uiuc_ranging_method", FT_UINT32, BASE_DEC, NULL, 0x00000006, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_reserved_1,
+			{"Reserved", "wmx.compact_ulmap.uiuc_reserved", FT_UINT32, BASE_HEX, NULL, 0x00000001, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_repetition_coding_indication,
+			{"Repetition Coding Indication", "wmx.compact_ulmap.uiuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(vals_repetitions), ALLOCATION_MODE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_repetition_coding_indication_1,
+			{"Repetition Coding Indication", "wmx.compact_ulmap.uiuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(vals_repetitions), ALLOCATION_MODE_MASK_1, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_reserved1,
+			{"Reserved", "wmx.compact_ulmap.uiuc_reserved1", FT_UINT8, BASE_HEX, NULL, 0x30, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_reserved11_1,
+			{"Reserved", "wmx.compact_ulmap.uiuc_reserved1", FT_UINT8, BASE_HEX, NULL, 0x03, "", HFILL}
+		},
+
+		{
+			&hf_culmap_uiuc_subchannel_offset,
+			{"Subchannel Offset", "wmx.compact_ulmap.uiuc_subchannel_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_subchannel_offset_1,
+			{"Subchannel Offset", "wmx.compact_ulmap.uiuc_subchannel_offset", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_num_of_ofdma_symbols,
+			{"Number Of OFDMA Symbols", "wmx.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_num_of_ofdma_symbols_1,
+			{"Number Of OFDMA Symbols", "wmx.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_num_of_subchannels,
+			{"Number Of Subchannels", "wmx.compact_ulmap.uiuc_num_of_subchannels", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+		},
+		{
+			&hf_culmap_uiuc_num_of_subchannels_1,
+			{"Number Of Subchannels", "wmx.compact_ulmap.uiuc_num_of_subchannels", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_harq_region_change_indication,
+			{"HARQ Region Change Indication", "wmx.compact_ulmap.harq_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x10, "", HFILL}
+		},
+		{
+			&hf_culmap_harq_region_change_indication_1,
+			{"HARQ Region Change Indication", "wmx.compact_ulmap.harq_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x01, "", HFILL}
+		},
+		{
+			&hf_culmap_cqi_region_change_indication,
+			{"CQI Region Change Indication", "wmx.compact_ulmap.cqi_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x10, "", HFILL}
+		},
+		{
+			&hf_culmap_cqi_region_change_indication_1,
+			{"CQI Region Change Indication", "wmx.compact_ulmap.cqi_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x01, "", HFILL}
+		},
+		{
+			&hf_culmap_reserved_type,
+			{"UL-MAP Reserved Type", "wmx.compact_ulmap.reserved_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_reserved_type_1,
+			{"UL-MAP Reserved Type", "wmx.compact_ulmap.reserved_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK_1, "", HFILL}
+		}
+	};
+
+	/* HARQ MAP Reduced CID IE display */
+	static hf_register_info hf_rcid[] =
 	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_3,
-		{"Repetition", "wmx.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK_3, "", HFILL }
-	},
+		{
+			&hf_rcid_ie_normal_cid,
+			{"Normal CID", "wmx.harq_map.rcid_ie.normal_cid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+		},
+		{
+			&hf_rcid_ie_normal_cid_1,
+			{"Normal CID", "wmx.harq_map.rcid_ie.normal_cid", FT_UINT24, BASE_HEX, NULL, WIMAX_RCID_IE_NORMAL_CID_MASK_1, "", HFILL}
+		},
+		{
+			&hf_rcid_ie_prefix,
+			{"Prefix", "wmx.harq_map.rcid_ie.prefix", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_PREFIX_MASK, "", HFILL}
+		},
+		{
+			&hf_rcid_ie_prefix_1,
+			{"Prefix", "wmx.harq_map.rcid_ie.prefix", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_PREFIX_MASK_1, "", HFILL}
+		},
+		{
+			&hf_rcid_ie_cid3,
+			{"3 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid3", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID3_MASK, "", HFILL}
+		},
+		{
+			&hf_rcid_ie_cid3_1,
+			{"3 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid3", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID3_MASK_1, "", HFILL}
+		},
+		{
+			&hf_rcid_ie_cid7,
+			{"7 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid7", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID7_MASK, "", HFILL}
+		},
+		{
+			&hf_rcid_ie_cid7_1,
+			{"7 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid7", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID7_MASK_1, "", HFILL}
+		},
+		{
+			&hf_rcid_ie_cid11,
+			{"11 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK, "", HFILL}
+		},
+		{
+			&hf_rcid_ie_cid11_1,
+			{"11 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK_1, "", HFILL}
+		},
+		{
+			&hf_rcid_ie_cid11_2,
+			{"11 LSB Of Multicast, AAS or Broadcast CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK, "", HFILL}
+		},
+		{
+			&hf_rcid_ie_cid11_3,
+			{"11 LSB Of Multicast, AAS or Broadcast CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK_1, "", HFILL}
+		}
+	};
+
+	/* HARQ MAP HARQ Control IE display */
+	static hf_register_info hf_harq_control[] =
 	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_padding,
-		{"Padding", "wmx.extended_uiuc_ie.mini_subchannel_alloc.padding", FT_UINT8, BASE_HEX, NULL, MINI_SUBCHANNEL_PADDING_MASK, "", HFILL }
-	},
+		{
+			&hf_harq_control_ie_prefix,
+			{"Prefix", "wmx.harq_map.harq_control_ie.prefix", FT_BOOLEAN, 8, TFS(&tfs_prefix), WIMAX_HARQ_CONTROL_IE_PREFIX_MASK, "", HFILL}
+		},
+		{
+			&hf_harq_control_ie_ai_sn,
+			{"HARQ ID Sequence Number(AI_SN)", "wmx.harq_map.harq_control_ie.ai_sn", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_AI_SN_MASK, "", HFILL}
+		},
+		{
+			&hf_harq_control_ie_spid,
+			{"Subpacket ID (SPID)", "wmx.harq_map.harq_control_ie.spid", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_SPID_MASK, "", HFILL}
+		},
+		{
+			&hf_harq_control_ie_acid,
+			{"HARQ CH ID (ACID)", "wmx.harq_map.harq_control_ie.acid", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_ACID_MASK, "", HFILL}
+		},
+		{
+			&hf_harq_control_ie_reserved,
+			{"Reserved", "wmx.harq_map.harq_control_ie.reserved", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_RESERVED_MASK, "", HFILL}
+		},
+		{
+			&hf_harq_control_ie_prefix_1,
+			{"Prefix", "wmx.harq_map.harq_control_ie.prefix", FT_BOOLEAN, 16, TFS(&tfs_prefix), WIMAX_HARQ_CONTROL_IE_PREFIX_MASK_1, "", HFILL}
+		},
+		{
+			&hf_harq_control_ie_ai_sn_1,
+			{"HARQ ID Sequence Number(AI_SN)", "wmx.harq_map.harq_control_ie.ai_sn", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_AI_SN_MASK_1, "", HFILL}
+		},
+		{
+			&hf_harq_control_ie_spid_1,
+			{"Subpacket ID (SPID)", "wmx.harq_map.harq_control_ie.spid", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_SPID_MASK_1, "", HFILL}
+		},
+		{
+			&hf_harq_control_ie_acid_1,
+			{"HARQ CH ID (ACID)", "wmx.harq_map.harq_control_ie.acid", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_ACID_MASK_1, "", HFILL}
+		},
+		{
+			&hf_harq_control_ie_reserved_1,
+			{"Reserved", "wmx.harq_map.harq_control_ie.reserved", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_RESERVED_MASK_1, "", HFILL}
+		}
+	};
+
+	static hf_register_info hf_extension_type[] =
 	{
-		&hf_extended_uiuc_ie_mini_subchannel_alloc_padding_1,
-		{"Padding", "wmx.extended_uiuc_ie.mini_subchannel_alloc.padding", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_PADDING_MASK_1, "", HFILL }
-	},
-	{	/* 8.4.5.4.6 AAS_UL_IE */
-		&hf_extended_uiuc_ie_aas_ul,
-		{"AAS_UL_IE (not implemented)", "wmx.extended_uiuc_ie.aas_ul", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-	{	/* 8.4.5.4.12 CQICH Allocation IE */
-		&hf_extended_uiuc_ie_cqich_alloc,
-		{"CQICH Allocation IE (not implemented)", "wmx.extended_uiuc_ie.cqich_alloc", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-	{	/* 8.4.5.4.7 UL Zone IE */
-		&hf_extended_uiuc_ie_ul_zone,
-		{"UL Zone IE (not implemented)", "wmx.extended_uiuc_ie.ul_zone", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-
-	{	/* 8.4.5.4.14 MIMO_UL_Basic_IE */
-		&hf_extended_uiuc_ie_mimo_ul_basic,
-		{"MIMO UL Basic IE (not implemented)", "wmx.extended_uiuc_ie.mimo_ul_basic", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-	{	/* 8.4.5.4.22 UL-MAP Fast Tracking IE */
-		&hf_extended_uiuc_ie_fast_tracking,
-		{"UL-MAP Fast Tracking IE (not implemented)", "wmx.extended_uiuc_ie.fast_tracking", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-	{	/* 8.4.5.4.21 Fast Ranging IE */
-		&hf_extended_uiuc_ie_fast_ranging,
-		{"Fast Ranging IE (not implemented)", "wmx.extended_uiuc_ie.fast_ranging", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-	{	/* 8.4.5.4.14 UL-MAP Physical Modifier IE */
-		&hf_extended_uiuc_ie_phymod_ul,
-		{"UL-MAP Physical Modifier IE (not implemented)", "wmx.extended_uiuc_ie.phymod_ul", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-	{	/* 8.4.5.4.17 UL PUSC Burst Allocation in Other Segment IE */
-		&hf_extended_uiuc_ie_ul_pusc_burst_allocation,
-		{"UL_PUSC_Burst_Allocation_in_Other_Segment_IE (not implemented)", "wmx.extended_uiuc_ie.ul_pusc_burst_allocation", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-	{	/* 8.4.5.4.15 UL Allocation Start IE */
-		&hf_extended_uiuc_ie_ul_allocation_start,
-		{"UL Allocation Start IE (not implemented)", "wmx.extended_uiuc_ie.ul_allocation_start", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
-	},
-	{	/* unknown UIUC */
-		&hf_extended_uiuc_ie_unknown_uiuc,
-		{"Unknown Extended UIUC", "wmx.extended_uiuc.unknown_uiuc", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
-	}
-};
+		{
+			&hf_culmap_extension_type,
+			{"UL-MAP Type", "wmx.extension_type.ul_map_type", FT_UINT16, BASE_DEC, NULL, EXTENSION_TYPE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_extension_type_1,
+			{"UL-MAP Type", "wmx.extension_type.ul_map_type", FT_UINT16, BASE_DEC, NULL, EXTENSION_TYPE_MASK_1, "", HFILL}
+		},
+		{
+			&hf_culmap_extension_subtype,
+			{"Extension Subtype", "wmx.extension_type.subtype", FT_UINT16, BASE_DEC, NULL, EXTENSION_SUBTYPE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_extension_subtype_1,
+			{"Extension Subtype", "wmx.extension_type.subtype", FT_UINT16, BASE_DEC, NULL, EXTENSION_SUBTYPE_MASK_1, "", HFILL}
+		},
+		{
+			&hf_culmap_extension_length,
+			{"Extension Length", "wmx.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_extension_length_1,
+			{"Extension Length", "wmx.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK_1, "", HFILL}
+		},
+		{
+			&hf_culmap_extension_time_diversity_mbs,
+			{"Time Diversity MBS", "wmx.extension_type.time_diversity_mbs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+		},
+		{
+			&hf_culmap_extension_time_diversity_mbs_1,
+			{"Time Diversity MBS", "wmx.extension_type.time_diversity_mbs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+		},
+		{
+			&hf_culmap_extension_harq_mode_1,
+			{"HARQ Mode Switch", "wmx.extension_type.harq_mode", FT_UINT16, BASE_HEX, NULL, 0x000F, "", HFILL}
+		},
+		{
+			&hf_culmap_extension_harq_mode,
+			{"HARQ Mode Switch", "wmx.extension_type.harq_mode", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+		},
+		{
+			&hf_culmap_extension_unknown_sub_type,
+			{"Unknown Extension Subtype", "wmx.extension_type.unknown_sub_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+		},
+		{
+			&hf_culmap_extension_unknown_sub_type_1,
+			{"Unknown Extension Subtype", "wmx.extension_type.unknown_sub_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+		}
+	};
+
+	static hf_register_info hf_cdma_allocation[] =
+	{
+		{	/* display the Duration */
+			&hf_cdma_allocation_duration,
+			{"Duration", "wmx.cdma_allocation.duration", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_DURATION_MASK, "", HFILL}
+		},
+		{	/* display the UIUC */
+			&hf_cdma_allocation_uiuc,
+			{"UIUC For Transmission", "wmx.cdma_allocation.uiuc", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_UIUC_MASK, "", HFILL}
+		},
+		{	/* display the Repetition Coding Indication */
+			&hf_cdma_allocation_repetition,
+			{"Repetition Coding Indication", "wmx.cdma_allocation.allocation_repetition", FT_UINT16, BASE_DEC, VALS(vals_repetitions), CDMA_ALLOCATION_REPETITION_CODE_MASK, "", HFILL}
+		},
+		{	/* display the Frame Number Index */
+			&hf_cdma_allocation_frame_number_index,
+			{"Frame Number Index (LSBs of relevant frame number)", "wmx.cdma_allocation.frame_number_index", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_FRAME_NUMBER_INDEX_MASK, "", HFILL}
+		},
+		{	/* display the Ranging Code */
+			&hf_cdma_allocation_ranging_code,
+			{"Ranging Code", "wmx.cdma_allocation.ranging_code", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+		},
+		{	/* display the Ranging Symbol */
+			&hf_cdma_allocation_ranging_symbol,
+			{"Ranging Symbol", "wmx.cdma_allocation.ranging_symbol", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+		},
+		{	/* display the Ranging Subchannel */
+			&hf_cdma_allocation_ranging_subchannel,
+			{"Ranging Subchannel", "wmx.cdma_allocation.ranging_subchannel", FT_UINT8, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_SUBCHANNEL_MASK, "", HFILL}
+		},
+		{	/* display the BW Request Mandatory */
+			&hf_cdma_allocation_bw_req,
+			{"BW Request Mandatory", "wmx.cdma_allocation.bw_req", FT_BOOLEAN, 8, TFS(&tfs_yes_no_ie), CDMA_ALLOCATION_BW_REQUEST_MANDATORY_MASK, "", HFILL}
+		},
+		{	/* display the Duration */
+			&hf_cdma_allocation_duration_1,
+			{"Duration", "wmx.cdma_allocation.duration", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_DURATION_MASK_1, "", HFILL}
+		},
+		{	/* display the UIUC */
+			&hf_cdma_allocation_uiuc_1,
+			{"UIUC For Transmission", "wmx.cdma_allocation.uiuc", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_UIUC_MASK_1, "", HFILL}
+		},
+		{	/* display the Repetition Coding Indication */
+			&hf_cdma_allocation_repetition_1,
+			{"Repetition Coding Indication", "wmx.cdma_allocation.allocation_repetition", FT_UINT16, BASE_DEC, VALS(vals_repetitions), CDMA_ALLOCATION_REPETITION_CODE_MASK_1, "", HFILL}
+		},
+		{	/* display the Frame Number Index */
+			&hf_cdma_allocation_frame_number_index_1,
+			{"Frame Number Index (LSBs of relevant frame number)", "wmx.cdma_allocation.frame_number_index", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_FRAME_NUMBER_INDEX_MASK_1, "", HFILL}
+		},
+		{	/* display the Ranging Code */
+			&hf_cdma_allocation_ranging_code_1,
+			{"Ranging Code", "wmx.cdma_allocation.ranging_code", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_CODE_MASK_1, "", HFILL}
+		},
+		{	/* display the Ranging Symbol */
+			&hf_cdma_allocation_ranging_symbol_1,
+			{"Ranging Symbol", "wmx.cdma_allocation.ranging_symbol", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_SYMBOL_MASK_1, "", HFILL}
+		},
+		{	/* display the Ranging Subchannel */
+			&hf_cdma_allocation_ranging_subchannel_1,
+			{"Ranging Subchannel", "wmx.cdma_allocation.ranging_subchannel", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_SUBCHANNEL_MASK_1, "", HFILL}
+		},
+		{	/* display the BW Request Mandatory */
+			&hf_cdma_allocation_bw_req_1,
+			{"BW Request Mandatory", "wmx.cdma_allocation.bw_req", FT_BOOLEAN, 32, TFS(&tfs_yes_no_ie), CDMA_ALLOCATION_BW_REQUEST_MANDATORY_MASK_1, "", HFILL}
+		}
+	};
+
+	static hf_register_info hf_extended_uiuc[] =
+	{
+		{	/* 8.4.5.4.4 Extended UIUC */
+			&hf_extended_uiuc_ie_uiuc,
+			{"Extended UIUC", "wmx.extended_uiuc_ie.uiuc", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL }
+		},
+		{	/* 8.4.5.4.4 Extended UIUC */
+			&hf_extended_uiuc_ie_uiuc_1,
+			{"Extended UIUC", "wmx.extended_uiuc_ie.uiuc", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL }
+		},
+		{	/* 8.4.5.4.4 IE Length */
+			&hf_extended_uiuc_ie_length,
+			{"Length", "wmx.extended_uiuc_ie.length", FT_UINT8, BASE_DEC, NULL, MSB_NIBBLE_MASK, "", HFILL }
+		},
+		{	/* 8.4.5.4.4 IE Length */
+			&hf_extended_uiuc_ie_length_1,
+			{"Length", "wmx.extended_uiuc_ie.length", FT_UINT24, BASE_DEC, NULL, LSB_NIBBLE_MASK, "", HFILL }
+		},
+		{	/* 8.4.5.4.5 Power Control IE */
+			&hf_extended_uiuc_ie_power_control,
+			{"Power Control", "wmx.extended_uiuc_ie.power_control", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+		{	/* 8.4.5.4.5 Power Control IE */
+			&hf_extended_uiuc_ie_power_control_24,
+			{"Power Control", "wmx.extended_uiuc_ie.power_control", FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_power_measurement_frame,
+			{"Power Measurement Frame", "wmx.extended_uiuc_ie.power_measurement_frame", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_power_measurement_frame_24,
+			{"Power Measurement Frame", "wmx.extended_uiuc_ie.power_measurement_frame", FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+		{	/* 8.4.5.4.8 Mini Subchannel Allocation IE */
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_ctype,
+			{"C Type", "wmx.extended_uiuc_ie.mini_subchannel_alloc.ctype", FT_UINT8, BASE_HEX, VALS(vals_ctypes), MINI_SUBCHANNEL_CTYPE_MASK, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_ctype_16,
+			{"C Type", "wmx.extended_uiuc_ie.mini_subchannel_alloc.ctype", FT_UINT16, BASE_HEX, VALS(vals_ctypes), MINI_SUBCHANNEL_CTYPE_MASK_16, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_duration,
+			{"Duration", "wmx.extended_uiuc_ie.mini_subchannel_alloc.duration", FT_UINT8, BASE_DEC, NULL, MINI_SUBCHANNEL_DURATION_MASK, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_duration_16,
+			{"Duration", "wmx.extended_uiuc_ie.mini_subchannel_alloc.duration", FT_UINT16, BASE_DEC, NULL, MINI_SUBCHANNEL_DURATION_MASK_16, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_cid,
+			{"CID", "wmx.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc,
+			{"UIUC", "wmx.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_repetition,
+			{"Repetition", "wmx.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_cid_1,
+			{"CID", "wmx.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK_1, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_1,
+			{"UIUC", "wmx.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK_1, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_1,
+			{"Repetition", "wmx.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK_1, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_cid_2,
+			{"CID", "wmx.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK_2, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_2,
+			{"UIUC", "wmx.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK_2, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_2,
+			{"Repetition", "wmx.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK_2, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_cid_3,
+			{"CID", "wmx.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK_3, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_3,
+			{"UIUC", "wmx.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK_2, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_3,
+			{"Repetition", "wmx.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK_3, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_padding,
+			{"Padding", "wmx.extended_uiuc_ie.mini_subchannel_alloc.padding", FT_UINT8, BASE_HEX, NULL, MINI_SUBCHANNEL_PADDING_MASK, "", HFILL }
+		},
+		{
+			&hf_extended_uiuc_ie_mini_subchannel_alloc_padding_1,
+			{"Padding", "wmx.extended_uiuc_ie.mini_subchannel_alloc.padding", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_PADDING_MASK_1, "", HFILL }
+		},
+		{	/* 8.4.5.4.6 AAS_UL_IE */
+			&hf_extended_uiuc_ie_aas_ul,
+			{"AAS_UL_IE (not implemented)", "wmx.extended_uiuc_ie.aas_ul", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+		{	/* 8.4.5.4.12 CQICH Allocation IE */
+			&hf_extended_uiuc_ie_cqich_alloc,
+			{"CQICH Allocation IE (not implemented)", "wmx.extended_uiuc_ie.cqich_alloc", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+		{	/* 8.4.5.4.7 UL Zone IE */
+			&hf_extended_uiuc_ie_ul_zone,
+			{"UL Zone IE (not implemented)", "wmx.extended_uiuc_ie.ul_zone", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+
+		{	/* 8.4.5.4.14 MIMO_UL_Basic_IE */
+			&hf_extended_uiuc_ie_mimo_ul_basic,
+			{"MIMO UL Basic IE (not implemented)", "wmx.extended_uiuc_ie.mimo_ul_basic", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+		{	/* 8.4.5.4.22 UL-MAP Fast Tracking IE */
+			&hf_extended_uiuc_ie_fast_tracking,
+			{"UL-MAP Fast Tracking IE (not implemented)", "wmx.extended_uiuc_ie.fast_tracking", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+		{	/* 8.4.5.4.21 Fast Ranging IE */
+			&hf_extended_uiuc_ie_fast_ranging,
+			{"Fast Ranging IE (not implemented)", "wmx.extended_uiuc_ie.fast_ranging", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+		{	/* 8.4.5.4.14 UL-MAP Physical Modifier IE */
+			&hf_extended_uiuc_ie_phymod_ul,
+			{"UL-MAP Physical Modifier IE (not implemented)", "wmx.extended_uiuc_ie.phymod_ul", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+		{	/* 8.4.5.4.17 UL PUSC Burst Allocation in Other Segment IE */
+			&hf_extended_uiuc_ie_ul_pusc_burst_allocation,
+			{"UL_PUSC_Burst_Allocation_in_Other_Segment_IE (not implemented)", "wmx.extended_uiuc_ie.ul_pusc_burst_allocation", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+		{	/* 8.4.5.4.15 UL Allocation Start IE */
+			&hf_extended_uiuc_ie_ul_allocation_start,
+			{"UL Allocation Start IE (not implemented)", "wmx.extended_uiuc_ie.ul_allocation_start", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+		},
+		{	/* unknown UIUC */
+			&hf_extended_uiuc_ie_unknown_uiuc,
+			{"Unknown Extended UIUC", "wmx.extended_uiuc.unknown_uiuc", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+		}
+	};
 
-/* Register Wimax Compact UL-MAP IE Protocol */
-void proto_register_wimax_compact_ulmap_ie(void)
-{
 	if (proto_wimax_compact_ulmap_ie_decoder == -1)
 	{
 		proto_wimax_compact_ulmap_ie_decoder = proto_wimax;