diff options
author | Jörg Mayer <jmayer@loplof.de> | 2013-09-15 15:00:03 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2013-09-15 15:00:03 +0000 |
commit | c5ffff76d87088bd66834af0ce8f2694d53fd54b (patch) | |
tree | 11f6eb0a9f43bcbb8f9964bb4d2bc39e35d20b71 /asn1/atn-cpdlc | |
parent | 05ba7d3afcd5b010f1f324f8e8ced78d01dd4180 (diff) |
Fix checkapi warnings (missing id)
Replace Makefile.{am,nmake,common} that did not conform by
their asn1/c133/ version.
svn path=/trunk/; revision=52062
Diffstat (limited to 'asn1/atn-cpdlc')
-rw-r--r-- | asn1/atn-cpdlc/Makefile.am | 28 | ||||
-rw-r--r-- | asn1/atn-cpdlc/Makefile.common | 33 | ||||
-rw-r--r-- | asn1/atn-cpdlc/Makefile.nmake | 23 | ||||
-rw-r--r-- | asn1/atn-cpdlc/atn-cpdlc.cnf | 6 |
4 files changed, 69 insertions, 21 deletions
diff --git a/asn1/atn-cpdlc/Makefile.am b/asn1/atn-cpdlc/Makefile.am index 7a03acb19a..d357a4d4df 100644 --- a/asn1/atn-cpdlc/Makefile.am +++ b/asn1/atn-cpdlc/Makefile.am @@ -1,12 +1,24 @@ -# Makefile.am -# ASN.1-based plugin atn-cpdlc -# Controller Pilot DataLink Communication (CPDLC) version 1 -# (Plain Old CPDLC and Protected Mode CPDLC) -# ICAO doc doc9705 Ed. 2 -# Aereonautical Telecommunications Network (ATN) -# -# (c) 2013 Mathias Guettler guettler@web.de +# $Id$ # +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + include ../Makefile.preinc include Makefile.common diff --git a/asn1/atn-cpdlc/Makefile.common b/asn1/atn-cpdlc/Makefile.common index 3c222c7b7a..5768d2c052 100644 --- a/asn1/atn-cpdlc/Makefile.common +++ b/asn1/atn-cpdlc/Makefile.common @@ -1,17 +1,30 @@ -# Makefile.common -# ASN.1-based plugin atn-cpdlc -# Controller Pilot DataLink Communication (CPDLC) version 1 -# (Plain Old CPDLC and Protected Mode CPDLC) -# ICAO doc doc9705 Ed. 2 -# Aereonautical Telecommunications Network (ATN) -# -# (c) 2013 Mathias Guettler guettler@web.de +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + PROTOCOL_NAME = atn-cpdlc EXT_ASN_FILE_LIST = -ASN_FILE_LIST = $(PROTOCOL_NAME).asn +ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ Makefile.nmake \ @@ -24,7 +37,7 @@ SRC_FILES = \ $(EXT_ASN_FILE_LIST) # ASN1 PER unaligned encoding -A2W_FLAGS= -u -L +A2W_FLAGS= -u -L EXTRA_CNF= diff --git a/asn1/atn-cpdlc/Makefile.nmake b/asn1/atn-cpdlc/Makefile.nmake index 78b3419d2b..25f75f5105 100644 --- a/asn1/atn-cpdlc/Makefile.nmake +++ b/asn1/atn-cpdlc/Makefile.nmake @@ -1,3 +1,26 @@ +## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake +# +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + include ../../config.nmake include ../Makefile.preinc.nmake diff --git a/asn1/atn-cpdlc/atn-cpdlc.cnf b/asn1/atn-cpdlc/atn-cpdlc.cnf index 3f7efbb4e8..cc8b96124f 100644 --- a/asn1/atn-cpdlc/atn-cpdlc.cnf +++ b/asn1/atn-cpdlc/atn-cpdlc.cnf @@ -45,7 +45,7 @@ Winds/speed winds_speed LevelSpeed/speed levelspeed_speed ProtectedGroundPDUs/abortProvider pmcpdlcproviderabortreason ProtectedAircraftPDUs/abortProvider pmcpdlcproviderabortreason -ProtectedGroundPDUs/abortUser pmcpdlcuserabortreason +ProtectedGroundPDUs/abortUser pmcpdlcuserabortreason ProtectedAircraftPDUs/abortUser pmcpdlcuserabortreason ProtectedStartDownMessage/mode protectedmode ProtectedGroundPDUs/send protecteduplinkmessage @@ -65,8 +65,8 @@ ProtectedAircraftPDUs/startdown protectedstartDownmessage case dm: dissect_atn_cpdlc_ATCDownlinkMessage(tvb_new_subset_remaining(tvb_usr, 0), 0, actx, tree, hf_index); break; - case um: - dissect_atn_cpdlc_ATCUplinkMessage(tvb_new_subset_remaining(tvb_usr, 0), 0, actx , tree, hf_index); + case um: + dissect_atn_cpdlc_ATCUplinkMessage(tvb_new_subset_remaining(tvb_usr, 0), 0, actx , tree, hf_index); break; default: break; |