diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 06:29:57 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 06:29:57 +0000 |
| commit | b0f4928ab2206ff823cb6fa01dc0acccbb07011c (patch) | |
| tree | 75c395d6bffd7497647e4b91a180c0df02544402 /epan/dissectors/packet-btavrcp.c | |
| parent | 3b24b8bbef960a96a9b5e95be13991382c4682e2 (diff) | |
From Michal Labedzki:
Use external value list for character set values
in AVRCP
There is a special list with a lot of values so why not using it.
- From me: import packet-wap.h.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304
svn path=/trunk/; revision=48390
Diffstat (limited to 'epan/dissectors/packet-btavrcp.c')
| -rw-r--r-- | epan/dissectors/packet-btavrcp.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index 6988b665f4..acd6265650 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -31,6 +31,7 @@ #include <epan/expert.h> #include <epan/oui.h> +#include "packet-wap.h" #include "packet-btl2cap.h" #include "packet-btsdp.h" #include "packet-btavctp.h" @@ -438,11 +439,6 @@ static const value_string vendor_unique_id_vals[] = { { 0, NULL } }; -static const value_string character_set_vals[] = { - { 0x006A, "UTF-8" }, - { 0, NULL } -}; - static const value_string direction_vals[] = { { 0x00, "Folder Up" }, { 0x01, "Folder Down" }, @@ -577,7 +573,6 @@ static const value_string player_subtype_vals[] = { { 0, NULL } }; - static gint dissect_attribute_id_list(tvbuff_t *tvb, proto_tree *tree, gint offset, guint count) @@ -2453,7 +2448,7 @@ proto_register_btavrcp(void) }, { &hf_btavrcp_character_set, { "Character Set", "btavrcp.character_set", - FT_UINT16, BASE_HEX, VALS(character_set_vals), 0x00, + FT_UINT16, BASE_HEX|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, NULL, HFILL } }, { &hf_btavrcp_number_of_items, |