From b240d5baa062a475ff0943b91205eb2aee2a0471 Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Tue, 5 Oct 2021 17:27:07 +0100 Subject: Ethercat: try to fix EEPROM Ctrl/Status bitmask fields Fixes remaining errors detected by ./tools/check_typed_item_calls.py --mask --- plugins/epan/ethercat/packet-ethercat-datagram.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'plugins/epan') diff --git a/plugins/epan/ethercat/packet-ethercat-datagram.c b/plugins/epan/ethercat/packet-ethercat-datagram.c index 2fda64c4d1..acd3fe785b 100644 --- a/plugins/epan/ethercat/packet-ethercat-datagram.c +++ b/plugins/epan/ethercat/packet-ethercat-datagram.c @@ -3024,51 +3024,51 @@ void proto_register_ecat(void) }, { &hf_ecat_reg_ctrlstat_wraccess, {"Write access", "ecat.reg.ctrlstat.wraccess", - FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x01, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x1000, NULL, HFILL } }, { &hf_ecat_reg_ctrlstat_eepromemul, {"EEPROM emulation", "ecat.reg.ctrlstat.eepromemul", - FT_BOOLEAN, 8, TFS(&tfs_esc_reg_502_5), 0x20, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&tfs_esc_reg_502_5), 0x2000, NULL, HFILL } }, { &hf_ecat_reg_ctrlstat_8bacc, {"8 byte access", "ecat.reg.ctrlstat.8bacc", - FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x40, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x4000, NULL, HFILL } }, { &hf_ecat_reg_ctrlstat_2bacc, {"2 byte address", "ecat.reg.ctrlstat.2bacc", - FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x80, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x8000, NULL, HFILL } }, { &hf_ecat_reg_ctrlstat_rdacc, {"Read access", "ecat.reg.ctrlstat.rdacc", - FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x0100, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0100, NULL, HFILL } }, { &hf_ecat_reg_ctrlstat_wracc, {"Write access", "ecat.reg.ctrlstat.wracc", - FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x0200, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0200, NULL, HFILL } }, { &hf_ecat_reg_ctrlstat_reloadacc, {"Reload access", "ecat.reg.ctrlstat.reloadacc", - FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x0400, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0400, NULL, HFILL } }, { &hf_ecat_reg_ctrlstat_crcerr, {"CRC error", "ecat.reg.ctrlstat.crcerr", - FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x0800, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0800, NULL, HFILL } }, { &hf_ecat_reg_ctrlstat_lderr, {"Load error", "ecat.reg.ctrlstat.lderr", - FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x1000, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0010, NULL, HFILL } }, { &hf_ecat_reg_ctrlstat_cmderr, {"Cmd error", "ecat.reg.ctrlstat.cmderr", - FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x2000, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0020, NULL, HFILL } }, { &hf_ecat_reg_ctrlstat_wrerr, {"Write error", "ecat.reg.ctrlstat.wrerr", - FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x4000, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0040, NULL, HFILL } }, { &hf_ecat_reg_ctrlstat_busy, {"Busy", "ecat.reg.ctrlstat.busy", - FT_BOOLEAN, 8, TFS(&tfs_local_true_false), 0x8000, NULL, HFILL } + FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0080, NULL, HFILL } }, { &hf_ecat_reg_addrl, {"EEPROM Address Lo (0x504)", "ecat.reg.addrl", -- cgit v1.2.3