aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-umts_mac.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2013-01-26 18:54:53 +0000
committerBill Meier <wmeier@newsguy.com>2013-01-26 18:54:53 +0000
commit0960e508e4fdac8449dec1a901c146b977e17b7f (patch)
tree56ca52ea32e5ca23f6df21eb4d8e6b9c43d698d0 /epan/dissectors/packet-umts_mac.c
parent33df8647d5c610b657d8c68b0982e4f95f348f99 (diff)
Comment out cases of unused hf array entries found by checkhf.
svn path=/trunk/; revision=47302
Diffstat (limited to 'epan/dissectors/packet-umts_mac.c')
-rw-r--r--epan/dissectors/packet-umts_mac.c30
1 files changed, 22 insertions, 8 deletions
diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c
index 57133186af..ab6ae64097 100644
--- a/epan/dissectors/packet-umts_mac.c
+++ b/epan/dissectors/packet-umts_mac.c
@@ -48,18 +48,18 @@ static int hf_mac_ueid_type = -1;
static int hf_mac_crnti = -1;
static int hf_mac_urnti = -1;
static int hf_mac_channel = -1;
-static int hf_mac_channel_str = -1;
+/* static int hf_mac_channel_str = -1; */
static int hf_mac_lch_id = -1;
static int hf_mac_macdflowd_id = -1;
-static int hf_mac_channel_hsdsch = -1;
+/* static int hf_mac_channel_hsdsch = -1; */
static int hf_mac_trch_id = -1;
-static int hf_mac_edch_type2_subframe_header = -1;
-static int hf_mac_edch_type2_descriptors = -1;
-static int hf_mac_edch_type2_lchid = -1;
-static int hf_mac_edch_type2_length = -1;
-static int hf_mac_edch_type2_flag = -1;
+/* static int hf_mac_edch_type2_subframe_header = -1; */
+/* static int hf_mac_edch_type2_descriptors = -1; */
+/* static int hf_mac_edch_type2_lchid = -1; */
+/* static int hf_mac_edch_type2_length = -1; */
+/* static int hf_mac_edch_type2_flag = -1; */
static int hf_mac_edch_type2_tsn = -1;
static int hf_mac_edch_type2_ss = -1;
static int hf_mac_edch_type2_sdu = -1;
@@ -1347,13 +1347,17 @@ proto_register_umts_mac(void)
FT_UINT16, BASE_DEC, VALS(mac_logical_channel_vals), 0, NULL, HFILL }
},
+/**
{ &hf_mac_channel_str,
{ "Logical Channel", "mac.logical_channel",
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
},
- { &hf_mac_channel_hsdsch,
+**/
+/**
+ { &hf_mac_channel_hsdsch,
{ "MACd-FlowID", "mac.macd_flowid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
+**/
{ &hf_mac_macdflowd_id,
{ "MACd-FlowID", "mac.macd_flowid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
@@ -1363,30 +1367,38 @@ proto_register_umts_mac(void)
{ &hf_mac_trch_id,
{ "Transport Channel ID", "mac.transport_channel_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
+/**
{ &hf_mac_edch_type2_descriptors,
{ "MAC-is Descriptors",
"mac.edch.type2.descriptors", FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
+**/
+/**
{ &hf_mac_edch_type2_lchid,
{ "LCH-ID",
"mac.logical_channel_id", FT_UINT8, BASE_HEX, NULL, 0xf0,
NULL, HFILL
}
},
+**/
+/**
{ &hf_mac_edch_type2_length,
{ "Length",
"mac.edch.type2.length", FT_UINT16, BASE_DEC, NULL, 0x0ffe,
NULL, HFILL
}
},
+**/
+/**
{ &hf_mac_edch_type2_flag,
{ "Flag",
"mac.edch.type2.lchid", FT_UINT8, BASE_HEX, NULL, 0x01,
"Indicates if another entry follows", HFILL
}
},
+**/
{ &hf_mac_edch_type2_ss,
{ "SS",
/* TODO: VALS */
@@ -1412,12 +1424,14 @@ proto_register_umts_mac(void)
NULL, HFILL
}
},
+/**
{ &hf_mac_edch_type2_subframe_header,
{ "Subframe header",
"mac.edch.type2.subframeheader", FT_STRING, BASE_NONE, NULL, 0x0,
"EDCH Subframe header", HFILL
}
},
+**/
{ &hf_mac_is_reasmin,
{ "Reassembled in frame", "mac.is.reasmin",
FT_FRAMENUM, BASE_NONE, NULL, 0, NULL, HFILL }