diff options
author | Evan Huus <eapache@gmail.com> | 2015-04-19 15:32:42 -0400 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-04-20 08:32:15 +0000 |
commit | 263564f175851b578179c85fdcf1f8c6f213176f (patch) | |
tree | 294906013f37f4e3cdfafa8ecf4cb05e0ba13afc /asn1 | |
parent | 1c6c3972037d799b1814d8ab9b7954510c5179aa (diff) |
sv: remove #if0'd code
we can always get it back from git if we want
Change-Id: I61911628541cf4ed4be20e736e41fbaa58978d75
Reviewed-on: https://code.wireshark.org/review/8124
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/sv/packet-sv-template.c | 94 |
1 files changed, 1 insertions, 93 deletions
diff --git a/asn1/sv/packet-sv-template.c b/asn1/sv/packet-sv-template.c index d58d74f790..eb428b5020 100644 --- a/asn1/sv/packet-sv-template.c +++ b/asn1/sv/packet-sv-template.c @@ -77,23 +77,7 @@ static int hf_sv_appid = -1; static int hf_sv_length = -1; static int hf_sv_reserve1 = -1; static int hf_sv_reserve2 = -1; -#if 0 -static int hf_sv_phmeas_instmag_i = -1; -static int hf_sv_phsmeas_q = -1; -static int hf_sv_phsmeas_q_validity = -1; -static int hf_sv_phsmeas_q_overflow = -1; -static int hf_sv_phsmeas_q_outofrange = -1; -static int hf_sv_phsmeas_q_badreference = -1; -static int hf_sv_phsmeas_q_oscillatory = -1; -static int hf_sv_phsmeas_q_failure = -1; -static int hf_sv_phsmeas_q_olddata = -1; -static int hf_sv_phsmeas_q_inconsistent = -1; -static int hf_sv_phsmeas_q_inaccurate = -1; -static int hf_sv_phsmeas_q_source = -1; -static int hf_sv_phsmeas_q_test = -1; -static int hf_sv_phsmeas_q_operatorblocked = -1; -static int hf_sv_phsmeas_q_derived = -1; -#endif + #include "packet-sv-hf.c" /* Initialize the subtree pointers */ @@ -106,82 +90,6 @@ static int ett_phsmeas_q = -1; static expert_field ei_sv_mal_utctime = EI_INIT; static expert_field ei_sv_zero_pdu = EI_INIT; -#if 0 -static const value_string sv_q_validity_vals[] = { - { 0, "good" }, - { 1, "invalid" }, - { 3, "questionable" }, - { 0, NULL } -}; - -static const value_string sv_q_source_vals[] = { - { 0, "process" }, - { 1, "substituted" }, - { 0, NULL } -}; - -static int -dissect_PhsMeas1(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, int hf_id _U_) -{ - gint8 class; - gboolean pc; - gint32 tag; - guint32 len; - proto_item *it; - proto_tree *subtree; - gint32 value; - guint32 qual; - guint32 i; - - static const int *q_flags[] = { - &hf_sv_phsmeas_q_validity, - &hf_sv_phsmeas_q_overflow, - &hf_sv_phsmeas_q_outofrange, - &hf_sv_phsmeas_q_badreference, - &hf_sv_phsmeas_q_oscillatory, - &hf_sv_phsmeas_q_failure, - &hf_sv_phsmeas_q_olddata, - &hf_sv_phsmeas_q_inconsistent, - &hf_sv_phsmeas_q_inaccurate, - &hf_sv_phsmeas_q_source, - &hf_sv_phsmeas_q_test, - &hf_sv_phsmeas_q_operatorblocked, - &hf_sv_phsmeas_q_derived, - NULL - }; - - if (!implicit_tag) { - offset=dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag); - offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL); - } else { - len=tvb_length_remaining(tvb, offset); - } - - subtree = proto_tree_add_subtree(tree, tvb, offset, len, ett_phsmeas, NULL, "PhsMeas1"); - - sv_data.num_phsMeas = 0; - for (i = 0; i < len/8; i++) { - if (tree && subtree) { - value = tvb_get_ntohl(tvb, offset); - qual = tvb_get_ntohl(tvb, offset + 4); - - proto_tree_add_item(subtree, hf_sv_phmeas_instmag_i, tvb, offset, 4, ENC_BIG_ENDIAN); - proto_tree_add_bitmask(subtree, tvb, offset + 4, hf_sv_phsmeas_q, ett_phsmeas_q, q_flags, ENC_BIG_ENDIAN); - - if (i < IEC61850_SV_MAX_PHSMEAS_ENTRIES) { - sv_data.phsMeas[i].value = value; - sv_data.phsMeas[i].qual = qual; - sv_data.num_phsMeas++; - } - } - - offset += 8; - } - - return offset; -} - -#endif #include "packet-sv-fn.c" /* |