From 263564f175851b578179c85fdcf1f8c6f213176f Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Sun, 19 Apr 2015 15:32:42 -0400 Subject: 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 Reviewed-by: Alexis La Goutte --- epan/dissectors/packet-sv.c | 104 +++----------------------------------------- 1 file changed, 6 insertions(+), 98 deletions(-) (limited to 'epan/dissectors/packet-sv.c') diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c index 99632561d9..1752230a90 100644 --- a/epan/dissectors/packet-sv.c +++ b/epan/dissectors/packet-sv.c @@ -85,23 +85,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 + /*--- Included file: packet-sv-hf.c ---*/ #line 1 "../../asn1/sv/packet-sv-hf.c" @@ -120,7 +104,7 @@ static int hf_sv_seqData = -1; /* Data */ static int hf_sv_smpMod = -1; /* T_smpMod */ /*--- End of included file: packet-sv-hf.c ---*/ -#line 98 "../../asn1/sv/packet-sv-template.c" +#line 82 "../../asn1/sv/packet-sv-template.c" /* Initialize the subtree pointers */ static int ett_sv = -1; @@ -136,87 +120,11 @@ static gint ett_sv_SEQUENCE_OF_ASDU = -1; static gint ett_sv_ASDU = -1; /*--- End of included file: packet-sv-ett.c ---*/ -#line 105 "../../asn1/sv/packet-sv-template.c" +#line 89 "../../asn1/sv/packet-sv-template.c" 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 /*--- Included file: packet-sv-fn.c ---*/ #line 1 "../../asn1/sv/packet-sv-fn.c" @@ -432,7 +340,7 @@ dissect_sv_SampledValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse /*--- End of included file: packet-sv-fn.c ---*/ -#line 186 "../../asn1/sv/packet-sv-template.c" +#line 94 "../../asn1/sv/packet-sv-template.c" /* * Dissect SV PDUs inside a PPDU. @@ -605,7 +513,7 @@ void proto_register_sv(void) { NULL, HFILL }}, /*--- End of included file: packet-sv-hfarr.c ---*/ -#line 302 "../../asn1/sv/packet-sv-template.c" +#line 210 "../../asn1/sv/packet-sv-template.c" }; /* List of subtrees */ @@ -622,7 +530,7 @@ void proto_register_sv(void) { &ett_sv_ASDU, /*--- End of included file: packet-sv-ettarr.c ---*/ -#line 310 "../../asn1/sv/packet-sv-template.c" +#line 218 "../../asn1/sv/packet-sv-template.c" }; static ei_register_info ei[] = { -- cgit v1.2.3