diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-rdm.c | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-rdm.c')
| -rw-r--r-- | epan/dissectors/packet-rdm.c | 1530 |
1 files changed, 765 insertions, 765 deletions
diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c index 8f8f6608..55868557 100644 --- a/epan/dissectors/packet-rdm.c +++ b/epan/dissectors/packet-rdm.c @@ -818,299 +818,299 @@ static const value_string on_off_vals[] = { { 0, NULL }, }; -static int proto_rdm = -1; - -static int hf_rdm_sub_start_code = -1; -static int hf_rdm_message_length = -1; -static int hf_rdm_dest_uid = -1; -static int hf_rdm_src_uid = -1; -static int hf_rdm_transaction_number = -1; -static int hf_rdm_port_id = -1; -static int hf_rdm_response_type = -1; -static int hf_rdm_message_count = -1; -static int hf_rdm_sub_device = -1; -static int hf_rdm_mdb = -1; -static int hf_rdm_command_class = -1; -static int hf_rdm_parameter_id = -1; -static int hf_rdm_parameter_data_length = -1; -static int hf_rdm_parameter_data = -1; -static int hf_rdm_parameter_data_raw = -1; -static int hf_rdm_intron = -1; -static int hf_rdm_checksum = -1; -static int hf_rdm_checksum_status = -1; -static int hf_rdm_trailer = -1; - -static int hf_rdm_pd_ack_timer_estimated_response_time = -1; -static int hf_rdm_pd_ack_overflow_raw_data = -1; -static int hf_rdm_pd_nack_reason_code = -1; - -static int hf_rdm_pd_device_label = -1; - -static int hf_rdm_pd_manu_label = -1; - -static int hf_rdm_pd_dmx_start_address = -1; - -static int hf_rdm_pd_queued_message_status = -1; - -static int hf_rdm_pd_sensor_nr = -1; -static int hf_rdm_pd_sensor_type = -1; -static int hf_rdm_pd_sensor_unit = -1; -static int hf_rdm_pd_sensor_prefix = -1; -static int hf_rdm_pd_sensor_value_pres = -1; -static int hf_rdm_pd_sensor_value_low = -1; -static int hf_rdm_pd_sensor_value_high = -1; -static int hf_rdm_pd_sensor_value_rec = -1; - -static int hf_rdm_pd_sensor_range_min_value = -1; -static int hf_rdm_pd_sensor_range_max_value = -1; -static int hf_rdm_pd_sensor_normal_min_value = -1; -static int hf_rdm_pd_sensor_normal_max_value = -1; -static int hf_rdm_pd_sensor_recorded_value_support = -1; -static int hf_rdm_pd_sensor_description = -1; - -static int hf_rdm_pd_device_hours = -1; -static int hf_rdm_pd_lamp_hours = -1; -static int hf_rdm_pd_lamp_strikes = -1; - - -static int hf_rdm_pd_proto_vers = -1; -static int hf_rdm_pd_device_model_id = -1; -static int hf_rdm_pd_product_cat = -1; -static int hf_rdm_pd_software_vers_id = -1; -static int hf_rdm_pd_dmx_footprint = -1; -static int hf_rdm_pd_dmx_pers_current = -1; -static int hf_rdm_pd_dmx_pers_total = -1; -static int hf_rdm_pd_sub_device_count = -1; -static int hf_rdm_pd_sensor_count = -1; - -static int hf_rdm_pd_device_model_description = -1; - -static int hf_rdm_pd_disc_unique_branch_lb_uid = -1; -static int hf_rdm_pd_disc_unique_branch_ub_uid = -1; -static int hf_rdm_pd_disc_mute_control_field = -1; -static int hf_rdm_pd_disc_mute_binding_uid = -1; -static int hf_rdm_pd_disc_unmute_control_field = -1; -static int hf_rdm_pd_disc_unmute_binding_uid = -1; -static int hf_rdm_pd_proxied_devices_uid = -1; -static int hf_rdm_pd_proxied_device_count = -1; -static int hf_rdm_pd_proxied_device_list_change = -1; -static int hf_rdm_pd_real_time_clock_year = -1; -static int hf_rdm_pd_real_time_clock_month = -1; -static int hf_rdm_pd_real_time_clock_day = -1; -static int hf_rdm_pd_real_time_clock_hour = -1; -static int hf_rdm_pd_real_time_clock_minute = -1; -static int hf_rdm_pd_real_time_clock_second = -1; -static int hf_rdm_pd_lamp_state = -1; -static int hf_rdm_pd_lamp_on_mode = -1; -static int hf_rdm_pd_device_power_cycles = -1; -static int hf_rdm_pd_display_invert = -1; -static int hf_rdm_pd_display_level = -1; -static int hf_rdm_pd_pan_invert = -1; -static int hf_rdm_pd_tilt_invert = -1; -static int hf_rdm_pd_tilt_swap = -1; -static int hf_rdm_pd_selftest_nr = -1; -static int hf_rdm_pd_selftest_state = -1; -static int hf_rdm_pd_selftest_description = -1; -static int hf_rdm_pd_language_code = -1; -static int hf_rdm_pd_identify_device = -1; -static int hf_rdm_pd_identify_device_state = -1; -static int hf_rdm_pd_reset_device = -1; -static int hf_rdm_pd_power_state = -1; -static int hf_rdm_pd_capture_preset_scene_nr = -1; -static int hf_rdm_pd_capture_preset_up_fade_time = -1; -static int hf_rdm_pd_capture_preset_down_fade_time = -1; -static int hf_rdm_pd_capture_preset_wait_time = -1; -static int hf_rdm_pd_preset_playback_mode = -1; -static int hf_rdm_pd_preset_playback_level = -1; -static int hf_rdm_pd_parameter_id = -1; -static int hf_rdm_pd_parameter_pdl_size = -1; -static int hf_rdm_pd_parameter_data_type = -1; -static int hf_rdm_pd_parameter_cmd_class = -1; -static int hf_rdm_pd_parameter_type = -1; -static int hf_rdm_pd_parameter_unit = -1; -static int hf_rdm_pd_parameter_prefix = -1; -static int hf_rdm_pd_parameter_min_value = -1; -static int hf_rdm_pd_parameter_max_value = -1; -static int hf_rdm_pd_parameter_default_value = -1; -static int hf_rdm_pd_parameter_description = -1; -static int hf_rdm_pd_software_version_label = -1; -static int hf_rdm_pd_boot_software_version_id = -1; -static int hf_rdm_pd_boot_software_version_label = -1; -static int hf_rdm_pd_comms_status_short_msg = -1; -static int hf_rdm_pd_comms_status_len_mismatch = -1; -static int hf_rdm_pd_comms_status_csum_fail = -1; -static int hf_rdm_pd_status_messages_type = -1; -static int hf_rdm_pd_status_messages_sub_device_id = -1; -static int hf_rdm_pd_status_messages_id = -1; -static int hf_rdm_pd_status_messages_data_value_1 = -1; -static int hf_rdm_pd_status_messages_data_value_2 = -1; -static int hf_rdm_pd_status_id = -1; -static int hf_rdm_pd_status_id_description = -1; -static int hf_rdm_pd_sub_device_status_report_threshold_status_type = -1; -static int hf_rdm_pd_product_detail_id_list = -1; -static int hf_rdm_pd_factory_defaults = -1; -static int hf_rdm_pd_background_discovery_endpoint_id = -1; -static int hf_rdm_pd_background_discovery_enabled = -1; -static int hf_rdm_pd_background_queued_status_policy_current_policy = -1; -static int hf_rdm_pd_background_queued_status_policy_number_of_policies = -1; -static int hf_rdm_pd_background_queued_status_policy_description_policy = -1; -static int hf_rdm_pd_background_queued_status_policy_description_description = -1; -static int hf_rdm_pd_binding_control_fields_endpoint_id = -1; -static int hf_rdm_pd_binding_control_fields_uid = -1; -static int hf_rdm_pd_binding_control_fields_control_field = -1; -static int hf_rdm_pd_binding_control_fields_binding_uid = -1; -static int hf_rem_pd_broker_status_set_allowed = -1; -static int hf_rem_pd_broker_status_state = -1; -static int hf_rdm_pd_burn_in = -1; -static int hf_rdm_pd_component_scope_scope_slot = -1; -static int hf_rdm_pd_component_scope_scope_string = -1; -static int hf_rdm_pd_component_scope_scope_static_config_type = -1; -static int hf_rdm_pd_component_scope_scope_static_ipv4_address = -1; -static int hf_rdm_pd_component_scope_scope_static_ipv6_address = -1; -static int hf_rdm_pd_component_scope_scope_static_port = -1; -static int hf_rdm_pd_current_address_interface_identifier = -1; -static int hf_rdm_pd_current_address_ipv4_address = -1; -static int hf_rdm_pd_current_address_netmask = -1; -static int hf_rdm_pd_current_address_dhcp_status = -1; -static int hf_rdm_pd_curve_curve = -1; -static int hf_rdm_pd_curve_number_of_curves = -1; -static int hf_rdm_pd_curve_description_curve = -1; -static int hf_rdm_pd_curve_description_text = -1; -static int hf_rdm_pd_dhcp_mode_interface_identifier = -1; -static int hf_rdm_pd_dhcp_mode_enabled = -1; -static int hf_rdm_pd_dimmer_info_minimum_level_lower_limit = -1; -static int hf_rdm_pd_dimmer_info_minimum_level_upper_limit = -1; -static int hf_rdm_pd_dimmer_info_maximum_level_lower_limit = -1; -static int hf_rdm_pd_dimmer_info_maximum_level_upper_limit = -1; -static int hf_rdm_pd_dimmer_info_number_of_supported_curves = -1; -static int hf_rdm_pd_dimmer_info_levels_resolution = -1; -static int hf_rdm_pd_dimmer_info_minimum_level_split_levels_supported = -1; -static int hf_rdm_pd_discovery_state_endpoint_id = -1; -static int hf_rdm_pd_discovery_state_device_count = -1; -static int hf_rdm_pd_discovery_state_discovery_state = -1; -static int hf_rdm_pd_dmx_block_address_base_dmx_address = -1; -static int hf_rdm_pd_dmx_block_address_subdevice_footprint = -1; -static int hf_rdm_pd_dmx_fail_mode_scene_number = -1; -static int hf_rdm_pd_dmx_fail_mode_loss_of_signal_delay = -1; -static int hf_rdm_pd_dmx_fail_mode_hold_time = -1; -static int hf_rdm_pd_dmx_fail_mode_level = -1; -static int hf_rdm_pd_dmx_pers_nr = -1; -static int hf_rdm_pd_dmx_pers_count = -1; -static int hf_rdm_pd_dmx_pers_requested = -1; -static int hf_rdm_pd_dmx_pers_slots = -1; -static int hf_rdm_pd_dmx_pers_text = -1; -static int hf_rdm_pd_dmx_startup_mode_scene_number = -1; -static int hf_rdm_pd_dmx_startup_mode_loss_of_signal_delay = -1; -static int hf_rdm_pd_dmx_startup_mode_hold_time = -1; -static int hf_rdm_pd_dmx_startup_mode_level = -1; -static int hf_rdm_pd_dns_domain_name = -1; -static int hf_rdm_pd_dns_hostname = -1; -static int hf_rdm_pd_dns_ipv4_name_server_index = -1; -static int hf_rdm_pd_dns_ipv4_name_server_address = -1; -static int hf_rdm_pd_endpoint_label_endpoint_id = -1; -static int hf_rdm_pd_endpoint_label_label = -1; -static int hf_rdm_pd_endpoint_list_change_number = -1; -static int hf_rdm_pd_endpoint_list_endpoint_id = -1; -static int hf_rdm_pd_endpoint_list_endpoint_type = -1; -static int hf_rdm_pd_endpoint_list_change_change_number = -1; -static int hf_rdm_pd_endpoint_mode_endpoint_id = -1; -static int hf_rdm_pd_endpoint_mode_endpoint_mode = -1; -static int hf_rdm_pd_endpoint_responder_list_change_endpoint_id = -1; -static int hf_rdm_pd_endpoint_responder_list_change_change_number = -1; -static int hf_rdm_pd_endpoint_responders_endpoint_id = -1; -static int hf_rdm_pd_endpoint_responders_change_number = -1; -static int hf_rdm_pd_endpoint_responders_uid = -1; -static int hf_rdm_pd_endpoint_timing_endpoint_id = -1; -static int hf_rdm_pd_endpoint_timing_setting = -1; -static int hf_rdm_pd_endpoint_timing_number_of_settings = -1; -static int hf_rdm_pd_endpoint_timing_description_setting = -1; -static int hf_rdm_pd_endpoint_timing_description_description = -1; -static int hf_rdm_pd_endpoint_to_universe_endpoint_id = -1; -static int hf_rdm_pd_endpoint_to_universe_universe_number = -1; -static int hf_rdm_pd_hardware_address_type1_interface_identifier = -1; -static int hf_rdm_pd_hardware_address_type1_hardware_address = -1; -static int hf_rdm_pd_identify_endpoint_endpoint_id = -1; -static int hf_rdm_pd_identify_endpoint_identify_state = -1; -static int hf_rdm_pd_identify_mode = -1; -static int hf_rdm_pd_interface_apply_configuration_interface_identifier = -1; -static int hf_rdm_pd_interface_label_interface_identifier = -1; -static int hf_rdm_pd_interface_label_label = -1; -static int hf_rdm_pd_interface_release_dhcp_interface_identifier = -1; -static int hf_rdm_pd_interface_renew_dhcp_interface_identifier = -1; -static int hf_rdm_pd_ipv4_default_route_interface_identifier = -1; -static int hf_rdm_pd_ipv4_default_route_ipv4_default_route = -1; -static int hf_rdm_pd_list_interfaces_interface_identifier = -1; -static int hf_rdm_pd_list_interfaces_interface_hardware_type = -1; -static int hf_rdm_pd_lock_pin_pin_code = -1; -static int hf_rdm_pd_lock_pin_new_pin_code = -1; -static int hf_rdm_pd_lock_state_lock_state = -1; -static int hf_rdm_pd_lock_state_number_of_lock_states = -1; -static int hf_rdm_pd_lock_state_pin_code = -1; -static int hf_rdm_pd_lock_state_description_lock_state = -1; -static int hf_rdm_pd_lock_state_description_text = -1; -static int hf_rdm_pd_maximum_level_level = -1; -static int hf_rdm_pd_preset_mergemode = -1; -static int hf_rdm_pd_power_on_self_test = -1; -static int hf_rdm_pd_minimum_level_increasing = -1; -static int hf_rdm_pd_minimum_level_decreasing = -1; -static int hf_rdm_pd_minimum_level_on_below_minimum = -1; -static int hf_rdm_pd_modulation_frequency_modulation_frequency = -1; -static int hf_rdm_pd_modulation_frequency_number_of_modulation_frequencies = -1; -static int hf_rdm_pd_modulation_frequency_description_modulation_frequency = -1; -static int hf_rdm_pd_modulation_frequency_description_text = -1; -static int hf_rdm_pd_output_response_time_response_time = -1; -static int hf_rdm_pd_output_response_time_number_of_response_times = -1; -static int hf_rdm_pd_output_response_time_description_output_response_time = -1; -static int hf_rdm_pd_output_response_time_description_text = -1; -static int hf_rdm_pd_preset_info_level_field_supported = -1; -static int hf_rdm_pd_preset_info_preset_sequence_supported = -1; -static int hf_rdm_pd_preset_info_split_times_supported = -1; -static int hf_rdm_pd_preset_info_dmx_fail_infinite_delay_time_supported = -1; -static int hf_rdm_pd_preset_info_dmx_fail_infinite_hold_time_supported = -1; -static int hf_rdm_pd_preset_info_start_up_infinite_hold_time_supported = -1; -static int hf_rdm_pd_preset_info_maximum_scene_number = -1; -static int hf_rdm_pd_preset_info_minimum_preset_fade_time_supported = -1; -static int hf_rdm_pd_preset_info_maximum_preset_fade_time_supported = -1; -static int hf_rdm_pd_preset_info_minimum_preset_wait_time_supported = -1; -static int hf_rdm_pd_preset_info_maximum_preset_wait_time_supported = -1; -static int hf_rdm_pd_preset_info_minimum_dmx_fail_delay_time_supported = -1; -static int hf_rdm_pd_preset_info_maximum_dmx_fail_delay_time_supported = -1; -static int hf_rdm_pd_preset_info_minimum_dmx_fail_hold_time_supported = -1; -static int hf_rdm_pd_preset_info_maximum_dmx_fail_hold_time_supported = -1; -static int hf_rdm_pd_preset_info_minimum_start_up_delay_time_supported = -1; -static int hf_rdm_pd_preset_info_maximum_start_up_delay_time_supported = -1; -static int hf_rdm_pd_preset_info_minimum_start_up_hold_time_supported = -1; -static int hf_rdm_pd_preset_info_maximum_start_up_hold_time_supported = -1; -static int hf_rdm_pd_preset_status_scene_number = -1; -static int hf_rdm_pd_preset_status_up_fade_time = -1; -static int hf_rdm_pd_preset_status_down_fade_time = -1; -static int hf_rdm_pd_preset_status_wait_time = -1; -static int hf_rdm_pd_preset_status_programmed = -1; -static int hf_rdm_pd_preset_status_clear_preset = -1; -static int hf_rdm_pd_rdm_traffic_enable_endpoint_id = -1; -static int hf_rdm_pd_rdm_traffic_enable_rdm_enabled = -1; -static int hf_rdm_pd_search_domain_dns_domain_name = -1; -static int hf_rdm_pd_slot_offset = -1; -static int hf_rdm_pd_slot_type = -1; -static int hf_rdm_pd_slot_label_id = -1; -static int hf_rdm_pd_slot_nr = -1; -static int hf_rdm_pd_slot_description = -1; -static int hf_rdm_pd_slot_value = -1; -static int hf_rdm_pd_static_address_interface_identifier = -1; -static int hf_rdm_pd_static_address_ipv4_address = -1; -static int hf_rdm_pd_static_address_netmask = -1; -static int hf_rdm_pd_tcp_comms_status_scope_string = -1; -static int hf_rdm_pd_tcp_comms_status_broker_ipv4_address = -1; -static int hf_rdm_pd_tcp_comms_status_broker_ipv6_address = -1; -static int hf_rdm_pd_tcp_comms_status_broker_port = -1; -static int hf_rdm_pd_tcp_comms_status_unhealthy_tcp_events = -1; -static int hf_rdm_pd_zeroconf_mode_interface_identifier = -1; -static int hf_rdm_pd_zeroconf_mode_enabled = -1; -static int hf_rdm_pd_rec_value_support = -1; - -static int ett_rdm = -1; - -static expert_field ei_rdm_checksum = EI_INIT; +static int proto_rdm; + +static int hf_rdm_sub_start_code; +static int hf_rdm_message_length; +static int hf_rdm_dest_uid; +static int hf_rdm_src_uid; +static int hf_rdm_transaction_number; +static int hf_rdm_port_id; +static int hf_rdm_response_type; +static int hf_rdm_message_count; +static int hf_rdm_sub_device; +static int hf_rdm_mdb; +static int hf_rdm_command_class; +static int hf_rdm_parameter_id; +static int hf_rdm_parameter_data_length; +static int hf_rdm_parameter_data; +static int hf_rdm_parameter_data_raw; +static int hf_rdm_intron; +static int hf_rdm_checksum; +static int hf_rdm_checksum_status; +static int hf_rdm_trailer; + +static int hf_rdm_pd_ack_timer_estimated_response_time; +static int hf_rdm_pd_ack_overflow_raw_data; +static int hf_rdm_pd_nack_reason_code; + +static int hf_rdm_pd_device_label; + +static int hf_rdm_pd_manu_label; + +static int hf_rdm_pd_dmx_start_address; + +static int hf_rdm_pd_queued_message_status; + +static int hf_rdm_pd_sensor_nr; +static int hf_rdm_pd_sensor_type; +static int hf_rdm_pd_sensor_unit; +static int hf_rdm_pd_sensor_prefix; +static int hf_rdm_pd_sensor_value_pres; +static int hf_rdm_pd_sensor_value_low; +static int hf_rdm_pd_sensor_value_high; +static int hf_rdm_pd_sensor_value_rec; + +static int hf_rdm_pd_sensor_range_min_value; +static int hf_rdm_pd_sensor_range_max_value; +static int hf_rdm_pd_sensor_normal_min_value; +static int hf_rdm_pd_sensor_normal_max_value; +static int hf_rdm_pd_sensor_recorded_value_support; +static int hf_rdm_pd_sensor_description; + +static int hf_rdm_pd_device_hours; +static int hf_rdm_pd_lamp_hours; +static int hf_rdm_pd_lamp_strikes; + + +static int hf_rdm_pd_proto_vers; +static int hf_rdm_pd_device_model_id; +static int hf_rdm_pd_product_cat; +static int hf_rdm_pd_software_vers_id; +static int hf_rdm_pd_dmx_footprint; +static int hf_rdm_pd_dmx_pers_current; +static int hf_rdm_pd_dmx_pers_total; +static int hf_rdm_pd_sub_device_count; +static int hf_rdm_pd_sensor_count; + +static int hf_rdm_pd_device_model_description; + +static int hf_rdm_pd_disc_unique_branch_lb_uid; +static int hf_rdm_pd_disc_unique_branch_ub_uid; +static int hf_rdm_pd_disc_mute_control_field; +static int hf_rdm_pd_disc_mute_binding_uid; +static int hf_rdm_pd_disc_unmute_control_field; +static int hf_rdm_pd_disc_unmute_binding_uid; +static int hf_rdm_pd_proxied_devices_uid; +static int hf_rdm_pd_proxied_device_count; +static int hf_rdm_pd_proxied_device_list_change; +static int hf_rdm_pd_real_time_clock_year; +static int hf_rdm_pd_real_time_clock_month; +static int hf_rdm_pd_real_time_clock_day; +static int hf_rdm_pd_real_time_clock_hour; +static int hf_rdm_pd_real_time_clock_minute; +static int hf_rdm_pd_real_time_clock_second; +static int hf_rdm_pd_lamp_state; +static int hf_rdm_pd_lamp_on_mode; +static int hf_rdm_pd_device_power_cycles; +static int hf_rdm_pd_display_invert; +static int hf_rdm_pd_display_level; +static int hf_rdm_pd_pan_invert; +static int hf_rdm_pd_tilt_invert; +static int hf_rdm_pd_tilt_swap; +static int hf_rdm_pd_selftest_nr; +static int hf_rdm_pd_selftest_state; +static int hf_rdm_pd_selftest_description; +static int hf_rdm_pd_language_code; +static int hf_rdm_pd_identify_device; +static int hf_rdm_pd_identify_device_state; +static int hf_rdm_pd_reset_device; +static int hf_rdm_pd_power_state; +static int hf_rdm_pd_capture_preset_scene_nr; +static int hf_rdm_pd_capture_preset_up_fade_time; +static int hf_rdm_pd_capture_preset_down_fade_time; +static int hf_rdm_pd_capture_preset_wait_time; +static int hf_rdm_pd_preset_playback_mode; +static int hf_rdm_pd_preset_playback_level; +static int hf_rdm_pd_parameter_id; +static int hf_rdm_pd_parameter_pdl_size; +static int hf_rdm_pd_parameter_data_type; +static int hf_rdm_pd_parameter_cmd_class; +static int hf_rdm_pd_parameter_type; +static int hf_rdm_pd_parameter_unit; +static int hf_rdm_pd_parameter_prefix; +static int hf_rdm_pd_parameter_min_value; +static int hf_rdm_pd_parameter_max_value; +static int hf_rdm_pd_parameter_default_value; +static int hf_rdm_pd_parameter_description; +static int hf_rdm_pd_software_version_label; +static int hf_rdm_pd_boot_software_version_id; +static int hf_rdm_pd_boot_software_version_label; +static int hf_rdm_pd_comms_status_short_msg; +static int hf_rdm_pd_comms_status_len_mismatch; +static int hf_rdm_pd_comms_status_csum_fail; +static int hf_rdm_pd_status_messages_type; +static int hf_rdm_pd_status_messages_sub_device_id; +static int hf_rdm_pd_status_messages_id; +static int hf_rdm_pd_status_messages_data_value_1; +static int hf_rdm_pd_status_messages_data_value_2; +static int hf_rdm_pd_status_id; +static int hf_rdm_pd_status_id_description; +static int hf_rdm_pd_sub_device_status_report_threshold_status_type; +static int hf_rdm_pd_product_detail_id_list; +static int hf_rdm_pd_factory_defaults; +static int hf_rdm_pd_background_discovery_endpoint_id; +static int hf_rdm_pd_background_discovery_enabled; +static int hf_rdm_pd_background_queued_status_policy_current_policy; +static int hf_rdm_pd_background_queued_status_policy_number_of_policies; +static int hf_rdm_pd_background_queued_status_policy_description_policy; +static int hf_rdm_pd_background_queued_status_policy_description_description; +static int hf_rdm_pd_binding_control_fields_endpoint_id; +static int hf_rdm_pd_binding_control_fields_uid; +static int hf_rdm_pd_binding_control_fields_control_field; +static int hf_rdm_pd_binding_control_fields_binding_uid; +static int hf_rem_pd_broker_status_set_allowed; +static int hf_rem_pd_broker_status_state; +static int hf_rdm_pd_burn_in; +static int hf_rdm_pd_component_scope_scope_slot; +static int hf_rdm_pd_component_scope_scope_string; +static int hf_rdm_pd_component_scope_scope_static_config_type; +static int hf_rdm_pd_component_scope_scope_static_ipv4_address; +static int hf_rdm_pd_component_scope_scope_static_ipv6_address; +static int hf_rdm_pd_component_scope_scope_static_port; +static int hf_rdm_pd_current_address_interface_identifier; +static int hf_rdm_pd_current_address_ipv4_address; +static int hf_rdm_pd_current_address_netmask; +static int hf_rdm_pd_current_address_dhcp_status; +static int hf_rdm_pd_curve_curve; +static int hf_rdm_pd_curve_number_of_curves; +static int hf_rdm_pd_curve_description_curve; +static int hf_rdm_pd_curve_description_text; +static int hf_rdm_pd_dhcp_mode_interface_identifier; +static int hf_rdm_pd_dhcp_mode_enabled; +static int hf_rdm_pd_dimmer_info_minimum_level_lower_limit; +static int hf_rdm_pd_dimmer_info_minimum_level_upper_limit; +static int hf_rdm_pd_dimmer_info_maximum_level_lower_limit; +static int hf_rdm_pd_dimmer_info_maximum_level_upper_limit; +static int hf_rdm_pd_dimmer_info_number_of_supported_curves; +static int hf_rdm_pd_dimmer_info_levels_resolution; +static int hf_rdm_pd_dimmer_info_minimum_level_split_levels_supported; +static int hf_rdm_pd_discovery_state_endpoint_id; +static int hf_rdm_pd_discovery_state_device_count; +static int hf_rdm_pd_discovery_state_discovery_state; +static int hf_rdm_pd_dmx_block_address_base_dmx_address; +static int hf_rdm_pd_dmx_block_address_subdevice_footprint; +static int hf_rdm_pd_dmx_fail_mode_scene_number; +static int hf_rdm_pd_dmx_fail_mode_loss_of_signal_delay; +static int hf_rdm_pd_dmx_fail_mode_hold_time; +static int hf_rdm_pd_dmx_fail_mode_level; +static int hf_rdm_pd_dmx_pers_nr; +static int hf_rdm_pd_dmx_pers_count; +static int hf_rdm_pd_dmx_pers_requested; +static int hf_rdm_pd_dmx_pers_slots; +static int hf_rdm_pd_dmx_pers_text; +static int hf_rdm_pd_dmx_startup_mode_scene_number; +static int hf_rdm_pd_dmx_startup_mode_loss_of_signal_delay; +static int hf_rdm_pd_dmx_startup_mode_hold_time; +static int hf_rdm_pd_dmx_startup_mode_level; +static int hf_rdm_pd_dns_domain_name; +static int hf_rdm_pd_dns_hostname; +static int hf_rdm_pd_dns_ipv4_name_server_index; +static int hf_rdm_pd_dns_ipv4_name_server_address; +static int hf_rdm_pd_endpoint_label_endpoint_id; +static int hf_rdm_pd_endpoint_label_label; +static int hf_rdm_pd_endpoint_list_change_number; +static int hf_rdm_pd_endpoint_list_endpoint_id; +static int hf_rdm_pd_endpoint_list_endpoint_type; +static int hf_rdm_pd_endpoint_list_change_change_number; +static int hf_rdm_pd_endpoint_mode_endpoint_id; +static int hf_rdm_pd_endpoint_mode_endpoint_mode; +static int hf_rdm_pd_endpoint_responder_list_change_endpoint_id; +static int hf_rdm_pd_endpoint_responder_list_change_change_number; +static int hf_rdm_pd_endpoint_responders_endpoint_id; +static int hf_rdm_pd_endpoint_responders_change_number; +static int hf_rdm_pd_endpoint_responders_uid; +static int hf_rdm_pd_endpoint_timing_endpoint_id; +static int hf_rdm_pd_endpoint_timing_setting; +static int hf_rdm_pd_endpoint_timing_number_of_settings; +static int hf_rdm_pd_endpoint_timing_description_setting; +static int hf_rdm_pd_endpoint_timing_description_description; +static int hf_rdm_pd_endpoint_to_universe_endpoint_id; +static int hf_rdm_pd_endpoint_to_universe_universe_number; +static int hf_rdm_pd_hardware_address_type1_interface_identifier; +static int hf_rdm_pd_hardware_address_type1_hardware_address; +static int hf_rdm_pd_identify_endpoint_endpoint_id; +static int hf_rdm_pd_identify_endpoint_identify_state; +static int hf_rdm_pd_identify_mode; +static int hf_rdm_pd_interface_apply_configuration_interface_identifier; +static int hf_rdm_pd_interface_label_interface_identifier; +static int hf_rdm_pd_interface_label_label; +static int hf_rdm_pd_interface_release_dhcp_interface_identifier; +static int hf_rdm_pd_interface_renew_dhcp_interface_identifier; +static int hf_rdm_pd_ipv4_default_route_interface_identifier; +static int hf_rdm_pd_ipv4_default_route_ipv4_default_route; +static int hf_rdm_pd_list_interfaces_interface_identifier; +static int hf_rdm_pd_list_interfaces_interface_hardware_type; +static int hf_rdm_pd_lock_pin_pin_code; +static int hf_rdm_pd_lock_pin_new_pin_code; +static int hf_rdm_pd_lock_state_lock_state; +static int hf_rdm_pd_lock_state_number_of_lock_states; +static int hf_rdm_pd_lock_state_pin_code; +static int hf_rdm_pd_lock_state_description_lock_state; +static int hf_rdm_pd_lock_state_description_text; +static int hf_rdm_pd_maximum_level_level; +static int hf_rdm_pd_preset_mergemode; +static int hf_rdm_pd_power_on_self_test; +static int hf_rdm_pd_minimum_level_increasing; +static int hf_rdm_pd_minimum_level_decreasing; +static int hf_rdm_pd_minimum_level_on_below_minimum; +static int hf_rdm_pd_modulation_frequency_modulation_frequency; +static int hf_rdm_pd_modulation_frequency_number_of_modulation_frequencies; +static int hf_rdm_pd_modulation_frequency_description_modulation_frequency; +static int hf_rdm_pd_modulation_frequency_description_text; +static int hf_rdm_pd_output_response_time_response_time; +static int hf_rdm_pd_output_response_time_number_of_response_times; +static int hf_rdm_pd_output_response_time_description_output_response_time; +static int hf_rdm_pd_output_response_time_description_text; +static int hf_rdm_pd_preset_info_level_field_supported; +static int hf_rdm_pd_preset_info_preset_sequence_supported; +static int hf_rdm_pd_preset_info_split_times_supported; +static int hf_rdm_pd_preset_info_dmx_fail_infinite_delay_time_supported; +static int hf_rdm_pd_preset_info_dmx_fail_infinite_hold_time_supported; +static int hf_rdm_pd_preset_info_start_up_infinite_hold_time_supported; +static int hf_rdm_pd_preset_info_maximum_scene_number; +static int hf_rdm_pd_preset_info_minimum_preset_fade_time_supported; +static int hf_rdm_pd_preset_info_maximum_preset_fade_time_supported; +static int hf_rdm_pd_preset_info_minimum_preset_wait_time_supported; +static int hf_rdm_pd_preset_info_maximum_preset_wait_time_supported; +static int hf_rdm_pd_preset_info_minimum_dmx_fail_delay_time_supported; +static int hf_rdm_pd_preset_info_maximum_dmx_fail_delay_time_supported; +static int hf_rdm_pd_preset_info_minimum_dmx_fail_hold_time_supported; +static int hf_rdm_pd_preset_info_maximum_dmx_fail_hold_time_supported; +static int hf_rdm_pd_preset_info_minimum_start_up_delay_time_supported; +static int hf_rdm_pd_preset_info_maximum_start_up_delay_time_supported; +static int hf_rdm_pd_preset_info_minimum_start_up_hold_time_supported; +static int hf_rdm_pd_preset_info_maximum_start_up_hold_time_supported; +static int hf_rdm_pd_preset_status_scene_number; +static int hf_rdm_pd_preset_status_up_fade_time; +static int hf_rdm_pd_preset_status_down_fade_time; +static int hf_rdm_pd_preset_status_wait_time; +static int hf_rdm_pd_preset_status_programmed; +static int hf_rdm_pd_preset_status_clear_preset; +static int hf_rdm_pd_rdm_traffic_enable_endpoint_id; +static int hf_rdm_pd_rdm_traffic_enable_rdm_enabled; +static int hf_rdm_pd_search_domain_dns_domain_name; +static int hf_rdm_pd_slot_offset; +static int hf_rdm_pd_slot_type; +static int hf_rdm_pd_slot_label_id; +static int hf_rdm_pd_slot_nr; +static int hf_rdm_pd_slot_description; +static int hf_rdm_pd_slot_value; +static int hf_rdm_pd_static_address_interface_identifier; +static int hf_rdm_pd_static_address_ipv4_address; +static int hf_rdm_pd_static_address_netmask; +static int hf_rdm_pd_tcp_comms_status_scope_string; +static int hf_rdm_pd_tcp_comms_status_broker_ipv4_address; +static int hf_rdm_pd_tcp_comms_status_broker_ipv6_address; +static int hf_rdm_pd_tcp_comms_status_broker_port; +static int hf_rdm_pd_tcp_comms_status_unhealthy_tcp_events; +static int hf_rdm_pd_zeroconf_mode_interface_identifier; +static int hf_rdm_pd_zeroconf_mode_enabled; +static int hf_rdm_pd_rec_value_support; + +static int ett_rdm; + +static expert_field ei_rdm_checksum; /* begin manufacturer-specific constants and variables */ /* begin ETC */ @@ -1481,153 +1481,153 @@ static const value_string etc_model_id_vals[] = { { 0, NULL }, }; -static int hf_etc_parameter_id = -1; /* every manufacturer needs one of these */ -static int hf_etc_pd_parameter_id = -1; /* every manufacturer needs one of these */ -static int hf_etc_pd_device_model_id = -1; -static int hf_etc_pd_led_curve = -1; -static int hf_etc_pd_led_curve_description_curve = -1; -static int hf_etc_pd_led_curve_description_text = -1; -static int hf_etc_pd_led_strobe = -1; -static int hf_etc_pd_led_output_mode = -1; -static int hf_etc_pd_led_output_mode_description_mode = -1; -static int hf_etc_pd_led_output_mode_description_text = -1; -static int hf_etc_pd_led_red_shift = -1; -static int hf_etc_pd_led_white_point = -1; -static int hf_etc_pd_led_white_point_description_white_point = -1; -static int hf_etc_pd_led_white_point_description_text = -1; -static int hf_etc_pd_led_frequency = -1; -static int hf_etc_pd_dmx_data_loss_behavior = -1; -static int hf_etc_pd_dmx_data_loss_behavior_description_behavior = -1; -static int hf_etc_pd_dmx_data_loss_behavior_description_text = -1; -static int hf_etc_pd_led_plus_seven = -1; -static int hf_etc_pd_backlight_brightness = -1; -static int hf_etc_pd_backlight_timeout = -1; -static int hf_etc_pd_status_indicators = -1; -static int hf_etc_pd_overtemp_mode = -1; -static int hf_etc_pd_simple_setup_mode = -1; -static int hf_etc_pd_led_strobe_description_strobe = -1; -static int hf_etc_pd_led_strobe_description_text = -1; -static int hf_etc_pd_red_shift_description_red_shift = -1; -static int hf_etc_pd_red_shift_description_text = -1; -static int hf_etc_pd_plus_seven_description_plus_seven = -1; -static int hf_etc_pd_plus_seven_description_text = -1; -static int hf_etc_pd_backlight_timeout_description_timeout = -1; -static int hf_etc_pd_backlight_timeout_description_text = -1; -static int hf_etc_pd_simple_setup_mode_description_mode = -1; -static int hf_etc_pd_simple_setup_mode_description_text = -1; -static int hf_etc_pd_overtemp_mode_description_mode = -1; -static int hf_etc_pd_overtemp_mode_description_text = -1; -static int hf_etc_pd_led_requested_xy_x = -1; -static int hf_etc_pd_led_requested_xy_y = -1; -static int hf_etc_pd_led_current_xy_x = -1; -static int hf_etc_pd_led_current_xy_y = -1; -static int hf_etc_pd_current_pwm_led_number = -1; -static int hf_etc_pd_current_pwm_channel_duty_cycle = -1; -static int hf_etc_pd_tristimulus_led_number = -1; -static int hf_etc_pd_tristimulus_x = -1; -static int hf_etc_pd_tristimulus_y = -1; -static int hf_etc_pd_tristimulus_z = -1; -static int hf_etc_pd_led_information_led_number = -1; -static int hf_etc_pd_led_information_type = -1; -static int hf_etc_pd_led_information_dmx_control_channel = -1; -static int hf_etc_pd_led_information_drive_current = -1; -static int hf_etc_pd_led_information_gamut_polygon_order = -1; -static int hf_etc_pd_led_information_quantity = -1; -static int hf_etc_pd_preset_config_preset_number = -1; -static int hf_etc_pd_preset_config_fade_time = -1; -static int hf_etc_pd_preset_config_delay_time = -1; -static int hf_etc_pd_preset_config_hue = -1; -static int hf_etc_pd_preset_config_saturation = -1; -static int hf_etc_pd_preset_config_intensity = -1; -static int hf_etc_pd_preset_config_strobe = -1; -static int hf_etc_pd_sequence_playback_sequence_number = -1; -static int hf_etc_pd_sequence_config_sequence_number = -1; -static int hf_etc_pd_sequence_config_preset_steps = -1; -static int hf_etc_pd_sequence_config_preset_step = -1; -static int hf_etc_pd_sequence_config_step_link_times = -1; -static int hf_etc_pd_sequence_config_step_link_time = -1; -static int hf_etc_pd_sequence_config_rate = -1; -static int hf_etc_pd_sequence_config_end_state = -1; -static int hf_etc_pd_low_power_timeout = -1; -static int hf_etc_pd_low_power_timeout_description_timeout = -1; -static int hf_etc_pd_low_power_timeout_description_text = -1; -static int hf_etc_pd_led_enum_frequency = -1; -static int hf_etc_pd_led_enum_frequency_description_frequency = -1; -static int hf_etc_pd_led_enum_frequency_description_text = -1; -static int hf_etc_pd_rgbi_preset_config_preset_number = -1; -static int hf_etc_pd_rgbi_preset_config_fade_time = -1; -static int hf_etc_pd_rgbi_preset_config_delay_time = -1; -static int hf_etc_pd_rgbi_preset_config_red = -1; -static int hf_etc_pd_rgbi_preset_config_green = -1; -static int hf_etc_pd_rgbi_preset_config_blue = -1; -static int hf_etc_pd_rgbi_preset_config_intensity = -1; -static int hf_etc_pd_rgbi_preset_config_strobe = -1; -static int hf_etc_pd_cct_preset_config_preset_number = -1; -static int hf_etc_pd_cct_preset_config_fade_time = -1; -static int hf_etc_pd_cct_preset_config_delay_time = -1; -static int hf_etc_pd_cct_preset_config_white_point = -1; -static int hf_etc_pd_cct_preset_config_tint = -1; -static int hf_etc_pd_cct_preset_config_strobe = -1; -static int hf_etc_pd_cct_preset_config_intensity = -1; -static int hf_etc_pd_cct_preset_config_tone = -1; -static int hf_etc_pd_cct_preset_config_reserved = -1; -static int hf_etc_pd_supplementary_device_version_param_index = -1; -static int hf_etc_pd_supplementary_device_version_param_description = -1; -static int hf_etc_pd_power_command = -1; -static int hf_etc_pd_power_command_description_state = -1; -static int hf_etc_pd_power_command_description_text = -1; -static int hf_etc_pd_dali_short_address = -1; -static int hf_etc_pd_dali_group_membership = -1; -static int hf_etc_pd_auto_bind = -1; -static int hf_etc_pd_packet_delay = -1; -static int hf_etc_pd_has_enum_text_pid = -1; -static int hf_etc_pd_has_enum_text_true_false = -1; -static int hf_etc_pd_get_enum_text_pid = -1; -static int hf_etc_pd_get_enum_text_enum = -1; -static int hf_etc_pd_get_enum_text_description = -1; - -static int ett_etc_sequence_config_steps = -1; -static int ett_etc_sequence_config_times = -1; +static int hf_etc_parameter_id; /* every manufacturer needs one of these */ +static int hf_etc_pd_parameter_id; /* every manufacturer needs one of these */ +static int hf_etc_pd_device_model_id; +static int hf_etc_pd_led_curve; +static int hf_etc_pd_led_curve_description_curve; +static int hf_etc_pd_led_curve_description_text; +static int hf_etc_pd_led_strobe; +static int hf_etc_pd_led_output_mode; +static int hf_etc_pd_led_output_mode_description_mode; +static int hf_etc_pd_led_output_mode_description_text; +static int hf_etc_pd_led_red_shift; +static int hf_etc_pd_led_white_point; +static int hf_etc_pd_led_white_point_description_white_point; +static int hf_etc_pd_led_white_point_description_text; +static int hf_etc_pd_led_frequency; +static int hf_etc_pd_dmx_data_loss_behavior; +static int hf_etc_pd_dmx_data_loss_behavior_description_behavior; +static int hf_etc_pd_dmx_data_loss_behavior_description_text; +static int hf_etc_pd_led_plus_seven; +static int hf_etc_pd_backlight_brightness; +static int hf_etc_pd_backlight_timeout; +static int hf_etc_pd_status_indicators; +static int hf_etc_pd_overtemp_mode; +static int hf_etc_pd_simple_setup_mode; +static int hf_etc_pd_led_strobe_description_strobe; +static int hf_etc_pd_led_strobe_description_text; +static int hf_etc_pd_red_shift_description_red_shift; +static int hf_etc_pd_red_shift_description_text; +static int hf_etc_pd_plus_seven_description_plus_seven; +static int hf_etc_pd_plus_seven_description_text; +static int hf_etc_pd_backlight_timeout_description_timeout; +static int hf_etc_pd_backlight_timeout_description_text; +static int hf_etc_pd_simple_setup_mode_description_mode; +static int hf_etc_pd_simple_setup_mode_description_text; +static int hf_etc_pd_overtemp_mode_description_mode; +static int hf_etc_pd_overtemp_mode_description_text; +static int hf_etc_pd_led_requested_xy_x; +static int hf_etc_pd_led_requested_xy_y; +static int hf_etc_pd_led_current_xy_x; +static int hf_etc_pd_led_current_xy_y; +static int hf_etc_pd_current_pwm_led_number; +static int hf_etc_pd_current_pwm_channel_duty_cycle; +static int hf_etc_pd_tristimulus_led_number; +static int hf_etc_pd_tristimulus_x; +static int hf_etc_pd_tristimulus_y; +static int hf_etc_pd_tristimulus_z; +static int hf_etc_pd_led_information_led_number; +static int hf_etc_pd_led_information_type; +static int hf_etc_pd_led_information_dmx_control_channel; +static int hf_etc_pd_led_information_drive_current; +static int hf_etc_pd_led_information_gamut_polygon_order; +static int hf_etc_pd_led_information_quantity; +static int hf_etc_pd_preset_config_preset_number; +static int hf_etc_pd_preset_config_fade_time; +static int hf_etc_pd_preset_config_delay_time; +static int hf_etc_pd_preset_config_hue; +static int hf_etc_pd_preset_config_saturation; +static int hf_etc_pd_preset_config_intensity; +static int hf_etc_pd_preset_config_strobe; +static int hf_etc_pd_sequence_playback_sequence_number; +static int hf_etc_pd_sequence_config_sequence_number; +static int hf_etc_pd_sequence_config_preset_steps; +static int hf_etc_pd_sequence_config_preset_step; +static int hf_etc_pd_sequence_config_step_link_times; +static int hf_etc_pd_sequence_config_step_link_time; +static int hf_etc_pd_sequence_config_rate; +static int hf_etc_pd_sequence_config_end_state; +static int hf_etc_pd_low_power_timeout; +static int hf_etc_pd_low_power_timeout_description_timeout; +static int hf_etc_pd_low_power_timeout_description_text; +static int hf_etc_pd_led_enum_frequency; +static int hf_etc_pd_led_enum_frequency_description_frequency; +static int hf_etc_pd_led_enum_frequency_description_text; +static int hf_etc_pd_rgbi_preset_config_preset_number; +static int hf_etc_pd_rgbi_preset_config_fade_time; +static int hf_etc_pd_rgbi_preset_config_delay_time; +static int hf_etc_pd_rgbi_preset_config_red; +static int hf_etc_pd_rgbi_preset_config_green; +static int hf_etc_pd_rgbi_preset_config_blue; +static int hf_etc_pd_rgbi_preset_config_intensity; +static int hf_etc_pd_rgbi_preset_config_strobe; +static int hf_etc_pd_cct_preset_config_preset_number; +static int hf_etc_pd_cct_preset_config_fade_time; +static int hf_etc_pd_cct_preset_config_delay_time; +static int hf_etc_pd_cct_preset_config_white_point; +static int hf_etc_pd_cct_preset_config_tint; +static int hf_etc_pd_cct_preset_config_strobe; +static int hf_etc_pd_cct_preset_config_intensity; +static int hf_etc_pd_cct_preset_config_tone; +static int hf_etc_pd_cct_preset_config_reserved; +static int hf_etc_pd_supplementary_device_version_param_index; +static int hf_etc_pd_supplementary_device_version_param_description; +static int hf_etc_pd_power_command; +static int hf_etc_pd_power_command_description_state; +static int hf_etc_pd_power_command_description_text; +static int hf_etc_pd_dali_short_address; +static int hf_etc_pd_dali_group_membership; +static int hf_etc_pd_auto_bind; +static int hf_etc_pd_packet_delay; +static int hf_etc_pd_has_enum_text_pid; +static int hf_etc_pd_has_enum_text_true_false; +static int hf_etc_pd_get_enum_text_pid; +static int hf_etc_pd_get_enum_text_enum; +static int hf_etc_pd_get_enum_text_description; + +static int ett_etc_sequence_config_steps; +static int ett_etc_sequence_config_times; /* end ETC */ /* end manufacturer-specific constants and variables */ -static guint16 -rdm_checksum(tvbuff_t *tvb, guint length) +static uint16_t +rdm_checksum(tvbuff_t *tvb, unsigned length) { - guint16 sum = RDM_SC_RDM; - guint i; + uint16_t sum = RDM_SC_RDM; + unsigned i; for (i = 0; i < length; i++) - sum += tvb_get_guint8(tvb, i); + sum += tvb_get_uint8(tvb, i); return sum; } static void -rdm_proto_tree_add_numeric_item(proto_tree *tree, int hfindex, tvbuff_t *tvb, guint *offset_ptr, guint8 len) +rdm_proto_tree_add_numeric_item(proto_tree *tree, int hfindex, tvbuff_t *tvb, unsigned *offset_ptr, uint8_t len) { - guint offset = *offset_ptr; + unsigned offset = *offset_ptr; proto_tree_add_item(tree, hfindex, tvb, offset, len, ENC_BIG_ENDIAN); *offset_ptr += len; } static void -rdm_proto_tree_add_ascii_item(proto_tree *tree, int hfindex, tvbuff_t *tvb, guint *offset_ptr, gint len) +rdm_proto_tree_add_ascii_item(proto_tree *tree, int hfindex, tvbuff_t *tvb, unsigned *offset_ptr, int len) { - guint offset = *offset_ptr; + unsigned offset = *offset_ptr; proto_tree_add_item(tree, hfindex, tvb, offset, len, ENC_ASCII|ENC_NA); *offset_ptr += len; } static void -rdm_proto_tree_add_bytes_item(proto_tree *tree, int hfindex, tvbuff_t *tvb, guint *offset_ptr, gint len) +rdm_proto_tree_add_bytes_item(proto_tree *tree, int hfindex, tvbuff_t *tvb, unsigned *offset_ptr, int len) { - guint offset = *offset_ptr; + unsigned offset = *offset_ptr; proto_tree_add_item(tree, hfindex, tvb, offset, len, ENC_NA); *offset_ptr += len; } -static guint -dissect_rdm_pd_queued_message(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_queued_message(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -1638,8 +1638,8 @@ dissect_rdm_pd_queued_message(tvbuff_t *tvb, guint offset, proto_tree *tree, gui return offset; } -static guint -dissect_rdm_pd_dmx_start_address(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_dmx_start_address(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -1651,8 +1651,8 @@ dissect_rdm_pd_dmx_start_address(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_rdm_pd_device_info(tvbuff_t *tvb _U_, guint offset, proto_tree *tree _U_, guint8 cc, guint8 len _U_, guint16 device_manufacturer_id) +static unsigned +dissect_rdm_pd_device_info(tvbuff_t *tvb _U_, unsigned offset, proto_tree *tree _U_, uint8_t cc, uint8_t len _U_, uint16_t device_manufacturer_id) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -1680,8 +1680,8 @@ dissect_rdm_pd_device_info(tvbuff_t *tvb _U_, guint offset, proto_tree *tree _U_ } -static guint -dissect_rdm_pd_device_model_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_device_model_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -1693,8 +1693,8 @@ dissect_rdm_pd_device_model_description(tvbuff_t *tvb, guint offset, proto_tree } -static guint -dissect_rdm_pd_device_label(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_device_label(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -1707,8 +1707,8 @@ dissect_rdm_pd_device_label(tvbuff_t *tvb, guint offset, proto_tree *tree, guint } -static guint -dissect_rdm_pd_device_hours(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_device_hours(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -1721,8 +1721,8 @@ dissect_rdm_pd_device_hours(tvbuff_t *tvb, guint offset, proto_tree *tree, guint } -static guint -dissect_rdm_pd_lamp_hours(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_lamp_hours(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -1735,8 +1735,8 @@ dissect_rdm_pd_lamp_hours(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 } -static guint -dissect_rdm_pd_lamp_strikes(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_lamp_strikes(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -1749,8 +1749,8 @@ dissect_rdm_pd_lamp_strikes(tvbuff_t *tvb, guint offset, proto_tree *tree, guint } -static guint -dissect_rdm_pd_sensor_definition(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_sensor_definition(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -1774,10 +1774,10 @@ dissect_rdm_pd_sensor_definition(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_rdm_pd_sensor_value(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_sensor_value(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { - guint8 original_len = len; + uint8_t original_len = len; switch(cc) { case RDM_CC_GET_COMMAND: @@ -1805,8 +1805,8 @@ dissect_rdm_pd_sensor_value(tvbuff_t *tvb, guint offset, proto_tree *tree, guint return offset; } -static guint -dissect_rdm_pd_manufacturer_label(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_manufacturer_label(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -1817,8 +1817,8 @@ dissect_rdm_pd_manufacturer_label(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_rdm_pd_disc_unique_branch(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_disc_unique_branch(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_DISCOVERY_COMMAND: @@ -1830,8 +1830,8 @@ dissect_rdm_pd_disc_unique_branch(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_rdm_pd_disc_mute(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_disc_mute(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_DISCOVERY_COMMAND_RESPONSE: @@ -1845,8 +1845,8 @@ dissect_rdm_pd_disc_mute(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 c return offset; } -static guint -dissect_rdm_pd_disc_un_mute(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_disc_un_mute(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_DISCOVERY_COMMAND_RESPONSE: @@ -1860,8 +1860,8 @@ dissect_rdm_pd_disc_un_mute(tvbuff_t *tvb, guint offset, proto_tree *tree, guint return offset; } -static guint -dissect_rdm_pd_proxied_devices(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_proxied_devices(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -1875,8 +1875,8 @@ dissect_rdm_pd_proxied_devices(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_proxied_device_count(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_proxied_device_count(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -1888,8 +1888,8 @@ dissect_rdm_pd_proxied_device_count(tvbuff_t *tvb, guint offset, proto_tree *tre return offset; } -static guint -dissect_rdm_pd_comms_status(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_comms_status(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -1902,8 +1902,8 @@ dissect_rdm_pd_comms_status(tvbuff_t *tvb, guint offset, proto_tree *tree, guint return offset; } -static guint -dissect_rdm_pd_status_messages(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_status_messages(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -1925,8 +1925,8 @@ dissect_rdm_pd_status_messages(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_status_id_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_status_id_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -1941,14 +1941,14 @@ dissect_rdm_pd_status_id_description(tvbuff_t *tvb, guint offset, proto_tree *tr return offset; } -static guint -dissect_rdm_pd_clear_status_id(tvbuff_t *tvb _U_, guint offset, proto_tree *tree _U_, guint8 cc _U_, guint8 len _U_) +static unsigned +dissect_rdm_pd_clear_status_id(tvbuff_t *tvb _U_, unsigned offset, proto_tree *tree _U_, uint8_t cc _U_, uint8_t len _U_) { return offset; } -static guint -dissect_rdm_pd_sub_device_status_report_threshold(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_sub_device_status_report_threshold(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -1961,7 +1961,7 @@ dissect_rdm_pd_sub_device_status_report_threshold(tvbuff_t *tvb, guint offset, p } static void -add_param_id_to_tree(guint16 param_id, proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 device_manufacturer_id) +add_param_id_to_tree(uint16_t param_id, proto_tree *tree, tvbuff_t *tvb, unsigned *offset, uint16_t device_manufacturer_id) { if (param_id < 0x8000) { rdm_proto_tree_add_numeric_item(tree, hf_rdm_pd_parameter_id, tvb, offset, 2); @@ -1977,10 +1977,10 @@ add_param_id_to_tree(guint16 param_id, proto_tree *tree, tvbuff_t *tvb, guint *o } } -static guint -dissect_rdm_pd_supported_parameters(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len, guint16 device_manufacturer_id) +static unsigned +dissect_rdm_pd_supported_parameters(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len, uint16_t device_manufacturer_id) { - guint16 param_id; + uint16_t param_id; switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -1995,10 +1995,10 @@ dissect_rdm_pd_supported_parameters(tvbuff_t *tvb, guint offset, proto_tree *tre return offset; } -static guint -dissect_rdm_pd_parameter_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len, guint16 device_manufacturer_id) +static unsigned +dissect_rdm_pd_parameter_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len, uint16_t device_manufacturer_id) { - guint16 param_id; + uint16_t param_id; switch(cc) { case RDM_CC_GET_COMMAND: @@ -2025,8 +2025,8 @@ dissect_rdm_pd_parameter_description(tvbuff_t *tvb, guint offset, proto_tree *tr return offset; } -static guint -dissect_rdm_pd_product_detail_id_list(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_product_detail_id_list(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2040,8 +2040,8 @@ dissect_rdm_pd_product_detail_id_list(tvbuff_t *tvb, guint offset, proto_tree *t return offset; } -static guint -dissect_rdm_pd_factory_defaults(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_factory_defaults(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2052,8 +2052,8 @@ dissect_rdm_pd_factory_defaults(tvbuff_t *tvb, guint offset, proto_tree *tree, g return offset; } -static guint -dissect_rdm_pd_language_capabilities(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_language_capabilities(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2067,8 +2067,8 @@ dissect_rdm_pd_language_capabilities(tvbuff_t *tvb, guint offset, proto_tree *tr return offset; } -static guint -dissect_rdm_pd_language(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_language(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2080,8 +2080,8 @@ dissect_rdm_pd_language(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc return offset; } -static guint -dissect_rdm_pd_software_version_label(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_software_version_label(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2092,8 +2092,8 @@ dissect_rdm_pd_software_version_label(tvbuff_t *tvb, guint offset, proto_tree *t return offset; } -static guint -dissect_rdm_pd_boot_software_version_id(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_boot_software_version_id(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2104,8 +2104,8 @@ dissect_rdm_pd_boot_software_version_id(tvbuff_t *tvb, guint offset, proto_tree return offset; } -static guint -dissect_rdm_pd_boot_software_version_label(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_boot_software_version_label(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2116,8 +2116,8 @@ dissect_rdm_pd_boot_software_version_label(tvbuff_t *tvb, guint offset, proto_tr return offset; } -static guint -dissect_rdm_pd_dmx_personality(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_dmx_personality(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2133,8 +2133,8 @@ dissect_rdm_pd_dmx_personality(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_dmx_personality_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_dmx_personality_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2151,8 +2151,8 @@ dissect_rdm_pd_dmx_personality_description(tvbuff_t *tvb, guint offset, proto_tr return offset; } -static guint -dissect_rdm_pd_slot_info(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_slot_info(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2168,8 +2168,8 @@ dissect_rdm_pd_slot_info(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 c return offset; } -static guint -dissect_rdm_pd_slot_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_slot_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2185,8 +2185,8 @@ dissect_rdm_pd_slot_description(tvbuff_t *tvb, guint offset, proto_tree *tree, g return offset; } -static guint -dissect_rdm_pd_slot_value(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_slot_value(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2201,8 +2201,8 @@ dissect_rdm_pd_slot_value(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint -dissect_rdm_pd_dmx_block_address(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_dmx_block_address(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2218,8 +2218,8 @@ dissect_rdm_pd_dmx_block_address(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_rdm_pd_dmx_fail_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_dmx_fail_mode(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2234,8 +2234,8 @@ dissect_rdm_pd_dmx_fail_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_rdm_pd_dmx_startup_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_dmx_startup_mode(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2250,8 +2250,8 @@ dissect_rdm_pd_dmx_startup_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, g return offset; } -static guint -dissect_rdm_pd_record_sensors(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_record_sensors(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2275,8 +2275,8 @@ dissect_rdm_pd_record_sensors(tvbuff_t *tvb, guint offset, proto_tree *tree, gui return offset; } -static guint -dissect_rdm_pd_dimmer_info(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_dimmer_info(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2293,8 +2293,8 @@ dissect_rdm_pd_dimmer_info(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint -dissect_rdm_pd_minimum_level(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_minimum_level(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2308,8 +2308,8 @@ dissect_rdm_pd_minimum_level(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_rdm_pd_maximum_level(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_maximum_level(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2321,8 +2321,8 @@ dissect_rdm_pd_maximum_level(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_rdm_pd_curve(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_curve(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2338,8 +2338,8 @@ dissect_rdm_pd_curve(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) return offset; } -static guint -dissect_rdm_pd_curve_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_curve_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2355,8 +2355,8 @@ dissect_rdm_pd_curve_description(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_rdm_pd_output_response_time(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_output_response_time(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2372,8 +2372,8 @@ dissect_rdm_pd_output_response_time(tvbuff_t *tvb, guint offset, proto_tree *tre return offset; } -static guint -dissect_rdm_pd_output_response_time_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_output_response_time_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2389,8 +2389,8 @@ dissect_rdm_pd_output_response_time_description(tvbuff_t *tvb, guint offset, pro return offset; } -static guint -dissect_rdm_pd_modulation_frequency(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_modulation_frequency(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2406,8 +2406,8 @@ dissect_rdm_pd_modulation_frequency(tvbuff_t *tvb, guint offset, proto_tree *tre return offset; } -static guint -dissect_rdm_pd_modulation_frequency_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_modulation_frequency_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2423,8 +2423,8 @@ dissect_rdm_pd_modulation_frequency_description(tvbuff_t *tvb, guint offset, pro return offset; } -static guint -dissect_rdm_pd_lamp_state(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_lamp_state(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2436,8 +2436,8 @@ dissect_rdm_pd_lamp_state(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint -dissect_rdm_pd_lamp_on_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_lamp_on_mode(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2449,8 +2449,8 @@ dissect_rdm_pd_lamp_on_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint return offset; } -static guint -dissect_rdm_pd_device_power_cycles(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_device_power_cycles(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2462,8 +2462,8 @@ dissect_rdm_pd_device_power_cycles(tvbuff_t *tvb, guint offset, proto_tree *tree return offset; } -static guint -dissect_rdm_pd_burn_in(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_burn_in(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2475,8 +2475,8 @@ dissect_rdm_pd_burn_in(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) return offset; } -static guint -dissect_rdm_pd_display_invert(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_display_invert(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2488,8 +2488,8 @@ dissect_rdm_pd_display_invert(tvbuff_t *tvb, guint offset, proto_tree *tree, gui return offset; } -static guint -dissect_rdm_pd_display_level(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_display_level(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2501,8 +2501,8 @@ dissect_rdm_pd_display_level(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_rdm_pd_pan_invert(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_pan_invert(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2514,8 +2514,8 @@ dissect_rdm_pd_pan_invert(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint -dissect_rdm_pd_tilt_invert(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_tilt_invert(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2527,8 +2527,8 @@ dissect_rdm_pd_tilt_invert(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint -dissect_rdm_pd_pan_tilt_swap(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_pan_tilt_swap(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2540,8 +2540,8 @@ dissect_rdm_pd_pan_tilt_swap(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_rdm_pd_real_time_clock(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_real_time_clock(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2558,8 +2558,8 @@ dissect_rdm_pd_real_time_clock(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_lock_pin(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_lock_pin(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2575,8 +2575,8 @@ dissect_rdm_pd_lock_pin(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc return offset; } -static guint -dissect_rdm_pd_lock_state(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_lock_state(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2593,8 +2593,8 @@ dissect_rdm_pd_lock_state(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint -dissect_rdm_pd_lock_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_lock_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2610,8 +2610,8 @@ dissect_rdm_pd_lock_description(tvbuff_t *tvb, guint offset, proto_tree *tree, g return offset; } -static guint -dissect_rdm_pd_list_interfaces(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_list_interfaces(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2626,8 +2626,8 @@ dissect_rdm_pd_list_interfaces(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_interface_label(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_interface_label(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2642,8 +2642,8 @@ dissect_rdm_pd_interface_label(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_hardware_address_type1(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_hardware_address_type1(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2658,8 +2658,8 @@ dissect_rdm_pd_hardware_address_type1(tvbuff_t *tvb, guint offset, proto_tree *t return offset; } -static guint -dissect_rdm_pd_dhcp_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_dhcp_mode(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2675,8 +2675,8 @@ dissect_rdm_pd_dhcp_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 c return offset; } -static guint -dissect_rdm_pd_zeroconf_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_zeroconf_mode(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2692,8 +2692,8 @@ dissect_rdm_pd_zeroconf_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_rdm_pd_current_address(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_current_address(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2710,8 +2710,8 @@ dissect_rdm_pd_current_address(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_static_address(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_static_address(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2728,8 +2728,8 @@ dissect_rdm_pd_static_address(tvbuff_t *tvb, guint offset, proto_tree *tree, gui return offset; } -static guint -dissect_rdm_pd_interface_renew_dhcp(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_interface_renew_dhcp(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2740,8 +2740,8 @@ dissect_rdm_pd_interface_renew_dhcp(tvbuff_t *tvb, guint offset, proto_tree *tre return offset; } -static guint -dissect_rdm_pd_interface_release_dhcp(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_interface_release_dhcp(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2752,8 +2752,8 @@ dissect_rdm_pd_interface_release_dhcp(tvbuff_t *tvb, guint offset, proto_tree *t return offset; } -static guint -dissect_rdm_pd_interface_apply_configuration(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_interface_apply_configuration(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2764,8 +2764,8 @@ dissect_rdm_pd_interface_apply_configuration(tvbuff_t *tvb, guint offset, proto_ return offset; } -static guint -dissect_rdm_pd_ipv4_default_route(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_ipv4_default_route(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2778,8 +2778,8 @@ dissect_rdm_pd_ipv4_default_route(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_rdm_pd_dns_ipv4_name_server(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_dns_ipv4_name_server(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2795,8 +2795,8 @@ dissect_rdm_pd_dns_ipv4_name_server(tvbuff_t *tvb, guint offset, proto_tree *tre return offset; } -static guint -dissect_rdm_pd_dns_hostname(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_dns_hostname(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2808,8 +2808,8 @@ dissect_rdm_pd_dns_hostname(tvbuff_t *tvb, guint offset, proto_tree *tree, guint return offset; } -static guint -dissect_rdm_pd_dns_domain_name(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_dns_domain_name(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2821,8 +2821,8 @@ dissect_rdm_pd_dns_domain_name(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_identify_device(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_identify_device(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2837,8 +2837,8 @@ dissect_rdm_pd_identify_device(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_reset_device(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_reset_device(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2849,8 +2849,8 @@ dissect_rdm_pd_reset_device(tvbuff_t *tvb, guint offset, proto_tree *tree, guint return offset; } -static guint -dissect_rdm_pd_power_state(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_power_state(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2862,8 +2862,8 @@ dissect_rdm_pd_power_state(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint -dissect_rdm_pd_perform_selftest(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_perform_selftest(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2878,8 +2878,8 @@ dissect_rdm_pd_perform_selftest(tvbuff_t *tvb, guint offset, proto_tree *tree, g return offset; } -static guint -dissect_rdm_pd_self_test_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_self_test_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2895,8 +2895,8 @@ dissect_rdm_pd_self_test_description(tvbuff_t *tvb, guint offset, proto_tree *tr return offset; } -static guint -dissect_rdm_pd_capture_preset(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_capture_preset(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2910,8 +2910,8 @@ dissect_rdm_pd_capture_preset(tvbuff_t *tvb, guint offset, proto_tree *tree, gui return offset; } -static guint -dissect_rdm_pd_preset_playback(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len _U_) +static unsigned +dissect_rdm_pd_preset_playback(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len _U_) { switch(cc) { case RDM_CC_SET_COMMAND: @@ -2924,8 +2924,8 @@ dissect_rdm_pd_preset_playback(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_identify_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_identify_mode(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2937,8 +2937,8 @@ dissect_rdm_pd_identify_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_rdm_pd_preset_info(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_preset_info(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -2967,8 +2967,8 @@ dissect_rdm_pd_preset_info(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint -dissect_rdm_pd_preset_status(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_preset_status(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -2993,8 +2993,8 @@ dissect_rdm_pd_preset_status(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_rdm_pd_preset_mergemode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_preset_mergemode(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3006,8 +3006,8 @@ dissect_rdm_pd_preset_mergemode(tvbuff_t *tvb, guint offset, proto_tree *tree, g return offset; } -static guint -dissect_rdm_pd_power_on_self_test(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_power_on_self_test(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3019,8 +3019,8 @@ dissect_rdm_pd_power_on_self_test(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_rdm_pd_background_queued_status_policy(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_background_queued_status_policy(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3035,8 +3035,8 @@ dissect_rdm_pd_background_queued_status_policy(tvbuff_t *tvb, guint offset, prot return offset; } -static guint -dissect_rdm_pd_background_queued_status_policy_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_background_queued_status_policy_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3051,8 +3051,8 @@ dissect_rdm_pd_background_queued_status_policy_description(tvbuff_t *tvb, guint return offset; } -static guint -dissect_rdm_pd_endpoint_list(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_endpoint_list(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3069,8 +3069,8 @@ dissect_rdm_pd_endpoint_list(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_rdm_pd_search_domain(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_search_domain(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3081,8 +3081,8 @@ dissect_rdm_pd_search_domain(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_rdm_pd_endpoint_to_universe(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_endpoint_to_universe(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3099,8 +3099,8 @@ dissect_rdm_pd_endpoint_to_universe(tvbuff_t *tvb, guint offset, proto_tree *tre return offset; } -static guint -dissect_rdm_pd_rdm_traffic_enable(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_rdm_traffic_enable(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3116,8 +3116,8 @@ dissect_rdm_pd_rdm_traffic_enable(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_rdm_pd_endpoint_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_endpoint_mode(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3134,8 +3134,8 @@ dissect_rdm_pd_endpoint_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_rdm_pd_endpoint_label(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_endpoint_label(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3152,8 +3152,8 @@ dissect_rdm_pd_endpoint_label(tvbuff_t *tvb, guint offset, proto_tree *tree, gui return offset; } -static guint -dissect_rdm_pd_discovery_state(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_discovery_state(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3174,8 +3174,8 @@ dissect_rdm_pd_discovery_state(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_endpoint_timing(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_endpoint_timing(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3196,8 +3196,8 @@ dissect_rdm_pd_endpoint_timing(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_endpoint_timing_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_endpoint_timing_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3212,8 +3212,8 @@ dissect_rdm_pd_endpoint_timing_description(tvbuff_t *tvb, guint offset, proto_tr return offset; } -static guint -dissect_rdm_pd_binding_control_fields(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_binding_control_fields(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3231,8 +3231,8 @@ dissect_rdm_pd_binding_control_fields(tvbuff_t *tvb, guint offset, proto_tree *t return offset; } -static guint -dissect_rdm_pd_identify_endpoint(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_identify_endpoint(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3249,8 +3249,8 @@ dissect_rdm_pd_identify_endpoint(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_rdm_pd_background_discovery(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_background_discovery(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3267,8 +3267,8 @@ dissect_rdm_pd_background_discovery(tvbuff_t *tvb, guint offset, proto_tree *tre return offset; } -static guint -dissect_rdm_pd_endpoint_responder_list_change(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_endpoint_responder_list_change(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3283,8 +3283,8 @@ dissect_rdm_pd_endpoint_responder_list_change(tvbuff_t *tvb, guint offset, proto return offset; } -static guint -dissect_rdm_pd_endpoint_responders(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_endpoint_responders(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3304,8 +3304,8 @@ dissect_rdm_pd_endpoint_responders(tvbuff_t *tvb, guint offset, proto_tree *tree return offset; } -static guint -dissect_rdm_pd_tcp_comms_status(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_rdm_pd_tcp_comms_status(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3326,8 +3326,8 @@ dissect_rdm_pd_tcp_comms_status(tvbuff_t *tvb, guint offset, proto_tree *tree, g return offset; } -static guint -dissect_rdm_pd_endpoint_list_change(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_endpoint_list_change(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3338,8 +3338,8 @@ dissect_rdm_pd_endpoint_list_change(tvbuff_t *tvb, guint offset, proto_tree *tre return offset; } -static guint -dissect_rdm_pd_component_scope(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_component_scope(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3359,8 +3359,8 @@ dissect_rdm_pd_component_scope(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_rdm_pd_broker_status(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_rdm_pd_broker_status(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3375,8 +3375,8 @@ dissect_rdm_pd_broker_status(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_etc_pd_led_curve(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_led_curve(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3388,8 +3388,8 @@ dissect_etc_pd_led_curve(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 c return offset; } -static guint -dissect_etc_pd_led_curve_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_led_curve_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3404,8 +3404,8 @@ dissect_etc_pd_led_curve_description(tvbuff_t *tvb, guint offset, proto_tree *tr return offset; } -static guint -dissect_etc_pd_led_strobe(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_led_strobe(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3417,8 +3417,8 @@ dissect_etc_pd_led_strobe(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint -dissect_etc_pd_led_output_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_led_output_mode(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3430,8 +3430,8 @@ dissect_etc_pd_led_output_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_etc_pd_led_output_mode_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_led_output_mode_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3446,8 +3446,8 @@ dissect_etc_pd_led_output_mode_description(tvbuff_t *tvb, guint offset, proto_tr return offset; } -static guint -dissect_etc_pd_led_red_shift(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_led_red_shift(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3459,8 +3459,8 @@ dissect_etc_pd_led_red_shift(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_etc_pd_led_white_point(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_led_white_point(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3472,8 +3472,8 @@ dissect_etc_pd_led_white_point(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_etc_pd_led_white_point_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_led_white_point_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3488,8 +3488,8 @@ dissect_etc_pd_led_white_point_description(tvbuff_t *tvb, guint offset, proto_tr return offset; } -static guint -dissect_etc_pd_led_frequency(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_led_frequency(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3501,8 +3501,8 @@ dissect_etc_pd_led_frequency(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_etc_pd_dmx_data_loss_behavior(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_dmx_data_loss_behavior(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3514,8 +3514,8 @@ dissect_etc_pd_dmx_data_loss_behavior(tvbuff_t *tvb, guint offset, proto_tree *t return offset; } -static guint -dissect_etc_pd_dmx_data_loss_behavior_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_dmx_data_loss_behavior_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3530,8 +3530,8 @@ dissect_etc_pd_dmx_data_loss_behavior_description(tvbuff_t *tvb, guint offset, p return offset; } -static guint -dissect_etc_pd_led_plus_seven(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_led_plus_seven(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3543,8 +3543,8 @@ dissect_etc_pd_led_plus_seven(tvbuff_t *tvb, guint offset, proto_tree *tree, gui return offset; } -static guint -dissect_etc_pd_backlight_brightness(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_backlight_brightness(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3556,8 +3556,8 @@ dissect_etc_pd_backlight_brightness(tvbuff_t *tvb, guint offset, proto_tree *tre return offset; } -static guint -dissect_etc_pd_backlight_timeout(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_backlight_timeout(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3569,8 +3569,8 @@ dissect_etc_pd_backlight_timeout(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_etc_pd_status_indicators(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_status_indicators(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3582,15 +3582,15 @@ dissect_etc_pd_status_indicators(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_etc_pd_recalibrate_fixture(guint offset) +static unsigned +dissect_etc_pd_recalibrate_fixture(unsigned offset) { /* set-only, no data */ return offset; } -static guint -dissect_etc_pd_overtemp_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_overtemp_mode(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3602,8 +3602,8 @@ dissect_etc_pd_overtemp_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_etc_pd_simple_setup_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_simple_setup_mode(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3615,8 +3615,8 @@ dissect_etc_pd_simple_setup_mode(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_etc_pd_led_strobe_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_led_strobe_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3631,8 +3631,8 @@ dissect_etc_pd_led_strobe_description(tvbuff_t *tvb, guint offset, proto_tree *t return offset; } -static guint -dissect_etc_pd_red_shift_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_red_shift_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3647,8 +3647,8 @@ dissect_etc_pd_red_shift_description(tvbuff_t *tvb, guint offset, proto_tree *tr return offset; } -static guint -dissect_etc_pd_plus_seven_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_plus_seven_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3663,8 +3663,8 @@ dissect_etc_pd_plus_seven_description(tvbuff_t *tvb, guint offset, proto_tree *t return offset; } -static guint -dissect_etc_pd_backlight_timeout_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_backlight_timeout_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3679,8 +3679,8 @@ dissect_etc_pd_backlight_timeout_description(tvbuff_t *tvb, guint offset, proto_ return offset; } -static guint -dissect_etc_pd_simple_setup_mode_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_simple_setup_mode_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3695,8 +3695,8 @@ dissect_etc_pd_simple_setup_mode_description(tvbuff_t *tvb, guint offset, proto_ return offset; } -static guint -dissect_etc_pd_overtemp_mode_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_overtemp_mode_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3711,8 +3711,8 @@ dissect_etc_pd_overtemp_mode_description(tvbuff_t *tvb, guint offset, proto_tree return offset; } -static guint -dissect_etc_pd_led_requested_xy(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_led_requested_xy(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3724,8 +3724,8 @@ dissect_etc_pd_led_requested_xy(tvbuff_t *tvb, guint offset, proto_tree *tree, g return offset; } -static guint -dissect_etc_pd_led_current_xy(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_led_current_xy(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3737,8 +3737,8 @@ dissect_etc_pd_led_current_xy(tvbuff_t *tvb, guint offset, proto_tree *tree, gui return offset; } -static guint -dissect_etc_pd_current_pwm(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_current_pwm(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3753,8 +3753,8 @@ dissect_etc_pd_current_pwm(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint -dissect_etc_pd_tristimulus(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_tristimulus(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3771,8 +3771,8 @@ dissect_etc_pd_tristimulus(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint -dissect_etc_pd_led_information(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_led_information(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3791,8 +3791,8 @@ dissect_etc_pd_led_information(tvbuff_t *tvb, guint offset, proto_tree *tree, gu return offset; } -static guint -dissect_etc_pd_preset_config(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_preset_config(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3813,8 +3813,8 @@ dissect_etc_pd_preset_config(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_etc_pd_sequence_playback(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_sequence_playback(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3826,10 +3826,10 @@ dissect_etc_pd_sequence_playback(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_etc_pd_sequence_config(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_sequence_config(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { - guint i; + unsigned i; proto_tree *preset_steps_tree, *preset_steps_sub_item; proto_tree *step_link_times_tree, *step_link_times_sub_item; @@ -3862,8 +3862,8 @@ dissect_etc_pd_sequence_config(tvbuff_t *tvb, guint offset, proto_tree *tree, gu } -static guint -dissect_etc_pd_low_power_timeout(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_low_power_timeout(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3875,8 +3875,8 @@ dissect_etc_pd_low_power_timeout(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_etc_pd_low_power_timeout_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_low_power_timeout_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3891,8 +3891,8 @@ dissect_etc_pd_low_power_timeout_description(tvbuff_t *tvb, guint offset, proto_ return offset; } -static guint -dissect_etc_pd_led_enum_frequency(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_led_enum_frequency(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3904,8 +3904,8 @@ dissect_etc_pd_led_enum_frequency(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_etc_pd_led_enum_frequency_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_led_enum_frequency_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3920,8 +3920,8 @@ dissect_etc_pd_led_enum_frequency_description(tvbuff_t *tvb, guint offset, proto return offset; } -static guint -dissect_etc_pd_rgbi_preset_config(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_rgbi_preset_config(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3943,8 +3943,8 @@ dissect_etc_pd_rgbi_preset_config(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_etc_pd_cct_preset_config(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_cct_preset_config(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3967,8 +3967,8 @@ dissect_etc_pd_cct_preset_config(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_etc_pd_supplementary_device_version(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_supplementary_device_version(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -3983,8 +3983,8 @@ dissect_etc_pd_supplementary_device_version(tvbuff_t *tvb, guint offset, proto_t return offset; } -static guint -dissect_etc_pd_power_command(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_power_command(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -3996,8 +3996,8 @@ dissect_etc_pd_power_command(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_etc_pd_power_command_description(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_power_command_description(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -4012,8 +4012,8 @@ dissect_etc_pd_power_command_description(tvbuff_t *tvb, guint offset, proto_tree return offset; } -static guint -dissect_etc_pd_dali_short_address(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_dali_short_address(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -4025,8 +4025,8 @@ dissect_etc_pd_dali_short_address(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_etc_pd_dali_group_membership(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_dali_group_membership(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -4038,8 +4038,8 @@ dissect_etc_pd_dali_group_membership(tvbuff_t *tvb, guint offset, proto_tree *tr return offset; } -static guint -dissect_etc_pd_auto_bind(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_auto_bind(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -4051,15 +4051,15 @@ dissect_etc_pd_auto_bind(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 c return offset; } -static guint -dissect_etc_pd_delete_subdevice(guint offset) +static unsigned +dissect_etc_pd_delete_subdevice(unsigned offset) { /* set-only, no data */ return offset; } -static guint -dissect_etc_pd_packet_delay(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_packet_delay(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND_RESPONSE: @@ -4071,8 +4071,8 @@ dissect_etc_pd_packet_delay(tvbuff_t *tvb, guint offset, proto_tree *tree, guint return offset; } -static guint -dissect_etc_pd_has_enum_text(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc) +static unsigned +dissect_etc_pd_has_enum_text(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -4087,8 +4087,8 @@ dissect_etc_pd_has_enum_text(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_etc_pd_get_enum_text(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint8 len) +static unsigned +dissect_etc_pd_get_enum_text(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint8_t len) { switch(cc) { case RDM_CC_GET_COMMAND: @@ -4105,15 +4105,15 @@ dissect_etc_pd_get_enum_text(tvbuff_t *tvb, guint offset, proto_tree *tree, guin return offset; } -static guint -dissect_etc_pd_prepare_for_software_download(guint offset) +static unsigned +dissect_etc_pd_prepare_for_software_download(unsigned offset) { /* set-only, no data */ return offset; } -static guint -dissect_etc_pid(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint16 param_id, guint8 pdl) +static unsigned +dissect_etc_pid(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint16_t param_id, uint8_t pdl) { switch(param_id) { case ETC_PARAM_ID_LED_CURVE: @@ -4299,8 +4299,8 @@ dissect_etc_pid(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint1 return offset; } -static guint -dissect_manufacturer_specific_pid(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint16 param_id, guint8 pdl, guint16 device_manufacturer_id) +static unsigned +dissect_manufacturer_specific_pid(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint16_t param_id, uint8_t pdl, uint16_t device_manufacturer_id) { switch(device_manufacturer_id) { case RDM_MANUFACTURER_ID_ETC: @@ -4315,8 +4315,8 @@ dissect_manufacturer_specific_pid(tvbuff_t *tvb, guint offset, proto_tree *tree, return offset; } -static guint -dissect_rdm_mdb_param_data(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint16 param_id, guint8 pdl, guint16 device_manufacturer_id) +static unsigned +dissect_rdm_mdb_param_data(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint16_t param_id, uint8_t pdl, uint16_t device_manufacturer_id) { if (param_id >= 0x8000) { offset = dissect_manufacturer_specific_pid(tvb, offset, tree, cc, param_id, pdl, device_manufacturer_id); @@ -4761,8 +4761,8 @@ dissect_rdm_mdb_param_data(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint -dissect_rdm_pd_ack_overflow(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint16 param_id _U_, guint8 pdl) +static unsigned +dissect_rdm_pd_ack_overflow(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint16_t param_id _U_, uint8_t pdl) { if (pdl > 0) { switch(cc) { @@ -4777,8 +4777,8 @@ dissect_rdm_pd_ack_overflow(tvbuff_t *tvb, guint offset, proto_tree *tree, guint return offset; } -static guint -dissect_rdm_pd_ack_timer(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint16 param_id _U_, guint8 pdl) +static unsigned +dissect_rdm_pd_ack_timer(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint16_t param_id _U_, uint8_t pdl) { if (pdl == 2) { switch(cc) { @@ -4793,8 +4793,8 @@ dissect_rdm_pd_ack_timer(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 c return offset; } -static guint -dissect_rdm_pd_nack_reason(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 cc, guint16 param_id _U_, guint8 pdl _U_) +static unsigned +dissect_rdm_pd_nack_reason(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint8_t cc, uint16_t param_id _U_, uint8_t pdl _U_) { if (pdl == 2) { switch(cc) { @@ -4810,8 +4810,8 @@ dissect_rdm_pd_nack_reason(tvbuff_t *tvb, guint offset, proto_tree *tree, guint8 return offset; } -static guint8 -is_response(guint8 command_class) +static uint8_t +is_response(uint8_t command_class) { if ((command_class & RDM_CC_COMMAND_RESPONSE_FLAG) == RDM_CC_COMMAND_RESPONSE_FLAG) { return 1; @@ -4820,7 +4820,7 @@ is_response(guint8 command_class) } static void -add_pid_to_tree(guint16 param_id, proto_tree *mdb_tree, tvbuff_t *tvb, guint offset, guint16 device_manufacturer_id) +add_pid_to_tree(uint16_t param_id, proto_tree *mdb_tree, tvbuff_t *tvb, unsigned offset, uint16_t device_manufacturer_id) { if (param_id < 0x8000) { proto_tree_add_item(mdb_tree, hf_rdm_parameter_id, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -4836,17 +4836,17 @@ add_pid_to_tree(guint16 param_id, proto_tree *mdb_tree, tvbuff_t *tvb, guint off } } -static guint -dissect_rdm_mdb(tvbuff_t *tvb, guint offset, proto_tree *tree, guint16 device_manufacturer_id) +static unsigned +dissect_rdm_mdb(tvbuff_t *tvb, unsigned offset, proto_tree *tree, uint16_t device_manufacturer_id) { - guint8 cc; - guint8 rt; - guint16 param_id; - guint8 parameter_data_length; + uint8_t cc; + uint8_t rt; + uint16_t param_id; + uint8_t parameter_data_length; proto_tree *hi,*si, *mdb_tree; - rt = tvb_get_guint8(tvb, offset); - cc = tvb_get_guint8(tvb, offset + 4); + rt = tvb_get_uint8(tvb, offset); + cc = tvb_get_uint8(tvb, offset + 4); if (is_response(cc)) { proto_tree_add_item(tree, hf_rdm_response_type, tvb, @@ -4879,7 +4879,7 @@ dissect_rdm_mdb(tvbuff_t *tvb, guint offset, proto_tree *tree, guint16 device_ma add_pid_to_tree(param_id, mdb_tree, tvb, offset, device_manufacturer_id); offset += 2; - parameter_data_length = tvb_get_guint8(tvb, offset); + parameter_data_length = tvb_get_uint8(tvb, offset); proto_tree_add_item(mdb_tree, hf_rdm_parameter_data_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -4916,8 +4916,8 @@ dissect_rdm_mdb(tvbuff_t *tvb, guint offset, proto_tree *tree, guint16 device_ma return offset; } -static guint16 -get_device_manufacturer_id(guint8 command_class, guint16 source_manufacturer_id, guint16 destination_manufacturer_id) +static uint16_t +get_device_manufacturer_id(uint8_t command_class, uint16_t source_manufacturer_id, uint16_t destination_manufacturer_id) { if ((command_class == RDM_CC_GET_COMMAND) || (command_class == RDM_CC_SET_COMMAND)) { @@ -4937,14 +4937,14 @@ dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) col_clear(pinfo->cinfo, COL_INFO); if (tree) { - gint padding_size; - guint8 command_class; - guint16 destination_manufacturer_id; - guint16 source_manufacturer_id; - guint16 device_manufacturer_id; - guint32 destination_device_id; - guint32 source_device_id; - guint message_length, offset = 0; + int padding_size; + uint8_t command_class; + uint16_t destination_manufacturer_id; + uint16_t source_manufacturer_id; + uint16_t device_manufacturer_id; + uint32_t destination_device_id; + uint32_t source_device_id; + unsigned message_length, offset = 0; proto_tree *ti = proto_tree_add_item(tree, proto_rdm, tvb, offset, -1, ENC_NA); @@ -4954,7 +4954,7 @@ dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) offset, 1, ENC_BIG_ENDIAN); offset += 1; - message_length = tvb_get_guint8(tvb, offset); + message_length = tvb_get_uint8(tvb, offset); proto_tree_add_item(rdm_tree, hf_rdm_message_length, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -4979,7 +4979,7 @@ dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) offset, 1, ENC_BIG_ENDIAN); offset += 1; - command_class = tvb_get_guint8(tvb, offset + 4); + command_class = tvb_get_uint8(tvb, offset + 4); device_manufacturer_id = get_device_manufacturer_id(command_class, source_manufacturer_id, destination_manufacturer_id); offset = dissect_rdm_mdb(tvb, offset, rdm_tree, device_manufacturer_id); @@ -6903,7 +6903,7 @@ proto_register_rdm(void) }; - static gint *ett[] = { + static int *ett[] = { &ett_rdm, &ett_etc_sequence_config_steps, &ett_etc_sequence_config_times |