packet-ipmi...: Various cleanups:

- refs to value_strings in hf[] entries, by convention, should use VALS macro;
- add editor-modelines as needed; Fix some indentation.

Change-Id: Iaa0196bab6de066ed68a2755b69b07fadd33e498
Reviewed-on: https://code.wireshark.org/review/1927
Reviewed-by: Bill Meier <wmeier@newsguy.com>

10 files changed, 353 insertions, 220 deletions

diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c
index 4ed0387bad..fffb526827 100644
--- a/epan/dissectors/packet-ipmi-app.c
+++ b/epan/dissectors/packet-ipmi-app.c
@@ -1084,7 +1084,7 @@ ipmi_register_app(gint proto_ipmi)
 
 		{ &hf_ipmi_app_04_result,
 			{ "Self test result",
-				"ipmi.app04.self_test_result", FT_UINT8, BASE_HEX, vals_04_result, 0, NULL, HFILL }},
+				"ipmi.app04.self_test_result", FT_UINT8, BASE_HEX, VALS(vals_04_result), 0, NULL, HFILL }},
 		{ &hf_ipmi_app_04_fail,
 			{ "Self-test error bitfield",
 				"ipmi.app04.fail", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
@@ -1122,20 +1122,20 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app06.syspwr.set", FT_BOOLEAN, 8, TFS(&tfs_06_pwr), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_06_syspwr_enum,
 			{ "System Power State enumeration",
-				"ipmi.app06.syspwr.enum", FT_UINT8, BASE_HEX, vals_06_syspwr, 0x7f, NULL, HFILL }},
+				"ipmi.app06.syspwr.enum", FT_UINT8, BASE_HEX, VALS(vals_06_syspwr), 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_app_06_devpwr_set,
 			{ "Device Power State",
 				"ipmi.app06.devpwr.set", FT_BOOLEAN, 8, TFS(&tfs_06_pwr), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_06_devpwr_enum,
 			{ "Device Power State enumeration",
-				"ipmi.app06.devpwr.enum", FT_UINT8, BASE_HEX, vals_06_devpwr, 0x7f, NULL, HFILL }},
+				"ipmi.app06.devpwr.enum", FT_UINT8, BASE_HEX, VALS(vals_06_devpwr), 0x7f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_07_syspwr_enum,
 			{ "ACPI System Power State",
-				"ipmi.app07.syspwr", FT_UINT8, BASE_HEX, vals_07_syspwr, 0x7f, NULL, HFILL }},
+				"ipmi.app07.syspwr", FT_UINT8, BASE_HEX, VALS(vals_07_syspwr), 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_app_07_devpwr_enum,
 			{ "ACPI Device Power State",
-				"ipmi.app07.devpwr", FT_UINT8, BASE_HEX, vals_07_devpwr, 0x7f, NULL, HFILL }},
+				"ipmi.app07.devpwr", FT_UINT8, BASE_HEX, VALS(vals_07_devpwr), 0x7f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_08_guid,
 			{ "GUID",
@@ -1149,13 +1149,13 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app24.timer_use.dont_stop", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_app_24_timer_use_timer_use,
 			{ "Timer use",
-				"ipmi.app24.timer_use.timer_use", FT_UINT8, BASE_HEX, vals_24_timer_use, 0x07, NULL, HFILL }},
+				"ipmi.app24.timer_use.timer_use", FT_UINT8, BASE_HEX, VALS(vals_24_timer_use), 0x07, NULL, HFILL }},
 		{ &hf_ipmi_app_24_timer_action_interrupt,
 			{ "Pre-timeout interrupt",
-				"ipmi.app24.timer_action.interrupt", FT_UINT8, BASE_HEX, vals_24_timer_action_interrupt, 0x70, NULL, HFILL }},
+				"ipmi.app24.timer_action.interrupt", FT_UINT8, BASE_HEX, VALS(vals_24_timer_action_interrupt), 0x70, NULL, HFILL }},
 		{ &hf_ipmi_app_24_timer_action_timeout_action,
 			{ "Timeout action",
-				"ipmi.app24.timer_action.timeout", FT_UINT8, BASE_HEX, vals_24_timer_action_timeout, 0x07, NULL, HFILL }},
+				"ipmi.app24.timer_action.timeout", FT_UINT8, BASE_HEX, VALS(vals_24_timer_action_timeout), 0x07, NULL, HFILL }},
 		{ &hf_ipmi_app_24_pretimeout,
 			{ "Pre-timeout interval",
 				"ipmi.app24.pretimeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }},
@@ -1186,13 +1186,13 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app25.timer_use.started", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_app_25_timer_use_timer_use,
 			{ "Timer user",
-				"ipmi.app25.timer_use.timer_use", FT_UINT8, BASE_HEX, vals_24_timer_use, 0x07, NULL, HFILL }},
+				"ipmi.app25.timer_use.timer_use", FT_UINT8, BASE_HEX, VALS(vals_24_timer_use), 0x07, NULL, HFILL }},
 		{ &hf_ipmi_app_25_timer_action_interrupt,
 			{ "Pre-timeout interrupt",
-				"ipmi.app25.timer_action.interrupt", FT_UINT8, BASE_HEX, vals_24_timer_action_interrupt, 0x70, NULL, HFILL }},
+				"ipmi.app25.timer_action.interrupt", FT_UINT8, BASE_HEX, VALS(vals_24_timer_action_interrupt), 0x70, NULL, HFILL }},
 		{ &hf_ipmi_app_25_timer_action_timeout_action,
 			{ "Timeout action",
-				"ipmi.app25.timer_action.timeout", FT_UINT8, BASE_HEX, vals_24_timer_action_timeout, 0x07, NULL, HFILL }},
+				"ipmi.app25.timer_action.timeout", FT_UINT8, BASE_HEX, VALS(vals_24_timer_action_timeout), 0x07, NULL, HFILL }},
 		{ &hf_ipmi_app_25_pretimeout,
 			{ "Pre-timeout interval",
 				"ipmi.app25.pretimeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }},
@@ -1305,7 +1305,7 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app32.rq_chno", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_32_rq_state,
 			{ "Channel State",
-				"ipmi.app32.rq_state", FT_UINT8, BASE_HEX, vals_32_state, 0x03, NULL, HFILL }},
+				"ipmi.app32.rq_state", FT_UINT8, BASE_HEX, VALS(vals_32_state), 0x03, NULL, HFILL }},
 		{ &hf_ipmi_app_32_rs_chno,
 			{ "Channel",
 				"ipmi.app32.rs_chno", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
@@ -1315,7 +1315,7 @@ ipmi_register_app(gint proto_ipmi)
 
 		{ &hf_ipmi_app_34_track,
 			{ "Tracking",
-				"ipmi.app34.track", FT_UINT8, BASE_HEX, vals_34_track, 0xc0, NULL, HFILL }},
+				"ipmi.app34.track", FT_UINT8, BASE_HEX, VALS(vals_34_track), 0xc0, NULL, HFILL }},
 		{ &hf_ipmi_app_34_encrypt,
 			{ "Encryption required",
 				"ipmi.app34.encrypt", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
@@ -1334,13 +1334,13 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app38.rq_chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rq_priv,
 			{ "Requested privilege level",
-				"ipmi.app38.rq_priv", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
+				"ipmi.app38.rq_priv", FT_UINT8, BASE_HEX, VALS(vals_XX_priv), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_chan,
 			{ "Channel",
 				"ipmi.app38.rs_chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_ipmi20,
 			{ "Version compatibility",
-				"ipmi.app38.rs_ipmi20", FT_UINT8, BASE_DEC, vals_38_ipmi20, 0x80, NULL, HFILL }},
+				"ipmi.app38.rs_ipmi20", FT_UINT8, BASE_DEC, VALS(vals_38_ipmi20), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_auth_oem,
 			{ "OEM Proprietary authentication",
 				"ipmi.app38.rs_auth_oem", FT_BOOLEAN, 8, TFS(&tfs_38_supp), 0x20, NULL, HFILL }},
@@ -1389,7 +1389,7 @@ ipmi_register_app(gint proto_ipmi)
 
 		{ &hf_ipmi_app_39_authtype,
 			{ "Authentication Type",
-				"ipmi.app39.authtype", FT_UINT8, BASE_HEX, vals_XX_auth, 0x0f, NULL, HFILL }},
+				"ipmi.app39.authtype", FT_UINT8, BASE_HEX, VALS(vals_XX_auth), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_39_user,
 			{ "User Name",
 				"ipmi.app39.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1402,10 +1402,10 @@ ipmi_register_app(gint proto_ipmi)
 
 		{ &hf_ipmi_app_3a_authtype,
 			{ "Authentication Type",
-				"ipmi.app3a.authtype", FT_UINT8, BASE_HEX, vals_XX_auth, 0x0f, NULL, HFILL }},
+				"ipmi.app3a.authtype", FT_UINT8, BASE_HEX, VALS(vals_XX_auth), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_privlevel,
 			{ "Requested Maximum Privilege Level",
-				"ipmi.app3a.privlevel", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
+				"ipmi.app3a.privlevel", FT_UINT8, BASE_HEX, VALS(vals_XX_priv), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_authcode,
 			{ "Challenge string/Auth Code",
 				"ipmi.app3a.authcode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1414,7 +1414,7 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app3a.outbound_seq", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_authtype_session,
 			{ "Authentication Type for session",
-				"ipmi.app3a.authtype_session", FT_UINT8, BASE_HEX, vals_XX_auth, 0x0f, NULL, HFILL }},
+				"ipmi.app3a.authtype_session", FT_UINT8, BASE_HEX, VALS(vals_XX_auth), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_session_id,
 			{ "Session ID",
 				"ipmi.app3a.session_id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
@@ -1423,14 +1423,14 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app3a.inbound_seq", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_maxpriv_session,
 			{ "Maximum Privilege Level for session",
-				"ipmi.app3a.maxpriv_session", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
+				"ipmi.app3a.maxpriv_session", FT_UINT8, BASE_HEX, VALS(vals_XX_priv), 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_3b_req_priv,
 			{ "Requested Privilege Level",
-				"ipmi.app3b.req_priv", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
+				"ipmi.app3b.req_priv", FT_UINT8, BASE_HEX, VALS(vals_XX_priv), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_3b_new_priv,
 			{ "New Privilege Level",
-				"ipmi.app3b.new_priv", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
+				"ipmi.app3b.new_priv", FT_UINT8, BASE_HEX, VALS(vals_XX_priv), 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_3c_session_id,
 			{ "Session ID",
@@ -1484,3 +1484,16 @@ ipmi_register_app(gint proto_ipmi)
 	ipmi_register_netfn_cmdtab(IPMI_APP_REQ, IPMI_OEM_NONE, NULL, 0, NULL,
 			cmd_app, array_length(cmd_app));
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-ipmi-chassis.c b/epan/dissectors/packet-ipmi-chassis.c
index d66af29989..2d8d85c5a6 100644
--- a/epan/dissectors/packet-ipmi-chassis.c
+++ b/epan/dissectors/packet-ipmi-chassis.c
@@ -715,7 +715,7 @@ ipmi_register_chassis(gint proto_ipmi)
 	static hf_register_info hf[] = {
 		{ &hf_ipmi_chs_bo00_sip,
 			{ "Set In Progress",
-				"ipmi.bootopt00.sip", FT_UINT8, BASE_HEX, bo00_sip_vals, 0x03, NULL, HFILL }},
+			  	"ipmi.bootopt00.sip", FT_UINT8, BASE_HEX, VALS(bo00_sip_vals), 0x03, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo01_spsel,
 			{ "Service Partition Selector",
 				"ipmi.bootopt01.spsel", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
@@ -775,7 +775,7 @@ ipmi_register_chassis(gint proto_ipmi)
 				"ipmi.bootopt05.lock_kbd", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_bootdev,
 			{ "Boot Device Selector",
-				"ipmi.bootopt05.bootdev", FT_UINT8, BASE_HEX, bo05_bootdev_vals, 0x3c, NULL, HFILL }},
+				"ipmi.bootopt05.bootdev", FT_UINT8, BASE_HEX, VALS(bo05_bootdev_vals), 0x3c, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_screen_blank,
 			{ "Screen Blank",
 				"ipmi.bootopt05.screen_blank", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
@@ -787,7 +787,7 @@ ipmi_register_chassis(gint proto_ipmi)
 				"ipmi.bootopt05.lockout_poweroff", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_bios_verbosity,
 			{ "BIOS verbosity",
-				"ipmi.bootopt05.bios_verbosity", FT_UINT8, BASE_HEX, bo05_bios_verbosity_vals, 0x60, NULL, HFILL }},
+				"ipmi.bootopt05.bios_verbosity", FT_UINT8, BASE_HEX, VALS(bo05_bios_verbosity_vals), 0x60, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_progress_traps,
 			{ "Force Progress Event Traps",
 				"ipmi.bootopt05.progress_traps", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
@@ -799,13 +799,13 @@ ipmi_register_chassis(gint proto_ipmi)
 				"ipmi.bootopt05.lock_sleep", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_console_redirection,
 			{ "Console redirection",
-				"ipmi.bootopt05.console_redirection", FT_UINT8, BASE_HEX, bo05_console_redir_vals, 0x03, NULL, HFILL }},
+				"ipmi.bootopt05.console_redirection", FT_UINT8, BASE_HEX, VALS(bo05_console_redir_vals), 0x03, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_bios_shared_override,
 			{ "BIOS Shared Mode Override",
 				"ipmi.bootopt05.bios_shared_override", FT_BOOLEAN, 8, TFS(&bo05_bios_shared_tfs), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_bios_muxctl_override,
 			{ "BIOS Mux Control Override",
-				"ipmi.bootopt05.bios_muxctl_override", FT_UINT8, BASE_HEX, bo05_bios_muxctl_vals, 0x07, NULL, HFILL }},
+				"ipmi.bootopt05.bios_muxctl_override", FT_UINT8, BASE_HEX, VALS(bo05_bios_muxctl_vals), 0x07, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_byte5,
 			{ "Data 5 (reserved)",
 				"ipmi.bootopt05.byte5", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
@@ -855,7 +855,7 @@ ipmi_register_chassis(gint proto_ipmi)
 
 		{ &hf_ipmi_chs_01_pwr_state_policy,
 			{ "Power Restore Policy",
-				"ipmi.ch01.cur_pwr.policy", FT_UINT8, BASE_HEX, vals_01_pwr_policy, 0x60, NULL, HFILL }},
+				"ipmi.ch01.cur_pwr.policy", FT_UINT8, BASE_HEX, VALS(vals_01_pwr_policy), 0x60, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_pwr_state_ctl_fault,
 			{ "Power Control Fault",
 				"ipmi.ch01.cur_pwr.ctl_fault", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
@@ -891,7 +891,7 @@ ipmi_register_chassis(gint proto_ipmi)
 				"ipmi.ch01.identsupp", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_misc_identstate,
 			{ "Chassis Identify state (if supported)",
-				"ipmi.ch01.identstate", FT_UINT8, BASE_HEX, vals_01_identstate, 0x30, NULL, HFILL }},
+				"ipmi.ch01.identstate", FT_UINT8, BASE_HEX, VALS(vals_01_identstate), 0x30, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_misc_fan,
 			{ "Cooling/fan fault detected",
 				"ipmi.ch01.misc.fan", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
@@ -931,7 +931,7 @@ ipmi_register_chassis(gint proto_ipmi)
 
 		{ &hf_ipmi_chs_02_cctrl,
 			{ "Chassis Control",
-				"ipmi.ch02.chassis_control", FT_UINT8, BASE_HEX, vals_02_cctrl, 0x0f, NULL, HFILL }},
+				"ipmi.ch02.chassis_control", FT_UINT8, BASE_HEX, VALS(vals_02_cctrl), 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_chs_04_ival,
 			{ "Identify Interval in seconds",
@@ -964,7 +964,7 @@ ipmi_register_chassis(gint proto_ipmi)
 
 		{ &hf_ipmi_chs_06_rq_policy,
 			{ "Power Restore Policy",
-				"ipmi.ch06.rq_policy", FT_UINT8, BASE_HEX, vals_06_policy, 0x07, NULL, HFILL }},
+				"ipmi.ch06.rq_policy", FT_UINT8, BASE_HEX, VALS(vals_06_policy), 0x07, NULL, HFILL }},
 		{ &hf_ipmi_chs_06_rs_policy_support_powerup,
 			{ "Always powering up",
 				"ipmi.ch06.rs_support.powerup", FT_BOOLEAN, 8, TFS(&tfs_06_supported), 0x04, NULL, HFILL }},
@@ -977,7 +977,7 @@ ipmi_register_chassis(gint proto_ipmi)
 
 		{ &hf_ipmi_chs_07_cause,
 			{ "Restart Cause",
-				"ipmi.ch07.cause", FT_UINT8, BASE_HEX, vals_07_cause, 0x0f, NULL, HFILL }},
+				"ipmi.ch07.cause", FT_UINT8, BASE_HEX, VALS(vals_07_cause), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_chs_07_chan,
 			{ "Channel",
 				"ipmi.ch07.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0, NULL, HFILL }},
@@ -1054,3 +1054,17 @@ ipmi_register_chassis(gint proto_ipmi)
 	ipmi_register_netfn_cmdtab(IPMI_CHASSIS_REQ, IPMI_OEM_NONE, NULL, 0, NULL,
 			cmd_chassis, array_length(cmd_chassis));
 }
+
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c
index 69744bcc9d..a957ff26ae 100644
--- a/epan/dissectors/packet-ipmi-picmg.c
+++ b/epan/dissectors/packet-ipmi-picmg.c
@@ -1658,7 +1658,7 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.led.on_duration", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_led_color,
 			{ "Color",
-				"ipmi.led.color", FT_UINT8, BASE_HEX, led_color_vals, 0x0f, NULL, HFILL }},
+				"ipmi.led.color", FT_UINT8, BASE_HEX, VALS(led_color_vals), 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_linkinfo_grpid,
 			{ "Grouping ID",
@@ -1668,13 +1668,13 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.linkinfo.type_ext", FT_UINT32, BASE_HEX, NULL, 0x00f00000, NULL, HFILL }},
 		{ &hf_ipmi_picmg_linkinfo_type,
 			{ "Type",
-				"ipmi.linkinfo.type", FT_UINT32, BASE_HEX, linkinfo_type_vals, 0x000ff000, NULL, HFILL }},
+				"ipmi.linkinfo.type", FT_UINT32, BASE_HEX, VALS(linkinfo_type_vals), 0x000ff000, NULL, HFILL }},
 		{ &hf_ipmi_picmg_linkinfo_ports,
 			{ "Ports",
-				"ipmi.linkinfo.ports", FT_UINT32, BASE_HEX, linkinfo_ports_vals, 0x00000f00, NULL, HFILL }},
+				"ipmi.linkinfo.ports", FT_UINT32, BASE_HEX, VALS(linkinfo_ports_vals), 0x00000f00, NULL, HFILL }},
 		{ &hf_ipmi_picmg_linkinfo_iface,
 			{ "Interface",
-				"ipmi.linkinfo.iface", FT_UINT32, BASE_HEX, linkinfo_iface_vals, 0x000000c0, NULL, HFILL }},
+				"ipmi.linkinfo.iface", FT_UINT32, BASE_HEX, VALS(linkinfo_iface_vals), 0x000000c0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_linkinfo_chan,
 			{ "Channel",
 				"ipmi.linkinfo.chan", FT_UINT32, BASE_DEC, NULL, 0x0000003f, NULL, HFILL }},
@@ -1697,13 +1697,13 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.picmg01.rq_fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rq_addr_key_type,
 			{ "Address Key Type",
-				"ipmi.picmg01.rq_addr_key_type", FT_UINT8, BASE_HEX, addr_key_type_vals, 0, NULL, HFILL }},
+				"ipmi.picmg01.rq_addr_key_type", FT_UINT8, BASE_HEX, VALS(addr_key_type_vals), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rq_addr_key,
 			{ "Address Key",
 				"ipmi.picmg01.rq_addr_key", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rq_site_type,
 			{ "Site Type",
-				"ipmi.picmg01.rq_site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, NULL, HFILL }},
+				"ipmi.picmg01.rq_site_type", FT_UINT8, BASE_HEX, VALS(site_type_vals), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rs_hwaddr,
 			{ "Hardware Address",
 				"ipmi.picmg01.rs_hwaddr", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
@@ -1721,14 +1721,14 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.picmg01.rs_site_num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rs_site_type,
 			{ "Site Type",
-				"ipmi.picmg01.rs_site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, NULL, HFILL }},
+				"ipmi.picmg01.rs_site_type", FT_UINT8, BASE_HEX, VALS(site_type_vals), 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_04_fruid,
 			{ "FRU ID",
 				"ipmi.picmg04.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_04_cmd,
 			{ "Command",
-				"ipmi.picmg04.cmd", FT_UINT8, BASE_HEX, vals_04_cmd, 0, NULL, HFILL }},
+				"ipmi.picmg04.cmd", FT_UINT8, BASE_HEX, VALS(vals_04_cmd), 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_05_fruid,
 			{ "FRU ID",
@@ -1775,10 +1775,10 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.picmg06.cap_blue", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_picmg_06_default_local_color,
 			{ "Default LED Color in Local Control state",
-				"ipmi.picmg06.def_local", FT_UINT8, BASE_HEX, led_color_vals, 0x0f, NULL, HFILL }},
+				"ipmi.picmg06.def_local", FT_UINT8, BASE_HEX, VALS(led_color_vals), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_picmg_06_default_override_color,
 			{ "Default LED Color in Override state",
-				"ipmi.picmg06.def_override", FT_UINT8, BASE_HEX, led_color_vals, 0x0f, NULL, HFILL }},
+				"ipmi.picmg06.def_override", FT_UINT8, BASE_HEX, VALS(led_color_vals), 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_07_fruid,
 			{ "FRU ID",
@@ -1844,7 +1844,7 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.picmg0c.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_0c_cmd,
 			{ "Command",
-				"ipmi.picmg0c.cmd", FT_UINT8, BASE_HEX, vals_0c_cmd, 0, NULL, HFILL }},
+				"ipmi.picmg0c.cmd", FT_UINT8, BASE_HEX, VALS(vals_0c_cmd), 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_0d_fruid,
 			{ "FRU ID",
@@ -1858,7 +1858,7 @@ ipmi_register_picmg(gint proto_ipmi)
 
 		{ &hf_ipmi_picmg_0f_iface,
 			{ "Interface",
-				"ipmi.linkinfo.iface", FT_UINT8, BASE_HEX, linkinfo_iface_vals, 0x000000c0, NULL, HFILL }},
+				"ipmi.linkinfo.iface", FT_UINT8, BASE_HEX, VALS(linkinfo_iface_vals), 0x000000c0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_0f_chan,
 			{ "Channel",
 				"ipmi.linkinfo.chan", FT_UINT8, BASE_DEC, NULL, 0x0000003f, NULL, HFILL }},
@@ -1881,14 +1881,14 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.picmg11.power_level", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_11_set_to_desired,
 			{ "Set Present Levels to Desired",
-				"ipmi.picmg11.set_to_desired", FT_UINT8, BASE_HEX, vals_11_set, 0, NULL, HFILL }},
+				"ipmi.picmg11.set_to_desired", FT_UINT8, BASE_HEX, VALS(vals_11_set), 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_12_fruid,
 			{ "FRU ID",
 				"ipmi.picmg12.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_12_pwr_type,
 			{ "Power Type",
-				"ipmi.picmg12.pwr_type", FT_UINT8, BASE_HEX, vals_12_pwr_type, 0, NULL, HFILL }},
+				"ipmi.picmg12.pwr_type", FT_UINT8, BASE_HEX, VALS(vals_12_pwr_type), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_12_dynamic,
 			{ "Dynamic Power Configuration",
 				"ipmi.picmg12.dynamic", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
@@ -1933,7 +1933,7 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.picmg15.fan_level", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_15_local_enable,
 			{ "Local Control Enable State",
-				"ipmi.picmg15.local_enable", FT_UINT8, BASE_HEX, enable_vals, 0, NULL, HFILL }},
+				"ipmi.picmg15.local_enable", FT_UINT8, BASE_HEX, VALS(enable_vals), 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_16_fruid,
 			{ "FRU ID",
@@ -1946,21 +1946,21 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.picmg16.local_level", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_16_local_enable,
 			{ "Local Control Enable State",
-				"ipmi.picmg16.local_enable", FT_UINT8, BASE_HEX, enabled_vals, 0, NULL, HFILL }},
+				"ipmi.picmg16.local_enable", FT_UINT8, BASE_HEX, VALS(enabled_vals), 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_17_cmd,
 			{ "Command",
 				"ipmi.picmg17.cmd", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_17_resid,
 			{ "Bused Resource ID",
-				"ipmi.picmg17.resid", FT_UINT8, BASE_HEX, busresid_vals, 0, NULL, HFILL }},
+				"ipmi.picmg17.resid", FT_UINT8, BASE_HEX, VALS(busresid_vals), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_17_status,
 			{ "Status",
 				"ipmi.picmg17.status", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_18_li_key_type,
 			{ "Link Info Key Type",
-				"ipmi.picmg18.li_key_type", FT_UINT8, BASE_HEX, vals_18_keytype, 0, NULL, HFILL }},
+				"ipmi.picmg18.li_key_type", FT_UINT8, BASE_HEX, VALS(vals_18_keytype), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_18_li_key,
 			{ "Link Info Key",
 				"ipmi.picmg18.li_key", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -1983,7 +1983,7 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.picmg1c.fan_site_number", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1c_fan_enable_state,
 			{ "Fan Enable state",
-				"ipmi.picmg1c.fan_enable_state", FT_UINT8, BASE_HEX, enable_vals, 0, NULL, HFILL }},
+				"ipmi.picmg1c.fan_enable_state", FT_UINT8, BASE_HEX, VALS(enable_vals), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1c_fan_policy_timeout,
 			{ "Fan Policy Timeout",
 				"ipmi.picmg1c.fan_policy_timeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }},
@@ -1992,7 +1992,7 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.picmg1c.site_number", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1c_site_type,
 			{ "Site Type",
-				"ipmi.picmg1c.site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, NULL, HFILL }},
+				"ipmi.picmg1c.site_type", FT_UINT8, BASE_HEX, VALS(site_type_vals), 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_1d_fan_site_number,
 			{ "Fan Tray Site Number",
@@ -2002,13 +2002,13 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.picmg1d.site_number", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1d_site_type,
 			{ "Site Type",
-				"ipmi.picmg1d.site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, NULL, HFILL }},
+				"ipmi.picmg1d.site_type", FT_UINT8, BASE_HEX, VALS(site_type_vals), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1d_policy,
 			{ "Policy",
-				"ipmi.picmg1d.fan_enable_state", FT_UINT8, BASE_HEX, vals_1d_policy, 0, NULL, HFILL }},
+				"ipmi.picmg1d.fan_enable_state", FT_UINT8, BASE_HEX, VALS(vals_1d_policy), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1d_coverage,
 			{ "Coverage",
-				"ipmi.picmg1d.coverage", FT_UINT8, BASE_HEX, vals_1d_coverage, 0, NULL, HFILL }},
+				"ipmi.picmg1d.coverage", FT_UINT8, BASE_HEX, VALS(vals_1d_coverage), 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_1e_fruid,
 			{ "FRU ID",
@@ -2028,7 +2028,7 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.picmg1f.rq_fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1f_rq_op,
 			{ "Operation",
-				"ipmi.picmg1f.rq_op", FT_UINT8, BASE_HEX, vals_1f_op, 0, NULL, HFILL }},
+				"ipmi.picmg1f.rq_op", FT_UINT8, BASE_HEX, VALS(vals_1f_op), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1f_rq_lockid,
 			{ "Lock ID",
 				"ipmi.picmg1f.rq_lockid", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
@@ -2066,7 +2066,7 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.picmg21.addr_count", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_site_type,
 			{ "Site Type",
-				"ipmi.picmg21.site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, NULL, HFILL }},
+				"ipmi.picmg21.site_type", FT_UINT8, BASE_HEX, VALS(site_type_vals), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_site_num,
 			{ "Site Number",
 				"ipmi.picmg21.site_num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -2175,7 +2175,7 @@ ipmi_register_picmg(gint proto_ipmi)
 				"ipmi.prop00.preparation", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_picmg_prop00_rollback,
 			{ "Rollback/Backup support",
-				"ipmi.prop00.rollback", FT_UINT8, BASE_HEX, vals_prop00_rollback, 0x03, NULL, HFILL }},
+				"ipmi.prop00.rollback", FT_UINT8, BASE_HEX, VALS(vals_prop00_rollback), 0x03, NULL, HFILL }},
 		{ &hf_ipmi_picmg_prop01_fw_major,
 			{ "Major Firmware Revision (binary encoded)",
 				"ipmi.prop01.fw_major", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
@@ -2201,7 +2201,7 @@ ipmi_register_picmg(gint proto_ipmi)
 
 		{ &hf_ipmi_picmg_31_action,
 			{ "Upgrade action",
-				"ipmi.picmg31.action", FT_UINT8, BASE_HEX, vals_31_action, 0, NULL, HFILL }},
+				"ipmi.picmg31.action", FT_UINT8, BASE_HEX, VALS(vals_31_action), 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_32_block,
 			{ "Block Number",
@@ -2235,11 +2235,11 @@ ipmi_register_picmg(gint proto_ipmi)
 
 		{ &hf_ipmi_picmg_35_rollback_override,
 			{ "Rollback Override Policy",
-				"ipmi.picmg35.rollback_override", FT_UINT8, BASE_HEX, vals_35_override, 0, NULL, HFILL }},
+				"ipmi.picmg35.rollback_override", FT_UINT8, BASE_HEX, VALS(vals_35_override), 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_36_result,
 			{ "Self test result",
-				"ipmi.picmg36.self_test_result", FT_UINT8, BASE_HEX, vals_36_result, 0, NULL, HFILL }},
+				"ipmi.picmg36.self_test_result", FT_UINT8, BASE_HEX, VALS(vals_36_result), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_36_fail,
 			{ "Self-test error bitfield",
 				"ipmi.picmg36.fail", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
@@ -2306,3 +2306,17 @@ ipmi_register_picmg(gint proto_ipmi)
 	ipmi_register_netfn_cmdtab(IPMI_GROUP_REQ, IPMI_OEM_NONE, sig_picmg, 1,
 			"PICMG", cmd_picmg, array_length(cmd_picmg));
 }
+
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-ipmi-pps.c b/epan/dissectors/packet-ipmi-pps.c
index ecf95ebe72..5d4a3c77c3 100644
--- a/epan/dissectors/packet-ipmi-pps.c
+++ b/epan/dissectors/packet-ipmi-pps.c
@@ -90,7 +90,20 @@ ipmi_register_pps(gint proto_ipmi _U_)
 	static guint8 sig_pps_rev[3] = { 0x00, 0x40, 0x0a };
 
 	ipmi_register_netfn_cmdtab(IPMI_OEM_REQ, IPMI_OEM_NONE, sig_pps, 3,
-			"Pigeon Point Systems", cmd_pps, array_length(cmd_pps));
+				   "Pigeon Point Systems", cmd_pps, array_length(cmd_pps));
 	ipmi_register_netfn_cmdtab(IPMI_OEM_REQ, IPMI_OEM_NONE, sig_pps_rev, 3,
-			"Pigeon Point Systems (reversed)", cmd_pps, array_length(cmd_pps));
+				   "Pigeon Point Systems (reversed)", cmd_pps, array_length(cmd_pps));
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c
index 865a5de93d..def7398c46 100644
--- a/epan/dissectors/packet-ipmi-se.c
+++ b/epan/dissectors/packet-ipmi-se.c
@@ -2909,38 +2909,38 @@ static const value_string cc30[] = {
 };
 
 static ipmi_cmd_t cmd_se[] = {
-  /* Event commands */
-  { 0x00, rq00, NULL, NULL, NULL, "Set Event Receiver", 0 },
-  { 0x01, NULL, rs01, NULL, NULL, "Get Event Receiver", 0 },
-  { 0x02, rq02, NULL, NULL, NULL, "Platform Event", 0 },
-
-  /* PEF and Alerting Commands */
-  { 0x10, NULL, rs10, NULL, NULL, "Get PEF Capabilities", 0 },
-  { 0x11, rq11, rs11, NULL, NULL, "Arm PEF Postpone Timer", 0 },
-  { 0x12, rq12, NULL, cc12, NULL, "Set PEF Configuration Parameters", 0 },
-  { 0x13, rq13, rs13, cc13, NULL, "Get PEF Configuration Parameters", CMD_CALLRQ },
-  { 0x14, rq14, NULL, cc14, NULL, "Set Last Processed Event ID", 0 },
-  { 0x15, NULL, rs15, cc15, NULL, "Get Last Processed Event ID", 0 },
-  { 0x16, rq16, rs16, cc16, NULL, "Alert Immediate", CMD_CALLRQ },
-  { 0x17, rq17, NULL, NULL, NULL, "PET Acknowledge", 0 },
-
-  /* Sensor Device Commands */
-  { 0x20, rq20, rs20, NULL, NULL, "Get Device SDR Info", CMD_CALLRQ },
-  { 0x21, rq21, rs21, cc21, NULL, "Get Device SDR", 0 },
-  { 0x22, NULL, rs22, NULL, NULL, "Reserve Device SDR Repository", 0 },
-  { 0x23, rq23, rs23, NULL, NULL, "Get Sensor Reading Factors", 0 },
-  { 0x24, rq24, NULL, NULL, NULL, "Set Sensor Hysteresis", 0 },
-  { 0x25, rq25, rs25, NULL, NULL, "Get Sensor Hysteresis", 0 },
-  { 0x26, rq26, NULL, NULL, NULL, "Set Sensor Threshold", 0 },
-  { 0x27, rq27, rs27, NULL, NULL, "Get Sensor Threshold", 0 },
-  { 0x28, rq28, NULL, NULL, NULL, "Set Sensor Event Enable", 0 },
-  { 0x29, rq29, rs29, NULL, NULL, "Get Sensor Event Enable", 0 },
-  { 0x2a, rq2a, NULL, NULL, NULL, "Re-arm Sensor Events", 0 },
-  { 0x2b, rq2b, rs2b, NULL, NULL, "Get Sensor Event Status", 0 },
-  { 0x2d, rq2d, rs2d, NULL, NULL, "Get Sensor Reading", 0 },
-  { 0x2e, rq2e, NULL, NULL, NULL, "Set Sensor Type", 0 },
-  { 0x2f, rq2f, rs2f, NULL, NULL, "Get Sensor Type", 0 },
-  { 0x30, IPMI_TBD,   cc30, NULL, "Set Sensor Reading and Event Status", 0 },
+	/* Event commands */
+	{ 0x00, rq00, NULL, NULL, NULL, "Set Event Receiver", 0 },
+	{ 0x01, NULL, rs01, NULL, NULL, "Get Event Receiver", 0 },
+	{ 0x02, rq02, NULL, NULL, NULL, "Platform Event", 0 },
+
+	/* PEF and Alerting Commands */
+	{ 0x10, NULL, rs10, NULL, NULL, "Get PEF Capabilities", 0 },
+	{ 0x11, rq11, rs11, NULL, NULL, "Arm PEF Postpone Timer", 0 },
+	{ 0x12, rq12, NULL, cc12, NULL, "Set PEF Configuration Parameters", 0 },
+	{ 0x13, rq13, rs13, cc13, NULL, "Get PEF Configuration Parameters", CMD_CALLRQ },
+	{ 0x14, rq14, NULL, cc14, NULL, "Set Last Processed Event ID", 0 },
+	{ 0x15, NULL, rs15, cc15, NULL, "Get Last Processed Event ID", 0 },
+	{ 0x16, rq16, rs16, cc16, NULL, "Alert Immediate", CMD_CALLRQ },
+	{ 0x17, rq17, NULL, NULL, NULL, "PET Acknowledge", 0 },
+
+	/* Sensor Device Commands */
+	{ 0x20, rq20, rs20, NULL, NULL, "Get Device SDR Info", CMD_CALLRQ },
+	{ 0x21, rq21, rs21, cc21, NULL, "Get Device SDR", 0 },
+	{ 0x22, NULL, rs22, NULL, NULL, "Reserve Device SDR Repository", 0 },
+	{ 0x23, rq23, rs23, NULL, NULL, "Get Sensor Reading Factors", 0 },
+	{ 0x24, rq24, NULL, NULL, NULL, "Set Sensor Hysteresis", 0 },
+	{ 0x25, rq25, rs25, NULL, NULL, "Get Sensor Hysteresis", 0 },
+	{ 0x26, rq26, NULL, NULL, NULL, "Set Sensor Threshold", 0 },
+	{ 0x27, rq27, rs27, NULL, NULL, "Get Sensor Threshold", 0 },
+	{ 0x28, rq28, NULL, NULL, NULL, "Set Sensor Event Enable", 0 },
+	{ 0x29, rq29, rs29, NULL, NULL, "Get Sensor Event Enable", 0 },
+	{ 0x2a, rq2a, NULL, NULL, NULL, "Re-arm Sensor Events", 0 },
+	{ 0x2b, rq2b, rs2b, NULL, NULL, "Get Sensor Event Status", 0 },
+	{ 0x2d, rq2d, rs2d, NULL, NULL, "Get Sensor Reading", 0 },
+	{ 0x2e, rq2e, NULL, NULL, NULL, "Set Sensor Type", 0 },
+	{ 0x2f, rq2f, rs2f, NULL, NULL, "Get Sensor Type", 0 },
+	{ 0x30, IPMI_TBD,   cc30, NULL, "Set Sensor Reading and Event Status", 0 },
 };
 
 void
@@ -2949,7 +2949,7 @@ ipmi_register_se(gint proto_ipmi)
 	static hf_register_info hf[] = {
 		{ &hf_ipmi_se_evt_rev,
 			{ "Event Message Revision",
-				"ipmi.evt.evmrev", FT_UINT8, BASE_HEX, evt_evm_rev_vals, 0, NULL, HFILL }},
+				"ipmi.evt.evmrev", FT_UINT8, BASE_HEX, VALS(evt_evm_rev_vals), 0, NULL, HFILL }},
 		{ &hf_ipmi_se_evt_sensor_type,
 			{ "Sensor Type",
 				"ipmi.evt.sensor_type", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
@@ -2986,7 +2986,7 @@ ipmi_register_se(gint proto_ipmi)
 
 		{ &hf_ipmi_se_cp00_sip,
 			{ "Set In Progress",
-				"ipmi.cp00.sip", FT_UINT8, BASE_HEX, cp00_sip_vals, 0x03, NULL, HFILL }},
+				"ipmi.cp00.sip", FT_UINT8, BASE_HEX, VALS(cp00_sip_vals), 0x03, NULL, HFILL }},
 		{ &hf_ipmi_se_cp01_alert_startup,
 			{ "PEF Alert Startup Delay disable",
 				"ipmi.cp01.alert_startup", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
@@ -3108,7 +3108,7 @@ ipmi_register_se(gint proto_ipmi)
 				"ipmi.cp15.retries", FT_UINT8, BASE_DEC, NULL, 0x70, NULL, HFILL }},
 		{ &hf_ipmi_se_cp15_operation,
 			{ "Operation",
-				"ipmi.cp15.operation", FT_UINT8, BASE_HEX, cp15_op_vals, 0x0f, NULL, HFILL }},
+				"ipmi.cp15.operation", FT_UINT8, BASE_HEX, VALS(cp15_op_vals), 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_se_00_addr,
 			{ "Event Receiver slave address",
@@ -3219,7 +3219,7 @@ ipmi_register_se(gint proto_ipmi)
 				"ipmi.se16.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_se_16_op,
 			{ "Operation",
-				"ipmi.se16.op", FT_UINT8, BASE_HEX, vals_16_op, 0xc0, NULL, HFILL }},
+				"ipmi.se16.op", FT_UINT8, BASE_HEX, VALS(vals_16_op), 0xc0, NULL, HFILL }},
 		{ &hf_ipmi_se_16_dst,
 			{ "Destination",
 				"ipmi.se16.dst", FT_UINT8, BASE_HEX, NULL, 0x0f, NULL, HFILL }},
@@ -3234,7 +3234,7 @@ ipmi_register_se(gint proto_ipmi)
 				"ipmi.se16.gen", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_16_status,
 			{ "Alert Immediate Status",
-				"ipmi.se16.status", FT_UINT8, BASE_HEX, vals_16_status, 0, NULL, HFILL }},
+				"ipmi.se16.status", FT_UINT8, BASE_HEX, VALS(vals_16_status), 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_17_seq,
 			{ "Sequence Number",
@@ -3494,7 +3494,7 @@ ipmi_register_se(gint proto_ipmi)
 				"ipmi.se28.fl_scan", FT_BOOLEAN, 8, TFS(&tfs_28_enable), 0x40, NULL, HFILL }},
 		{ &hf_ipmi_se_28_fl_action,
 			{ "Action",
-				"ipmi.se28.fl_action", FT_UINT8, BASE_HEX, vals_28_act, 0x30, NULL, HFILL }},
+				"ipmi.se28.fl_action", FT_UINT8, BASE_HEX, VALS(vals_28_act), 0x30, NULL, HFILL }},
 
 		{ &hf_ipmi_se_29_sensor,
 			{ "Sensor Number",
@@ -3655,3 +3655,16 @@ ipmi_register_se(gint proto_ipmi)
 	ipmi_register_netfn_cmdtab(IPMI_SE_REQ, IPMI_OEM_NONE, NULL, 0, NULL,
 			cmd_se, array_length(cmd_se));
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c
index 1c72aeb2c9..b3f6e403ad 100644
--- a/epan/dissectors/packet-ipmi-session.c
+++ b/epan/dissectors/packet-ipmi-session.c
@@ -77,36 +77,36 @@ static const value_string ipmi_authtype_vals[] = {
 #define IPMI_OEM_EXPLICIT	2
 
 static const value_string ipmi_payload_vals[] = {
-	{ IPMI_IPMI_MESSAGE,	"IPMI Message" },
-	{ 0x01,	"SOL (serial over LAN)" },
-	{ IPMI_OEM_EXPLICIT,	"OEM Explicit" },
+	{ IPMI_IPMI_MESSAGE, "IPMI Message" },
+	{ 0x01,		     "SOL (serial over LAN)" },
+	{ IPMI_OEM_EXPLICIT, "OEM Explicit" },
 	/* Session Setup Payload Types */
-	{ 0x10,	"RMCP+ Open Session Request" },
-	{ 0x11,	"RMCP+ Open Session Response" },
-	{ 0x12,	"RAKP Message 1" },
-	{ 0x13,	"RAKP Message 2" },
-	{ 0x14,	"RAKP Message 3" },
-	{ 0x15,	"RAKP Message 4" },
+	{ 0x10,		     "RMCP+ Open Session Request" },
+	{ 0x11,		     "RMCP+ Open Session Response" },
+	{ 0x12,		     "RAKP Message 1" },
+	{ 0x13,		     "RAKP Message 2" },
+	{ 0x14,		     "RAKP Message 3" },
+	{ 0x15,		     "RAKP Message 4" },
 	/* OEM Payload Type Handles */
-	{ 0x20,	"OEM0 (OEM Payload)" },
-	{ 0x21,	"OEM1 (OEM Payload)" },
-	{ 0x22,	"OEM2 (OEM Payload)" },
-	{ 0x23,	"OEM3 (OEM Payload)" },
-	{ 0x24,	"OEM4 (OEM Payload)" },
-	{ 0x25,	"OEM5 (OEM Payload)" },
-	{ 0x26,	"OEM6 (OEM Payload)" },
-	{ 0x27,	"OEM7 (OEM Payload)" },
+	{ 0x20,		     "OEM0 (OEM Payload)" },
+	{ 0x21,		     "OEM1 (OEM Payload)" },
+	{ 0x22,		     "OEM2 (OEM Payload)" },
+	{ 0x23,		     "OEM3 (OEM Payload)" },
+	{ 0x24,		     "OEM4 (OEM Payload)" },
+	{ 0x25,		     "OEM5 (OEM Payload)" },
+	{ 0x26,		     "OEM6 (OEM Payload)" },
+	{ 0x27,		     "OEM7 (OEM Payload)" },
 	{ 0x00,	NULL }
 };
 
 static const true_false_string ipmi_payload_aut_val  = {
-  "Payload is authenticated",
-  "Payload is unauthenticated"
+	"Payload is authenticated",
+	"Payload is unauthenticated"
 };
 
 static const true_false_string ipmi_payload_enc_val  = {
-  "Payload is encrypted",
-  "Payload is unencrypted"
+	"Payload is encrypted",
+	"Payload is unencrypted"
 };
 
 static int
@@ -321,3 +321,16 @@ proto_reg_handoff_ipmi_session(void)
 	data_handle = find_dissector("data");
 	ipmi_handle = find_dissector("ipmi");
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-ipmi-storage.c b/epan/dissectors/packet-ipmi-storage.c
index bf3dfb6e96..29f260235d 100644
--- a/epan/dissectors/packet-ipmi-storage.c
+++ b/epan/dissectors/packet-ipmi-storage.c
@@ -705,41 +705,41 @@ rq5b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 }
 
 static ipmi_cmd_t cmd_storage[] = {
-  /* FRU Device Commands */
-  { 0x10, rq10, rs10, NULL, NULL, "Get FRU Inventory Area Info", 0 },
-  { 0x11, rq11, rs11, cc11, NULL, "Read FRU Data", 0 },
-  { 0x12, rq12, rs12, cc12, NULL, "Write FRU Data", 0 },
-
-  /* SDR Device Commands */
-  { 0x20, NULL, rs20, NULL, NULL, "Get SDR Repository Info", 0 },
-  { 0x21, NULL, rs21, NULL, NULL, "Get SDR Repository Allocation Info", 0 },
-  { 0x22, NULL, rs22, NULL, NULL, "Reserve SDR Repository", 0 },
-  { 0x23, rq23, rs23, NULL, NULL, "Get SDR", 0 },
-  { 0x24, rq24, rs24, NULL, NULL, "Add SDR", 0 },
-  { 0x25, rq25, rs25, cc25, NULL, "Partial Add SDR", 0 },
-  { 0x26, rq26, rs26, NULL, NULL, "Delete SDR", 0 },
-  { 0x27, rq27, rs27, NULL, NULL, "Clear SDR Repository", 0 },
-  { 0x28, NULL, rs28, NULL, NULL, "Get SDR Repository Time", 0 },
-  { 0x29, rq29, NULL, NULL, NULL, "Set SDR Repository Time", 0 },
-  { 0x2a, NULL, NULL, NULL, NULL, "Enter SDR Repository Update Mode", 0 },
-  { 0x2b, NULL, NULL, NULL, NULL, "Exit SDR Repository Update Mode", 0 },
-  { 0x2c, rq2c, rs2c, NULL, NULL, "Run Initialization Agent", 0 },
-
-  /* SEL Device Commands */
-  { 0x40, NULL, rs40, cc40, NULL, "Get SEL Info", 0 },
-  { 0x41, NULL, rs41, NULL, NULL, "Get SEL Allocation Info", 0 },
-  { 0x42, NULL, rs42, cc42, NULL, "Reserve SEL", 0 },
-  { 0x43, rq43, rs43, cc43, NULL, "Get SEL Entry", 0 },
-  { 0x44, rq44, rs44, cc44, NULL, "Add SEL Entry", 0 },
-  { 0x45, rq45, rs45, cc45, NULL, "Partial Add SEL Entry", 0 },
-  { 0x46, rq46, rs46, cc46, NULL, "Delete SEL Entry", 0 },
-  { 0x47, rq47, rs47, NULL, NULL, "Clear SEL", 0 },
-  { 0x48, NULL, rs48, NULL, NULL, "Get SEL Time", 0 },
-  { 0x49, rq49, NULL, NULL, NULL, "Set SEL Time", 0 },
-  { 0x5a, rq5a, rs5a, NULL, NULL, "Get Auxiliary Log Status", CMD_CALLRQ },
-  { 0x5b, rq5b, NULL, NULL, NULL, "Set Auxiliary Log Status", 0 },
-  { 0x5c, IPMI_TBD,   NULL, NULL, "Get SEL Time UTC Offset", 0 },
-  { 0x5d, IPMI_TBD,   NULL, NULL, "Set SEL Time UTC Offset", 0 },
+	/* FRU Device Commands */
+	{ 0x10, rq10, rs10, NULL, NULL, "Get FRU Inventory Area Info", 0 },
+	{ 0x11, rq11, rs11, cc11, NULL, "Read FRU Data", 0 },
+	{ 0x12, rq12, rs12, cc12, NULL, "Write FRU Data", 0 },
+
+	/* SDR Device Commands */
+	{ 0x20, NULL, rs20, NULL, NULL, "Get SDR Repository Info", 0 },
+	{ 0x21, NULL, rs21, NULL, NULL, "Get SDR Repository Allocation Info", 0 },
+	{ 0x22, NULL, rs22, NULL, NULL, "Reserve SDR Repository", 0 },
+	{ 0x23, rq23, rs23, NULL, NULL, "Get SDR", 0 },
+	{ 0x24, rq24, rs24, NULL, NULL, "Add SDR", 0 },
+	{ 0x25, rq25, rs25, cc25, NULL, "Partial Add SDR", 0 },
+	{ 0x26, rq26, rs26, NULL, NULL, "Delete SDR", 0 },
+	{ 0x27, rq27, rs27, NULL, NULL, "Clear SDR Repository", 0 },
+	{ 0x28, NULL, rs28, NULL, NULL, "Get SDR Repository Time", 0 },
+	{ 0x29, rq29, NULL, NULL, NULL, "Set SDR Repository Time", 0 },
+	{ 0x2a, NULL, NULL, NULL, NULL, "Enter SDR Repository Update Mode", 0 },
+	{ 0x2b, NULL, NULL, NULL, NULL, "Exit SDR Repository Update Mode", 0 },
+	{ 0x2c, rq2c, rs2c, NULL, NULL, "Run Initialization Agent", 0 },
+
+	/* SEL Device Commands */
+	{ 0x40, NULL, rs40, cc40, NULL, "Get SEL Info", 0 },
+	{ 0x41, NULL, rs41, NULL, NULL, "Get SEL Allocation Info", 0 },
+	{ 0x42, NULL, rs42, cc42, NULL, "Reserve SEL", 0 },
+	{ 0x43, rq43, rs43, cc43, NULL, "Get SEL Entry", 0 },
+	{ 0x44, rq44, rs44, cc44, NULL, "Add SEL Entry", 0 },
+	{ 0x45, rq45, rs45, cc45, NULL, "Partial Add SEL Entry", 0 },
+	{ 0x46, rq46, rs46, cc46, NULL, "Delete SEL Entry", 0 },
+	{ 0x47, rq47, rs47, NULL, NULL, "Clear SEL", 0 },
+	{ 0x48, NULL, rs48, NULL, NULL, "Get SEL Time", 0 },
+	{ 0x49, rq49, NULL, NULL, NULL, "Set SEL Time", 0 },
+	{ 0x5a, rq5a, rs5a, NULL, NULL, "Get Auxiliary Log Status", CMD_CALLRQ },
+	{ 0x5b, rq5b, NULL, NULL, NULL, "Set Auxiliary Log Status", 0 },
+	{ 0x5c, IPMI_TBD,   NULL, NULL, "Get SEL Time UTC Offset", 0 },
+	{ 0x5d, IPMI_TBD,   NULL, NULL, "Set SEL Time UTC Offset", 0 },
 };
 
 void
@@ -805,7 +805,7 @@ ipmi_register_storage(gint proto_ipmi)
 				"ipmi.st20.op_overflow", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_stor_20_op_update,
 			{ "SDR Repository Update",
-				"ipmi.st20.op_update", FT_UINT8, BASE_HEX, vals_20_update, 0x60, NULL, HFILL }},
+				"ipmi.st20.op_update", FT_UINT8, BASE_HEX, VALS(vals_20_update), 0x60, NULL, HFILL }},
 		{ &hf_ipmi_stor_20_op_delete,
 			{ "Delete SDR",
 				"ipmi.st20.op_delete", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
@@ -876,7 +876,7 @@ ipmi_register_storage(gint proto_ipmi)
 				"ipmi.st25.offset", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_25_inprogress,
 			{ "In progress",
-				"ipmi.st25.inprogress", FT_UINT8, BASE_HEX, vals_25_inprogress, 0x0f, NULL, HFILL }},
+				"ipmi.st25.inprogress", FT_UINT8, BASE_HEX, VALS(vals_25_inprogress), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_stor_25_data,
 			{ "SDR Data",
 				"ipmi.st25.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -905,10 +905,10 @@ ipmi_register_storage(gint proto_ipmi)
 				"ipmi.st27.clr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_27_action,
 			{ "Action",
-				"ipmi.st27.action", FT_UINT8, BASE_HEX, vals_27_action, 0, NULL, HFILL }},
+				"ipmi.st27.action", FT_UINT8, BASE_HEX, VALS(vals_27_action), 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_27_status,
 			{ "Erasure Status",
-				"ipmi.st27.status", FT_UINT8, BASE_HEX, vals_27_status, 0x0f, NULL, HFILL }},
+				"ipmi.st27.status", FT_UINT8, BASE_HEX, VALS(vals_27_status), 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_28_time,
 			{ "Time",
@@ -1013,7 +1013,7 @@ ipmi_register_storage(gint proto_ipmi)
 				"ipmi.st45.offset", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_45_inprogress,
 			{ "In progress",
-				"ipmi.st45.inprogress", FT_UINT8, BASE_HEX, vals_45_inprogress, 0x0f, NULL, HFILL }},
+				"ipmi.st45.inprogress", FT_UINT8, BASE_HEX, VALS(vals_45_inprogress), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_stor_45_data,
 			{ "Record Data",
 				"ipmi.st45.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1042,10 +1042,10 @@ ipmi_register_storage(gint proto_ipmi)
 				"ipmi.st47.clr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_47_action,
 			{ "Action",
-				"ipmi.st47.action", FT_UINT8, BASE_HEX, vals_47_action, 0, NULL, HFILL }},
+				"ipmi.st47.action", FT_UINT8, BASE_HEX, VALS(vals_47_action), 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_47_status,
 			{ "Erasure Status",
-				"ipmi.st47.status", FT_UINT8, BASE_HEX, vals_47_status, 0x0f, NULL, HFILL }},
+				"ipmi.st47.status", FT_UINT8, BASE_HEX, VALS(vals_47_status), 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_48_time,
 			{ "Time",
@@ -1057,7 +1057,7 @@ ipmi_register_storage(gint proto_ipmi)
 
 		{ &hf_ipmi_stor_5a_log_type,
 			{ "Log type",
-				"ipmi.st5a.log_type", FT_UINT8, BASE_HEX, log_type_vals, 0x0f, NULL, HFILL }},
+				"ipmi.st5a.log_type", FT_UINT8, BASE_HEX, VALS(log_type_vals), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_stor_5a_ts_add,
 			{ "Last addition timestamp",
 				"ipmi.st5a.ts_add", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -1076,7 +1076,7 @@ ipmi_register_storage(gint proto_ipmi)
 
 		{ &hf_ipmi_stor_5b_log_type,
 			{ "Log type",
-				"ipmi.st5b.log_type", FT_UINT8, BASE_HEX, log_type_vals, 0x0f, NULL, HFILL }},
+				"ipmi.st5b.log_type", FT_UINT8, BASE_HEX, VALS(log_type_vals), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_stor_5b_ts_add,
 			{ "Last addition timestamp",
 				"ipmi.st5b.ts_add", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -1113,3 +1113,16 @@ ipmi_register_storage(gint proto_ipmi)
 	ipmi_register_netfn_cmdtab(IPMI_STORAGE_REQ, IPMI_OEM_NONE, NULL, 0, NULL,
 			cmd_storage, array_length(cmd_storage));
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c
index a3b72db7f1..30591496b1 100644
--- a/epan/dissectors/packet-ipmi-transport.c
+++ b/epan/dissectors/packet-ipmi-transport.c
@@ -2138,37 +2138,37 @@ static const value_string cc33[] = {
 };
 
 static ipmi_cmd_t cmd_transport[] = {
-  /* LAN Device Commands */
-  { 0x01, rq01, NULL, cc01, NULL, "Set LAN Configuration Parameters", 0 },
-  { 0x02, rq02, rs02, cc02, NULL, "Get LAN Configuration Parameters", CMD_CALLRQ },
-  { 0x03, rq03, rs03, NULL, NULL, "Suspend BMC ARPs", 0 },
-  { 0x04, rq04, rs04, NULL, NULL, "Get IP/UDP/RMCP Statistics", 0 },
-
-  /* Serial/Modem Device Commands */
-  { 0x10, rq10, NULL, cc10, NULL, "Set Serial/Modem Configuration", 0 },
-  { 0x11, rq11, rs11, cc11, NULL, "Get Serial/Modem Configuration", CMD_CALLRQ },
-  { 0x12, rq12, rs12, NULL, NULL, "Set Serial/Modem Mux", 0 },
-  { 0x13, rq13, rs13, NULL, NULL, "Get TAP Response Codes", 0 },
-  { 0x14, rq14, NULL, NULL, NULL, "Set PPP UDP Proxy Transmit Data", 0 },
-  { 0x15, rq15, rs15, NULL, NULL, "Get PPP UDP Proxy Transmit Data", 0 },
-  { 0x16, rq16, NULL, cc16, NULL, "Send PPP UDP Proxy Packet", 0 },
-  { 0x17, rq17, rs17, cc17, NULL, "Get PPP UDP Proxy Receive Data", CMD_CALLRQ },
-  { 0x18, rq18, NULL, NULL, NULL, "Serial/Modem Connection Active", 0 },
-  { 0x19, rq19, NULL, cc19, NULL, "Callback", 0 },
-  { 0x1a, rq1a, NULL, NULL, NULL, "Set User Callback Options", 0 },
-  { 0x1b, rq1b, rs1b, NULL, NULL, "Get User Callback Options", 0 },
-  { 0x1c, IPMI_TBD,   NULL, NULL, "Set Serial Routing Mux", 0 },
-
-  /* Serial-Over-LAN Commands */
-  { 0x20, IPMI_TBD,   NULL, NULL, "SOL Activating", 0 },
-  { 0x21, IPMI_TBD,   cc21, NULL, "Set SOL Configuration Parameters", 0 },
-  { 0x22, IPMI_TBD,   cc22, NULL, "Get SOL Configuration Parameters", CMD_CALLRQ },
-
-  /* Command Forwarding Commands */
-  { 0x30, IPMI_TBD,   NULL, NULL, "Forwarded Command", 0 },
-  { 0x31, IPMI_TBD,   NULL, NULL, "Set Forwarded Commands", 0 },
-  { 0x32, IPMI_TBD,   NULL, NULL, "Get Forwarded Commands", 0 },
-  { 0x33, IPMI_TBD,   cc33, NULL, "Enable Forwarded Commands", 0 },
+	/* LAN Device Commands */
+	{ 0x01, rq01, NULL, cc01, NULL, "Set LAN Configuration Parameters", 0 },
+	{ 0x02, rq02, rs02, cc02, NULL, "Get LAN Configuration Parameters", CMD_CALLRQ },
+	{ 0x03, rq03, rs03, NULL, NULL, "Suspend BMC ARPs", 0 },
+	{ 0x04, rq04, rs04, NULL, NULL, "Get IP/UDP/RMCP Statistics", 0 },
+
+	/* Serial/Modem Device Commands */
+	{ 0x10, rq10, NULL, cc10, NULL, "Set Serial/Modem Configuration", 0 },
+	{ 0x11, rq11, rs11, cc11, NULL, "Get Serial/Modem Configuration", CMD_CALLRQ },
+	{ 0x12, rq12, rs12, NULL, NULL, "Set Serial/Modem Mux", 0 },
+	{ 0x13, rq13, rs13, NULL, NULL, "Get TAP Response Codes", 0 },
+	{ 0x14, rq14, NULL, NULL, NULL, "Set PPP UDP Proxy Transmit Data", 0 },
+	{ 0x15, rq15, rs15, NULL, NULL, "Get PPP UDP Proxy Transmit Data", 0 },
+	{ 0x16, rq16, NULL, cc16, NULL, "Send PPP UDP Proxy Packet", 0 },
+	{ 0x17, rq17, rs17, cc17, NULL, "Get PPP UDP Proxy Receive Data", CMD_CALLRQ },
+	{ 0x18, rq18, NULL, NULL, NULL, "Serial/Modem Connection Active", 0 },
+	{ 0x19, rq19, NULL, cc19, NULL, "Callback", 0 },
+	{ 0x1a, rq1a, NULL, NULL, NULL, "Set User Callback Options", 0 },
+	{ 0x1b, rq1b, rs1b, NULL, NULL, "Get User Callback Options", 0 },
+	{ 0x1c, IPMI_TBD,   NULL, NULL, "Set Serial Routing Mux", 0 },
+
+	/* Serial-Over-LAN Commands */
+	{ 0x20, IPMI_TBD,   NULL, NULL, "SOL Activating", 0 },
+	{ 0x21, IPMI_TBD,   cc21, NULL, "Set SOL Configuration Parameters", 0 },
+	{ 0x22, IPMI_TBD,   cc22, NULL, "Get SOL Configuration Parameters", CMD_CALLRQ },
+
+	/* Command Forwarding Commands */
+	{ 0x30, IPMI_TBD,   NULL, NULL, "Forwarded Command", 0 },
+	{ 0x31, IPMI_TBD,   NULL, NULL, "Set Forwarded Commands", 0 },
+	{ 0x32, IPMI_TBD,   NULL, NULL, "Get Forwarded Commands", 0 },
+	{ 0x33, IPMI_TBD,   cc33, NULL, "Enable Forwarded Commands", 0 },
 };
 
 void
@@ -2177,7 +2177,7 @@ ipmi_register_transport(gint proto_ipmi)
 	static hf_register_info hf[] = {
 		{ &hf_ipmi_trn_lan00_sip,
 			{ "Set In Progress",
-				"ipmi.lan00.sip", FT_UINT8, BASE_HEX, lan00_sip_vals, 0x03, NULL, HFILL }},
+				"ipmi.lan00.sip", FT_UINT8, BASE_HEX, VALS(lan00_sip_vals), 0x03, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lanXX_oem,
 			{ "OEM Proprietary",
@@ -2201,7 +2201,7 @@ ipmi_register_transport(gint proto_ipmi)
 
 		{ &hf_ipmi_trn_lan04_ipsrc,
 			{ "IP Address Source",
-				"ipmi.lan04.ipsrc", FT_UINT8, BASE_HEX, lan04_ipsrc_vals, 0x0f, NULL, HFILL }},
+				"ipmi.lan04.ipsrc", FT_UINT8, BASE_HEX, VALS(lan04_ipsrc_vals), 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan05_ether,
 			{ "MAC Address",
@@ -2275,7 +2275,7 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.lan18.ack", FT_BOOLEAN, 8, TFS(&lan18_ack_tfs), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan18_dst_type,
 			{ "Destination Type",
-				"ipmi.lan18.dst_type", FT_UINT8, BASE_HEX, lan18_dst_type_vals, 0x07, NULL, HFILL }},
+				"ipmi.lan18.dst_type", FT_UINT8, BASE_HEX, VALS(lan18_dst_type_vals), 0x07, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan18_tout,
 			{ "Timeout/Retry Interval",
 				"ipmi.lan18.tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0, NULL, HFILL }},
@@ -2288,7 +2288,7 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.lan19.dst_selector", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan19_addr_format,
 			{ "Address Format",
-				"ipmi.lan19.addr_format", FT_UINT8, BASE_HEX, lan19_af_vals, 0xf0, NULL, HFILL }},
+				"ipmi.lan19.addr_format", FT_UINT8, BASE_HEX, VALS(lan19_af_vals), 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan19_address,
 			{ "Address (format unknown)",
 				"ipmi.lan19.address", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -2330,7 +2330,7 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.lan25.dst_selector", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan25_addr_format,
 			{ "Address Format",
-				"ipmi.lan25.addr_format", FT_UINT8, BASE_HEX, lan25_af_vals, 0xf0, NULL, HFILL }},
+				"ipmi.lan25.addr_format", FT_UINT8, BASE_HEX, VALS(lan25_af_vals), 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan25_address,
 			{ "Address (format unknown)",
 				"ipmi.lan25.address", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
@@ -2394,13 +2394,13 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.serial06.dcd", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial07_flowctl,
 			{ "Flow Control",
-				"ipmi.serial07.flowctl", FT_UINT8, BASE_HEX, serialXX_flowctl_vals, 0xc0, NULL, HFILL }},
+				"ipmi.serial07.flowctl", FT_UINT8, BASE_HEX, VALS(serialXX_flowctl_vals), 0xc0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial07_dtrhangup,
 			{ "DTR Hang-up",
 				"ipmi.serial07.dtrhangup", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial07_bitrate,
 			{ "Bit rate",
-				"ipmi.serial07.bitrate", FT_UINT8, BASE_HEX, serialXX_bitrate_vals, 0x0f, NULL, HFILL }},
+				"ipmi.serial07.bitrate", FT_UINT8, BASE_HEX, VALS(serialXX_bitrate_vals), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial08_esc_powerup,
 			{ "Power-up/wakeup via ESC-^",
 				"ipmi.serial08.esc_powerup", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x40, NULL, HFILL }},
@@ -2472,7 +2472,7 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.serial17.ack", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_dest_type,
 			{ "Destination Type",
-				"ipmi.serial17.dest_type", FT_UINT8, BASE_HEX, serial17_dest_type_vals, 0x0f, NULL, HFILL }},
+				"ipmi.serial17.dest_type", FT_UINT8, BASE_HEX, VALS(serial17_dest_type_vals), 0x0f, NULL, HFILL }},
 #if 0
 		{ &hf_ipmi_trn_serial17_ack_timeout,
 			{ "Alert Acknowledge Timeout",
@@ -2510,7 +2510,7 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.serial19.destsel", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial19_flowctl,
 			{ "Flow Control",
-				"ipmi.serial19.flowctl", FT_UINT8, BASE_HEX, serialXX_flowctl_vals, 0xc0, NULL, HFILL }},
+				"ipmi.serial19.flowctl", FT_UINT8, BASE_HEX, VALS(serialXX_flowctl_vals), 0xc0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial19_dtrhangup,
 			{ "DTR Hang-up",
 				"ipmi.serial19.dtrhangup", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20, NULL, HFILL }},
@@ -2522,10 +2522,10 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.serial19.charsize", FT_BOOLEAN, 8, TFS(&serial19_charsize_tfs), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial19_parity,
 			{ "Parity",
-				"ipmi.serial19.parity", FT_UINT8, BASE_HEX, serial19_parity_vals, 0x07, NULL, HFILL }},
+				"ipmi.serial19.parity", FT_UINT8, BASE_HEX, VALS(serial19_parity_vals), 0x07, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial19_bitrate,
 			{ "Bit rate",
-				"ipmi.serial19.bitrate", FT_UINT8, BASE_HEX, serialXX_bitrate_vals, 0x0f, NULL, HFILL }},
+				"ipmi.serial19.bitrate", FT_UINT8, BASE_HEX, VALS(serialXX_bitrate_vals), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial20_num_dial_strings,
 			{ "Number of Dial Strings",
 				"ipmi.serial20.num_dial_strings", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
@@ -2576,7 +2576,7 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.serial28.tapsrv_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_confirm,
 			{ "TAP Confirmation",
-				"ipmi.serial28.confirm", FT_UINT8, BASE_HEX, serial28_confirm_vals, 0x03, NULL, HFILL }},
+				"ipmi.serial28.confirm", FT_UINT8, BASE_HEX, VALS(serial28_confirm_vals), 0x03, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_srvtype,
 			{ "TAP 'SST' Service Type",
 				"ipmi.serial28.srvtype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -2615,13 +2615,13 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.serial28.tap_n3", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_op,
 			{ "Parameter Operation",
-				"ipmi.serial29.op", FT_UINT8, BASE_HEX, serial29_op_vals, 0xc0, NULL, HFILL }},
+				"ipmi.serial29.op", FT_UINT8, BASE_HEX, VALS(serial29_op_vals), 0xc0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_lineedit,
 			{ "Line Editing",
 				"ipmi.serial29.lineedit", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_deletectl,
 			{ "Delete control",
-				"ipmi.serial29.deletectl", FT_UINT8, BASE_HEX, serial29_delete_vals, 0x0c, NULL, HFILL }},
+				"ipmi.serial29.deletectl", FT_UINT8, BASE_HEX, VALS(serial29_delete_vals), 0x0c, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_echo,
 			{ "Echo",
 				"ipmi.serial29.echo", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }},
@@ -2630,19 +2630,19 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.serial29.handshake", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_o_newline,
 			{ "Output newline sequence",
-				"ipmi.serial29.o_newline", FT_UINT8, BASE_HEX, serial29_o_nl_vals, 0xf0, NULL, HFILL }},
+				"ipmi.serial29.o_newline", FT_UINT8, BASE_HEX, VALS(serial29_o_nl_vals), 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_i_newline,
 			{ "Input newline sequence",
-				"ipmi.serial29.i_newline", FT_UINT8, BASE_HEX, serial29_i_nl_vals, 0x0f, NULL, HFILL }},
+				"ipmi.serial29.i_newline", FT_UINT8, BASE_HEX, VALS(serial29_i_nl_vals), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_snooping,
 			{ "System Negotiation Snooping",
 				"ipmi.serial30.snooping", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_snoopctl,
 			{ "Snoop ACCM Control",
-				"ipmi.serial30.snoopctl", FT_UINT8, BASE_HEX, serial30_snoopctl_vals, 0x03, NULL, HFILL }},
+				"ipmi.serial30.snoopctl", FT_UINT8, BASE_HEX, VALS(serial30_snoopctl_vals), 0x03, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_negot_ctl,
 			{ "BMC negotiates link parameters",
-				"ipmi.serial30.negot_ctl", FT_UINT8, BASE_HEX, serial30_negoctl_vals, 0x30, NULL, HFILL }},
+				"ipmi.serial30.negot_ctl", FT_UINT8, BASE_HEX, VALS(serial30_negoctl_vals), 0x30, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_use_xmit_accm,
 			{ "Filtering incoming chars",
 				"ipmi.serial30.filter", FT_BOOLEAN, 8, TFS(&serial30_filter_tfs), 0x04, NULL, HFILL }},
@@ -2654,7 +2654,7 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.serial30.xmit_proto_comp", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_ipaddr,
 			{ "IP Address negotiation",
-				"ipmi.serial30.ipaddr", FT_UINT8, BASE_HEX, serial30_ipaddr_val, 0x18, NULL, HFILL }},
+				"ipmi.serial30.ipaddr", FT_UINT8, BASE_HEX, VALS(serial30_ipaddr_val), 0x18, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_accm,
 			{ "ACCM Negotiation",
 				"ipmi.serial30.accm", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, NULL, HFILL }},
@@ -2672,7 +2672,7 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.serial32.port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial33_auth_proto,
 			{ "PPP Link Authentication Protocol",
-				"ipmi.serial33.auth_proto", FT_UINT8, BASE_HEX, serialXX_proto_vals, 0x0f, NULL, HFILL }},
+				"ipmi.serial33.auth_proto", FT_UINT8, BASE_HEX, VALS(serialXX_proto_vals), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial34_chap_name,
 			{ "CHAP Name",
 				"ipmi.serial34.chap_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -2723,7 +2723,7 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.serial43.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial43_auth_proto,
 			{ "Link Auth Type",
-				"ipmi.serial43.auth_proto", FT_UINT8, BASE_HEX, serialXX_proto_vals, 0x0f, NULL, HFILL }},
+				"ipmi.serial43.auth_proto", FT_UINT8, BASE_HEX, VALS(serialXX_proto_vals), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial44_acct_sel,
 			{ "PPP Account Selector",
 				"ipmi.serial44.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -2922,7 +2922,7 @@ ipmi_register_transport(gint proto_ipmi)
 				"ipmi.tr12.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_12_mux_setting,
 			{ "Mux Setting",
-				"ipmi.tr12.mux_setting", FT_UINT8, BASE_HEX, vals_12_mux, 0x0f, NULL, HFILL }},
+				"ipmi.tr12.mux_setting", FT_UINT8, BASE_HEX, VALS(vals_12_mux), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_12_sw_to_sys,
 			{ "Requests to switch to system",
 				"ipmi.tr12.sw_to_sys", FT_BOOLEAN, 8, TFS(&tfs_12_blocked), 0x80, NULL, HFILL }},
@@ -3018,7 +3018,7 @@ ipmi_register_transport(gint proto_ipmi)
 
 		{ &hf_ipmi_trn_18_state,
 			{ "Session state",
-				"ipmi.tr18.state", FT_UINT8, BASE_HEX, vals_18_state, 0x0f, NULL, HFILL }},
+				"ipmi.tr18.state", FT_UINT8, BASE_HEX, VALS(vals_18_state), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_18_ipmi_ver,
 			{ "IPMI Version",
 				"ipmi.tr18.ipmi_ver", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }},
@@ -3185,3 +3185,16 @@ ipmi_register_transport(gint proto_ipmi)
 	ipmi_register_netfn_cmdtab(IPMI_TRANSPORT_REQ, IPMI_OEM_NONE, NULL, 0, NULL,
 			cmd_transport, array_length(cmd_transport));
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index 49b792586c..62f71049d3 100644
--- a/epan/dissectors/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
@@ -1454,3 +1454,16 @@ proto_register_ipmi(void)
 			"Selects which OEM format is used for commands that IPMI does not define",
 			&selected_oem, oemsel_vals, FALSE);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-ipmi.h b/epan/dissectors/packet-ipmi.h
index 51e9dabf31..840506f737 100644
--- a/epan/dissectors/packet-ipmi.h
+++ b/epan/dissectors/packet-ipmi.h
@@ -182,3 +182,17 @@ int ipmi_sendmsg_whichresponse(struct ipmi_header *hdr, struct ipmi_reqresp *rr)
 int ipmi_sendmsg_otheridx(struct ipmi_header *hdr);
 
 #endif
+
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */