Fix various issues seen with tools/check_typed_item_calls.py

4 files changed, 43 insertions, 38 deletions

diff --git a/plugins/epan/ethercat/packet-ethercat-datagram.c b/plugins/epan/ethercat/packet-ethercat-datagram.c
index 69af5fffc2..08ce73b948 100644
--- a/plugins/epan/ethercat/packet-ethercat-datagram.c
+++ b/plugins/epan/ethercat/packet-ethercat-datagram.c
@@ -2592,11 +2592,11 @@ void proto_register_ecat(void)
          },
          { &hf_ecat_reg_alctrl_errack,
            {"Error Ack", "ecat.reg.alctrl.errack",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x10, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0010, NULL, HFILL }
          },
          { &hf_ecat_reg_alctrl_id,
            {"Id", "ecat.reg.alctrl.id",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x20, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0020, NULL, HFILL }
          },
          { &hf_ecat_reg_alstatus,
            {"AL Status (0x130)", "ecat.reg.alstatus",
@@ -2604,15 +2604,15 @@ void proto_register_ecat(void)
          },
          { &hf_ecat_reg_alstatus_status,
            {"Al Status", "ecat.reg.alstatus.status",
-           FT_UINT16, BASE_HEX, VALS(vals_esc_reg_120), 0x0f, NULL, HFILL }
+           FT_UINT16, BASE_HEX, VALS(vals_esc_reg_120), 0x000f, NULL, HFILL }
          },
          { &hf_ecat_reg_alstatus_err,
            {"Error", "ecat.reg.alstatus.err",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x10, NULL, HFILL }
+		   FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0010, NULL, HFILL }
          },
          { &hf_ecat_reg_alstatus_id,
            {"Id", "ecat.reg.alstatus.id",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x20, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0020, NULL, HFILL }
          },
          { &hf_ecat_reg_alstatuscode,
            {"AL Status Code (0x134)", "ecat.reg.alstatuscode",
@@ -2720,23 +2720,23 @@ void proto_register_ecat(void)
          },
          { &hf_ecat_reg_pdiL_latchin,
            {"Latch input", "ecat.reg.irqmask.pdiL.latchin",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x02, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0002, NULL, HFILL }
          },
          { &hf_ecat_reg_pdiL_sync0,
            {"SYNC 0", "ecat.reg.irqmask.pdiL.sync0",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x04, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0004, NULL, HFILL }
          },
          { &hf_ecat_reg_pdiL_sync1,
            {"SYNC 1", "ecat.reg.irqmask.pdiL.sync1",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x08, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0008, NULL, HFILL }
          },
          { &hf_ecat_reg_pdiL_smchg,
            {"SM changed", "ecat.reg.irqmask.pdiL.smchg",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x10, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0010, NULL, HFILL }
          },
          { &hf_ecat_reg_pdiL_eepromcmdpen,
            {"EEPROM command pending", "ecat.reg.irqmask.pdiL.eepromcmdpen",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x20, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0020, NULL, HFILL }
          },
          { &hf_ecat_reg_pdiL_sm0,
            {"SM 0", "ecat.reg.irqmask.pdiL.sm0",
@@ -2828,27 +2828,27 @@ void proto_register_ecat(void)
          },
          { &hf_ecat_reg_pdi1_alctrl,
            {"AL Ctrl", "ecat.reg.irq.pdi1.alctrl",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x1, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0001, NULL, HFILL }
          },
          { &hf_ecat_reg_pdi1_latchin,
            {"Latch input", "ecat.reg.irq.pdi1.latchin",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x02, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0002, NULL, HFILL }
          },
          { &hf_ecat_reg_pdi1_sync0,
            {"SYNC 0", "ecat.reg.irq.pdi1.sync0",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x04, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0004, NULL, HFILL }
          },
          { &hf_ecat_reg_pdi1_sync1,
            {"SYNC 1", "ecat.reg.irq.pdi1.sync1",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x08, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0008, NULL, HFILL }
          },
          { &hf_ecat_reg_pdi1_smchg,
            {"SM changed", "ecat.reg.irq.pdi1.smchg",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x10, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0010, NULL, HFILL }
          },
          { &hf_ecat_reg_pdi1_eepromcmdpen,
            {"EEPROM command pending", "ecat.reg.irq.pdi1.eepromcmdpen",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x20, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0020, NULL, HFILL }
          },
          { &hf_ecat_reg_pdi1_sm0,
            {"SM 0", "ecat.reg.irq.pdi1.sm0",
@@ -3099,6 +3099,9 @@ void proto_register_ecat(void)
            {"Phy MIO Ctrl/Status (0x510)", "ecat.reg.mio.ctrlstat",
            FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }
          },
+
+         /* TODO: check these masks (ecat_esc_reg_510) against spec.
+          * In particular hf_ecat_reg_mio_ctrlstat_offsphy is non-contiguous and overlaps wracc1 */
          { &hf_ecat_reg_mio_ctrlstat_wracc1,
            {"Write access", "ecat.reg.mio.ctrlstat.wracc1",
            FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0001, NULL, HFILL }
@@ -3123,6 +3126,7 @@ void proto_register_ecat(void)
            {"Busy", "ecat.reg.mio.ctrlstat.busy",
            FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x8000, NULL, HFILL }
          },
+
          { &hf_ecat_reg_mio_addr,
            {"Phy MIO Address (0x512)", "ecat.reg.mio.addr",
            FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }
@@ -3373,19 +3377,19 @@ void proto_register_ecat(void)
          },
          { &hf_ecat_reg_syncman_enable,
            {"Enable", "ecat.syncman.enable",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x1, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0001, NULL, HFILL }
          },
          { &hf_ecat_reg_syncman_repeatreq,
            {"Repeat request", "ecat.syncman.repeatreq",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x02, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0002, NULL, HFILL }
          },
          { &hf_ecat_reg_syncman_latchsmchg_ecat,
            {"Latch SyncMan Change ECAT", "ecat.syncman.latchsmchg.ecat",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x40, NULL, HFILL }
+		   FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0040, NULL, HFILL }
          },
          { &hf_ecat_reg_syncman_latchsmchg_pdi,
            {"Latch SyncMan Change PDI", "ecat.syncman.latchsmchg.pdi",
-           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x80, NULL, HFILL }
+           FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0080, NULL, HFILL }
          },
          { &hf_ecat_reg_syncman_deactivate,
            {"Deactivate", "ecat.syncman.deactivate",
diff --git a/plugins/epan/gryphon/packet-gryphon.c b/plugins/epan/gryphon/packet-gryphon.c
index 8d8423dc68..969dc8abb1 100644
--- a/plugins/epan/gryphon/packet-gryphon.c
+++ b/plugins/epan/gryphon/packet-gryphon.c
@@ -2032,6 +2032,7 @@ cmd_sched(tvbuff_t *tvb, int offset, proto_tree *pt)
         tree1 = proto_item_add_subtree (item1, ett_gryphon_flags);
         proto_tree_add_item(tree1, hf_gryphon_sched_skip_transmit_period, tvb, offset, 2, ENC_BIG_ENDIAN);
         if (i == 1) {
+            /* N.B. Same bit as skip_transmit_period..? */
             proto_tree_add_item(tree1, hf_gryphon_sched_skip_sleep, tvb, offset, 2, ENC_BIG_ENDIAN);
         }
 
@@ -4652,7 +4653,7 @@ proto_register_gryphon(void)
           { "Flags", "gryphon.sched.flags", FT_UINT32, BASE_HEX, NULL, 0x0,
                 NULL, HFILL }},
         { &hf_gryphon_sched_flags_scheduler,
-          { "Scheduler", "gryphon.sched.flags.scheduler", FT_BOOLEAN, 32, TFS(&critical_normal), 0x01,
+          { "Scheduler", "gryphon.sched.flags.scheduler", FT_BOOLEAN, 32, TFS(&critical_normal), 0x00000001,
                 NULL, HFILL }},
         { &hf_gryphon_sched_sleep,
           { "Sleep (milliseconds)", "gryphon.sched.sleep", FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -4667,10 +4668,10 @@ proto_register_gryphon(void)
           { "Flags", "gryphon.sched.transmit_flags", FT_UINT16, BASE_HEX, NULL, 0x0,
                 NULL, HFILL }},
         { &hf_gryphon_sched_skip_transmit_period,
-          { "Last transmit period", "gryphon.sched.skip_transmit_period", FT_BOOLEAN, 16, TFS(&skip_not_skip), 0x01,
+          { "Last transmit period", "gryphon.sched.skip_transmit_period", FT_BOOLEAN, 16, TFS(&skip_not_skip), 0x0001,
                 NULL, HFILL }},
         { &hf_gryphon_sched_skip_sleep,
-          { "Last transmit period", "gryphon.sched.skip_transmit_period", FT_BOOLEAN, 16, TFS(&skip_not_skip), 0x01,
+          { "Last transmit period", "gryphon.sched.skip_transmit_period", FT_BOOLEAN, 16, TFS(&skip_not_skip), 0x0001,
                 NULL, HFILL }},
         { &hf_gryphon_sched_channel,
           { "Channel", "gryphon.sched.channel", FT_UINT8, BASE_DEC, NULL, 0x0,
diff --git a/plugins/epan/profinet/packet-dcerpc-pn-io.c b/plugins/epan/profinet/packet-dcerpc-pn-io.c
index e01f1391c1..8c76bfa8d7 100644
--- a/plugins/epan/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/epan/profinet/packet-dcerpc-pn-io.c
@@ -14597,12 +14597,12 @@ proto_register_pn_io (void)
     },
     { &hf_pn_io_sr_properties_InputValidOnBackupAR_with_SRProperties_Mode_0,
       { "InputValidOnBackupAR", "pn_io.sr_properties.InputValidOnBackupAR",
-        FT_BOOLEAN, 32, TFS(&tfs_pn_io_sr_properties_BackupAR_with_SRProperties_Mode_0), 0x01,
+        FT_BOOLEAN, 32, TFS(&tfs_pn_io_sr_properties_BackupAR_with_SRProperties_Mode_0), 0x00000001,
         NULL, HFILL }
     },
     { &hf_pn_io_sr_properties_InputValidOnBackupAR_with_SRProperties_Mode_1,
       { "InputValidOnBackupAR", "pn_io.sr_properties.InputValidOnBackupAR",
-        FT_BOOLEAN, 32, TFS(&tfs_pn_io_sr_properties_BackupAR_with_SRProperties_Mode_1), 0x01,
+        FT_BOOLEAN, 32, TFS(&tfs_pn_io_sr_properties_BackupAR_with_SRProperties_Mode_1), 0x00000001,
         NULL, HFILL }
     },
     { &hf_pn_io_sr_properties_Reserved_1,
@@ -14677,7 +14677,7 @@ proto_register_pn_io (void)
     },
     { &hf_pn_io_iocr_properties_reserved_3,
       { "Reserved3", "pn_io.iocr_properties.reserved3",
-        FT_UINT32, BASE_HEX, NULL, 0xF000000,
+        FT_UINT32, BASE_HEX, NULL, 0x0F000000,
         NULL, HFILL }
     },
     { &hf_pn_io_iocr_properties_fast_forwarding_mac_adr,
@@ -14702,17 +14702,17 @@ proto_register_pn_io (void)
     },
     { &hf_pn_io_DistributedWatchDogFactor,
       { "SFIOCRProperties.DistributedWatchDogFactor", "pn_io.SFIOCRProperties.DistributedWatchDogFactor",
-        FT_UINT32, BASE_HEX, NULL, 0x0FF,
+        FT_UINT32, BASE_HEX, NULL, 0x000000FF,
         NULL, HFILL }
     },
     { &hf_pn_io_RestartFactorForDistributedWD,
       { "SFIOCRProperties.RestartFactorForDistributedWD", "pn_io.SFIOCRProperties.RestartFactorForDistributedWD",
-        FT_UINT32, BASE_HEX, NULL, 0xff00,
+        FT_UINT32, BASE_HEX, NULL, 0x0000ff00,
         NULL, HFILL }
     },
     { &hf_pn_io_SFIOCRProperties_DFPmode,
       { "SFIOCRProperties.DFPmode", "pn_io.SFIOCRProperties.DFPmode",
-        FT_UINT32, BASE_HEX, NULL, 0xFF0000,
+        FT_UINT32, BASE_HEX, NULL, 0x00FF0000,
         NULL, HFILL }
     },
     { &hf_pn_io_SFIOCRProperties_reserved_1,
@@ -15112,7 +15112,7 @@ proto_register_pn_io (void)
     },
     { &hf_pn_io_control_command_reserved_7_15,
       { "ControlBlockProperties.reserved", "pn_io.control_properties_reserved_7_15",
-        FT_UINT16, BASE_HEX, NULL, 0x0FF80,
+        FT_UINT16, BASE_HEX, NULL, 0xFF80,
         NULL, HFILL }
     },
     { &hf_pn_io_control_block_properties,
@@ -16543,12 +16543,12 @@ proto_register_pn_io (void)
     },
     { &hf_pn_io_tx_phase_assignment_begin_value,
       { "AssignedValueForReservedBegin", "pn_io.tx_phase_assignment_begin_value",
-        FT_UINT16, BASE_DEC, NULL, 0x0F,
+        FT_UINT16, BASE_DEC, NULL, 0x000F,
         NULL, HFILL }
     },
     { &hf_pn_io_tx_phase_assignment_orange_begin,
       { "AssignedValueForOrangeBegin", "pn_io.tx_phase_assignment_orange_begin",
-        FT_UINT16, BASE_DEC, NULL, 0x0F0,
+        FT_UINT16, BASE_DEC, NULL, 0x00F0,
         NULL, HFILL }
     },
     { &hf_pn_io_tx_phase_assignment_end_reserved,
@@ -16558,7 +16558,7 @@ proto_register_pn_io (void)
     },
     { &hf_pn_io_tx_phase_assignment_reserved,
       { "Reserved should be 0", "pn_io.tx_phase_assignment_reserved",
-        FT_UINT16, BASE_DEC, NULL, 0x0F000,
+        FT_UINT16, BASE_DEC, NULL, 0xF000,
         NULL, HFILL }
     },
     { &hf_pn_ir_rx_phase_assignment,
@@ -16921,12 +16921,12 @@ proto_register_pn_io (void)
     },
     { &hf_pn_io_mrp_check_reserved_1,
       { "MRP_Check.reserved_1", "pn_io.mrp_check_reserved_1",
-        FT_UINT32, BASE_HEX, NULL, 0x0FFFFFC,
+        FT_UINT32, BASE_HEX, NULL, 0xFFFFFC,
         NULL, HFILL }
     },
     { &hf_pn_io_mrp_check_reserved_2,
       { "MRP_Check.reserved_2", "pn_io.mrp_check_reserved_2",
-        FT_UINT32, BASE_HEX, NULL, 0x0FF000000,
+        FT_UINT32, BASE_HEX, NULL, 0xFF000000,
         NULL, HFILL }
     },
     { &hf_pn_io_mrp_rtmode,
@@ -17238,12 +17238,12 @@ proto_register_pn_io (void)
     },
     { &hf_pn_io_rs_alarm_info_reserved_8_15,
       { "RSAlarmInfo.Reserved2", "pn_io.rs_alarm_info_reserved_8_15",
-        FT_UINT16, BASE_HEX, NULL, 0x0FF00,
+        FT_UINT16, BASE_HEX, NULL, 0xFF00,
         NULL, HFILL }
     },
     { &hf_pn_io_rs_alarm_info_reserved_0_7,
       { "RSAlarmInfo.Reserved1", "pn_io.rs_alarm_info_reserved_0_7",
-        FT_UINT16, BASE_HEX, NULL, 0x000FF,
+        FT_UINT16, BASE_HEX, NULL, 0x00FF,
         NULL, HFILL }
     },
     { &hf_pn_io_rs_alarm_info,
diff --git a/plugins/epan/profinet/packet-pn-ptcp.c b/plugins/epan/profinet/packet-pn-ptcp.c
index d6b1bb6e80..8cdfe3df6d 100644
--- a/plugins/epan/profinet/packet-pn-ptcp.c
+++ b/plugins/epan/profinet/packet-pn-ptcp.c
@@ -933,7 +933,7 @@ proto_register_pn_ptcp (void)
 
         { &hf_pn_ptcp_tl_length,
           { "TypeLength.Length", "pn_ptcp.tl_length",
-            FT_UINT16, BASE_DEC, 0x0, 0x1FF,
+            FT_UINT16, BASE_DEC, 0x0, 0x01FF,
             NULL, HFILL }},
 
         { &hf_pn_ptcp_tl_type,