diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2019-08-13 13:55:50 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2019-08-25 19:55:32 +0000 |
| commit | 55dc9c042855414ece676d57e493d6b7a2085649 (patch) | |
| tree | 6febf64e7e11d3fb941614071051a8eb8039b0d8 | |
| parent | ef014f76d587918f6e6e305626e56daca6b11d64 (diff) | |
usb-audio: fix conflict
'usbaudio.as_if_gen.bmFormats.rsv' exists multiple times with NOT compatible types: FT_UINT32 and FT_BOOLEAN
Change-Id: I908b815bfa0f96f2ec421367995d971040f423a1
Reviewed-on: https://code.wireshark.org/review/34283
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-usb-audio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c index 427e8e6ea5..97e98f0d98 100644 --- a/epan/dissectors/packet-usb-audio.c +++ b/epan/dissectors/packet-usb-audio.c @@ -2420,7 +2420,7 @@ proto_register_usb_audio(void) FT_BOOLEAN, 32, NULL, (1u << 4), NULL, HFILL }}, { &hf_as_if_gen_formats_i_rsv, { "Reserved", "usbaudio.as_if_gen.bmFormats.rsv", - FT_BOOLEAN, 32, NULL, (0x7FFFFFE0u), "Must be zero", HFILL }}, + FT_UINT32, BASE_HEX, NULL, (0x7FFFFFE0u), "Must be zero", HFILL }}, { &hf_as_if_gen_formats_i_d31, { "Type I Raw Data", "usbaudio.as_if_gen.bmFormats.d31", FT_BOOLEAN, 32, NULL, (1u << 31), NULL, HFILL }}, @@ -2439,7 +2439,7 @@ proto_register_usb_audio(void) FT_BOOLEAN, 32, NULL, (1u << 3), NULL, HFILL }}, { &hf_as_if_gen_formats_ii_rsv, { "Reserved", "usbaudio.as_if_gen.bmFormats.rsv", - FT_BOOLEAN, 32, NULL, (0x7FFFFFF0u), "Must be zero", HFILL }}, + FT_UINT32, BASE_HEX, NULL, (0x7FFFFFF0u), "Must be zero", HFILL }}, { &hf_as_if_gen_formats_ii_d31, { "Type II Raw Data", "usbaudio.as_if_gen.bmFormats.d31", FT_BOOLEAN, 32, NULL, (1u << 31), NULL, HFILL }}, @@ -2485,7 +2485,7 @@ proto_register_usb_audio(void) FT_BOOLEAN, 32, NULL, (1u << 12), NULL, HFILL }}, { &hf_as_if_gen_formats_iii_rsv, { "Reserved", "usbaudio.as_if_gen.bmFormats.rsv", - FT_BOOLEAN, 32, NULL, (0xFFFFE000u), "Must be zero", HFILL }}, + FT_UINT32, BASE_HEX, NULL, (0xFFFFE000u), "Must be zero", HFILL }}, { &hf_as_if_gen_formats_iv_d0, { "PCM", "usbaudio.as_if_gen.bmFormats.d0", |