diff options
author | Anders Broman <anders.broman@ericsson.com> | 2008-07-24 00:30:11 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2008-07-24 00:30:11 +0000 |
commit | ff8291413a448228b652140f9f5765177d3dd66e (patch) | |
tree | 8ef545895a0c8d9e1b77b2c806a423e826129625 /epan/dissectors/packet-h282.c | |
parent | a4d1eb9ee97e6c762f4e2507c9bd7511b077d09f (diff) |
Get rid of unused code warnings.
svn path=/trunk/; revision=25812
Diffstat (limited to 'epan/dissectors/packet-h282.c')
-rw-r--r-- | epan/dissectors/packet-h282.c | 174 |
1 files changed, 57 insertions, 117 deletions
diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c index 90bcc0723b..8077c194ae 100644 --- a/epan/dissectors/packet-h282.c +++ b/epan/dissectors/packet-h282.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h282.c */ -/* ../../../svn/trunk/tools/asn2wrs.py -p h282 -c ../../../svn/trunk/asn1/h282/h282.cnf -s ../../../svn/trunk/asn1/h282/packet-h282-template -D ../../../svn/trunk/asn1/h282 RDC-PROTOCOL.asn */ +/* ../../tools/asn2wrs.py -p h282 -c h282.cnf -s packet-h282-template RDC-PROTOCOL.asn */ /* Input file: packet-h282-template.c */ @@ -244,9 +244,6 @@ static int hf_h282_wide = -1; /* NULL */ static int hf_h282_focusDirection = -1; /* T_focusDirection */ static int hf_h282_near = -1; /* NULL */ static int hf_h282_far = -1; /* NULL */ -static int hf_h282_irisDirection = -1; /* T_irisDirection */ -static int hf_h282_darker = -1; /* NULL */ -static int hf_h282_lighter = -1; /* NULL */ static int hf_h282_relative = -1; /* NULL */ static int hf_h282_absolute = -1; /* NULL */ static int hf_h282_zoomPosition = -1; /* ZoomPosition */ @@ -556,8 +553,6 @@ static gint ett_h282_ZoomContinuous = -1; static gint ett_h282_T_zoomDirection = -1; static gint ett_h282_FocusContinuous = -1; static gint ett_h282_T_focusDirection = -1; -static gint ett_h282_IrisContinuous = -1; -static gint ett_h282_T_irisDirection = -1; static gint ett_h282_PositioningMode = -1; static gint ett_h282_SetZoomPosition = -1; static gint ett_h282_SetFocusPosition = -1; @@ -728,7 +723,7 @@ dissect_h282_NonStandardParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h282_Handle(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 4294967295U, NULL, FALSE); + 0U, 4294967295U, NULL, FALSE); return offset; } @@ -811,7 +806,7 @@ dissect_h282_DeviceClass(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_h282_DeviceID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 127U, NULL, FALSE); + 0U, 127U, NULL, FALSE); return offset; } @@ -821,7 +816,7 @@ dissect_h282_DeviceID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p static int dissect_h282_StreamID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 65535U, NULL, FALSE); + 0U, 65535U, NULL, FALSE); return offset; } @@ -840,7 +835,7 @@ dissect_h282_BOOLEAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr static int dissect_h282_INTEGER_0_255(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 255U, NULL, FALSE); + 0U, 255U, NULL, FALSE); return offset; } @@ -888,7 +883,7 @@ dissect_h282_StreamProfile(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_h282_INTEGER_0_65535(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 65535U, NULL, FALSE); + 0U, 65535U, NULL, FALSE); return offset; } @@ -998,7 +993,7 @@ dissect_h282_NonCollapsingCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_h282_Day(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 31U, NULL, FALSE); + 1U, 31U, NULL, FALSE); return offset; } @@ -1008,7 +1003,7 @@ dissect_h282_Day(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_ static int dissect_h282_Month(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 12U, NULL, FALSE); + 1U, 12U, NULL, FALSE); return offset; } @@ -1018,7 +1013,7 @@ dissect_h282_Month(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot static int dissect_h282_Year(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1980U, 2999U, NULL, FALSE); + 1980U, 2999U, NULL, FALSE); return offset; } @@ -1028,7 +1023,7 @@ dissect_h282_Year(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto static int dissect_h282_Hour(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 23U, NULL, FALSE); + 0U, 23U, NULL, FALSE); return offset; } @@ -1038,7 +1033,7 @@ dissect_h282_Hour(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto static int dissect_h282_Minute(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 59U, NULL, FALSE); + 0U, 59U, NULL, FALSE); return offset; } @@ -1058,7 +1053,7 @@ dissect_h282_DeviceText(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_h282_PanPosition(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - -18000, 18000U, NULL, FALSE); + -18000, 18000U, NULL, FALSE); return offset; } @@ -1068,7 +1063,7 @@ dissect_h282_PanPosition(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_h282_TiltPosition(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - -18000, 18000U, NULL, FALSE); + -18000, 18000U, NULL, FALSE); return offset; } @@ -1078,7 +1073,7 @@ dissect_h282_TiltPosition(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_h282_ZoomPosition(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - -1023, 1023U, NULL, FALSE); + -1023, 1023U, NULL, FALSE); return offset; } @@ -1088,7 +1083,7 @@ dissect_h282_ZoomPosition(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_h282_IrisPosition(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - -127, 127U, NULL, FALSE); + -127, 127U, NULL, FALSE); return offset; } @@ -1098,7 +1093,7 @@ dissect_h282_IrisPosition(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_h282_FocusPosition(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - -127, 127U, NULL, FALSE); + -127, 127U, NULL, FALSE); return offset; } @@ -1108,7 +1103,7 @@ dissect_h282_FocusPosition(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_h282_CameraPanSpeed(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 18000U, NULL, FALSE); + 1U, 18000U, NULL, FALSE); return offset; } @@ -1118,7 +1113,7 @@ dissect_h282_CameraPanSpeed(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h282_CameraTiltSpeed(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 18000U, NULL, FALSE); + 1U, 18000U, NULL, FALSE); return offset; } @@ -1128,7 +1123,7 @@ dissect_h282_CameraTiltSpeed(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h282_BackLight(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 255U, NULL, FALSE); + 0U, 255U, NULL, FALSE); return offset; } @@ -1138,7 +1133,7 @@ dissect_h282_BackLight(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_h282_WhiteBalance(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 255U, NULL, FALSE); + 0U, 255U, NULL, FALSE); return offset; } @@ -1148,7 +1143,7 @@ dissect_h282_WhiteBalance(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_h282_PresetNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 255U, NULL, FALSE); + 1U, 255U, NULL, FALSE); return offset; } @@ -1241,7 +1236,7 @@ dissect_h282_DevicePresetCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int dissect_h282_INTEGER_2_255(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 2U, 255U, NULL, FALSE); + 2U, 255U, NULL, FALSE); return offset; } @@ -1251,7 +1246,7 @@ dissect_h282_INTEGER_2_255(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_h282_INTEGER_1_255(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 255U, NULL, FALSE); + 1U, 255U, NULL, FALSE); return offset; } @@ -1349,7 +1344,7 @@ dissect_h282_CameraLensCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h282_INTEGER_1_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 10U, NULL, FALSE); + 1U, 10U, NULL, FALSE); return offset; } @@ -1435,7 +1430,7 @@ dissect_h282_CameraTiltSpeedCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_h282_MaxBacklight(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 255U, NULL, FALSE); + 1U, 255U, NULL, FALSE); return offset; } @@ -1445,7 +1440,7 @@ dissect_h282_MaxBacklight(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_h282_MaxWhiteBalance(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 255U, NULL, FALSE); + 1U, 255U, NULL, FALSE); return offset; } @@ -1455,7 +1450,7 @@ dissect_h282_MaxWhiteBalance(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h282_MinZoomPositionSetSize(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 1023U, NULL, FALSE); + 1U, 1023U, NULL, FALSE); return offset; } @@ -1465,7 +1460,7 @@ dissect_h282_MinZoomPositionSetSize(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int dissect_h282_MinFocusPositionStepSize(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 127U, NULL, FALSE); + 1U, 127U, NULL, FALSE); return offset; } @@ -1475,7 +1470,7 @@ dissect_h282_MinFocusPositionStepSize(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static int dissect_h282_MinIrisPositionStepSize(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 127U, NULL, FALSE); + 1U, 127U, NULL, FALSE); return offset; } @@ -1485,7 +1480,7 @@ dissect_h282_MinIrisPositionStepSize(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int dissect_h282_INTEGER_M18000_0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - -18000, 0U, NULL, FALSE); + -18000, 0U, NULL, FALSE); return offset; } @@ -1495,7 +1490,7 @@ dissect_h282_INTEGER_M18000_0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_h282_INTEGER_0_18000(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 18000U, NULL, FALSE); + 0U, 18000U, NULL, FALSE); return offset; } @@ -1505,7 +1500,7 @@ dissect_h282_INTEGER_0_18000(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h282_INTEGER_1_18000(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 18000U, NULL, FALSE); + 1U, 18000U, NULL, FALSE); return offset; } @@ -1547,7 +1542,7 @@ dissect_h282_TiltPositionCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int dissect_h282_MinZoomMagnificationStepSize(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 1000U, NULL, FALSE); + 1U, 1000U, NULL, FALSE); return offset; } @@ -1557,7 +1552,7 @@ dissect_h282_MinZoomMagnificationStepSize(tvbuff_t *tvb _U_, int offset _U_, asn static int dissect_h282_MaxNumberOfSlides(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 1024U, NULL, FALSE); + 1U, 1024U, NULL, FALSE); return offset; } @@ -1567,7 +1562,7 @@ dissect_h282_MaxNumberOfSlides(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int dissect_h282_MaxSlideDisplayTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 255U, NULL, FALSE); + 1U, 255U, NULL, FALSE); return offset; } @@ -1577,7 +1572,7 @@ dissect_h282_MaxSlideDisplayTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h282_MaxNumberOfPrograms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 1023U, NULL, FALSE); + 1U, 1023U, NULL, FALSE); return offset; } @@ -1587,7 +1582,7 @@ dissect_h282_MaxNumberOfPrograms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h282_INTEGER_10_1000(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 10U, 1000U, NULL, FALSE); + 10U, 1000U, NULL, FALSE); return offset; } @@ -1640,7 +1635,7 @@ dissect_h282_PlayBackSpeedCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int dissect_h282_INTEGER_2_64(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 2U, 64U, NULL, FALSE); + 2U, 64U, NULL, FALSE); return offset; } @@ -1650,7 +1645,7 @@ dissect_h282_INTEGER_2_64(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_h282_INTEGER_1_64(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 64U, NULL, FALSE); + 1U, 64U, NULL, FALSE); return offset; } @@ -2091,7 +2086,7 @@ dissect_h282_T_panDirection(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h282_INTEGER_50_1000(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 50U, 1000U, NULL, FALSE); + 50U, 1000U, NULL, FALSE); return offset; } @@ -2235,47 +2230,6 @@ dissect_h282_FocusContinuous(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const value_string h282_T_irisDirection_vals[] = { - { 0, "darker" }, - { 1, "lighter" }, - { 2, "stop" }, - { 3, "continue" }, - { 0, NULL } -}; - -static const per_choice_t T_irisDirection_choice[] = { - { 0, &hf_h282_darker , ASN1_NO_EXTENSIONS , dissect_h282_NULL }, - { 1, &hf_h282_lighter , ASN1_NO_EXTENSIONS , dissect_h282_NULL }, - { 2, &hf_h282_stop , ASN1_NO_EXTENSIONS , dissect_h282_NULL }, - { 3, &hf_h282_continue , ASN1_NO_EXTENSIONS , dissect_h282_NULL }, - { 0, NULL, 0, NULL } -}; - -static int -dissect_h282_T_irisDirection(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, - ett_h282_T_irisDirection, T_irisDirection_choice, - NULL); - - return offset; -} - - -static const per_sequence_t IrisContinuous_sequence[] = { - { &hf_h282_irisDirection , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h282_T_irisDirection }, - { &hf_h282_timeOut , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_h282_INTEGER_50_1000 }, - { NULL, 0, 0, NULL } -}; - -static int -dissect_h282_IrisContinuous(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_h282_IrisContinuous, IrisContinuous_sequence); - - return offset; -} - - static const value_string h282_PositioningMode_vals[] = { { 0, "relative" }, { 1, "absolute" }, @@ -2302,7 +2256,7 @@ dissect_h282_PositioningMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h282_CameraLensNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 255U, NULL, FALSE); + 1U, 255U, NULL, FALSE); return offset; } @@ -2312,7 +2266,7 @@ dissect_h282_CameraLensNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_h282_CameraFilterNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 255U, NULL, FALSE); + 1U, 255U, NULL, FALSE); return offset; } @@ -2397,7 +2351,7 @@ dissect_h282_SetTiltPosition(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h282_ZoomMagnification(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 10U, 1000U, NULL, FALSE); + 10U, 1000U, NULL, FALSE); return offset; } @@ -2407,7 +2361,7 @@ dissect_h282_ZoomMagnification(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int dissect_h282_PanView(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - -1000, 1000U, NULL, FALSE); + -1000, 1000U, NULL, FALSE); return offset; } @@ -2417,7 +2371,7 @@ dissect_h282_PanView(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr static int dissect_h282_TiltView(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - -1000, 1000U, NULL, FALSE); + -1000, 1000U, NULL, FALSE); return offset; } @@ -2427,7 +2381,7 @@ dissect_h282_TiltView(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p static int dissect_h282_SlideNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 1023U, NULL, FALSE); + 0U, 1023U, NULL, FALSE); return offset; } @@ -2483,7 +2437,7 @@ dissect_h282_AutoSlideShowControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h282_AutoSlideDisplayTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 255U, NULL, FALSE); + 1U, 255U, NULL, FALSE); return offset; } @@ -2493,7 +2447,7 @@ dissect_h282_AutoSlideDisplayTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h282_ProgramNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 1023U, NULL, FALSE); + 1U, 1023U, NULL, FALSE); return offset; } @@ -2503,7 +2457,7 @@ dissect_h282_ProgramNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_h282_INTEGER_0_24(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 24U, NULL, FALSE); + 0U, 24U, NULL, FALSE); return offset; } @@ -2513,7 +2467,7 @@ dissect_h282_INTEGER_0_24(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_h282_INTEGER_0_59(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 59U, NULL, FALSE); + 0U, 59U, NULL, FALSE); return offset; } @@ -2523,7 +2477,7 @@ dissect_h282_INTEGER_0_59(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_h282_INTEGER_0_99999(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 99999U, NULL, FALSE); + 0U, 99999U, NULL, FALSE); return offset; } @@ -4309,7 +4263,7 @@ static const per_choice_t RequestPDU_choice[] = { static int dissect_h282_RequestPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 20 "h282.cnf" +#line 24 "h282.cnf" gint32 msg_type = -1; const gchar *p = NULL; @@ -4317,7 +4271,7 @@ dissect_h282_RequestPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, ett_h282_RequestPDU, RequestPDU_choice, &msg_type); -#line 23 "h282.cnf" +#line 27 "h282.cnf" p = match_strval(msg_type, VALS(h282_RequestPDU_vals)); if (p && check_col(actx->pinfo->cinfo, COL_INFO)) col_add_fstr(actx->pinfo->cinfo, COL_INFO, "RequestPDU/%s", p); @@ -4352,7 +4306,7 @@ static const per_choice_t ResponsePDU_choice[] = { static int dissect_h282_ResponsePDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 31 "h282.cnf" +#line 35 "h282.cnf" gint32 msg_type = -1; const gchar *p = NULL; @@ -4360,7 +4314,7 @@ dissect_h282_ResponsePDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ ett_h282_ResponsePDU, ResponsePDU_choice, &msg_type); -#line 34 "h282.cnf" +#line 38 "h282.cnf" p = match_strval(msg_type, VALS(h282_ResponsePDU_vals)); if (p && check_col(actx->pinfo->cinfo, COL_INFO)) col_add_fstr(actx->pinfo->cinfo, COL_INFO, "ResponsePDU/%s", p); @@ -4387,7 +4341,7 @@ static const per_choice_t IndicationPDU_choice[] = { static int dissect_h282_IndicationPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 42 "h282.cnf" +#line 46 "h282.cnf" gint32 msg_type = -1; const gchar *p = NULL; @@ -4395,7 +4349,7 @@ dissect_h282_IndicationPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ ett_h282_IndicationPDU, IndicationPDU_choice, &msg_type); -#line 45 "h282.cnf" +#line 49 "h282.cnf" p = match_strval(msg_type, VALS(h282_IndicationPDU_vals)); if (p && check_col(actx->pinfo->cinfo, COL_INFO)) col_add_fstr(actx->pinfo->cinfo, COL_INFO, "IndicationPDU/%s", p); @@ -5225,18 +5179,6 @@ void proto_register_h282(void) { { "far", "h282.far", FT_NONE, BASE_NONE, NULL, 0, "h282.NULL", HFILL }}, - { &hf_h282_irisDirection, - { "irisDirection", "h282.irisDirection", - FT_UINT32, BASE_DEC, VALS(h282_T_irisDirection_vals), 0, - "h282.T_irisDirection", HFILL }}, - { &hf_h282_darker, - { "darker", "h282.darker", - FT_NONE, BASE_NONE, NULL, 0, - "h282.NULL", HFILL }}, - { &hf_h282_lighter, - { "lighter", "h282.lighter", - FT_NONE, BASE_NONE, NULL, 0, - "h282.NULL", HFILL }}, { &hf_h282_relative, { "relative", "h282.relative", FT_NONE, BASE_NONE, NULL, 0, @@ -6283,8 +6225,6 @@ void proto_register_h282(void) { &ett_h282_T_zoomDirection, &ett_h282_FocusContinuous, &ett_h282_T_focusDirection, - &ett_h282_IrisContinuous, - &ett_h282_T_irisDirection, &ett_h282_PositioningMode, &ett_h282_SetZoomPosition, &ett_h282_SetFocusPosition, |