diff options
Diffstat (limited to 'epan/dissectors/packet-zbee-zcl-hvac.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-hvac.c | 174 |
1 files changed, 87 insertions, 87 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-hvac.c b/epan/dissectors/packet-zbee-zcl-hvac.c index 7ea373dc..1dbee78c 100644 --- a/epan/dissectors/packet-zbee-zcl-hvac.c +++ b/epan/dissectors/packet-zbee-zcl-hvac.c @@ -94,7 +94,7 @@ void proto_register_zbee_zcl_pump_config_control(void); void proto_reg_handoff_zbee_zcl_pump_config_control(void); /* Command Dissector Helpers */ -static void dissect_zcl_pump_config_control_attr_data (proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr); +static void dissect_zcl_pump_config_control_attr_data (proto_tree *tree, tvbuff_t *tvb, unsigned *offset, uint16_t attr_id, unsigned data_type, bool client_attr); /* Private functions prototype */ @@ -102,43 +102,43 @@ static void dissect_zcl_pump_config_control_attr_data (proto_tree *tree, tv /* Global Variables */ /*************************/ /* Initialize the protocol and registered fields */ -static int proto_zbee_zcl_pump_config_control = -1; - -static int hf_zbee_zcl_pump_config_control_attr_id = -1; -static int hf_zbee_zcl_pump_config_control_attr_eff_opr_mode = -1; -static int hf_zbee_zcl_pump_config_control_attr_opr_mode = -1; -static int hf_zbee_zcl_pump_config_control_attr_eff_ctrl_mode = -1; -static int hf_zbee_zcl_pump_config_control_attr_ctrl_mode = -1; -static int hf_zbee_zcl_pump_config_control_status = -1; -static int hf_zbee_zcl_pump_config_control_status_device_fault = -1; -static int hf_zbee_zcl_pump_config_control_status_supply_fault = -1; -static int hf_zbee_zcl_pump_config_control_status_speed_low = -1; -static int hf_zbee_zcl_pump_config_control_status_speed_high = -1; -static int hf_zbee_zcl_pump_config_control_status_local_override = -1; -static int hf_zbee_zcl_pump_config_control_status_running = -1; -static int hf_zbee_zcl_pump_config_control_status_rem_pressure = -1; -static int hf_zbee_zcl_pump_config_control_status_rem_flow = -1; -static int hf_zbee_zcl_pump_config_control_status_rem_temp = -1; -static int hf_zbee_zcl_pump_config_control_alarm = -1; -static int hf_zbee_zcl_pump_config_control_alarm_volt_too_low = -1; -static int hf_zbee_zcl_pump_config_control_alarm_volt_too_high = -1; -static int hf_zbee_zcl_pump_config_control_alarm_pwr_missing_phase = -1; -static int hf_zbee_zcl_pump_config_control_alarm_press_too_low = -1; -static int hf_zbee_zcl_pump_config_control_alarm_press_too_high = -1; -static int hf_zbee_zcl_pump_config_control_alarm_dry_running = -1; -static int hf_zbee_zcl_pump_config_control_alarm_mtr_temp_too_high = -1; -static int hf_zbee_zcl_pump_config_control_alarm_pump_mtr_fatal_fail = -1; -static int hf_zbee_zcl_pump_config_control_alarm_elec_temp_too_high = -1; -static int hf_zbee_zcl_pump_config_control_alarm_pump_block = -1; -static int hf_zbee_zcl_pump_config_control_alarm_sensor_fail = -1; -static int hf_zbee_zcl_pump_config_control_alarm_elec_non_fatal_fail = -1; -static int hf_zbee_zcl_pump_config_control_alarm_fatal_fail = -1; -static int hf_zbee_zcl_pump_config_control_alarm_gen_fault = -1; +static int proto_zbee_zcl_pump_config_control; + +static int hf_zbee_zcl_pump_config_control_attr_id; +static int hf_zbee_zcl_pump_config_control_attr_eff_opr_mode; +static int hf_zbee_zcl_pump_config_control_attr_opr_mode; +static int hf_zbee_zcl_pump_config_control_attr_eff_ctrl_mode; +static int hf_zbee_zcl_pump_config_control_attr_ctrl_mode; +static int hf_zbee_zcl_pump_config_control_status; +static int hf_zbee_zcl_pump_config_control_status_device_fault; +static int hf_zbee_zcl_pump_config_control_status_supply_fault; +static int hf_zbee_zcl_pump_config_control_status_speed_low; +static int hf_zbee_zcl_pump_config_control_status_speed_high; +static int hf_zbee_zcl_pump_config_control_status_local_override; +static int hf_zbee_zcl_pump_config_control_status_running; +static int hf_zbee_zcl_pump_config_control_status_rem_pressure; +static int hf_zbee_zcl_pump_config_control_status_rem_flow; +static int hf_zbee_zcl_pump_config_control_status_rem_temp; +static int hf_zbee_zcl_pump_config_control_alarm; +static int hf_zbee_zcl_pump_config_control_alarm_volt_too_low; +static int hf_zbee_zcl_pump_config_control_alarm_volt_too_high; +static int hf_zbee_zcl_pump_config_control_alarm_pwr_missing_phase; +static int hf_zbee_zcl_pump_config_control_alarm_press_too_low; +static int hf_zbee_zcl_pump_config_control_alarm_press_too_high; +static int hf_zbee_zcl_pump_config_control_alarm_dry_running; +static int hf_zbee_zcl_pump_config_control_alarm_mtr_temp_too_high; +static int hf_zbee_zcl_pump_config_control_alarm_pump_mtr_fatal_fail; +static int hf_zbee_zcl_pump_config_control_alarm_elec_temp_too_high; +static int hf_zbee_zcl_pump_config_control_alarm_pump_block; +static int hf_zbee_zcl_pump_config_control_alarm_sensor_fail; +static int hf_zbee_zcl_pump_config_control_alarm_elec_non_fatal_fail; +static int hf_zbee_zcl_pump_config_control_alarm_fatal_fail; +static int hf_zbee_zcl_pump_config_control_alarm_gen_fault; /* Initialize the subtree pointers */ -static gint ett_zbee_zcl_pump_config_control = -1; -static gint ett_zbee_zcl_pump_config_control_status = -1; -static gint ett_zbee_zcl_pump_config_control_alarm = -1; +static int ett_zbee_zcl_pump_config_control; +static int ett_zbee_zcl_pump_config_control_status; +static int ett_zbee_zcl_pump_config_control_alarm; /* Attributes */ static const value_string zbee_zcl_pump_config_control_attr_names[] = { @@ -221,7 +221,7 @@ dissect_zbee_zcl_pump_config_control(tvbuff_t *tvb _U_, packet_info *pinfo _U_, *@param client_attr ZCL client */ void -dissect_zcl_pump_config_control_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) +dissect_zcl_pump_config_control_attr_data(proto_tree *tree, tvbuff_t *tvb, unsigned *offset, uint16_t attr_id, unsigned data_type, bool client_attr) { static int * const pump_status[] = { &hf_zbee_zcl_pump_config_control_status_device_fault, @@ -349,39 +349,39 @@ proto_register_zbee_zcl_pump_config_control(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_status_device_fault, - { "Device Fault", "zbee_zcl_hvac.pump_config_control.attr.status.device_fault", FT_BOOLEAN, 8, TFS(&tfs_no_yes), + { "Device Fault", "zbee_zcl_hvac.pump_config_control.attr.status.device_fault", FT_BOOLEAN, 16, TFS(&tfs_no_yes), ZBEE_ZCL_PUMP_CONFIG_CONTROL_STATUS_DEVICE_FAULT, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_status_supply_fault, - { "Supply Fault", "zbee_zcl_hvac.pump_config_control.attr.status.supply_fault", FT_BOOLEAN, 8, TFS(&tfs_no_yes), + { "Supply Fault", "zbee_zcl_hvac.pump_config_control.attr.status.supply_fault", FT_BOOLEAN, 16, TFS(&tfs_no_yes), ZBEE_ZCL_PUMP_CONFIG_CONTROL_STATUS_SUPPLY_FAULT, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_status_speed_low, - { "Speed Low", "zbee_zcl_hvac.pump_config_control.attr.status.speed_low", FT_BOOLEAN, 8, TFS(&tfs_no_yes), + { "Speed Low", "zbee_zcl_hvac.pump_config_control.attr.status.speed_low", FT_BOOLEAN, 16, TFS(&tfs_no_yes), ZBEE_ZCL_PUMP_CONFIG_CONTROL_STATUS_SPEED_LOW, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_status_speed_high, - { "Speed High", "zbee_zcl_hvac.pump_config_control.attr.status.speed_high", FT_BOOLEAN, 8, TFS(&tfs_no_yes), + { "Speed High", "zbee_zcl_hvac.pump_config_control.attr.status.speed_high", FT_BOOLEAN, 16, TFS(&tfs_no_yes), ZBEE_ZCL_PUMP_CONFIG_CONTROL_STATUS_SPEED_HIGH, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_status_local_override, - { "Local Override", "zbee_zcl_hvac.pump_config_control.attr.status.local_override", FT_BOOLEAN, 8, TFS(&tfs_no_yes), + { "Local Override", "zbee_zcl_hvac.pump_config_control.attr.status.local_override", FT_BOOLEAN, 16, TFS(&tfs_no_yes), ZBEE_ZCL_PUMP_CONFIG_CONTROL_STATUS_LOCAL_OVERRIDE, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_status_running, - { "Running", "zbee_zcl_hvac.pump_config_control.attr.status.running", FT_BOOLEAN, 8, TFS(&tfs_no_yes), + { "Running", "zbee_zcl_hvac.pump_config_control.attr.status.running", FT_BOOLEAN, 16, TFS(&tfs_no_yes), ZBEE_ZCL_PUMP_CONFIG_CONTROL_STATUS_RUNNING, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_status_rem_pressure, - { "Remote Pressure", "zbee_zcl_hvac.pump_config_control.attr.status.rem_pressure", FT_BOOLEAN, 8, TFS(&tfs_no_yes), + { "Remote Pressure", "zbee_zcl_hvac.pump_config_control.attr.status.rem_pressure", FT_BOOLEAN, 16, TFS(&tfs_no_yes), ZBEE_ZCL_PUMP_CONFIG_CONTROL_STATUS_REMOTE_PRESSURE, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_status_rem_flow, - { "Remote Flow", "zbee_zcl_hvac.pump_config_control.attr.status.rem_flow", FT_BOOLEAN, 8, TFS(&tfs_no_yes), + { "Remote Flow", "zbee_zcl_hvac.pump_config_control.attr.status.rem_flow", FT_BOOLEAN, 16, TFS(&tfs_no_yes), ZBEE_ZCL_PUMP_CONFIG_CONTROL_STATUS_REMOTE_FLOW, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_status_rem_temp, - { "Remote Temperature", "zbee_zcl_hvac.pump_config_control.attr.status.rem_temp", FT_BOOLEAN, 8, TFS(&tfs_no_yes), + { "Remote Temperature", "zbee_zcl_hvac.pump_config_control.attr.status.rem_temp", FT_BOOLEAN, 16, TFS(&tfs_no_yes), ZBEE_ZCL_PUMP_CONFIG_CONTROL_STATUS_REMOTE_TEMP, NULL, HFILL } }, /* end Pump Status fields */ @@ -391,65 +391,65 @@ proto_register_zbee_zcl_pump_config_control(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_volt_too_low, - { "Supply voltage too low", "zbee_zcl_hvac.pump_config_control.attr.alarm.volt_too_low", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "Supply voltage too low", "zbee_zcl_hvac.pump_config_control.attr.alarm.volt_too_low", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_VOLTAGE_TOO_LOW, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_volt_too_high, - { "Supply voltage too high", "zbee_zcl_hvac.pump_config_control.attr.alarm.volt_too_high", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "Supply voltage too high", "zbee_zcl_hvac.pump_config_control.attr.alarm.volt_too_high", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_VOLTAGE_TOO_HIGH, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_pwr_missing_phase, - { "Power missing phase", "zbee_zcl_hvac.pump_config_control.attr.alarm.pwr_missing_phase", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "Power missing phase", "zbee_zcl_hvac.pump_config_control.attr.alarm.pwr_missing_phase", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_PWR_MISSING_PHASE, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_press_too_low, - { "System pressure too low", "zbee_zcl_hvac.pump_config_control.attr.alarm.press_too_low", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "System pressure too low", "zbee_zcl_hvac.pump_config_control.attr.alarm.press_too_low", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_PRESSURE_TOO_LOW, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_press_too_high, - { "System pressure too high", "zbee_zcl_hvac.pump_config_control.attr.alarm.press_too_high", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "System pressure too high", "zbee_zcl_hvac.pump_config_control.attr.alarm.press_too_high", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_PRESSURE_TOO_HIGH, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_dry_running, - { "Dry running", "zbee_zcl_hvac.pump_config_control.attr.alarm.dry_running", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "Dry running", "zbee_zcl_hvac.pump_config_control.attr.alarm.dry_running", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_DRY_RUNNING, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_mtr_temp_too_high, - { "Motor temperature too high", "zbee_zcl_hvac.pump_config_control.attr.alarm.mtr_temp_too_high", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "Motor temperature too high", "zbee_zcl_hvac.pump_config_control.attr.alarm.mtr_temp_too_high", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_MTR_TEMP_TOO_HIGH, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_pump_mtr_fatal_fail, - { "Pump motor has fatal failure", "zbee_zcl_hvac.pump_config_control.attr.alarm.mtr_fatal_fail", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "Pump motor has fatal failure", "zbee_zcl_hvac.pump_config_control.attr.alarm.mtr_fatal_fail", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_PUMP_MTR_FATAL_FAILURE, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_elec_temp_too_high, - { "Electronic temperature too high", "zbee_zcl_hvac.pump_config_control.attr.alarm.elec_temp_too_high", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "Electronic temperature too high", "zbee_zcl_hvac.pump_config_control.attr.alarm.elec_temp_too_high", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_ELEC_TEMP_TOO_HIGH, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_pump_block, - { "Pump blocked", "zbee_zcl_hvac.pump_config_control.attr.alarm.pump_block", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "Pump blocked", "zbee_zcl_hvac.pump_config_control.attr.alarm.pump_block", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_PUMP_BLOCK, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_sensor_fail, - { "Sensor failure", "zbee_zcl_hvac.pump_config_control.attr.alarm.sensor_fail", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "Sensor failure", "zbee_zcl_hvac.pump_config_control.attr.alarm.sensor_fail", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_SENSOR_FAILURE, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_elec_non_fatal_fail, - { "Electronic non-fatal failure", "zbee_zcl_hvac.pump_config_control.attr.alarm.elec_non_fatal_fail", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "Electronic non-fatal failure", "zbee_zcl_hvac.pump_config_control.attr.alarm.elec_non_fatal_fail", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_ELEC_NON_FATAL_FAILURE, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_fatal_fail, - { "Electronic fatal failure", "zbee_zcl_hvac.pump_config_control.attr.alarm.elec_fatal_fail", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "Electronic fatal failure", "zbee_zcl_hvac.pump_config_control.attr.alarm.elec_fatal_fail", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_ELEC_FATAL_FAILURE, NULL, HFILL } }, { &hf_zbee_zcl_pump_config_control_alarm_gen_fault, - { "General fault", "zbee_zcl_hvac.pump_config_control.attr.alarm.gen_fault", FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), + { "General fault", "zbee_zcl_hvac.pump_config_control.attr.alarm.gen_fault", FT_BOOLEAN, 16, TFS(&tfs_disabled_enabled), ZBEE_ZCL_PUMP_CONFIG_CONTROL_ALARM_GENERAL_FAULT, NULL, HFILL } } /* end Alarm Mask fields */ }; /* ZCL Pump Configuration and Control subtrees */ - static gint *ett[ZBEE_ZCL_PUMP_CONFIG_CONTROL_NUM_ETT]; + static int *ett[ZBEE_ZCL_PUMP_CONFIG_CONTROL_NUM_ETT]; ett[0] = &ett_zbee_zcl_pump_config_control; ett[1] = &ett_zbee_zcl_pump_config_control_status; @@ -510,7 +510,7 @@ void proto_register_zbee_zcl_fan_control(void); void proto_reg_handoff_zbee_zcl_fan_control(void); /* Command Dissector Helpers */ -static void dissect_zcl_fan_control_attr_data (proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr); +static void dissect_zcl_fan_control_attr_data (proto_tree *tree, tvbuff_t *tvb, unsigned *offset, uint16_t attr_id, unsigned data_type, bool client_attr); /* Private functions prototype */ @@ -518,14 +518,14 @@ static void dissect_zcl_fan_control_attr_data (proto_tree *tree, tvbuff_t * /* Global Variables */ /*************************/ /* Initialize the protocol and registered fields */ -static int proto_zbee_zcl_fan_control = -1; +static int proto_zbee_zcl_fan_control; -static int hf_zbee_zcl_fan_control_attr_id = -1; -static int hf_zbee_zcl_fan_control_attr_fan_mode = -1; -static int hf_zbee_zcl_fan_control_attr_fan_mode_seq = -1; +static int hf_zbee_zcl_fan_control_attr_id; +static int hf_zbee_zcl_fan_control_attr_fan_mode; +static int hf_zbee_zcl_fan_control_attr_fan_mode_seq; /* Initialize the subtree pointers */ -static gint ett_zbee_zcl_fan_control = -1; +static int ett_zbee_zcl_fan_control; /* Attributes */ static const value_string zbee_zcl_fan_control_attr_names[] = { @@ -586,7 +586,7 @@ dissect_zbee_zcl_fan_control(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr *@param client_attr ZCL client */ void -dissect_zcl_fan_control_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) +dissect_zcl_fan_control_attr_data(proto_tree *tree, tvbuff_t *tvb, unsigned *offset, uint16_t attr_id, unsigned data_type, bool client_attr) { /* Dissect attribute data type and data */ switch (attr_id) { @@ -633,7 +633,7 @@ proto_register_zbee_zcl_fan_control(void) }; /* ZCL Fan Control subtrees */ - static gint *ett[ZBEE_ZCL_FAN_CONTROL_NUM_ETT]; + static int *ett[ZBEE_ZCL_FAN_CONTROL_NUM_ETT]; ett[0] = &ett_zbee_zcl_fan_control; @@ -698,7 +698,7 @@ void proto_register_zbee_zcl_dehumidification_control(void); void proto_reg_handoff_zbee_zcl_dehumidification_control(void); /* Command Dissector Helpers */ -static void dissect_zcl_dehumidification_control_attr_data (proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr); +static void dissect_zcl_dehumidification_control_attr_data (proto_tree *tree, tvbuff_t *tvb, unsigned *offset, uint16_t attr_id, unsigned data_type, bool client_attr); /* Private functions prototype */ @@ -706,15 +706,15 @@ static void dissect_zcl_dehumidification_control_attr_data (proto_tree *tre /* Global Variables */ /*************************/ /* Initialize the protocol and registered fields */ -static int proto_zbee_zcl_dehumidification_control = -1; +static int proto_zbee_zcl_dehumidification_control; -static int hf_zbee_zcl_dehumidification_control_attr_id = -1; -static int hf_zbee_zcl_dehumidification_control_attr_rel_hum_mode = -1; -static int hf_zbee_zcl_dehumidification_control_attr_dehum_lockout = -1; -static int hf_zbee_zcl_dehumidification_control_attr_rel_hum_display = -1; +static int hf_zbee_zcl_dehumidification_control_attr_id; +static int hf_zbee_zcl_dehumidification_control_attr_rel_hum_mode; +static int hf_zbee_zcl_dehumidification_control_attr_dehum_lockout; +static int hf_zbee_zcl_dehumidification_control_attr_rel_hum_display; /* Initialize the subtree pointers */ -static gint ett_zbee_zcl_dehumidification_control = -1; +static int ett_zbee_zcl_dehumidification_control; /* Attributes */ static const value_string zbee_zcl_dehumidification_control_attr_names[] = { @@ -765,7 +765,7 @@ static const value_string zbee_zcl_dehumidification_control_rel_hum_display_name static int dissect_zbee_zcl_dehumidification_control(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void* data _U_) { - return tvb_captured_length(tvb);; + return tvb_captured_length(tvb); } /*dissect_zbee_zcl_dehumidification_control*/ @@ -780,7 +780,7 @@ dissect_zbee_zcl_dehumidification_control(tvbuff_t *tvb _U_, packet_info *pinfo *@param client_attr ZCL client */ void -dissect_zcl_dehumidification_control_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) +dissect_zcl_dehumidification_control_attr_data(proto_tree *tree, tvbuff_t *tvb, unsigned *offset, uint16_t attr_id, unsigned data_type, bool client_attr) { /* Dissect attribute data type and data */ switch (attr_id) { @@ -841,7 +841,7 @@ proto_register_zbee_zcl_dehumidification_control(void) }; /* ZCL Dehumidification Control subtrees */ - static gint *ett[ZBEE_ZCL_DEHUMIDIFICATION_CONTROL_NUM_ETT]; + static int *ett[ZBEE_ZCL_DEHUMIDIFICATION_CONTROL_NUM_ETT]; ett[0] = &ett_zbee_zcl_dehumidification_control; @@ -900,7 +900,7 @@ void proto_register_zbee_zcl_thermostat_ui_config(void); void proto_reg_handoff_zbee_zcl_thermostat_ui_config(void); /* Command Dissector Helpers */ -static void dissect_zcl_thermostat_ui_config_attr_data (proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr); +static void dissect_zcl_thermostat_ui_config_attr_data (proto_tree *tree, tvbuff_t *tvb, unsigned *offset, uint16_t attr_id, unsigned data_type, bool client_attr); /* Private functions prototype */ @@ -908,14 +908,14 @@ static void dissect_zcl_thermostat_ui_config_attr_data (proto_tree *tree, t /* Global Variables */ /*************************/ /* Initialize the protocol and registered fields */ -static int proto_zbee_zcl_thermostat_ui_config = -1; +static int proto_zbee_zcl_thermostat_ui_config; -static int hf_zbee_zcl_thermostat_ui_config_attr_id = -1; -static int hf_zbee_zcl_thermostat_ui_config_attr_temp_disp_mode = -1; -static int hf_zbee_zcl_thermostat_ui_config_attr_keypad_lockout = -1; +static int hf_zbee_zcl_thermostat_ui_config_attr_id; +static int hf_zbee_zcl_thermostat_ui_config_attr_temp_disp_mode; +static int hf_zbee_zcl_thermostat_ui_config_attr_keypad_lockout; /* Initialize the subtree pointers */ -static gint ett_zbee_zcl_thermostat_ui_config = -1; +static int ett_zbee_zcl_thermostat_ui_config; /* Attributes */ static const value_string zbee_zcl_thermostat_ui_config_attr_names[] = { @@ -972,7 +972,7 @@ dissect_zbee_zcl_thermostat_ui_config(tvbuff_t *tvb _U_, packet_info *pinfo _U_, *@param client_attr ZCL client */ void -dissect_zcl_thermostat_ui_config_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) +dissect_zcl_thermostat_ui_config_attr_data(proto_tree *tree, tvbuff_t *tvb, unsigned *offset, uint16_t attr_id, unsigned data_type, bool client_attr) { /* Dissect attribute data type and data */ switch (attr_id) { @@ -1019,7 +1019,7 @@ proto_register_zbee_zcl_thermostat_ui_config(void) }; /* ZCL Thermostat User Interface Configuration subtrees */ - static gint *ett[ZBEE_ZCL_THERMOSTAT_UI_CONFIG_NUM_ETT]; + static int *ett[ZBEE_ZCL_THERMOSTAT_UI_CONFIG_NUM_ETT]; ett[0] = &ett_zbee_zcl_thermostat_ui_config; /* Register the ZigBee ZCL Thermostat User Interface Configuration cluster protocol name and description */ |