zbee: minor cleanup

- replace C++ comments by C-style comments (or #if 0...#endif);
- Chnage all hf[] "" blurbs to NULL;
- Fix some spelling;
- Remove two unused handles.

svn path=/trunk/; revision=28439

7 files changed, 248 insertions, 251 deletions

diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c
index 6833645eea..09c0268f80 100644
--- a/epan/dissectors/packet-zbee-aps.c
+++ b/epan/dissectors/packet-zbee-aps.c
@@ -48,8 +48,6 @@
  *************************
  */
 /* Protocol Registration */
-void    proto_reg_handoff_zbee_aps  (void);
-void    proto_register_zbee_aps     (void);
 void    proto_init_zbee_aps         (void);
 
 /* Dissector Routines */
@@ -76,7 +74,7 @@ guint   zbee_apf_transaction_len    (tvbuff_t *tvb, guint offset, guint8 type);
  * Global Variables *
  ********************
  */
-/* Field indicies. */
+/* Field indices. */
 static int proto_zbee_aps = -1;
 static int hf_zbee_aps_fcf_frame_type = -1;
 static int hf_zbee_aps_fcf_delivery = -1;
@@ -112,18 +110,18 @@ static int hf_zbee_aps_cmd_device_status = -1;
 static int hf_zbee_aps_cmd_ea_key_type = -1;
 static int hf_zbee_aps_cmd_ea_data = -1;
 
-/* Field indicies for ZigBee 2003 & earlier Application Framework. */
+/* Field indices for ZigBee 2003 & earlier Application Framework. */
 static int proto_zbee_apf = -1;
 static int hf_zbee_apf_count = -1;
 static int hf_zbee_apf_type = -1;
 
-/* Subtree indicies. */
+/* Subtree indices. */
 static gint ett_zbee_aps = -1;
 static gint ett_zbee_aps_fcf = -1;
 static gint ett_zbee_aps_ext = -1;
 static gint ett_zbee_aps_cmd = -1;
 
-/* Fragmentation indicies. */
+/* Fragmentation indices. */
 static int hf_zbee_aps_fragments = -1;
 static int hf_zbee_aps_fragment = -1;
 static int hf_zbee_aps_fragment_overlap = -1;
@@ -135,14 +133,13 @@ static int hf_zbee_aps_reassembled_in = -1;
 static gint ett_zbee_aps_fragment = -1;
 static gint ett_zbee_aps_fragments = -1;
 
-/* Subtree indicies for the ZigBee 2004 & earlier Application Framework. */
+/* Subtree indices for the ZigBee 2004 & earlier Application Framework. */
 static gint ett_zbee_apf = -1;
 
 /* Dissector Handles. */
 static dissector_handle_t   data_handle;
 static dissector_handle_t   zbee_aps_handle;
 static dissector_handle_t   zbee_apf_handle;
-static dissector_handle_t   security_handle;
 
 /* Dissector List. */
 static dissector_table_t    zbee_aps_dissector_table;
@@ -468,7 +465,9 @@ dissect_zbee_aps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         /* Cluster ID is 8-bits long in ZigBee 2004 and earlier. */
         pinfo->zbee_cluster_id = packet.cluster = tvb_get_guint8(tvb, offset);
         if (tree) {
-            //proto_tree_add_uint(aps_tree, hf_zbee_aps_cluster, tvb, offset, sizeof(guint8), packet.cluster);
+#if 0
+            proto_tree_add_uint(aps_tree, hf_zbee_aps_cluster, tvb, offset, sizeof(guint8), packet.cluster);
+#endif
             proto_tree_add_uint_format_value(aps_tree, hf_zbee_aps_cluster, tvb, offset, sizeof(guint8), packet.cluster, "0x%02x", packet.cluster);
         }
         offset += sizeof(guint8);
@@ -1504,19 +1503,19 @@ void proto_register_zbee_aps(void)
     static hf_register_info hf[] = {
             { &hf_zbee_aps_fcf_frame_type,
             { "Frame Type",             "zbee.aps.type", FT_UINT8, BASE_HEX, VALS(zbee_aps_frame_types), ZBEE_APS_FCF_FRAME_TYPE,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_fcf_delivery,
             { "Delivery Mode",          "zbee.aps.delivery", FT_UINT8, BASE_HEX, VALS(zbee_aps_delivery_modes), ZBEE_APS_FCF_DELIVERY_MODE,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_fcf_indirect_mode,
             { "Indirect Address Mode",  "zbee.aps.indirect_mode", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_INDIRECT_MODE,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_fcf_ack_mode,
             { "Acknowledgement Mode",  "zbee.aps.ack_mode", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_ACK_MODE,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_fcf_security,
             { "Security",               "zbee.aps.security", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_SECURITY,
@@ -1528,35 +1527,35 @@ void proto_register_zbee_aps(void)
 
             { &hf_zbee_aps_fcf_ext_header,
             { "Extended Header",        "zbee.aps.ext_header", FT_BOOLEAN, 8, NULL, ZBEE_APS_FCF_EXT_HEADER,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_dst,
             { "Destination Endpoint",   "zbee.aps.dst", FT_UINT8, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_group,
             { "Group",                  "zbee.aps.group", FT_UINT16, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_cluster,
             { "Cluster",                "zbee.aps.cluster", FT_UINT16, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_profile,
             { "Profile",                "zbee.aps.profile", FT_UINT16, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_src,
             { "Source Endpoint",        "zbee.aps.src", FT_UINT8, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_counter,
             { "Counter",                "zbee.aps.counter", FT_UINT8, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_fragmentation,
             { "Fragmentation",          "zbee.aps.fragmentation", FT_UINT8, BASE_HEX, VALS(zbee_aps_fragmentation_modes), ZBEE_APS_EXT_FCF_FRAGMENT,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_block_number,
             { "Block Number",           "zbee.aps.block", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -1564,7 +1563,7 @@ void proto_register_zbee_aps(void)
 
             { &hf_zbee_aps_cmd_id,
             { "Command Identifier",     "zbee.aps.cmd.id", FT_UINT8, BASE_HEX, VALS(zbee_aps_cmd_names), 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_cmd_initiator,
             { "Initiator Address",      "zbee.aps.cmd.initiator", FT_UINT64, BASE_HEX, NULL, 0x0,
@@ -1584,11 +1583,11 @@ void proto_register_zbee_aps(void)
 
             { &hf_zbee_aps_cmd_device,
             { "Device Address",         "zbee.aps.cmd.device", FT_UINT64, BASE_HEX, NULL, 0x0,
-                "The device who's status is being updated.", HFILL }},
+                "The device whose status is being updated.", HFILL }},
 
             { &hf_zbee_aps_cmd_challenge,
             { "Challenge",              "zbee.aps.cmd.challenge", FT_BYTES, BASE_HEX, NULL, 0x0,
-                "Random challge value used during SKKE and authentication.", HFILL }},
+                "Random challenge value used during SKKE and authentication.", HFILL }},
 
             { &hf_zbee_aps_cmd_mac,
             { "Message Authentication Code",    "zbee.aps.cmd.mac", FT_BYTES, BASE_HEX, NULL, 0x0,
@@ -1596,19 +1595,19 @@ void proto_register_zbee_aps(void)
 
             { &hf_zbee_aps_cmd_key,
             { "Key",                    "zbee.aps.cmd.key", FT_BYTES, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_cmd_key_type,
             { "Key Type",               "zbee.aps.cmd.key_type", FT_UINT8, BASE_HEX, VALS(zbee_aps_key_names), 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_cmd_dst,
             { "Destination Address",    "zbee.aps.cmd.dst", FT_UINT64, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_cmd_src,
             { "Source Address",         "zbee.aps.cmd.src", FT_UINT64, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_cmd_seqno,
             { "Sequence Number",        "zbee.aps.cmd.seqno", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -1616,7 +1615,7 @@ void proto_register_zbee_aps(void)
 
             { &hf_zbee_aps_cmd_short_addr,
             { "Device Address",         "zbee.aps.cmd.addr", FT_UINT16, BASE_HEX, NULL, 0x0,
-                "The device who's status is being updated.", HFILL }},
+                "The device whose status is being updated.", HFILL }},
 
             { &hf_zbee_aps_cmd_device_status,
             { "Device Status",          "zbee.aps.cmd.status", FT_UINT8, BASE_HEX, VALS(zbee_aps_update_status_names), 0x0,
@@ -1624,7 +1623,7 @@ void proto_register_zbee_aps(void)
 
             { &hf_zbee_aps_cmd_ea_key_type,
             { "Key Type",               "zbee.aps.cmd.ea.key_type", FT_UINT8, BASE_HEX, VALS(zbee_aps_ea_key_names), 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_cmd_ea_data,
             { "Data",                   "zbee.aps.cmd.ea.data", FT_BYTES, BASE_HEX, NULL, 0x0,
@@ -1632,45 +1631,45 @@ void proto_register_zbee_aps(void)
 
             { &hf_zbee_aps_fragments,
             { "Message fragments",      "zbee.aps.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_fragment,
             { "Message fragment",       "zbee.aps.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_fragment_overlap,
             { "Message fragment overlap",       "zbee.aps.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_fragment_overlap_conflicts,
             { "Message fragment overlapping with conflicting data", "zbee.aps.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_fragment_multiple_tails,
             { "Message has multiple tail fragments", "zbee.aps.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_fragment_too_long_fragment,
             { "Message fragment too long",      "zbee.aps.fragment.too_long_fragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_fragment_error,
             { "Message defragmentation error",  "zbee.aps.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_aps_reassembled_in,
-            { "Reassembled in",  "zbee.aps.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-                "", HFILL }}
+            { "Reassembled in",         "zbee.aps.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+                NULL, HFILL }}
     };
 
     static hf_register_info hf_apf[] = {
             { &hf_zbee_apf_count,
             { "Count",                  "zbee.app.count", FT_UINT8, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_apf_type,
             { "Type",                   "zbee.app.type", FT_UINT8, BASE_HEX, VALS(zbee_apf_type_names), 0x0,
-                "", HFILL }}
+                NULL, HFILL }}
     };
 
     /*  APS subtrees */
@@ -1725,7 +1724,6 @@ void proto_reg_handoff_zbee_aps(void)
     data_handle     = find_dissector("data");
     zbee_aps_handle = find_dissector("zbee.aps");
     zbee_apf_handle = find_dissector("zbee.apf");
-    security_handle = find_dissector("zbee.security");
 } /* proto_reg_handoff_zbee_aps */
 
 /*FUNCTION:------------------------------------------------------
diff --git a/epan/dissectors/packet-zbee-aps.h b/epan/dissectors/packet-zbee-aps.h
index 991db55e9b..3b65bd5a80 100644
--- a/epan/dissectors/packet-zbee-aps.h
+++ b/epan/dissectors/packet-zbee-aps.h
@@ -29,25 +29,25 @@
 
 /*  Structure to contain the APS frame information */
 typedef struct{
-    gboolean    indirect_mode;  // ZigBee 2004 and Earlier
-    gboolean    ack_mode;       // ZigBee 2007 and Later
+    gboolean    indirect_mode;  /* ZigBee 2004 and Earlier  */
+    gboolean    ack_mode;       /* ZigBee 2007 and Later    */
     gboolean    security;
     gboolean    ack_req;
-    gboolean    ext_header;     // ZigBee 2007 and Later
+    gboolean    ext_header;     /* ZigBee 2007 and Later    */
     guint8      type;
     guint8      delivery;
 
     guint8      dst;
-    guint16     group;          // ZigBee 2006 and Later
+    guint16     group;          /* ZigBee 2006 and Later    */
     guint16     cluster;
     guint16     profile;
     guint8      src;
     guint8      counter;
 
     /* Fragmentation Fields. */
-    guint8      fragmentation;  // ZigBee 2007 and Later
-    guint8      block_number;   // ZigBee 2007 and Later
-    guint8      ack_bitfield;   // ZigBee 2007 and Later
+    guint8      fragmentation;  /* ZigBee 2007 and Later    */
+    guint8      block_number;   /* ZigBee 2007 and Later    */
+    guint8      ack_bitfield;   /* ZigBee 2007 and Later    */
 
     /* Some helpers for the upper layers. */
     gboolean    profile_present;
@@ -57,8 +57,8 @@ typedef struct{
 
 #define ZBEE_APS_FCF_FRAME_TYPE     0x03
 #define ZBEE_APS_FCF_DELIVERY_MODE  0x0c
-#define ZBEE_APS_FCF_INDIRECT_MODE  0x10    // ZigBee 2004 and earlier.
-#define ZBEE_APS_FCF_ACK_MODE       0x10    // ZigBee 2007 and later.
+#define ZBEE_APS_FCF_INDIRECT_MODE  0x10    /* ZigBee 2004 and earlier.  */
+#define ZBEE_APS_FCF_ACK_MODE       0x10    /* ZigBee 2007 and later.    */
 #define ZBEE_APS_FCF_SECURITY       0x20
 #define ZBEE_APS_FCF_ACK_REQ        0x40
 #define ZBEE_APS_FCF_EXT_HEADER     0x80
@@ -70,7 +70,7 @@ typedef struct{
 #define ZBEE_APS_FCF_UNICAST        0x00
 #define ZBEE_APS_FCF_INDIRECT       0x01
 #define ZBEE_APS_FCF_BCAST          0x02
-#define ZBEE_APS_FCF_GROUP          0x03    // ZigBee 2006 and later.
+#define ZBEE_APS_FCF_GROUP          0x03    /* ZigBee 2006 and later.    */
 
 #define ZBEE_APS_EXT_FCF_FRAGMENT           0x03
 #define ZBEE_APS_EXT_FCF_FRAGMENT_NONE      0x00
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c
index 0ae3ceab2a..b9391b9bfd 100644
--- a/epan/dissectors/packet-zbee-nwk.c
+++ b/epan/dissectors/packet-zbee-nwk.c
@@ -154,7 +154,6 @@ static gint ett_zbee_nwk_cmd_cinfo = -1;
 
 static dissector_handle_t   data_handle;
 static dissector_handle_t   aps_handle;
-static dissector_handle_t   security_handle;
 
 /********************/
 /* Field Names      */
@@ -1453,11 +1452,11 @@ void proto_register_zbee_nwk(void)
 
             { &hf_zbee_nwk_frame_type,
             { "Frame Type",             "zbee.nwk.frame_type", FT_UINT16, BASE_HEX, VALS(zbee_nwk_frame_types), ZBEE_NWK_FCF_FRAME_TYPE,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_proto_version,
             { "Protocol Version",       "zbee.nwk.proto_version", FT_UINT16, BASE_DEC, NULL, ZBEE_NWK_FCF_VERSION,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_discover_route,
             { "Discover Route",         "zbee.nwk.discovery", FT_UINT16, BASE_HEX, VALS(zbee_nwk_discovery_modes), ZBEE_NWK_FCF_DISCOVER_ROUTE,
@@ -1465,7 +1464,7 @@ void proto_register_zbee_nwk(void)
 
             { &hf_zbee_nwk_multicast,
             { "Multicast",              "zbee.nwk.multicast", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_MULTICAST,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_security,
             { "Security",               "zbee.nwk.security", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_SECURITY,
@@ -1473,23 +1472,23 @@ void proto_register_zbee_nwk(void)
 
             { &hf_zbee_nwk_source_route,
             { "Source Route",           "zbee.nwk.src_route", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_SOURCE_ROUTE,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_ext_dst,
             { "Extended Destination",   "zbee.nwk.ext_dst", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_EXT_DEST,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_ext_src,
             { "Extended Source",        "zbee.nwk.ext_src", FT_BOOLEAN, 16, NULL, ZBEE_NWK_FCF_EXT_SOURCE,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_dst,
             { "Destination",            "zbee.nwk.dst", FT_UINT16, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_src,
             { "Source",                 "zbee.nwk.src", FT_UINT16, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_radius,
             { "Radius",                 "zbee.nwk.radius", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -1497,7 +1496,7 @@ void proto_register_zbee_nwk(void)
 
             { &hf_zbee_nwk_seqno,
             { "Sequence Number",        "zbee.nwk.seqno", FT_UINT8, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_mcast_mode,
             { "Multicast Mode",         "zbee.nwk.multicast.mode", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_MCAST_MODE,
@@ -1509,15 +1508,15 @@ void proto_register_zbee_nwk(void)
 
             { &hf_zbee_nwk_mcast_max_radius,
             { "Max Non-Member Radius",  "zbee.nwk.multicast.max_radius", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_MCAST_MAX_RADIUS,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_dst64,
             { "Extended Destination",   "zbee.nwk.dst64", FT_UINT64, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_src64,
             { "Extended Source",        "zbee.nwk.scr64", FT_UINT64, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_relay_count,
             { "Relay Count",            "zbee.nwk.relay.count", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -1529,11 +1528,11 @@ void proto_register_zbee_nwk(void)
 
             { &hf_zbee_nwk_cmd_id,
             { "Command Identifier",     "zbee.nwk.cmd.id", FT_UINT8, BASE_HEX, VALS(zbee_nwk_cmd_names), 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_addr,
             { "Address",                "zbee.nwk.cmd.addr", FT_UINT16, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_route_id,
             { "Route ID",               "zbee.nwk.cmd.route.id", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -1541,27 +1540,27 @@ void proto_register_zbee_nwk(void)
 
             { &hf_zbee_nwk_cmd_route_dest,
             { "Destination",            "zbee.nwk.cmd.route.dest", FT_UINT16, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_route_orig,
             { "Originator",             "zbee.nwk.cmd.route.orig", FT_UINT16, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_route_resp,
             { "Responder",              "zbee.nwk.cmd.route.resp", FT_UINT16, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_route_dest_ext,
             { "Extended Destination",   "zbee.nwk.cmd.route.dest_ext", FT_UINT64, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_route_orig_ext,
             { "Extended Originator",    "zbee.nwk.cmd.route.orig_ext", FT_UINT64, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_route_resp_ext,
             { "Extended Responder",     "zbee.nwk.cmd.route.resp_ext", FT_UINT64, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_route_cost,
             { "Path Cost",              "zbee.nwk.cmd.route.cost", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -1577,23 +1576,23 @@ void proto_register_zbee_nwk(void)
 
             { &hf_zbee_nwk_cmd_route_opt_dest_ext,
             { "Extended Destination",   "zbee.nwk.cmd.route.opts.dest_ext", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_ROUTE_OPTION_DEST_EXT,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_route_opt_resp_ext,
             { "Extended Responder",   "zbee.nwk.cmd.route.opts.resp_ext", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_ROUTE_OPTION_RESP_EXT,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_route_opt_orig_ext,
             { "Extended Originator",    "zbee.nwk.cmd.route.opts.orig_ext", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_ROUTE_OPTION_ORIG_EXT,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_route_opt_many_to_one,
             { "Many-to-One Discovery",  "zbee.nwk.cmd.route.opts.many2one", FT_UINT8, BASE_HEX, VALS(zbee_nwk_cmd_route_many_modes), ZBEE_NWK_CMD_ROUTE_OPTION_MANY_MASK,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_nwk_status,
             { "Status Code",            "zbee.nwk.cmd.status", FT_UINT8, BASE_HEX, VALS(zbee_nwk_status_codes), 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_leave_rejoin,
             { "Rejoin",                 "zbee.nwk.cmd.leave.rejoin", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_LEAVE_OPTION_REJOIN,
@@ -1617,7 +1616,7 @@ void proto_register_zbee_nwk(void)
 
             { &hf_zbee_nwk_cmd_cinfo_type,
             { "Full-Function Device",   "zbee.nwk.cmd.cinfo.ffd", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_DEVICE_TYPE,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_cinfo_power,
             { "AC Power",               "zbee.nwk.cmd.cinfo.power", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_POWER_SRC,
@@ -1637,7 +1636,7 @@ void proto_register_zbee_nwk(void)
 
             { &hf_zbee_nwk_cmd_rejoin_status,
             { "Status",                 "zbee.nwk.cmd.rejoin_status", FT_UINT8, BASE_HEX, VALS(zbee_nwk_rejoin_codes), 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_link_last,
             { "Last Frame",             "zbee.nwk.cmd.link.last", FT_BOOLEAN, 8, NULL, ZBEE_NWK_CMD_LINK_OPTION_LAST_FRAME,
@@ -1649,43 +1648,43 @@ void proto_register_zbee_nwk(void)
 
             { &hf_zbee_nwk_cmd_link_count,
             { "Link Status Count",      "zbee.nwk.cmd.link.count", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_CMD_LINK_OPTION_COUNT_MASK,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_report_type,
             { "Report Type",            "zbee.nwk.cmd.report.type", FT_UINT8, BASE_HEX, VALS(zbee_nwk_report_types), ZBEE_NWK_CMD_NWK_REPORT_ID_MASK,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_report_count,
             { "Report Information Count",   "zbee.nwk.cmd.report.count", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_CMD_NWK_REPORT_COUNT_MASK,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_update_type,
             { "Update Type",            "zbee.nwk.cmd.update.type", FT_UINT8, BASE_HEX, VALS(zbee_nwk_update_types), ZBEE_NWK_CMD_NWK_UPDATE_ID_MASK,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_update_count,
             { "Update Information Count",   "zbee.nwk.cmd.update.count", FT_UINT8, BASE_DEC, NULL, ZBEE_NWK_CMD_NWK_UPDATE_COUNT_MASK,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_update_id,
             { "Update ID",              "zbee.nwk.cmd.update.id", FT_UINT8, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_nwk_cmd_epid,
             { "Extended PAN ID",        "zbee.nwk.cmd.epid", FT_UINT64, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_beacon_protocol,
             { "Protocol ID",            "zbee.beacon.protocol", FT_UINT8, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_beacon_stack_profile,
             { "Stack Profile",          "zbee.beacon.profile", FT_UINT8, BASE_HEX, VALS(zbee_nwk_stack_profiles), 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_beacon_version,
             { "Protocol Version",       "zbee.beacon.version", FT_UINT8, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_beacon_router_capacity,
             { "Router Capacity", "zbee.beacon.router", FT_BOOLEAN, 8, NULL, 0x0,
@@ -1709,7 +1708,7 @@ void proto_register_zbee_nwk(void)
 
             { &hf_zbee_beacon_update_id,
             { "Update ID",              "zbee.beacon.update_id", FT_UINT8, BASE_DEC, NULL, 0x0,
-                "", HFILL }}
+                NULL, HFILL }}
     };
 
     /*  NWK Layer subtrees */
@@ -1752,7 +1751,6 @@ void proto_reg_handoff_zbee_nwk(void)
 {
     /* Find the other dissectors we need. */
     data_handle     = find_dissector("data");
-    security_handle = find_dissector("zbee.security");
     aps_handle      = find_dissector("zbee.aps");
 
     /* Register our dissector with IEEE 802.15.4 */
diff --git a/epan/dissectors/packet-zbee-nwk.h b/epan/dissectors/packet-zbee-nwk.h
index 835fddac47..b1e3da4fe4 100644
--- a/epan/dissectors/packet-zbee-nwk.h
+++ b/epan/dissectors/packet-zbee-nwk.h
@@ -30,11 +30,11 @@
 #define ZBEE_NWK_FCF_FRAME_TYPE             0x0003
 #define ZBEE_NWK_FCF_VERSION                0x003C
 #define ZBEE_NWK_FCF_DISCOVER_ROUTE         0x00C0
-#define ZBEE_NWK_FCF_MULTICAST              0x0100  // ZigBee 2006 and Later
+#define ZBEE_NWK_FCF_MULTICAST              0x0100  /* ZigBee 2006 and Later */
 #define ZBEE_NWK_FCF_SECURITY               0x0200
-#define ZBEE_NWK_FCF_SOURCE_ROUTE           0x0400  // ZigBee 2006 and Later
-#define ZBEE_NWK_FCF_EXT_DEST               0x0800  // ZigBee 2006 and Later
-#define ZBEE_NWK_FCF_EXT_SOURCE             0x1000  // ZigBee 2006 and Later
+#define ZBEE_NWK_FCF_SOURCE_ROUTE           0x0400  /* ZigBee 2006 and Later */
+#define ZBEE_NWK_FCF_EXT_DEST               0x0800  /* ZigBee 2006 and Later */
+#define ZBEE_NWK_FCF_EXT_SOURCE             0x1000  /* ZigBee 2006 and Later */
 
 /*  ZigBee NWK FCF Frame Types */
 #define ZBEE_NWK_FCF_DATA                   0x0000
@@ -46,31 +46,31 @@
 #define ZBEE_NWK_FCF_DISCOVERY_FORCE        0x0003
 
 /* Multicast Control */
-#define ZBEE_NWK_MCAST_MODE                 0x03    // ZigBee 2006 and later
-#define ZBEE_NWK_MCAST_RADIUS               0x1c    // ZigBee 2006 and later
-#define ZBEE_NWK_MCAST_MAX_RADIUS           0xe0    // ZigBee 2006 and later
-#define ZBEE_NWK_MCAST_MODE_NONMEMBER       0x00    // ZigBee 2006 and later
-#define ZBEE_NWK_MCAST_MODE_MEMBER          0x01    // ZigBee 2006 and later
+#define ZBEE_NWK_MCAST_MODE                 0x03    /* ZigBee 2006 and later */
+#define ZBEE_NWK_MCAST_RADIUS               0x1c    /* ZigBee 2006 and later */
+#define ZBEE_NWK_MCAST_MAX_RADIUS           0xe0    /* ZigBee 2006 and later */
+#define ZBEE_NWK_MCAST_MODE_NONMEMBER       0x00    /* ZigBee 2006 and later */
+#define ZBEE_NWK_MCAST_MODE_MEMBER          0x01    /* ZigBee 2006 and later */
 
 /*  ZigBee NWK Command Types */
 #define ZBEE_NWK_CMD_ROUTE_REQ                  0x01
 #define ZBEE_NWK_CMD_ROUTE_REPLY                0x02
 #define ZBEE_NWK_CMD_NWK_STATUS                 0x03
-#define ZBEE_NWK_CMD_LEAVE                      0x04    // ZigBee 2006 and Later
-#define ZBEE_NWK_CMD_ROUTE_RECORD               0x05    // ZigBee 2006 and later
-#define ZBEE_NWK_CMD_REJOIN_REQ                 0x06    // ZigBee 2006 and later
-#define ZBEE_NWK_CMD_REJOIN_RESP                0x07    // ZigBee 2006 and later
-#define ZBEE_NWK_CMD_LINK_STATUS                0x08    // ZigBee 2007 and later
-#define ZBEE_NWK_CMD_NWK_REPORT                 0x09    // ZigBee 2007 and later
-#define ZBEE_NWK_CMD_NWK_UPDATE                 0x0a    // ZigBee 2007 and later
+#define ZBEE_NWK_CMD_LEAVE                      0x04    /* ZigBee 2006 and Later */
+#define ZBEE_NWK_CMD_ROUTE_RECORD               0x05    /* ZigBee 2006 and later */
+#define ZBEE_NWK_CMD_REJOIN_REQ                 0x06    /* ZigBee 2006 and later */
+#define ZBEE_NWK_CMD_REJOIN_RESP                0x07    /* ZigBee 2006 and later */
+#define ZBEE_NWK_CMD_LINK_STATUS                0x08    /* ZigBee 2007 and later */
+#define ZBEE_NWK_CMD_NWK_REPORT                 0x09    /* ZigBee 2007 and later */
+#define ZBEE_NWK_CMD_NWK_UPDATE                 0x0a    /* ZigBee 2007 and later */
 
 /*  ZigBee NWK Route Options Flags */
-#define ZBEE_NWK_CMD_ROUTE_OPTION_REPAIR        0x80    // ZigBee 2004 only.
-#define ZBEE_NWK_CMD_ROUTE_OPTION_MCAST         0x40    // ZigBee 2006 and later
-#define ZBEE_NWK_CMD_ROUTE_OPTION_DEST_EXT      0x20    // ZigBee 2007 and later (route request only).
-#define ZBEE_NWK_CMD_ROUTE_OPTION_MANY_MASK     0x18    // ZigBee 2007 and later (route request only).
-#define ZBEE_NWK_CMD_ROUTE_OPTION_RESP_EXT      0x20    // ZigBee 2007 and layer (route reply only).
-#define ZBEE_NWK_CMD_ROUTE_OPTION_ORIG_EXT      0x10    // ZigBee 2007 and later (route reply only).
+#define ZBEE_NWK_CMD_ROUTE_OPTION_REPAIR        0x80    /* ZigBee 2004 only. */
+#define ZBEE_NWK_CMD_ROUTE_OPTION_MCAST         0x40    /* ZigBee 2006 and later */
+#define ZBEE_NWK_CMD_ROUTE_OPTION_DEST_EXT      0x20    /* ZigBee 2007 and later (route request only). */
+#define ZBEE_NWK_CMD_ROUTE_OPTION_MANY_MASK     0x18    /* ZigBee 2007 and later (route request only). */
+#define ZBEE_NWK_CMD_ROUTE_OPTION_RESP_EXT      0x20    /* ZigBee 2007 and layer (route reply only). */
+#define ZBEE_NWK_CMD_ROUTE_OPTION_ORIG_EXT      0x10    /* ZigBee 2007 and later (route reply only). */
 
 /* Many-to-One modes, ZigBee 2007 and later (route request only). */
 #define ZBEE_NWK_CMD_ROUTE_OPTION_MANY_NONE     0x00
@@ -126,23 +126,23 @@ typedef struct{
     gboolean    security;
     gboolean    discovery;
     gboolean    is_bcast;
-    gboolean    multicast;          // ZigBee 2006 and Later
-    gboolean    route;              // ZigBee 2006 and Later
-    gboolean    ext_dst;            // ZigBee 2006 and Later
-    gboolean    ext_src;            // ZigBee 2006 and Later
+    gboolean    multicast;          /* ZigBee 2006 and Later */
+    gboolean    route;              /* ZigBee 2006 and Later */
+    gboolean    ext_dst;            /* ZigBee 2006 and Later */
+    gboolean    ext_src;            /* ZigBee 2006 and Later */
     guint16     type;
     guint8      version;
 
     guint16     dst;
     guint16     src;
-    guint64     dst64;              // ZigBee 2006 and Later
-    guint64     src64;              // ZigBee 2006 and Later
+    guint64     dst64;              /* ZigBee 2006 and Later */
+    guint64     src64;              /* ZigBee 2006 and Later */
     guint8      radius;
     guint8      seqno;
 
-    guint8      mcast_mode;         // ZigBee 2006 and Later
-    guint8      mcast_radius;       // ZigBee 2006 and Later
-    guint8      mcast_max_radius;   // ZigBee 2006 and Later
+    guint8      mcast_mode;         /* ZigBee 2006 and Later */
+    guint8      mcast_radius;       /* ZigBee 2006 and Later */
+    guint8      mcast_max_radius;   /* ZigBee 2006 and Later */
 
     guint8      payload_offset;
     guint8      payload_len;
diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c
index c0e9ab77cb..d9bd60ebd0 100644
--- a/epan/dissectors/packet-zbee-security.c
+++ b/epan/dissectors/packet-zbee-security.c
@@ -132,8 +132,9 @@ static const gchar *  gPREF_zbee_sec_tclink_key = NULL;
  * phase. Unfortunately, this is broken, and I don't know why. However, using
  * the messier EBC mode (to emulate CCM*) still works fine.
  */
-//#define ZBEE_SEC_USE_GCRYPT_CBC_MAC
-
+#if 0
+#define ZBEE_SEC_USE_GCRYPT_CBC_MAC
+#endif
 /*FUNCTION:------------------------------------------------------
  *  NAME
  *      zbee_security_register
@@ -151,31 +152,31 @@ void zbee_security_register(module_t *prefs, int proto)
     static hf_register_info hf[] = {
             { &hf_zbee_sec_level,
             { "Level",                  "zbee.sec.level", FT_UINT8, BASE_HEX, VALS(zbee_sec_level_names), ZBEE_SEC_CONTROL_LEVEL,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_sec_key,
             { "Key",                    "zbee.sec.key", FT_UINT8, BASE_HEX, VALS(zbee_sec_key_names), ZBEE_SEC_CONTROL_KEY,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_sec_nonce,
             { "Extended Nonce",         "zbee.sec.ext_nonce", FT_BOOLEAN, 8, NULL, ZBEE_SEC_CONTROL_NONCE,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_sec_counter,
             { "Frame Counter",          "zbee.sec.counter", FT_UINT32, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_sec_src,
             { "Source",                 "zbee.sec.src", FT_UINT64, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_sec_key_seqno,
             { "Key Sequence Number",    "zbee.sec.key_seqno", FT_UINT8, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
             { &hf_zbee_sec_mic,
             { "Message Integrity Code", "zbee.sec.mic", FT_BYTES, BASE_HEX, NULL, 0x0,
-                "", HFILL }}
+                NULL, HFILL }}
     };
 
     static gint *ett[] = {
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c
index fac894c52d..d0b71dedf6 100644
--- a/epan/dissectors/packet-zbee-zdp.c
+++ b/epan/dissectors/packet-zbee-zdp.c
@@ -149,7 +149,7 @@ extern void dissect_zbee_zdp_rsp_mgmt_nwkupdate     (tvbuff_t *tvb, packet_info
 /* Global field indicies. */
 int proto_zbee_zdp = -1;
 int hf_zbee_zdp_seqno = -1;
-int hf_zbee_zdp_length = -1; // Deprecates since ZigBee 2006.
+int hf_zbee_zdp_length = -1; /* Deprecates since ZigBee 2006. */
 
 /* General indicies. */
 int hf_zbee_zdp_ext_addr = -1;
@@ -1404,51 +1404,51 @@ void proto_register_zbee_zdp(void)
     static hf_register_info hf[] = {
         { &hf_zbee_zdp_seqno,
         { "Sequence Number",            "zbee.zdp.seqno", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_length,
         { "Length",                     "zbee.zdp.length", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_ext_addr,
         { "Extended Address",           "zbee.zdp.ext_addr", FT_UINT64, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_device,
         { "Device",                     "zbee.zdp.device", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_req_type,
         { "Request Type",               "zbee.zdp.req_type", FT_UINT8, BASE_DEC, VALS(zbee_zdp_req_types), 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_index,
         { "Index",                      "zbee.zdp.index", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_status,
         { "Status",                     "zbee.zdp.status", FT_UINT8, BASE_DEC, VALS(zbee_zdp_status_names), 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_endpoint,
         { "Endpoint",                   "zbee.zdp.endpoint", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_ep_count,
         { "Endpoint Count",             "zbee.zdp.ep_count", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_profile,
         { "Profile",                    "zbee.zdp.profile", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_addr_mode,
         { "Address Mode",               "zbee.zdp.addr_mode", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_cluster,
         { "Cluster",                    "zbee.zdp.cluster", FT_UINT16, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_table_size,
         { "Table Size",                 "zbee.zdp.table_size", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1460,27 +1460,27 @@ void proto_register_zbee_zdp(void)
 
         { &hf_zbee_zdp_in_count,
         { "Input Cluster Count",        "zbee.zdp.in_count", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_out_count,
         { "Output Cluster Count",       "zbee.zdp.out_count", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_in_cluster,
         { "Input Cluster",              "zbee.zdp.in_cluster", FT_UINT16, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_out_cluster,
         { "Output Cluster",             "zbee.zdp.out_cluster", FT_UINT16, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_assoc_device_count,
         { "Associated Device Count",    "zbee.zdp.assoc_device_count", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_assoc_device,
         { "Associated Device",          "zbee.zdp.assoc_device", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_cinfo_alt_coord,
         { "Alternate Coordinator",      "zbee.zdp.cinfo.alt_coord", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_ALT_COORD,
@@ -1488,7 +1488,7 @@ void proto_register_zbee_zdp(void)
 
         { &hf_zbee_zdp_cinfo_ffd,
         { "Full-Function Device",       "zbee.zdp.cinfo.ffd", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_FFD,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_cinfo_power,
         { "AC Power",                   "zbee.zdp.cinfo.power", FT_BOOLEAN, 8, NULL, ZBEE_CINFO_POWER,
@@ -1508,131 +1508,131 @@ void proto_register_zbee_zdp(void)
 
         { &hf_zbee_zdp_server_pri_trust,
         { "Primary Trust Center",       "zbee.zdp.server.pri_trust", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_PRIMARY_TRUST,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_server_bak_trust,
         { "Backup Trust Center",        "zbee.zdp.server.bak_trust", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_BACKUP_TRUST,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_server_pri_bind,
         { "Primary Binding Table Cache","zbee.zdp.server.pri_bind", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_PRIMARY_BIND,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_server_bak_bind,
         { "Backup Binding Table Cache", "zbee.zdp.server.bak_bind", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_BACKUP_BIND,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_server_pri_disc,
         { "Primary Discovery Cache",    "zbee.zdp.server.pri_disc", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_PRIMARY_DISC,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_server_bak_disc,
         { "Backup Discovery Cache",     "zbee.zdp.server.bak_bind", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_SERVER_BACKUP_DISC,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_node_type,
         { "Type",                       "zbee.zdp.node.type", FT_UINT16, BASE_DEC, NULL, ZBEE_ZDP_NODE_TYPE,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_node_complex,
         { "Complex Descriptor",         "zbee.zdp.node.complex", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_COMPLEX,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_node_user,
         { "User Descriptor",            "zbee.zdp.node.user", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_USER,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_node_freq_868,
         { "868MHz Band",                "zbee.zdp.node.freq.868mhz", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_FREQ_868MHZ,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_node_freq_900,
         { "900MHz Band",                "zbee.zdp.node.freq.900mhz", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_FREQ_900MHZ,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_node_freq_2400,
         { "2.4GHz Band",                "zbee.zdp.node.freq.2400mhz", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_NODE_FREQ_2400MHZ,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_node_manufacturer,
         { "Manufacturer Code",          "zbee.zdp.node.manufacturer", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_node_max_buffer,
         { "Max Buffer Size",            "zbee.zdp.node.max_buffer", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_node_max_transfer,
         { "Max Transfer Size",          "zbee.zdp.node.max_transfer", FT_UINT16, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_power_mode,
         { "Mode",                       "zbee.zdp.power.mode", FT_UINT16, BASE_DEC, NULL, ZBEE_ZDP_POWER_MODE,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_power_avail_ac,
         { "Available AC Power",         "zbee.zdp.power.avail.ac", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_AVAIL_AC,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_power_avail_recharge,
         { "Available Rechargeable Battery", "zbee.zdp.power.avail.rech", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_AVAIL_RECHARGEABLE,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_power_avail_dispose,
         { "Available Disposeable Battery",  "zbee.zdp.power.avail.disp", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_AVAIL_DISPOSEABLE,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_power_source_ac,
         { "Using AC Power",             "zbee.zdp.power.source.ac", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_SOURCE_AC,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_power_source_recharge,
         { "Using Rechargeable Battery", "zbee.zdp.power.source.ac", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_SOURCE_RECHARGEABLE,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_power_source_dispose,
         { "Using Disposeable Battery",  "zbee.zdp.power.source.ac", FT_BOOLEAN, 16, NULL, ZBEE_ZDP_POWER_SOURCE_DISPOSEABLE,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_power_level,
         { "Level",                      "zbee.zdp.power.level", FT_UINT16, BASE_DEC, NULL, ZBEE_ZDP_POWER_LEVEL,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_simple_app_device,
         { "Application Device",         "zbee.zdp.app.device", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_simple_app_version,
         { "Application Version",        "zbee.zdp.app.version", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_complex_length,
         { "Complex Descriptor Length",  "zbee.zdp.complex_length", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_complex,
         { "Complex Descriptor",         "zbee.zdp.complex", FT_STRING, BASE_NONE, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_user,
         { "User Descriptor",            "zbee.zdp.user", FT_STRING, BASE_NONE, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_user_length,
         { "User Descriptor Length",     "zbee.zdp.user_length", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_simple_length,
         { "Simple Descriptor Length",   "zbee.zdp.simple_length", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_disc_node_size,
         { "Node Descriptor Size",       "zbee.zdp.node_size", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_disc_power_size,
         { "Power Descriptor Size",      "zbee.zdp.power_size", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_cache,
         { "Cache",                      "zbee.zdp.cache", FT_UINT16, BASE_HEX, NULL, 0x0,
@@ -1640,99 +1640,99 @@ void proto_register_zbee_zdp(void)
 
         { &hf_zbee_zdp_disc_ep_count,
         { "Active Endpoint Count",      "zbee.zdp.ep_count", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_disc_simple_count,
         { "Simple Descriptor Count",    "zbee.zdp.simple_count", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_disc_simple_size,
         { "Simple Descriptor Size",     "zbee.zdp.simple_size", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_target,
         { "Target",                     "zbee.zdp.target", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_target64,
         { "Target",                     "zbee.zdp.target64", FT_UINT64, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_target_ep,
         { "Target Endpoint",            "zbee.zdp.target_ep", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_replacement,
         { "Replacement",                "zbee.zdp.replacement", FT_UINT64, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_replacement_ep,
         { "Replacement Endpoint",       "zbee.zdp.replacement_ep", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_bind_src,
         { "Source",                     "zbee.zdp.bind.src", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_bind_src64,
         { "Source",                     "zbee.zdp.bind.src64", FT_UINT64, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_bind_src_ep,
         { "Source Endpoint",            "zbee.zdp.bind.src_ep", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_bind_dst,
         { "Destination",                "zbee.zdp.bind.dst", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_bind_dst64,
         { "Destination",                "zbee.zdp.bind.dst64", FT_UINT64, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_bind_dst_ep,
         { "Destination Endpoint",       "zbee.zdp.bind.dst_ep", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_duration,
         { "Duration",                   "zbee.zdp.duration", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_leave_children,
         { "Remove Children",            "zbee.zdp.leave.children", FT_BOOLEAN, 8, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_leave_rejoin,
         { "Rejoin",                     "zbee.zdp.leave.rejoin", FT_BOOLEAN, 8, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_significance,
         { "Significance",               "zbee.zdp.significance", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_scan_count,
         { "Scan Count",                 "zbee.zdp.scan_count", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_update_id,
         { "Update ID",                  "zbee.zdp.update_id", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_manager,
         { "Network Manager",            "zbee.zdp.manager", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_tx_total,
         { "Total Transmissions",        "zbee.zdp.tx_total", FT_UINT16, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_tx_fail,
         { "Failed Transmissions",       "zbee.zdp.tx_fail", FT_UINT16, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zbee_zdp_channel_count,
         { "Channel List Count",         "zbee.zdp.channel_count", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }}
+            NULL, HFILL }}
     };
 
     /*  APS subtrees */
diff --git a/epan/dissectors/packet-zbee-zdp.h b/epan/dissectors/packet-zbee-zdp.h
index 06ca2cc4f4..3809e87732 100644
--- a/epan/dissectors/packet-zbee-zdp.h
+++ b/epan/dissectors/packet-zbee-zdp.h
@@ -43,36 +43,36 @@
 #define ZBEE_ZDP_REQ_DISCOVERY_CACHE        0x0012
 #define ZBEE_ZDP_REQ_DEVICE_ANNCE           0x0013
 #define ZBEE_ZDP_REQ_SET_USER_DESC          0x0014
-#define ZBEE_ZDP_REQ_SYSTEM_SERVER_DISC     0x0015  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_STORE_DISCOVERY        0x0016  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_STORE_NODE_DESC        0x0017  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_STORE_POWER_DESC       0x0018  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_STORE_ACTIVE_EP        0x0019  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_STORE_SIMPLE_DESC      0x001a  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_REMOVE_NODE_CACHE      0x001b  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_FIND_NODE_CACHE        0x001c  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_EXT_SIMPLE_DESC        0x001d  // ZigBee 2007 & later.
-#define ZBEE_ZDP_REQ_EXT_ACTIVE_EP          0x001e  // ZigBee 2007 & later.
+#define ZBEE_ZDP_REQ_SYSTEM_SERVER_DISC     0x0015  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_STORE_DISCOVERY        0x0016  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_STORE_NODE_DESC        0x0017  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_STORE_POWER_DESC       0x0018  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_STORE_ACTIVE_EP        0x0019  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_STORE_SIMPLE_DESC      0x001a  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_REMOVE_NODE_CACHE      0x001b  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_FIND_NODE_CACHE        0x001c  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_EXT_SIMPLE_DESC        0x001d  /* ZigBee 2007 & later. */
+#define ZBEE_ZDP_REQ_EXT_ACTIVE_EP          0x001e  /* ZigBee 2007 & later. */
 #define ZBEE_ZDP_REQ_END_DEVICE_BIND        0x0020
 #define ZBEE_ZDP_REQ_BIND                   0x0021
 #define ZBEE_ZDP_REQ_UNBIND                 0x0022
-#define ZBEE_ZDP_REQ_BIND_REGISTER          0x0023  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_REPLACE_DEVICE         0x0024  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_STORE_BAK_BIND_ENTRY   0x0025  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_REMOVE_BAK_BIND_ENTRY  0x0026  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_BACKUP_BIND_TABLE      0x0027  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_RECOVER_BIND_TABLE     0x0028  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_BACKUP_SOURCE_BIND     0x0029  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_RECOVER_SOURCE_BIND    0x002a  // ZigBee 2006 & later.
+#define ZBEE_ZDP_REQ_BIND_REGISTER          0x0023  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_REPLACE_DEVICE         0x0024  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_STORE_BAK_BIND_ENTRY   0x0025  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_REMOVE_BAK_BIND_ENTRY  0x0026  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_BACKUP_BIND_TABLE      0x0027  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_RECOVER_BIND_TABLE     0x0028  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_BACKUP_SOURCE_BIND     0x0029  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_RECOVER_SOURCE_BIND    0x002a  /* ZigBee 2006 & later. */
 #define ZBEE_ZDP_REQ_MGMT_NWK_DISC          0x0030
 #define ZBEE_ZDP_REQ_MGMT_LQI               0x0031
 #define ZBEE_ZDP_REQ_MGMT_RTG               0x0032
 #define ZBEE_ZDP_REQ_MGMT_BIND              0x0033
 #define ZBEE_ZDP_REQ_MGMT_LEAVE             0x0034
 #define ZBEE_ZDP_REQ_MGMT_DIRECT_JOIN       0x0035
-#define ZBEE_ZDP_REQ_MGMT_PERMIT_JOIN       0x0036  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_MGMT_CACHE             0x0037  // ZigBee 2006 & later.
-#define ZBEE_ZDP_REQ_MGMT_NWKUPDATE         0x0038  // ZigBee 2007 & later.
+#define ZBEE_ZDP_REQ_MGMT_PERMIT_JOIN       0x0036  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_MGMT_CACHE             0x0037  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_REQ_MGMT_NWKUPDATE         0x0038  /* ZigBee 2007 & later. */
 
 #define ZBEE_ZDP_RSP_NWK_ADDR               0x8000
 #define ZBEE_ZDP_RSP_IEEE_ADDR              0x8001
@@ -84,37 +84,37 @@
 #define ZBEE_ZDP_RSP_COMPLEX_DESC           0x8010
 #define ZBEE_ZDP_RSP_USER_DESC              0x8011
 #define ZBEE_ZDP_RSP_DISCOVERY_CACHE        0x8012
-#define ZBEE_ZDP_RSP_CONF_USER_DESC         0x8014  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_SYSTEM_SERVER_DISC     0x8015  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_STORE_DISCOVERY        0x8016  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_STORE_NODE_DESC        0x8017  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_STORE_POWER_DESC       0x8018  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_STORE_ACTIVE_EP        0x8019  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_STORE_SIMPLE_DESC      0x801a  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_REMOVE_NODE_CACHE      0x801b  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_FIND_NODE_CACHE        0x801c  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_EXT_SIMPLE_DESC        0x801d  // ZigBee 2007 & later.
-#define ZBEE_ZDP_RSP_EXT_ACTIVE_EP          0x801e  // ZigBee 2007 & later.
+#define ZBEE_ZDP_RSP_CONF_USER_DESC         0x8014  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_SYSTEM_SERVER_DISC     0x8015  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_STORE_DISCOVERY        0x8016  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_STORE_NODE_DESC        0x8017  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_STORE_POWER_DESC       0x8018  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_STORE_ACTIVE_EP        0x8019  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_STORE_SIMPLE_DESC      0x801a  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_REMOVE_NODE_CACHE      0x801b  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_FIND_NODE_CACHE        0x801c  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_EXT_SIMPLE_DESC        0x801d  /* ZigBee 2007 & later. */
+#define ZBEE_ZDP_RSP_EXT_ACTIVE_EP          0x801e  /* ZigBee 2007 & later. */
 #define ZBEE_ZDP_RSP_END_DEVICE_BIND        0x8020
 #define ZBEE_ZDP_RSP_BIND                   0x8021
 #define ZBEE_ZDP_RSP_UNBIND                 0x8022
-#define ZBEE_ZDP_RSP_BIND_REGISTER          0x8023  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_REPLACE_DEVICE         0x8024  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_STORE_BAK_BIND_ENTRY   0x8025  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_REMOVE_BAK_BIND_ENTRY  0x8026  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_BACKUP_BIND_TABLE      0x8027  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_RECOVER_BIND_TABLE     0x8028  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_BACKUP_SOURCE_BIND     0x8029  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_RECOVER_SOURCE_BIND    0x802a  // ZigBee 2006 & later.
+#define ZBEE_ZDP_RSP_BIND_REGISTER          0x8023  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_REPLACE_DEVICE         0x8024  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_STORE_BAK_BIND_ENTRY   0x8025  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_REMOVE_BAK_BIND_ENTRY  0x8026  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_BACKUP_BIND_TABLE      0x8027  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_RECOVER_BIND_TABLE     0x8028  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_BACKUP_SOURCE_BIND     0x8029  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_RECOVER_SOURCE_BIND    0x802a  /* ZigBee 2006 & later. */
 #define ZBEE_ZDP_RSP_MGMT_NWK_DISC          0x8030
 #define ZBEE_ZDP_RSP_MGMT_LQI               0x8031
 #define ZBEE_ZDP_RSP_MGMT_RTG               0x8032
 #define ZBEE_ZDP_RSP_MGMT_BIND              0x8033
 #define ZBEE_ZDP_RSP_MGMT_LEAVE             0x8034
 #define ZBEE_ZDP_RSP_MGMT_DIRECT_JOIN       0x8035
-#define ZBEE_ZDP_RSP_MGMT_PERMIT_JOIN       0x8036  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_MGMT_CACHE             0x8037  // ZigBee 2006 & later.
-#define ZBEE_ZDP_RSP_MGMT_NWKUPDATE         0x8038  // ZigBee 2007 & later.
+#define ZBEE_ZDP_RSP_MGMT_PERMIT_JOIN       0x8036  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_MGMT_CACHE             0x8037  /* ZigBee 2006 & later. */
+#define ZBEE_ZDP_RSP_MGMT_NWKUPDATE         0x8038  /* ZigBee 2007 & later. */
 
 #define ZBEE_ZDP_MSG_RESPONSE_BIT           0x8000
 #define ZBEE_ZDP_MSG_MASK                   (ZBEE_ZDP_MSG_RESPONSE_BIT-1)