diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-03-05 21:20:40 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-03-06 03:19:41 +0000 |
| commit | 7a4702d9d899016bd903d54e147c79e939e92b76 (patch) | |
| tree | b220300530dabb54a0db457b297eab1e3f72e38b /epan/dissectors/packet-rfid-pn532.c | |
| parent | be0b4b9dc8a63ef9b55cbaa7301800962d08a01e (diff) | |
Ue TFS & VALS macros for certain 'fieldconvert' fields.
Change-Id: I8d7468e62d5de99eb68b554134be71b17d1b87c8
Reviewed-on: https://code.wireshark.org/review/525
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-rfid-pn532.c')
| -rw-r--r-- | epan/dissectors/packet-rfid-pn532.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c index f6ded23343..7b0bfd646f 100644 --- a/epan/dissectors/packet-rfid-pn532.c +++ b/epan/dissectors/packet-rfid-pn532.c @@ -2068,7 +2068,7 @@ void proto_register_pn532(void) NULL, 0x00, NULL, HFILL}}, {&hf_pn532_field, {"Field", "pn532.register.value", FT_BOOLEAN, BASE_NONE, - &tfs_present_not_present, 0x00, "Field indicates if an external RF field is present and detected by the PN532", HFILL}}, + TFS(&tfs_present_not_present), 0x00, "Field indicates if an external RF field is present and detected by the PN532", HFILL}}, {&hf_pn532_brrx, {"Baudrate Rx", "pn532.brrx", FT_UINT8, BASE_HEX, VALS(pn532_speed_vals), 0x00, NULL, HFILL}}, @@ -2155,10 +2155,10 @@ void proto_register_pn532(void) NULL, 0xFC, NULL, HFILL}}, {&hf_pn532_next_gi, {"Gi", "pn532.next.gi", FT_BOOLEAN, 8, - &tfs_present_not_present, 0x02, NULL, HFILL}}, + TFS(&tfs_present_not_present), 0x02, NULL, HFILL}}, {&hf_pn532_next_nfc_id_3i, {"NFC ID 3i", "pn532.next.nfc_id_3i", FT_BOOLEAN, 8, - &tfs_present_not_present, 0x01, NULL, HFILL}}, + TFS(&tfs_present_not_present), 0x01, NULL, HFILL}}, {&hf_pn532_nfc_id_3t, {"NFC ID 3t", "pn532.nfc_id_3t", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL}}, @@ -2173,13 +2173,13 @@ void proto_register_pn532(void) NULL, 0xF8, NULL, HFILL}}, {&hf_pn532_jump_next_gi, {"Gi", "pn532.jump_next.gi", FT_BOOLEAN, 8, - &tfs_present_not_present, 0x04, NULL, HFILL}}, + TFS(&tfs_present_not_present), 0x04, NULL, HFILL}}, {&hf_pn532_jump_next_nfc_id_3i, {"NFC ID 3i", "pn532.jump_next.nfc_id_3i", FT_BOOLEAN, 8, - &tfs_present_not_present, 0x02, NULL, HFILL}}, + TFS(&tfs_present_not_present), 0x02, NULL, HFILL}}, {&hf_pn532_jump_next_passive_initiator_data, {"Passive Initiator Data", "pn532.jump_next.passive_initiator_data", FT_BOOLEAN, 8, - &tfs_present_not_present, 0x01, NULL, HFILL}}, + TFS(&tfs_present_not_present), 0x01, NULL, HFILL}}, {&hf_pn532_passive_initiator_data, {"Passive Initiator Data", "pn532.passive_initiator_data", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL}}, @@ -2272,7 +2272,7 @@ void proto_register_pn532(void) NULL, 0x00, NULL, HFILL}}, {&hf_pn532_diagnose_result, {"Result", "pn532.result", FT_BOOLEAN, BASE_NONE, - &tfs_ok_error, 0x00, NULL, HFILL}}, + TFS(&tfs_ok_error), 0x00, NULL, HFILL}}, {&hf_pn532_andet_bot, {"Andet Bot", "pn532.andet.bot", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, |