Fix encoding arg for ptvcursor_add() and ptvcursor_add_noadvance() function calls.

svn path=/trunk/; revision=39566

7 files changed, 779 insertions, 779 deletions

diff --git a/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c
index d74a2316bb..a9004dda28 100644
--- a/epan/dissectors/packet-homeplug-av.c
+++ b/epan/dissectors/packet-homeplug-av.c
@@ -1098,7 +1098,7 @@ dissect_homeplug_av_mmhdr(ptvcursor_t *cursor)
   guint8 lsb, msb;
   guint16 homeplug_av_mmtype;
 
-  ti = ptvcursor_add_no_advance(cursor, hf_homeplug_av_mmhdr, 3, FALSE);
+  ti = ptvcursor_add_no_advance(cursor, hf_homeplug_av_mmhdr, 3, ENC_NA);
 
   lsb = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 	ptvcursor_current_offset(cursor) + 1);
@@ -1112,13 +1112,13 @@ dissect_homeplug_av_mmhdr(ptvcursor_t *cursor)
 
   ptvcursor_push_subtree(cursor, ti, ett_homeplug_av_mmhdr);
   {
-     ptvcursor_add(cursor, hf_homeplug_av_mmhdr_mmver, 1, FALSE);
-     ti_mmtype = ptvcursor_add_no_advance(cursor, hf_homeplug_av_mmhdr_mmtype, 2, TRUE);
+     ptvcursor_add(cursor, hf_homeplug_av_mmhdr_mmver, 1, ENC_BIG_ENDIAN);
+     ti_mmtype = ptvcursor_add_no_advance(cursor, hf_homeplug_av_mmhdr_mmtype, 2, ENC_LITTLE_ENDIAN);
 
      ptvcursor_push_subtree(cursor, ti_mmtype, ett_homeplug_av_mmtype);
      {
-	ptvcursor_add(cursor, hf_homeplug_av_mmhdr_mmtype_lsb, 1, FALSE);
-	ptvcursor_add(cursor, hf_homeplug_av_mmhdr_mmtype_msb, 1, FALSE);
+	ptvcursor_add(cursor, hf_homeplug_av_mmhdr_mmtype_lsb, 1, ENC_BIG_ENDIAN);
+	ptvcursor_add(cursor, hf_homeplug_av_mmhdr_mmtype_msb, 1, ENC_BIG_ENDIAN);
      }
      ptvcursor_pop_subtree(cursor);
   }
@@ -1126,23 +1126,23 @@ dissect_homeplug_av_mmhdr(ptvcursor_t *cursor)
 
   if (homeplug_av_mmtype_msb_is_vendor(msb))
   {
-     ti_vendor = ptvcursor_add_no_advance(cursor, hf_homeplug_av_vendor, -1, FALSE);
+     ti_vendor = ptvcursor_add_no_advance(cursor, hf_homeplug_av_vendor, -1, ENC_NA);
 
      ptvcursor_push_subtree(cursor, ti_vendor, ett_homeplug_av_vendor);
      {
-	ptvcursor_add(cursor, hf_homeplug_av_vendor_oui, 3, TRUE);
+	ptvcursor_add(cursor, hf_homeplug_av_vendor_oui, 3, ENC_NA);
      }
      ptvcursor_pop_subtree(cursor);
   }
   else
   {
-     ti_public = ptvcursor_add_no_advance(cursor, hf_homeplug_av_public, -1, FALSE);
+     ti_public = ptvcursor_add_no_advance(cursor, hf_homeplug_av_public, -1, ENC_NA);
 
      ptvcursor_push_subtree(cursor, ti_public, ett_homeplug_av_public);
      {
-	ptvcursor_add_no_advance(cursor, hf_homeplug_av_public_frag_count, 1, FALSE);
-	ptvcursor_add(cursor, hf_homeplug_av_public_frag_index, 1, FALSE);
-	ptvcursor_add(cursor, hf_homeplug_av_public_frag_seqnum, 1, FALSE);
+	ptvcursor_add_no_advance(cursor, hf_homeplug_av_public_frag_count, 1, ENC_BIG_ENDIAN);
+	ptvcursor_add(cursor, hf_homeplug_av_public_frag_index, 1, ENC_BIG_ENDIAN);
+	ptvcursor_add(cursor, hf_homeplug_av_public_frag_seqnum, 1, ENC_BIG_ENDIAN);
      }
      ptvcursor_pop_subtree(cursor);
   }
@@ -1159,19 +1159,19 @@ dissect_homeplug_av_beacon(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_bcn, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_bcn, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_bcn);
    {
-      ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_del_type, 1, FALSE);
-      ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_access, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_snid, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_bcn_bts, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_bcn_bto_0, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_bcn_bto_1, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_bcn_bto_2, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_bcn_bto_3, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_fccs_av, 3, FALSE);
+      ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_del_type, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_access, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_snid, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_bcn_bts, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_bcn_bto_0, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_bcn_bto_1, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_bcn_bto_2, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_bcn_bto_3, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_fccs_av, 3, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1185,39 +1185,39 @@ dissect_homeplug_av_frame_control(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_fc);
    {
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_del_type, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_access, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_nw_info_snid, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_fc_stei, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_fc_dtei, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_fc_lid, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_cfs, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_bdf, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_hp10df, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_hp11df, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_nw_info_peks, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_fc_ppb, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_fc_ble, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_pbsz, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_num_sym, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_fc_tmi_av, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_mpdu_cnt, 2, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_burst_cnt, 2, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_fc_fl_av, 2, TRUE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_clst, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_fc_rg_len, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_mfs_cmd_mgmt, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_mfs_cmd_data, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_fc_rsr, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_mcf, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_dccpcf, 1, FALSE);
-     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_mnbf, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_nw_info_fccs_av, 3, TRUE);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_del_type, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_access, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_nw_info_snid, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_fc_stei, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_fc_dtei, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_fc_lid, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_cfs, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_bdf, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_hp10df, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_hp11df, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_nw_info_peks, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_fc_ppb, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_fc_ble, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_pbsz, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_num_sym, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_fc_tmi_av, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_mpdu_cnt, 2, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_burst_cnt, 2, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_fc_fl_av, 2, ENC_LITTLE_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_clst, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_fc_rg_len, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_mfs_cmd_mgmt, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_mfs_cmd_data, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_fc_rsr, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_mcf, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_dccpcf, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add_no_advance(cursor, hf_homeplug_av_fc_mnbf, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, ENC_NA);
+     ptvcursor_add(cursor, hf_homeplug_av_nw_info_fccs_av, 3, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1230,17 +1230,17 @@ dissect_homeplug_av_nw_info_sta(ptvcursor_t *cursor, gboolean vendor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_sta_info, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_sta_info, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_nw_info_sta_info);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_sta_da, 6, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_sta_da, 6, ENC_NA);
       if (vendor) {
-	ptvcursor_add(cursor, hf_homeplug_av_nw_info_sta_tei, 1, FALSE);
-	ptvcursor_add(cursor, hf_homeplug_av_nw_info_sta_bda, 6, FALSE);
+	ptvcursor_add(cursor, hf_homeplug_av_nw_info_sta_tei, 1, ENC_BIG_ENDIAN);
+	ptvcursor_add(cursor, hf_homeplug_av_nw_info_sta_bda, 6, ENC_NA);
       }
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_sta_phy_dr_tx, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_sta_phy_dr_rx, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_sta_phy_dr_tx, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_sta_phy_dr_rx, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1253,22 +1253,22 @@ dissect_homeplug_av_nw_info_net(ptvcursor_t *cursor, gboolean vendor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_net_info, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_net_info, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_nw_info_net_info);
    {
-     ptvcursor_add(cursor, hf_homeplug_av_nw_info_nid, 7, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_nw_info_snid, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_nw_info_tei, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_nw_info_sta_role, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_nw_info_cco_mac, 6, FALSE);
+     ptvcursor_add(cursor, hf_homeplug_av_nw_info_nid, 7, ENC_NA);
+     ptvcursor_add(cursor, hf_homeplug_av_nw_info_snid, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_nw_info_tei, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_nw_info_sta_role, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_nw_info_cco_mac, 6, ENC_NA);
      if (vendor) {
-       ptvcursor_add(cursor, hf_homeplug_av_nw_info_cco_tei, 1, FALSE);
+       ptvcursor_add(cursor, hf_homeplug_av_nw_info_cco_tei, 1, ENC_BIG_ENDIAN);
      }
      else
      {
-       ptvcursor_add(cursor, hf_homeplug_av_nw_info_access, 1, FALSE);
-       ptvcursor_add(cursor, hf_homeplug_av_nw_info_num_coord, 1, FALSE);
+       ptvcursor_add(cursor, hf_homeplug_av_nw_info_access, 1, ENC_BIG_ENDIAN);
+       ptvcursor_add(cursor, hf_homeplug_av_nw_info_num_coord, 1, ENC_BIG_ENDIAN);
      }
    }
    ptvcursor_pop_subtree(cursor);
@@ -1283,17 +1283,17 @@ dissect_homeplug_av_cc_sta_info(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cc_sta_info, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cc_sta_info, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cc_sta_info);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_cc_sta_info_mac, 6, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cc_sta_info_tei, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cc_sta_info_same_net, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_snid, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_cco_cap, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cc_sta_info_sig_level, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cc_sta_info_avg_ble, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_cc_sta_info_mac, 6, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_cc_sta_info_tei, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cc_sta_info_same_net, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_snid, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_cco_cap, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cc_sta_info_sig_level, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cc_sta_info_avg_ble, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1306,16 +1306,16 @@ dissect_homeplug_av_cc_net_info(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cc_net_info, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cc_net_info, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cc_net_info);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_nid, 7, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_snid, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cc_net_info_hyb_mode, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cc_net_info_bcn_slots, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cc_net_info_cco_sts, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cc_net_info_bcn_ofs, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_nid, 7, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_snid, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cc_net_info_hyb_mode, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cc_net_info_bcn_slots, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cc_net_info_cco_sts, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cc_net_info_bcn_ofs, 2, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1332,13 +1332,13 @@ dissect_homeplug_av_cc_disc_list_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cc_disc_list_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cc_disc_list_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cc_disc_list_cnf);
    {
       num_stas = tvb_get_guint8(ptvcursor_tvbuff(cursor),
       		ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_av_cc_disc_list_sta_cnt, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_cc_disc_list_sta_cnt, 1, ENC_BIG_ENDIAN);
 
       for (sta = 0; sta < num_stas; sta++) {
 	dissect_homeplug_av_cc_sta_info(cursor);
@@ -1346,7 +1346,7 @@ dissect_homeplug_av_cc_disc_list_cnf(ptvcursor_t *cursor)
 
       num_nets = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 				ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_av_cc_disc_list_net_cnt, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_cc_disc_list_net_cnt, 1, ENC_BIG_ENDIAN);
 
       for (net = 0; net < num_nets; net++) {
 	dissect_homeplug_av_cc_net_info(cursor);
@@ -1364,27 +1364,27 @@ dissect_homeplug_av_cm_enc_pld_ind(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_enc_pld_ind, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_enc_pld_ind, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cm_enc_pld_ind);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_peks, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cm_enc_pld_ind_avlns, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_peks, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cm_enc_pld_ind_avlns, 1, ENC_BIG_ENDIAN);
       pid = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 		ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pid, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_prn, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pmn, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pid, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_prn, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pmn, 1, ENC_BIG_ENDIAN);
       if (pid == HOMEPLUG_AV_PID_HLE) {
-	ptvcursor_add(cursor, hf_homeplug_av_cm_enc_pld_ind_iv, 16, TRUE);
+	ptvcursor_add(cursor, hf_homeplug_av_cm_enc_pld_ind_iv, 16, ENC_NA);
       } else {
-	ptvcursor_add(cursor, hf_homeplug_av_cm_enc_pld_ind_uuid, 16, TRUE);
+	ptvcursor_add(cursor, hf_homeplug_av_cm_enc_pld_ind_uuid, 16, ENC_LITTLE_ENDIAN);
       }
-      ptvcursor_add(cursor, hf_homeplug_av_cm_enc_pld_ind_len, 2, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_cm_enc_pld_ind_len, 2, ENC_LITTLE_ENDIAN);
 
       /* Encrypted payload follows */
       if (pid != HOMEPLUG_AV_PID_HLE) {
-	ptvcursor_add(cursor, hf_homeplug_av_cm_enc_pld_ind_pld, -1, FALSE);
+	ptvcursor_add(cursor, hf_homeplug_av_cm_enc_pld_ind_pld, -1, ENC_NA);
       }
    }
    ptvcursor_pop_subtree(cursor);
@@ -1398,13 +1398,13 @@ dissect_homeplug_av_cm_enc_pld_rsp(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_enc_pld_rsp, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_enc_pld_rsp, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cm_enc_pld_rsp);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_cm_enc_pld_rsp_result, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pid, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_prn, 2, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_cm_enc_pld_rsp_result, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pid, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_prn, 2, ENC_LITTLE_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1417,20 +1417,20 @@ dissect_homeplug_av_cm_set_key_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_set_key_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_set_key_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cm_set_key_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_key_type, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_my_nonce, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_your_nonce, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pid, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_prn, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pmn, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_cco_cap, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_nid, 7, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_peks, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cm_set_key_req_nw_key, -1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_key_type, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_my_nonce, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_your_nonce, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pid, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_prn, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pmn, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_cco_cap, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_nid, 7, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_peks, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cm_set_key_req_nw_key, -1, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1443,17 +1443,17 @@ dissect_homeplug_av_cm_set_key_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_set_key_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_set_key_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cm_set_key_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_cm_set_key_cnf_result, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_my_nonce, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_your_nonce, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pid, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_prn, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pmn, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_cco_cap, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_cm_set_key_cnf_result, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_my_nonce, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_your_nonce, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pid, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_prn, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pmn, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_cco_cap, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1467,22 +1467,22 @@ dissect_homeplug_av_cm_get_key_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_get_key_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_get_key_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cm_get_key_req);
    {
 
-      ptvcursor_add(cursor, hf_homeplug_av_cm_get_key_req_type, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_cm_get_key_req_type, 1, ENC_BIG_ENDIAN);
       key_type = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 				ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_key_type, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_nid, 7, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_my_nonce, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pid, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_prn, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pmn, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_key_type, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_nid, 7, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_my_nonce, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pid, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_prn, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pmn, 1, ENC_BIG_ENDIAN);
       if (key_type == HOMEPLUG_AV_KEY_TYPE_HASH) {
-	ptvcursor_add(cursor, hf_homeplug_av_cm_get_key_req_has_key, -1, FALSE);
+	ptvcursor_add(cursor, hf_homeplug_av_cm_get_key_req_has_key, -1, ENC_NA);
       }
    }
    ptvcursor_pop_subtree(cursor);
@@ -1496,20 +1496,20 @@ dissect_homeplug_av_cm_get_key_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_get_key_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_get_key_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cm_get_key_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_cm_get_key_cnf_result, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cm_get_key_cnf_rtype, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_my_nonce, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_your_nonce, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_nid, 7, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_peks, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pid, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_prn, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pmn, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cm_get_key_cnf_key, -1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_cm_get_key_cnf_result, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cm_get_key_cnf_rtype, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_my_nonce, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_your_nonce, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_nid, 7, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_peks, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pid, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_prn, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_pmn, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cm_get_key_cnf_key, -1, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1525,23 +1525,23 @@ dissect_homeplug_av_get_brg_infos_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_brg_infos_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_brg_infos_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_brg_infos_cnf);
    {
       bridging = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 		ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_av_brg_infos_cnf_brd, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_brg_infos_cnf_brd, 1, ENC_BIG_ENDIAN);
 
       if (bridging) {
-	ptvcursor_add(cursor, hf_homeplug_av_brg_infos_cnf_btei, 1, FALSE);
+	ptvcursor_add(cursor, hf_homeplug_av_brg_infos_cnf_btei, 1, ENC_BIG_ENDIAN);
 
 	num_stas = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 				  ptvcursor_current_offset(cursor));
-	ptvcursor_add(cursor, hf_homeplug_av_brg_infos_cnf_num_stas, 1, FALSE);
+	ptvcursor_add(cursor, hf_homeplug_av_brg_infos_cnf_num_stas, 1, ENC_BIG_ENDIAN);
 
 	for (sta = 0; sta < num_stas; sta++) {
-	  ptvcursor_add(cursor, hf_homeplug_av_brg_infos_cnf_mac, 6, FALSE);
+	  ptvcursor_add(cursor, hf_homeplug_av_brg_infos_cnf_mac, 6, ENC_NA);
 	}
       }
    }
@@ -1558,13 +1558,13 @@ dissect_homeplug_av_nw_infos_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_nw_infos_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cm_nw_infos_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cm_nw_infos_cnf);
    {
       num_avlns = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 		ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_num_avlns, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_num_avlns, 1, ENC_BIG_ENDIAN);
 
       for (net = 0; net < num_avlns; net++) {
 	dissect_homeplug_av_nw_info_net(cursor, FALSE);
@@ -1583,13 +1583,13 @@ dissect_homeplug_av_nw_stats_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_stats_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_stats_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_nw_stats_cnf);
    {
       num_stas = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 		ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_num_stas, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_num_stas, 1, ENC_BIG_ENDIAN);
 
       for (sta = 0; sta < num_stas; sta++) {
 	dissect_homeplug_av_nw_info_sta(cursor, FALSE);
@@ -1607,15 +1607,15 @@ dissect_homeplug_av_get_sw_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_get_sw_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_get_sw_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_get_sw_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_dev_id, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_ver_len, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_ver_str, 64, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_upg, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_dev_id, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_ver_len, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_ver_str, 64, ENC_ASCII|ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_get_sw_cnf_upg, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1628,13 +1628,13 @@ dissect_homeplug_av_wr_mem_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wr_mem_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wr_mem_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_wr_mem_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_mem_addr, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_len_32bits, 4, TRUE);
-      ptvcursor_add_no_advance(cursor, hf_homeplug_av_mem_data, -1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_addr, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_len_32bits, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add_no_advance(cursor, hf_homeplug_av_mem_data, -1, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1647,13 +1647,13 @@ dissect_homeplug_av_wr_mem_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wr_mem_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wr_mem_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_wr_mem_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_mem_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_addr, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_len_32bits, 4, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_addr, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_len_32bits, 4, ENC_LITTLE_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1666,12 +1666,12 @@ dissect_homeplug_av_rd_mem_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rd_mem_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rd_mem_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_rd_mem_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_mem_addr, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_len_32bits, 4, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_addr, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_len_32bits, 4, ENC_LITTLE_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1684,14 +1684,14 @@ dissect_homeplug_av_rd_mem_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rd_mem_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rd_mem_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_rd_mem_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_mem_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_addr, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_len_32bits, 4, TRUE);
-      ptvcursor_add_no_advance(cursor, hf_homeplug_av_mem_data, -1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_addr, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_len_32bits, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add_no_advance(cursor, hf_homeplug_av_mem_data, -1, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1704,16 +1704,16 @@ dissect_homeplug_av_st_mac_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_st_mac_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_st_mac_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_st_mac_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 3, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_st_mac_req_img_load, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_st_mac_req_img_len, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_st_mac_req_img_chksum, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_st_mac_req_img_start, 4, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 3, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_st_mac_req_img_load, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_st_mac_req_img_len, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_st_mac_req_img_chksum, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_st_mac_req_img_start, 4, ENC_LITTLE_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1727,12 +1727,12 @@ dissect_homeplug_av_st_mac_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_st_mac_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_st_mac_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_st_mac_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_st_mac_cnf_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_st_mac_cnf_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1745,15 +1745,15 @@ dissect_homeplug_av_get_nvm_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_get_nvm_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_get_nvm_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_get_nvm_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_get_nvm_cnf_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_get_nvm_cnf_nvm_type, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_get_nvm_cnf_nvm_page, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_get_nvm_cnf_nvm_block, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_get_nvm_cnf_nvm_size, 4, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_get_nvm_cnf_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_get_nvm_cnf_nvm_type, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_get_nvm_cnf_nvm_page, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_get_nvm_cnf_nvm_block, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_get_nvm_cnf_nvm_size, 4, ENC_LITTLE_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1766,11 +1766,11 @@ dissect_homeplug_av_rs_dev_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rs_dev_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rs_dev_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_rs_dev_cnf);
    {
-     ptvcursor_add(cursor, hf_homeplug_av_rs_dev_cnf_status, 1, FALSE);
+     ptvcursor_add(cursor, hf_homeplug_av_rs_dev_cnf_status, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1782,16 +1782,16 @@ static void dissect_homeplug_av_wr_mod_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wr_mod_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wr_mod_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_wr_mod_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_len_16bits, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_offset, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_checksum, 4, TRUE);
-      ptvcursor_add_no_advance(cursor, hf_homeplug_av_mem_data, -1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_len_16bits, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_offset, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_checksum, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add_no_advance(cursor, hf_homeplug_av_mem_data, -1, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1803,15 +1803,15 @@ static void dissect_homeplug_av_wr_mod_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wr_mod_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wr_mod_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_wr_mod_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_wr_mod_cnf_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_len_16bits, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_offset, 4, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_wr_mod_cnf_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_len_16bits, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_offset, 4, ENC_LITTLE_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1823,12 +1823,12 @@ static void dissect_homeplug_av_wr_mod_ind(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wr_mod_ind, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wr_mod_ind, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_wr_mod_ind);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_wr_mod_ind_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_wr_mod_ind_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1841,14 +1841,14 @@ dissect_homeplug_av_rd_mod_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rd_mod_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rd_mod_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_rd_mod_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_len_16bits, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_offset, 4, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_len_16bits, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_offset, 4, ENC_LITTLE_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1861,18 +1861,18 @@ dissect_homeplug_av_rd_mod_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rd_mod_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rd_mod_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_rd_mod_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_rd_mod_cnf_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 3, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_len_16bits, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_offset, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_mem_checksum, 4, TRUE);
-      ptvcursor_add_no_advance(cursor, hf_homeplug_av_mem_data, -1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_rd_mod_cnf_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 3, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_len_16bits, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_offset, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mem_checksum, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add_no_advance(cursor, hf_homeplug_av_mem_data, -1, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1885,11 +1885,11 @@ dissect_homeplug_av_mod_nvm_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_mod_nvm_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_mod_nvm_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_mod_nvm_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1902,12 +1902,12 @@ dissect_homeplug_av_mod_nvm_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_mod_nvm_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_mod_nvm_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_mod_nvm_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_mod_nvm_cnf_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_mod_nvm_cnf_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mac_module_id, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1920,12 +1920,12 @@ dissect_homeplug_av_wd_rpt_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wd_rpt_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wd_rpt_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_wd_rpt_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_req_session_id, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_req_clr, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_req_session_id, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_req_clr, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1938,17 +1938,17 @@ dissect_homeplug_av_wd_rpt_ind(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wd_rpt_ind, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_wd_rpt_ind, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_wd_rpt_ind);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_session_id, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_num_parts, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_curr_part, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_rdata_len, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_rdata_ofs, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_rdata, -1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_session_id, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_num_parts, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_curr_part, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_rdata_len, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_rdata_ofs, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_wd_rpt_ind_rdata, -1, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1961,14 +1961,14 @@ dissect_homeplug_av_lnk_stats_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_lnk_stats_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_lnk_stats_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_lnk_stats_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_req_mcontrol, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_req_dir, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_req_lid, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_req_macaddr, 6, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_req_mcontrol, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_req_dir, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_req_lid, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_req_macaddr, 6, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -1981,15 +1981,15 @@ dissect_homeplug_av_lnk_stats_tx(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_lnk_stats_tx, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_lnk_stats_tx, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_lnk_stats_tx);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_tx_mpdu_ack, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_tx_mpdu_col, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_tx_mpdu_fai, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_tx_pbs_pass, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_tx_pbs_fail, 8, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_tx_mpdu_ack, 8, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_tx_mpdu_col, 8, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_tx_mpdu_fai, 8, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_tx_pbs_pass, 8, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_tx_pbs_fail, 8, ENC_LITTLE_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2002,15 +2002,15 @@ dissect_homeplug_av_lnk_stats_rx_interval(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rx_inv_stats, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rx_inv_stats, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_lnk_stats_rx_inv);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_rx_inv_phy_rate, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_rx_inv_pbs_pass, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_rx_inv_pbs_fail, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_rx_inv_tb_pass, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_rx_inv_tb_fail, 8, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_rx_inv_phy_rate, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_rx_inv_pbs_pass, 8, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_rx_inv_pbs_fail, 8, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_rx_inv_tb_pass, 8, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_rx_inv_tb_fail, 8, ENC_LITTLE_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2025,19 +2025,19 @@ dissect_homeplug_av_lnk_stats_rx(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_lnk_stats_rx, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_lnk_stats_rx, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_lnk_stats_rx);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_mpdu_ack, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_mpdu_fai, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_pbs_pass, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_pbs_fail, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_tb_pass, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_tb_fail, 8, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_mpdu_ack, 8, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_mpdu_fai, 8, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_pbs_pass, 8, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_pbs_fail, 8, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_tb_pass, 8, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_tb_fail, 8, ENC_LITTLE_ENDIAN);
       num_rx_interval = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 					ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_num_int, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_rx_num_int, 1, ENC_BIG_ENDIAN);
 
       for (interval = 0; interval < num_rx_interval; interval++) {
 	dissect_homeplug_av_lnk_stats_rx_interval(cursor);
@@ -2056,22 +2056,22 @@ dissect_homeplug_av_lnk_stats_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_lnk_stats_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_lnk_stats_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_lnk_stats_cnf);
    {
       status = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 					ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_cnf_status, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_cnf_status, 1, ENC_BIG_ENDIAN);
 
       direction = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 					ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_cnf_dir, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_cnf_dir, 1, ENC_BIG_ENDIAN);
 
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_cnf_lid, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_cnf_tei, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_cnf_lid, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lnk_stats_cnf_tei, 1, ENC_BIG_ENDIAN);
 
-      ptvcursor_add_no_advance(cursor, hf_homeplug_av_lnk_stats_cnf_lstats, -1, FALSE);
+      ptvcursor_add_no_advance(cursor, hf_homeplug_av_lnk_stats_cnf_lstats, -1, ENC_NA);
 
       if (status == HOMEPLUG_AV_LNK_STATS_STATUS_SUCCESS)
       {
@@ -2100,12 +2100,12 @@ dissect_homeplug_av_sniffer_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_sniffer_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_sniffer_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_sniffer_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_sniffer_req_ctrl, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 4, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_sniffer_req_ctrl, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 4, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2118,13 +2118,13 @@ dissect_homeplug_av_sniffer_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_sniffer_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_sniffer_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_sniffer_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_sniffer_cnf_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_sniffer_cnf_state, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_sniffer_cnf_da, 6, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_sniffer_cnf_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_sniffer_cnf_state, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_sniffer_cnf_da, 6, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2138,19 +2138,19 @@ dissect_homeplug_av_sniffer_ind(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_sniffer_ind, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_sniffer_ind, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_sniffer_ind);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_sniffer_ind_type, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_sniffer_ind_type, 1, ENC_BIG_ENDIAN);
 
-      it_data = ptvcursor_add_no_advance(cursor, hf_homeplug_av_sniffer_ind_data, -1, FALSE);
+      it_data = ptvcursor_add_no_advance(cursor, hf_homeplug_av_sniffer_ind_data, -1, ENC_NA);
 
       ptvcursor_push_subtree(cursor, it_data, ett_homeplug_av_sniffer_ind_data);
       {
-	ptvcursor_add(cursor, hf_homeplug_av_sniffer_data_dir, 1, FALSE);
-	ptvcursor_add(cursor, hf_homeplug_av_sniffer_data_systime, 8, TRUE);
-	ptvcursor_add(cursor, hf_homeplug_av_sniffer_data_bc_time, 4, TRUE);
+	ptvcursor_add(cursor, hf_homeplug_av_sniffer_data_dir, 1, ENC_BIG_ENDIAN);
+	ptvcursor_add(cursor, hf_homeplug_av_sniffer_data_systime, 8, ENC_LITTLE_ENDIAN);
+	ptvcursor_add(cursor, hf_homeplug_av_sniffer_data_bc_time, 4, ENC_LITTLE_ENDIAN);
 	dissect_homeplug_av_frame_control(cursor);
 	 dissect_homeplug_av_beacon(cursor);
       }
@@ -2170,19 +2170,19 @@ dissect_homeplug_av_nw_info_cnf(ptvcursor_t *cursor)
     if (!ptvcursor_tree(cursor))
       return;
 
-    it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_cnf, -1, FALSE);
+    it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_nw_info_cnf, -1, ENC_NA);
 
     ptvcursor_push_subtree(cursor, it, ett_homeplug_av_nw_info_cnf);
     {
        num_avlns = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 					ptvcursor_current_offset(cursor));
-       ptvcursor_add(cursor, hf_homeplug_av_nw_info_num_avlns, 1, FALSE);
+       ptvcursor_add(cursor, hf_homeplug_av_nw_info_num_avlns, 1, ENC_BIG_ENDIAN);
 
        if (num_avlns) {
 	   dissect_homeplug_av_nw_info_net(cursor, TRUE);
 	   num_stas = tvb_get_guint8(ptvcursor_tvbuff(cursor),
 					    ptvcursor_current_offset(cursor));
-	   ptvcursor_add(cursor, hf_homeplug_av_nw_info_num_stas, 1, FALSE);
+	   ptvcursor_add(cursor, hf_homeplug_av_nw_info_num_stas, 1, ENC_BIG_ENDIAN);
 
 	   for (sta = 0; sta < num_stas; sta++) {
 	      dissect_homeplug_av_nw_info_sta(cursor, TRUE);
@@ -2200,12 +2200,12 @@ dissect_homeplug_av_cp_rpt_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cp_rpt_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cp_rpt_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cp_rpt_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_req_session_id, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_req_clr, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_req_session_id, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_req_clr, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2218,23 +2218,23 @@ dissect_homeplug_av_cp_rpt_ind(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cp_rpt_ind, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cp_rpt_ind, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cp_rpt_ind);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_status, 1, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_major_ver, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_minor_ver, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 14, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_session_id, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_total_size, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_blk_offset, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_byte_index, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_num_parts, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_curr_part, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_data_len, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_data_ofs, 1, TRUE);
-      ptvcursor_add_no_advance(cursor, hf_homeplug_av_cp_rpt_ind_data, -1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_status, 1, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_major_ver, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_minor_ver, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 14, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_session_id, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_total_size, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_blk_offset, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_byte_index, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_num_parts, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_curr_part, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_data_len, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cp_rpt_ind_data_ofs, 1, ENC_LITTLE_ENDIAN);
+      ptvcursor_add_no_advance(cursor, hf_homeplug_av_cp_rpt_ind_data, -1, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2247,14 +2247,14 @@ dissect_homeplug_av_fr_lbk_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_fr_lbk_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_fr_lbk_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_fr_lbk_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_fr_lbk_duration, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_fr_lbk_len, 2, FALSE);
-      ptvcursor_add_no_advance(cursor, hf_homeplug_av_fr_lbk_req_data, -1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_fr_lbk_duration, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 1, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_fr_lbk_len, 2, ENC_BIG_ENDIAN);
+      ptvcursor_add_no_advance(cursor, hf_homeplug_av_fr_lbk_req_data, -1, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2267,13 +2267,13 @@ dissect_homeplug_av_fr_lbk_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_fr_lbk_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_fr_lbk_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_fr_lbk_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_fr_lbk_cnf_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_fr_lbk_duration, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_fr_lbk_len, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_fr_lbk_cnf_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_fr_lbk_duration, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_fr_lbk_len, 2, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2286,12 +2286,12 @@ dissect_homeplug_av_lbk_stat_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_lbk_stat_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_lbk_stat_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_lbk_stat_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_lbk_stat_cnf_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_lbk_stat_cnf_lbk_stat, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_lbk_stat_cnf_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_lbk_stat_cnf_lbk_stat, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2304,15 +2304,15 @@ dissect_homeplug_av_set_key_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_set_key_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_set_key_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_set_key_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_set_key_req_eks, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_set_key_req_nmk, 16, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_nw_info_peks, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_set_key_req_rda, 6, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_set_key_req_dak, 16, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_set_key_req_eks, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_set_key_req_nmk, 16, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_nw_info_peks, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_set_key_req_rda, 6, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_set_key_req_dak, 16, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2325,11 +2325,11 @@ dissect_homeplug_av_set_key_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_set_key_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_set_key_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_set_key_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_set_key_cnf_status, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_set_key_cnf_status, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2342,13 +2342,13 @@ dissect_homeplug_av_mfg_string_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_mfg_string_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_mfg_string_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_mfg_string_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_mfg_string_cnf_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mfg_string_cnf_len, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_mfg_string_cnf_string, 64, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_mfg_string_cnf_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mfg_string_cnf_len, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_mfg_string_cnf_string, 64, ENC_ASCII|ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2361,19 +2361,19 @@ dissect_homeplug_av_cblock_hdr(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cblock_hdr, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cblock_hdr, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cblock_hdr);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_hdr_ver, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_img_rom_addr, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_img_addr, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_img_len, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_img_chksum, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_entry_point, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 12, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_next_hdr, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_hdr_chksum, 4, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_hdr_ver, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_img_rom_addr, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_img_addr, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_img_len, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_img_chksum, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_entry_point, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 12, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_next_hdr, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_hdr_chksum, 4, ENC_LITTLE_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2386,18 +2386,18 @@ dissect_homeplug_av_cblock(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cblock, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_cblock, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_cblock);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_sdram_size, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_sdram_conf, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_sdram_tim0, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_sdram_tim1, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_sdram_cntrl, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_sdram_refresh, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_cblock_mac_clock, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 4, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_sdram_size, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_sdram_conf, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_sdram_tim0, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_sdram_tim1, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_sdram_cntrl, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_sdram_refresh, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_cblock_mac_clock, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 4, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2410,12 +2410,12 @@ dissect_homeplug_av_rd_cblock_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rd_cblock_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_rd_cblock_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_rd_cblock_cnf);
    {
-     ptvcursor_add(cursor, hf_homeplug_av_rd_cblock_cnf_status, 1, FALSE);
-     ptvcursor_add(cursor, hf_homeplug_av_rd_cblock_cnf_len, 1, FALSE);
+     ptvcursor_add(cursor, hf_homeplug_av_rd_cblock_cnf_status, 1, ENC_BIG_ENDIAN);
+     ptvcursor_add(cursor, hf_homeplug_av_rd_cblock_cnf_len, 1, ENC_BIG_ENDIAN);
      dissect_homeplug_av_cblock_hdr(cursor);
      dissect_homeplug_av_cblock(cursor);
    }
@@ -2430,12 +2430,12 @@ dissect_homeplug_av_set_sdram_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_set_sdram_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_set_sdram_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_set_sdram_req);
    {
       dissect_homeplug_av_cblock(cursor);
-      ptvcursor_add(cursor, hf_homeplug_av_set_sdram_req_chksum, 4, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_set_sdram_req_chksum, 4, ENC_LITTLE_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2448,11 +2448,11 @@ dissect_homeplug_av_set_sdram_cnf(ptvcursor_t *cursor)
     if (!ptvcursor_tree(cursor))
       return;
 
-    it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_set_sdram_cnf, -1, FALSE);
+    it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_set_sdram_cnf, -1, ENC_NA);
 
     ptvcursor_push_subtree(cursor, it, ett_homeplug_av_set_sdram_cnf);
     {
-       ptvcursor_add(cursor, hf_homeplug_av_set_sdram_cnf_status, 1, FALSE);
+       ptvcursor_add(cursor, hf_homeplug_av_set_sdram_cnf_status, 1, ENC_BIG_ENDIAN);
     }
     ptvcursor_pop_subtree(cursor);
 }
@@ -2465,11 +2465,11 @@ dissect_homeplug_av_host_action_ind(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_host_action_ind, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_host_action_ind, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_host_action_ind);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_host_action_ind_act, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_host_action_ind_act, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2482,11 +2482,11 @@ dissect_homeplug_av_host_action_rsp(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_host_action_rsp, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_host_action_rsp, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_host_action_rsp);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_host_action_rsp_sts, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_host_action_rsp_sts, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2499,12 +2499,12 @@ dissect_homeplug_av_op_attr_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_op_attr_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_op_attr_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_op_attr_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_cookie, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_rep_type, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_cookie, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_rep_type, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2517,19 +2517,19 @@ dissect_homeplug_av_op_attr_bin_report(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_op_attr_cnf_data, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_op_attr_cnf_data, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_op_attr_data);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_hw, 16, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw, 16, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_major, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_minor, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_sub, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_num, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 8, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_date, 8, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_rel, 12, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_hw, 16, ENC_ASCII|ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw, 16, ENC_ASCII|ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_major, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_minor, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_sub, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_num, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 8, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_date, 8, ENC_ASCII|ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_data_sw_rel, 12, ENC_ASCII|ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2542,14 +2542,14 @@ dissect_homeplug_av_op_attr_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_op_attr_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_op_attr_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_op_attr_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_cnf_status, 2, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_cookie, 4, TRUE);
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_rep_type, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_op_attr_cnf_size, 2, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_cnf_status, 2, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_cookie, 4, ENC_LITTLE_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_rep_type, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_op_attr_cnf_size, 2, ENC_LITTLE_ENDIAN);
       dissect_homeplug_av_op_attr_bin_report(cursor);
    }
    ptvcursor_pop_subtree(cursor);
@@ -2563,13 +2563,13 @@ dissect_homeplug_av_get_enet_phy_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_enet_phy_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_enet_phy_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_enet_phy_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_enet_phy_req_mcontrol, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_enet_phy_req_addcaps, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_reserved, 3, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_enet_phy_req_mcontrol, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_enet_phy_req_addcaps, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_reserved, 3, ENC_NA);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2582,13 +2582,13 @@ dissect_homeplug_av_get_enet_phy_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
       return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_enet_phy_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_enet_phy_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_enet_phy_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_enet_phy_cnf_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_enet_phy_cnf_speed, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_enet_phy_cnf_duplex, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_enet_phy_cnf_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_enet_phy_cnf_speed, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_enet_phy_cnf_duplex, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2601,12 +2601,12 @@ dissect_homeplug_av_tone_map_req(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_tone_map_req, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_tone_map_req, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_tone_map_req);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_tone_map_req_mac, 6, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_tone_map_req_slot, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_av_tone_map_req_mac, 6, ENC_NA);
+      ptvcursor_add(cursor, hf_homeplug_av_tone_map_req_slot, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2619,12 +2619,12 @@ dissect_homeplug_av_tone_map_carrier(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_tone_map_carrier, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_tone_map_carrier, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_tone_map_carrier);
    {
-      ptvcursor_add_no_advance(cursor, hf_homeplug_av_tone_map_carrier_lo, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_tone_map_carrier_hi, 1, FALSE);
+      ptvcursor_add_no_advance(cursor, hf_homeplug_av_tone_map_carrier_lo, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_tone_map_carrier_hi, 1, ENC_BIG_ENDIAN);
    }
    ptvcursor_pop_subtree(cursor);
 }
@@ -2638,14 +2638,14 @@ dissect_homeplug_av_tone_map_cnf(ptvcursor_t *cursor)
    if (!ptvcursor_tree(cursor))
      return;
 
-   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_tone_map_cnf, -1, FALSE);
+   it = ptvcursor_add_no_advance(cursor, hf_homeplug_av_tone_map_cnf, -1, ENC_NA);
 
    ptvcursor_push_subtree(cursor, it, ett_homeplug_av_tone_map_cnf);
    {
-      ptvcursor_add(cursor, hf_homeplug_av_tone_map_cnf_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_tone_map_cnf_slot, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_tone_map_cnf_num_tms, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_av_tone_map_cnf_num_act, 2, TRUE);
+      ptvcursor_add(cursor, hf_homeplug_av_tone_map_cnf_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_tone_map_cnf_slot, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_tone_map_cnf_num_tms, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_av_tone_map_cnf_num_act, 2, ENC_LITTLE_ENDIAN);
 
       for (i = 0; i < HOMEPLUG_AV_MAX_CARRIERS; i++) {
 	dissect_homeplug_av_tone_map_carrier(cursor);
diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c
index bcc6a642a7..85626fe736 100644
--- a/epan/dissectors/packet-homeplug.c
+++ b/epan/dissectors/packet-homeplug.c
@@ -475,15 +475,15 @@ static void dissect_homeplug_mctrl(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_mctrl, 1, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_mctrl, 1, ENC_NA);
   /* Extract Number Of MAC Data Entries */
   homeplug_ne = tvb_get_guint8(ptvcursor_tvbuff(cursor),
       ptvcursor_current_offset(cursor)) & HOMEPLUG_MCTRL_NE;
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_mctrl);
   {
-    ptvcursor_add_no_advance(cursor, hf_homeplug_mctrl_reserved, 1, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_mctrl_ne, 1, FALSE);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_mctrl_reserved, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_mctrl_ne, 1, ENC_BIG_ENDIAN);
   }
   ptvcursor_pop_subtree(cursor);
 }
@@ -496,14 +496,14 @@ static void dissect_homeplug_mehdr(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_mehdr, 1, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_mehdr, 1, ENC_NA);
   homeplug_metype = tvb_get_guint8(ptvcursor_tvbuff(cursor),
       ptvcursor_current_offset(cursor)) & HOMEPLUG_MEHDR_METYPE;
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_mehdr);
   {
-    ptvcursor_add_no_advance(cursor, hf_homeplug_mehdr_mev, 1, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_mehdr_metype, 1, FALSE);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_mehdr_mev, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_mehdr_metype, 1, ENC_BIG_ENDIAN);
   }
   ptvcursor_pop_subtree(cursor);
 }
@@ -515,7 +515,7 @@ static void dissect_homeplug_melen(ptvcursor_t * cursor)
     return;
 
   homeplug_melen = tvb_get_guint8(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
-  ptvcursor_add(cursor, hf_homeplug_melen, 1, FALSE);
+  ptvcursor_add(cursor, hf_homeplug_melen, 1, ENC_BIG_ENDIAN);
 
 }
 
@@ -527,12 +527,12 @@ static void dissect_homeplug_rce(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_rce, homeplug_melen, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_rce, homeplug_melen, ENC_NA);
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_rce);
   {
-    ptvcursor_add_no_advance(cursor, hf_homeplug_rce_cev, 1, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_rce_rsvd, 1, FALSE);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_rce_cev, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_rce_rsvd, 1, ENC_BIG_ENDIAN);
   }
   ptvcursor_pop_subtree(cursor);
 }
@@ -548,33 +548,33 @@ static void dissect_homeplug_cer(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_cer, homeplug_melen, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_cer, homeplug_melen, ENC_NA);
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_cer);
   {
-    ptvcursor_add_no_advance(cursor, hf_homeplug_cer_cerv, 1, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_cer_rsvd1, 2, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_cer_rxtmi, 1, FALSE);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_cer_cerv, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_cer_rsvd1, 2, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_cer_rxtmi, 1, ENC_BIG_ENDIAN);
 
     for (;iTone < 10; iTone++) {
-      ptvcursor_add(cursor, hf_homeplug_cer_vt, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_cer_vt, 1, ENC_BIG_ENDIAN);
     }
 
-    ptvcursor_add_no_advance(cursor, hf_homeplug_cer_rate, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_cer_bp, 1, FALSE);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_cer_rate, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_cer_bp, 1, ENC_BIG_ENDIAN);
     BP = tvb_get_guint8(ptvcursor_tvbuff(cursor),
         ptvcursor_current_offset(cursor)) & HOMEPLUG_CER_BP;
-    ptvcursor_add_no_advance(cursor, hf_homeplug_cer_mod, 1, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_cer_vt11, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_cer_rsvd2, 1, FALSE);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_cer_mod, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_cer_vt11, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_cer_rsvd2, 1, ENC_BIG_ENDIAN);
 
     if (BP) {
       iNBDA = tvb_get_guint8(ptvcursor_tvbuff(cursor),
           ptvcursor_current_offset(cursor)) & HOMEPLUG_CER_NBDAS;
-      ptvcursor_add(cursor, hf_homeplug_cer_nbdas, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_cer_nbdas, 1, ENC_BIG_ENDIAN);
       /* TODO : Check on iNBDA! INT51X1 up to 16 dba. But up to 32 for INT51X1 (Host/DTE) */
       for (;iNBDA > 0; iNBDA--) {
-        ptvcursor_add(cursor, hf_homeplug_cer_bda, 6, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_cer_bda, 6, ENC_NA);
       }
     }
   }
@@ -589,18 +589,18 @@ static void dissect_homeplug_vs(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_vs, homeplug_melen, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_vs, homeplug_melen, ENC_NA);
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_vs);
   {
-    ptvcursor_add(cursor, hf_homeplug_vs_oui, 3, FALSE);
+    ptvcursor_add(cursor, hf_homeplug_vs_oui, 3, ENC_BIG_ENDIAN);
 
-    it = ptvcursor_add_no_advance(cursor, hf_homeplug_vs_mid, 1, FALSE);
+    it = ptvcursor_add_no_advance(cursor, hf_homeplug_vs_mid, 1, ENC_BIG_ENDIAN);
 
     ptvcursor_push_subtree(cursor, it, ett_homeplug_vs_mid);
     {
-      ptvcursor_add_no_advance(cursor, hf_homeplug_vs_dir, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_vs_mid, 1, FALSE);
+      ptvcursor_add_no_advance(cursor, hf_homeplug_vs_dir, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_vs_mid, 1, ENC_BIG_ENDIAN);
     }
     ptvcursor_pop_subtree(cursor);
 
@@ -618,7 +618,7 @@ static void dissect_homeplug_rba(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  ptvcursor_add_no_advance(cursor, hf_homeplug_rba, homeplug_melen, FALSE);
+  ptvcursor_add_no_advance(cursor, hf_homeplug_rba, homeplug_melen, ENC_NA);
 }
 
 /* Dissection of Request Parameters and Statistics MME */
@@ -627,7 +627,7 @@ static void dissect_homeplug_rps(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  ptvcursor_add(cursor, hf_homeplug_rps, homeplug_melen, FALSE);
+  ptvcursor_add(cursor, hf_homeplug_rps, homeplug_melen, ENC_NA);
 }
 
 /* Dissection of Set Network Encryption Key MME */
@@ -638,12 +638,12 @@ static void dissect_homeplug_snk(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_snk, homeplug_melen, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_snk, homeplug_melen, ENC_NA);
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_snk);
   {
-    ptvcursor_add(cursor, hf_homeplug_snk_eks, 1, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_snk_nek, 8, FALSE);
+    ptvcursor_add(cursor, hf_homeplug_snk_eks, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_snk_nek, 8, ENC_NA);
   }
   ptvcursor_pop_subtree(cursor);
 }
@@ -654,7 +654,7 @@ static void dissect_homeplug_mwr(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  ptvcursor_add_no_advance(cursor, hf_homeplug_mwr, homeplug_melen, FALSE);
+  ptvcursor_add_no_advance(cursor, hf_homeplug_mwr, homeplug_melen, ENC_NA);
 }
 
 /* Dissection of Confirm Network Encryption Key MME */
@@ -663,7 +663,7 @@ static void dissect_homeplug_cnk(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  ptvcursor_add_no_advance(cursor, hf_homeplug_cnk, homeplug_melen, FALSE);
+  ptvcursor_add_no_advance(cursor, hf_homeplug_cnk, homeplug_melen, ENC_NA);
 }
 
 /* Dissection of Parameters and Statistics Response MME */
@@ -674,20 +674,20 @@ static void dissect_homeplug_psr(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_psr, homeplug_melen, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_psr, homeplug_melen, ENC_NA);
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_psr);
   {
-    ptvcursor_add(cursor, hf_homeplug_psr_txack, 2, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_psr_txnack, 2, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_psr_txfail, 2, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_psr_txcloss, 2, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_psr_txcoll, 2, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_psr_txca3lat, 2, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_psr_txca2lat, 2, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_psr_txca1lat, 2, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_psr_txca0lat, 2, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_psr_rxbp40, 4, FALSE);
+    ptvcursor_add(cursor, hf_homeplug_psr_txack, 2, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_psr_txnack, 2, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_psr_txfail, 2, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_psr_txcloss, 2, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_psr_txcoll, 2, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_psr_txca3lat, 2, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_psr_txca2lat, 2, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_psr_txca1lat, 2, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_psr_txca0lat, 2, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_psr_rxbp40, 4, ENC_BIG_ENDIAN);
   }
   ptvcursor_pop_subtree(cursor);
 }
@@ -700,11 +700,11 @@ static void dissect_homeplug_slp(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_slp, homeplug_melen, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_slp, homeplug_melen, ENC_NA);
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_slp);
   {
-    ptvcursor_add(cursor, hf_homeplug_slp_ma, 6, FALSE);
+    ptvcursor_add(cursor, hf_homeplug_slp_ma, 6, ENC_NA);
   }
   ptvcursor_pop_subtree(cursor);
 }
@@ -718,7 +718,7 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
   if (!ptvcursor_tree(cursor))
     return;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_loader, -1, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_loader, -1, ENC_NA);
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_loader);
   {
@@ -731,157 +731,157 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
     switch(mid) {
     case HOMEPLUG_MID_LGDFV:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Get Firmware Version");
-      ptvcursor_add(cursor, hf_homeplug_loader_gdfv, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_gdfv, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       if (length != 0) {
-        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, FALSE);
-        ptvcursor_add(cursor, hf_homeplug_loader_version, -1, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN);
+        ptvcursor_add(cursor, hf_homeplug_loader_version, -1, ENC_ASCII|ENC_NA);
       }
       break;
     case HOMEPLUG_MID_LSF:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Start Firmware");
-      ptvcursor_add(cursor, hf_homeplug_loader_lsf, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_lsf, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_LWM:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Write Memory");
-      ptvcursor_add(cursor, hf_homeplug_loader_lwm, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_lwm, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       if (length == 7)
-        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_data_address, 4, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_data_address, 4, ENC_BIG_ENDIAN);
 
       dlen = tvb_get_ntohs(ptvcursor_tvbuff(cursor),
                            ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_loader_data_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_data_length, 2, ENC_BIG_ENDIAN);
       if (length != 7)
-        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, ENC_NA);
       break;
     case HOMEPLUG_MID_LRM:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Read Memory");
-      ptvcursor_add(cursor, hf_homeplug_loader_lrm, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_lrm, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       if (length != 6)
-        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_data_address, 4, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_data_address, 4, ENC_BIG_ENDIAN);
       dlen = tvb_get_ntohs(ptvcursor_tvbuff(cursor),
                            ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_loader_data_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_data_length, 2, ENC_BIG_ENDIAN);
       if (length != 6)
-        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, ENC_NA);
       break;
     case HOMEPLUG_MID_LRNVM:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Read NVM");
-      ptvcursor_add(cursor, hf_homeplug_loader_lrnvm, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_lrnvm, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       if (length != 7)
-        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_data_address, 4, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_data_address, 4, ENC_BIG_ENDIAN);
       dlen = tvb_get_ntohs(ptvcursor_tvbuff(cursor),
                            ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_loader_data_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_data_length, 2, ENC_BIG_ENDIAN);
       if (length != 7)
-        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, ENC_NA);
       break;
     case HOMEPLUG_MID_LWNVM:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Write NVM");
-      ptvcursor_add(cursor, hf_homeplug_loader_lwnvm, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_lwnvm, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       if (length == 7)
-        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_data_address, 4, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_data_address, 4, ENC_BIG_ENDIAN);
       dlen = tvb_get_ntohs(ptvcursor_tvbuff(cursor),
                            ptvcursor_current_offset(cursor));
-      ptvcursor_add(cursor, hf_homeplug_loader_data_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_data_length, 2, ENC_BIG_ENDIAN);
       if (length != 7)
-        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, ENC_NA);
       break;
     case HOMEPLUG_MID_LRESET:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Reset");
-      ptvcursor_add(cursor, hf_homeplug_loader_lreset, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_lreset, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_GMD:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Get Module Data");
-      ptvcursor_add(cursor, hf_homeplug_loader_gmd, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_gmd, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       if (length != 10)
-        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_module_id, 4, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_module_offset, 4, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_module_id, 4, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_module_offset, 4, ENC_BIG_ENDIAN);
       if (length == 10) {
-        ptvcursor_add(cursor, hf_homeplug_loader_data_length, 2, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_data_length, 2, ENC_BIG_ENDIAN);
       } else {
-        ptvcursor_add(cursor, hf_homeplug_loader_module_size, 4, FALSE);
-        ptvcursor_add(cursor, hf_homeplug_loader_data, length - 13, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_module_size, 4, ENC_BIG_ENDIAN);
+        ptvcursor_add(cursor, hf_homeplug_loader_data, length - 13, ENC_NA);
       }
       break;
     case HOMEPLUG_MID_SMD:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Set Module Data");
-      ptvcursor_add(cursor, hf_homeplug_loader_smd, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_smd, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       if (length == 13)
-        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_module_id, 4, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_module_offset, 4, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_module_id, 4, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_module_offset, 4, ENC_BIG_ENDIAN);
       dlen = tvb_get_ntohs(ptvcursor_tvbuff(cursor),
                            ptvcursor_current_offset(cursor));
       if (length != 13) {
-        ptvcursor_add(cursor, hf_homeplug_loader_data_length, 2, FALSE);
-        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_data_length, 2, ENC_BIG_ENDIAN);
+        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, ENC_NA);
       } else
-        ptvcursor_add(cursor, hf_homeplug_loader_module_size, 4, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_module_size, 4, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_CM:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Commit Module");
-      ptvcursor_add(cursor, hf_homeplug_loader_cm, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_cm, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       if (length == 5)
-        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_module_id, 4, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_module_id, 4, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_LEMD:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Erase Module Data");
-      ptvcursor_add(cursor, hf_homeplug_loader_lemd, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_lemd, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       if (length == 9)
-        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_module_id, 4, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_module_id, 4, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_LENVMS:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Erase NVM Sectors");
-      ptvcursor_add(cursor, hf_homeplug_loader_lenvms, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_lenvms, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       if (length == 9)
-        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_data_address, 4, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_module_size, 4, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_data_address, 4, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_module_size, 4, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_GNVMP:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Get NVM Parametes");
-      ptvcursor_add(cursor, hf_homeplug_loader_gnvmp, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_gnvmp, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       if (length == 17) {
-        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, FALSE);
-        ptvcursor_add(cursor, hf_homeplug_loader_nvmp_type, 4, FALSE);
-        ptvcursor_add(cursor, hf_homeplug_loader_nvmp_pagesize, 4, FALSE);
-        ptvcursor_add(cursor, hf_homeplug_loader_nvmp_blocksize, 4, FALSE);
-        ptvcursor_add(cursor, hf_homeplug_loader_nvmp_memorysize, 4, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN);
+        ptvcursor_add(cursor, hf_homeplug_loader_nvmp_type, 4, ENC_BIG_ENDIAN);
+        ptvcursor_add(cursor, hf_homeplug_loader_nvmp_pagesize, 4, ENC_BIG_ENDIAN);
+        ptvcursor_add(cursor, hf_homeplug_loader_nvmp_blocksize, 4, ENC_BIG_ENDIAN);
+        ptvcursor_add(cursor, hf_homeplug_loader_nvmp_memorysize, 4, ENC_BIG_ENDIAN);
       }
       break;
     case HOMEPLUG_MID_SNVMP:
       col_set_str(pinfo->cinfo, COL_INFO, "Loader Set NVM Parametes");
-      ptvcursor_add(cursor, hf_homeplug_loader_snvmp, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_snvmp, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_length, 2, ENC_BIG_ENDIAN);
       if (length == 17)
-        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_nvmp_type, 4, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_nvmp_pagesize, 4, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_nvmp_blocksize, 4, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_loader_nvmp_memorysize, 4, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_loader_status, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_nvmp_type, 4, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_nvmp_pagesize, 4, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_nvmp_blocksize, 4, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_loader_nvmp_memorysize, 4, ENC_BIG_ENDIAN);
       break;
     default:
-      ptvcursor_add(cursor, hf_homeplug_loader_mid, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_loader_mid, 1, ENC_BIG_ENDIAN);
       break;
     }
   }
@@ -897,7 +897,7 @@ static void dissect_homeplug_hreq(ptvcursor_t * cursor, packet_info * pinfo)
   if (!ptvcursor_tree(cursor))
     return;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_hreq, homeplug_melen, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_hreq, homeplug_melen, ENC_NA);
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_hreq);
   {
@@ -909,49 +909,49 @@ static void dissect_homeplug_hreq(ptvcursor_t * cursor, packet_info * pinfo)
     switch(mid) {
     case HOMEPLUG_MID_GDV:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Device Version");
-      ptvcursor_add(cursor, hf_homeplug_hreq_gdv, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hreq_gdv, 1, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_GFV:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Firmware Version");
-      ptvcursor_add(cursor, hf_homeplug_hreq_gfv, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hreq_gfv, 1, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_GNEK:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Network Encryption Key Request");
-      ptvcursor_add(cursor, hf_homeplug_hreq_gnek, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hreq_gnek, 1, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_GCLBPL:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get/ Clear Local Bridge Proxy List");
-      ptvcursor_add(cursor, hf_homeplug_hreq_gclbpl, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hreq_gclbpl, 1, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_NVDS:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Non-volatile Database Status");
-      ptvcursor_add(cursor, hf_homeplug_hreq_nvds, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hreq_nvds, 1, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_GRBT:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Remote Bridge Table");
-      ptvcursor_add(cursor, hf_homeplug_hreq_grbt, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hreq_grbt, 1, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_GSLNM:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get/Set Logical Network Mappings");
-      ptvcursor_add(cursor, hf_homeplug_hreq_gslnm, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hreq_gslnm, 1, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_GSSS:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get/Set Spectral Scaling");
-      ptvcursor_add(cursor, hf_homeplug_hreq_gsss, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hreq_gsss, 1, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_RSL:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: MAC Reset to Secondary Loader");
-      ptvcursor_add(cursor, hf_homeplug_hreq_rsl, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hreq_rsl, 1, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_RESET:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: MAC Reset");
-      ptvcursor_add(cursor, hf_homeplug_hreq_reset, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_hreq_reset_type, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hreq_reset, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_hreq_reset_type, 1, ENC_BIG_ENDIAN);
       if (length == 4)
-        ptvcursor_add(cursor, hf_homeplug_hreq_reset_delay, 2, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_hreq_reset_delay, 2, ENC_BIG_ENDIAN);
       break;
     default:
-      ptvcursor_add(cursor, hf_homeplug_hreq_mid, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hreq_mid, 1, ENC_BIG_ENDIAN);
       break;
     }
   }
@@ -967,7 +967,7 @@ static void dissect_homeplug_hrsp(ptvcursor_t * cursor, packet_info * pinfo)
   if (!ptvcursor_tree(cursor))
     return;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_hrsp, homeplug_melen, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_hrsp, homeplug_melen, ENC_NA);
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_hrsp);
   {
@@ -976,26 +976,26 @@ static void dissect_homeplug_hrsp(ptvcursor_t * cursor, packet_info * pinfo)
     switch(mid) {
     case HOMEPLUG_MID_GDVR:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Get Device Version");
-      ptvcursor_add(cursor, hf_homeplug_hrsp_gdvr, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_hrsp_version, -1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hrsp_gdvr, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_hrsp_version, -1, ENC_ASCII|ENC_NA);
       break;
     case HOMEPLUG_MID_GFVR:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Get Firmware Version");
-      ptvcursor_add(cursor, hf_homeplug_hrsp_gfvr, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_hrsp_version, -1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hrsp_gfvr, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_hrsp_version, -1, ENC_ASCII|ENC_NA);
       break;
     case HOMEPLUG_MID_GNEKR:
       col_set_str(pinfo->cinfo, COL_INFO, "Get Network Encryption Key");
-      ptvcursor_add(cursor, hf_homeplug_hrsp_gnekr, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_hrsp_gnekr_select, 1, FALSE);
-      ptvcursor_add(cursor, hf_homeplug_hrsp_gnekr_key, 8, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hrsp_gnekr, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_hrsp_gnekr_select, 1, ENC_BIG_ENDIAN);
+      ptvcursor_add(cursor, hf_homeplug_hrsp_gnekr_key, 8, ENC_BIG_ENDIAN);
       break;
     case HOMEPLUG_MID_INVALID:
       col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Invalid MME");
-      ptvcursor_add(cursor, hf_homeplug_hrsp_invalid, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hrsp_invalid, 1, ENC_BIG_ENDIAN);
       break;
     default:
-      ptvcursor_add(cursor, hf_homeplug_hrsp_mid, 1, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_hrsp_mid, 1, ENC_BIG_ENDIAN);
       break;
     }
   }
@@ -1008,7 +1008,7 @@ static void dissect_homeplug_htag(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  ptvcursor_add_no_advance(cursor, hf_homeplug_htag, homeplug_melen, FALSE);
+  ptvcursor_add_no_advance(cursor, hf_homeplug_htag, homeplug_melen, ENC_NA);
 }
 
 /* Dissection of the Network Statistics MME */
@@ -1036,18 +1036,18 @@ static void dissect_homeplug_ns(ptvcursor_t * cursor, packet_info * pinfo)
              ptvcursor_tvbuff(cursor), 0, 0, extended);
     PROTO_ITEM_SET_GENERATED(ti);
 
-    ptvcursor_add_no_advance(cursor, hf_homeplug_ns_netw_ctrl_ac, 1, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_ns_netw_ctrl_icid, 1, FALSE);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_ns_netw_ctrl_ac, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_ns_netw_ctrl_icid, 1, ENC_BIG_ENDIAN);
 
-    ptvcursor_add_no_advance(cursor, hf_homeplug_ns_bytes40_robo, 2, TRUE);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_ns_bytes40_robo, 2, ENC_LITTLE_ENDIAN);
     ns_bytes40 = tvb_get_letohs(ptvcursor_tvbuff(cursor),
         ptvcursor_current_offset(cursor));
     proto_tree_add_text(ptvcursor_tree(cursor), ptvcursor_tvbuff(cursor),
         ptvcursor_current_offset(cursor), 2, "MHz :  %.3f", (float)(ns_bytes40)/42);
     ptvcursor_advance(cursor, 2);
 
-    ptvcursor_add(cursor, hf_homeplug_ns_fails_robo, 2, TRUE);
-    ptvcursor_add(cursor, hf_homeplug_ns_drops_robo, 2, TRUE);
+    ptvcursor_add(cursor, hf_homeplug_ns_fails_robo, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_ns_drops_robo, 2, ENC_LITTLE_ENDIAN);
 
     while (iTone < 15) {
       newt_da = ((gint64)tvb_get_ntoh24(ptvcursor_tvbuff(cursor),
@@ -1059,17 +1059,17 @@ static void dissect_homeplug_ns(ptvcursor_t * cursor, packet_info * pinfo)
         ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH,
             ett_homeplug_tone, "Tone Map #%d", iTone+1);
         {
-          ptvcursor_add(cursor, hf_homeplug_ns_netw_da, 6, FALSE);
+          ptvcursor_add(cursor, hf_homeplug_ns_netw_da, 6, ENC_NA);
 
-          ptvcursor_add_no_advance(cursor, hf_homeplug_ns_bytes40, 2, TRUE);
+          ptvcursor_add_no_advance(cursor, hf_homeplug_ns_bytes40, 2, ENC_LITTLE_ENDIAN);
           ns_bytes40 = tvb_get_letohs(ptvcursor_tvbuff(cursor),
                                       ptvcursor_current_offset(cursor));
           proto_tree_add_text(ptvcursor_tree(cursor), ptvcursor_tvbuff(cursor),
                               ptvcursor_current_offset(cursor), 2, "MHz :  %.3f", (float)(ns_bytes40)/42);
           ptvcursor_advance(cursor, 2);
 
-          ptvcursor_add(cursor, hf_homeplug_ns_fails, 2, TRUE);
-          ptvcursor_add(cursor, hf_homeplug_ns_drops, 2, TRUE);
+          ptvcursor_add(cursor, hf_homeplug_ns_fails, 2, ENC_LITTLE_ENDIAN);
+          ptvcursor_add(cursor, hf_homeplug_ns_drops, 2, ENC_LITTLE_ENDIAN);
         }
         ptvcursor_pop_subtree(cursor);
       } else {
@@ -1084,11 +1084,11 @@ static void dissect_homeplug_ns(ptvcursor_t * cursor, packet_info * pinfo)
         ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH,
             ett_homeplug_tx_bfr_state, "TX_BFR_%d_STATE", i_buffer);
         {
-          ptvcursor_add_no_advance(cursor, hf_homeplug_ns_buf_in_use, 1, FALSE);
-          ptvcursor_add_no_advance(cursor, hf_homeplug_ns_prio, 1, FALSE);
-          ptvcursor_add(cursor, hf_homeplug_ns_msdu_len, 1, FALSE);
-          ptvcursor_add_no_advance(cursor, hf_homeplug_ns_seqn, 1, FALSE);
-          ptvcursor_add(cursor, hf_homeplug_ns_toneidx, 1, FALSE);
+          ptvcursor_add_no_advance(cursor, hf_homeplug_ns_buf_in_use, 1, ENC_BIG_ENDIAN);
+          ptvcursor_add_no_advance(cursor, hf_homeplug_ns_prio, 1, ENC_BIG_ENDIAN);
+          ptvcursor_add(cursor, hf_homeplug_ns_msdu_len, 1, ENC_BIG_ENDIAN);
+          ptvcursor_add_no_advance(cursor, hf_homeplug_ns_seqn, 1, ENC_BIG_ENDIAN);
+          ptvcursor_add(cursor, hf_homeplug_ns_toneidx, 1, ENC_BIG_ENDIAN);
         }
         ptvcursor_pop_subtree(cursor);
         i_buffer++;
@@ -1107,25 +1107,25 @@ static void dissect_homeplug_bcn(ptvcursor_t * cursor)
   guint8 i_da;
   guint8 fbn;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_bcn, homeplug_melen, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_bcn, homeplug_melen, ENC_NA);
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_bcn);
   {
-    ptvcursor_add_no_advance(cursor, hf_homeplug_bcn_network, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_bcn_return, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_bcn_rsvd, 1, FALSE);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_bcn_network, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_bcn_return, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_bcn_rsvd, 1, ENC_BIG_ENDIAN);
     fbn = tvb_get_guint8(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor))
         & HOMEPLUG_BCN_FBN;
-    ptvcursor_add(cursor, hf_homeplug_bcn_fbn, 1, FALSE);
+    ptvcursor_add(cursor, hf_homeplug_bcn_fbn, 1, ENC_BIG_ENDIAN);
     while (i_bridge < 2) {
       ptvcursor_add_text_with_subtree(cursor, SUBTREE_UNDEFINED_LENGTH,
           ett_homeplug_bridge, "Bridge #%d", fbn + i_bridge);
       {
-        ptvcursor_add(cursor, hf_homeplug_bcn_brda, 6, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_bcn_brda, 6, ENC_NA);
         num_das = tvb_get_guint8(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
-        ptvcursor_add(cursor, hf_homeplug_bcn_bp_das, 1, FALSE);
+        ptvcursor_add(cursor, hf_homeplug_bcn_bp_das, 1, ENC_BIG_ENDIAN);
         for (i_da = 0; i_da < num_das; i_da++) {
-          ptvcursor_add(cursor, hf_homeplug_bcn_bp_da, 6, FALSE);
+          ptvcursor_add(cursor, hf_homeplug_bcn_bp_da, 6, ENC_NA);
         }
       }
       ptvcursor_pop_subtree(cursor);
@@ -1142,19 +1142,19 @@ static void dissect_homeplug_bcl(ptvcursor_t * cursor)
   guint8 num_das;
   guint8 i_da = 0;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_bcl, homeplug_melen, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_bcl, homeplug_melen, ENC_NA);
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_bcl);
   {
-    ptvcursor_add_no_advance(cursor, hf_homeplug_bcl_network, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_bcl_return, 1, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_bcl_rsvd, 1, FALSE);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_bcl_network, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_bcl_return, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_bcl_rsvd, 1, ENC_BIG_ENDIAN);
 
     num_das = tvb_get_guint8(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor));
-    ptvcursor_add(cursor, hf_homeplug_bcl_hprox_das, 1, FALSE);
+    ptvcursor_add(cursor, hf_homeplug_bcl_hprox_das, 1, ENC_BIG_ENDIAN);
 
     while (i_da < num_das) {
-      ptvcursor_add(cursor, hf_homeplug_bcl_hpbda, 6, FALSE);
+      ptvcursor_add(cursor, hf_homeplug_bcl_hpbda, 6, ENC_NA);
       i_da++;
     }
   }
@@ -1191,24 +1191,24 @@ static void dissect_homeplug_stc(ptvcursor_t * cursor)
   if (!ptvcursor_tree(cursor))
     return;
 
-  it = ptvcursor_add_no_advance(cursor, hf_homeplug_stc, homeplug_melen, FALSE);
+  it = ptvcursor_add_no_advance(cursor, hf_homeplug_stc, homeplug_melen, ENC_NA);
 
   ptvcursor_push_subtree(cursor, it, ett_homeplug_stc);
   {
-    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_lco, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_encf, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_txprio, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_rexp, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_txcf, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_cftop, 1, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_stc_rsvd1, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_retry, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_rsvd2, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_dder, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_dur, 1, FALSE);
-    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_ebp, 1, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_stc_dees, 1, FALSE);
-    ptvcursor_add(cursor, hf_homeplug_stc_txeks, 1, FALSE);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_lco, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_encf, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_txprio, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_rexp, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_txcf, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_cftop, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_stc_rsvd1, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_retry, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_rsvd2, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_dder, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_dur, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add_no_advance(cursor, hf_homeplug_stc_ebp, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_stc_dees, 1, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_homeplug_stc_txeks, 1, ENC_BIG_ENDIAN);
   }
   ptvcursor_pop_subtree(cursor);
 
@@ -1218,7 +1218,7 @@ static void dissect_homeplug_stc(ptvcursor_t * cursor)
 /* Dissection of unknown tags */
 static void dissect_homeplug_unknown(ptvcursor_t * cursor)
 {
-  ptvcursor_add(cursor, hf_homeplug_data, homeplug_melen, FALSE);
+  ptvcursor_add(cursor, hf_homeplug_data, homeplug_melen, ENC_NA);
 }
 
 static void dissect_homeplug_mme(ptvcursor_t * cursor, packet_info * pinfo)
diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c
index 4bcd91ab53..c5d14b8407 100644
--- a/epan/dissectors/packet-omapi.c
+++ b/epan/dissectors/packet-omapi.c
@@ -124,8 +124,8 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   else if (tvb_reported_length_remaining(tvb, 0) < 24)
   {
     /* This is a startup message */
-    ptvcursor_add(cursor, hf_omapi_version, 4, FALSE);
-    ptvcursor_add(cursor, hf_omapi_hlength, 4, FALSE);
+    ptvcursor_add(cursor, hf_omapi_version, 4, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_omapi_hlength, 4, ENC_BIG_ENDIAN);
 
     col_set_str(pinfo->cinfo, COL_INFO, "Status message");
     proto_item_append_text(ti, ", Status message");
@@ -135,8 +135,8 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   else if ( !(tvb_get_ntohl(tvb, 8) || tvb_get_ntohl(tvb, 12)) )
   {
     /* This is a startup message, and more */
-    ptvcursor_add(cursor, hf_omapi_version, 4, FALSE);
-    ptvcursor_add(cursor, hf_omapi_hlength, 4, FALSE);
+    ptvcursor_add(cursor, hf_omapi_version, 4, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_omapi_hlength, 4, ENC_BIG_ENDIAN);
 
     if (check_col(pinfo->cinfo, COL_INFO))
     {
@@ -145,9 +145,9 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     proto_item_append_text(ti, ", Status message");
   }
 
-  ptvcursor_add(cursor, hf_omapi_auth_id, 4, FALSE);
+  ptvcursor_add(cursor, hf_omapi_auth_id, 4, ENC_BIG_ENDIAN);
   authlength = tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor));
-  ptvcursor_add(cursor, hf_omapi_auth_len, 4, FALSE);
+  ptvcursor_add(cursor, hf_omapi_auth_len, 4, ENC_BIG_ENDIAN);
 
   if (check_col(pinfo->cinfo, COL_INFO))
   {
@@ -157,18 +157,18 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_item_append_text(ti, ", Opcode: %s",
     val_to_str(tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor)), omapi_opcode_vals, "Unknown opcode (0x%04x)"));
 
-  ptvcursor_add(cursor, hf_omapi_opcode, 4, FALSE);
-  ptvcursor_add(cursor, hf_omapi_handle, 4, FALSE);
-  ptvcursor_add(cursor, hf_omapi_id, 4, FALSE);
-  ptvcursor_add(cursor, hf_omapi_rid, 4, FALSE);
+  ptvcursor_add(cursor, hf_omapi_opcode, 4, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_omapi_handle, 4, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_omapi_id, 4, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_omapi_rid, 4, ENC_BIG_ENDIAN);
 
   msglength = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
   while (msglength)
   {
-    ptvcursor_add(cursor, hf_omapi_msg_name_len, 2, FALSE);
-    ptvcursor_add(cursor, hf_omapi_msg_name, msglength, FALSE);
+    ptvcursor_add(cursor, hf_omapi_msg_name_len, 2, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_omapi_msg_name, msglength, ENC_ASCII|ENC_NA);
     msglength = tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor));
-    ptvcursor_add(cursor, hf_omapi_msg_value_len, 4, FALSE);
+    ptvcursor_add(cursor, hf_omapi_msg_value_len, 4, ENC_BIG_ENDIAN);
 
     if (msglength == 0)
     {
@@ -180,7 +180,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
     else
     {
-      ptvcursor_add(cursor, hf_omapi_msg_value, msglength, FALSE);
+      ptvcursor_add(cursor, hf_omapi_msg_value, msglength, ENC_ASCII|ENC_NA);
     }
 
     msglength = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
@@ -192,10 +192,10 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   objlength = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
   while (objlength)
   {
-    ptvcursor_add(cursor, hf_omapi_obj_name_len, 2, FALSE);
-    ptvcursor_add(cursor, hf_omapi_obj_name, objlength, FALSE);
+    ptvcursor_add(cursor, hf_omapi_obj_name_len, 2, ENC_BIG_ENDIAN);
+    ptvcursor_add(cursor, hf_omapi_obj_name, objlength, ENC_ASCII|ENC_NA);
     objlength = tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor));
-    ptvcursor_add(cursor, hf_omapi_obj_value_len, 4, FALSE);
+    ptvcursor_add(cursor, hf_omapi_obj_value_len, 4, ENC_BIG_ENDIAN);
 
     if (objlength == 0)
     {
@@ -207,7 +207,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
     else
     {
-      ptvcursor_add(cursor, hf_omapi_obj_value, objlength, FALSE);
+      ptvcursor_add(cursor, hf_omapi_obj_value, objlength, ENC_NA);
     }
 
     objlength = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
@@ -217,7 +217,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   ptvcursor_advance(cursor, 2);
 
   if (authlength > 0) {
-    ptvcursor_add(cursor, hf_omapi_signature, authlength, FALSE);
+    ptvcursor_add(cursor, hf_omapi_signature, authlength, ENC_NA);
   }
 }
 
diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c
index fbaf5f2152..cb24835345 100644
--- a/epan/dissectors/packet-pgm.c
+++ b/epan/dissectors/packet-pgm.c
@@ -376,9 +376,9 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 		"%s Options (Total Length %d)", pktname, opts_total_len);
 	opts_tree = proto_item_add_subtree(tf, ett_pgm_opts);
 	ptvcursor_set_tree(cursor, opts_tree);
-	ptvcursor_add(cursor, hf_pgm_opt_type, 1, FALSE);
-	ptvcursor_add(cursor, hf_pgm_opt_len, 1, FALSE);
-	ptvcursor_add(cursor, hf_pgm_opt_tlen, 2, FALSE);
+	ptvcursor_add(cursor, hf_pgm_opt_type, 1, ENC_BIG_ENDIAN);
+	ptvcursor_add(cursor, hf_pgm_opt_len, 1, ENC_BIG_ENDIAN);
+	ptvcursor_add(cursor, hf_pgm_opt_tlen, 2, ENC_BIG_ENDIAN);
 
 	for (opts_total_len -= 4; !theend && opts_total_len != 0;){
 		if (opts_total_len < 4) {
@@ -418,8 +418,8 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 			opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_join);
 			ptvcursor_set_tree(cursor, opt_tree);
 
-			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
+			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, ENC_BIG_ENDIAN);
 
 			if (genopts_len < PGM_OPT_JOIN_SIZE) {
 				proto_tree_add_uint_format(opt_tree, hf_pgm_genopt_len, tvb,
@@ -428,10 +428,10 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 					genopts_len, PGM_OPT_JOIN_SIZE);
 				break;
 			}
-			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_join_res, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_join_minjoin, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_join_res, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_join_minjoin, 4, ENC_BIG_ENDIAN);
 
 			break;
 		}
@@ -441,8 +441,8 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 			opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_parityprm);
 			ptvcursor_set_tree(cursor, opt_tree);
 
-			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
+			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, ENC_BIG_ENDIAN);
 
 
 			if (genopts_len < PGM_OPT_PARITY_PRM_SIZE) {
@@ -452,15 +452,15 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 					genopts_len, PGM_OPT_PARITY_PRM_SIZE);
 				break;
 			}
-			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE);
+			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, ENC_BIG_ENDIAN);
 			optdata_po = tvb_get_guint8(tvb, ptvcursor_current_offset(cursor));
 			proto_tree_add_uint_format(opt_tree, hf_pgm_opt_parity_prm_po, tvb,
 				ptvcursor_current_offset(cursor), 1, optdata_po, "Parity Parameters: %s (0x%x)",
 				paritystr(optdata_po), optdata_po);
 			ptvcursor_advance(cursor, 1);
 
-			ptvcursor_add(cursor, hf_pgm_opt_parity_prm_prmtgsz, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_opt_parity_prm_prmtgsz, 4, ENC_BIG_ENDIAN);
 
 			break;
 		}
@@ -468,8 +468,8 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 			opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_paritygrp);
 			ptvcursor_set_tree(cursor, opt_tree);
 
-			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
+			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, ENC_BIG_ENDIAN);
 
 			if (genopts_len < PGM_OPT_PARITY_GRP_SIZE) {
 				proto_tree_add_uint_format(opt_tree, hf_pgm_genopt_len, tvb,
@@ -478,10 +478,10 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 					genopts_len, PGM_OPT_PARITY_GRP_SIZE);
 				break;
 			}
-			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_parity_grp_res, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_parity_grp_prmgrp, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_parity_grp_res, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_parity_grp_prmgrp, 4, ENC_BIG_ENDIAN);
 
 			break;
 		}
@@ -495,13 +495,13 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 			opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_naklist);
 			ptvcursor_set_tree(cursor, opt_tree);
 
-			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
+			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, ENC_BIG_ENDIAN);
 
 			optdata_len = tvb_get_guint8(tvb, ptvcursor_current_offset(cursor));
-			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_nak_res, 1, FALSE);
+			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_nak_res, 1, ENC_BIG_ENDIAN);
 
 			optdata_len -= PGM_OPT_NAK_LIST_SIZE;
 			tvb_memcpy(tvb, (guint8 *)naklist, ptvcursor_current_offset(cursor), optdata_len);
@@ -554,8 +554,8 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 			opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_ccdata);
 			ptvcursor_set_tree(cursor, opt_tree);
 
-			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
+			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, ENC_BIG_ENDIAN);
 
 			if (genopts_len < PGM_OPT_PGMCC_DATA_SIZE) {
 				proto_tree_add_uint_format(opt_tree, hf_pgm_genopt_len, tvb,
@@ -564,22 +564,22 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 					genopts_len, PGM_OPT_PGMCC_DATA_SIZE);
 				break;
 			}
-			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_ccdata_res, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_ccdata_tsp, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_ccdata_res, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_ccdata_tsp, 4, ENC_BIG_ENDIAN);
 			optdata_afi = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
-			ptvcursor_add(cursor, hf_pgm_opt_ccdata_afi, 2, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_ccdata_res2, 2, FALSE);
+			ptvcursor_add(cursor, hf_pgm_opt_ccdata_afi, 2, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_ccdata_res2, 2, ENC_BIG_ENDIAN);
 
 			switch (optdata_afi) {
 
 			case AFNUM_INET:
-				ptvcursor_add(cursor, hf_pgm_opt_ccdata_acker, 4, FALSE);
+				ptvcursor_add(cursor, hf_pgm_opt_ccdata_acker, 4, ENC_BIG_ENDIAN);
 				break;
 
 			case AFNUM_INET6:
-				ptvcursor_add(cursor, hf_pgm_opt_ccdata_acker6, 16, FALSE);
+				ptvcursor_add(cursor, hf_pgm_opt_ccdata_acker6, 16, ENC_NA);
 				break;
 
 			default:
@@ -596,8 +596,8 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 			opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_ccdata);
 			ptvcursor_set_tree(cursor, opt_tree);
 
-			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
+			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, ENC_BIG_ENDIAN);
 
 			if (genopts_len < PGM_OPT_PGMCC_FEEDBACK_SIZE) {
 				proto_tree_add_uint_format(opt_tree, hf_pgm_genopt_len, tvb,
@@ -606,22 +606,22 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 					genopts_len, PGM_OPT_PGMCC_FEEDBACK_SIZE);
 				break;
 			}
-			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_ccfeedbk_res, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_ccfeedbk_tsp, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_ccfeedbk_res, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_ccfeedbk_tsp, 4, ENC_BIG_ENDIAN);
 			optdata_afi = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
-			ptvcursor_add(cursor, hf_pgm_opt_ccfeedbk_afi, 2, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_ccfeedbk_lossrate, 2, FALSE);
+			ptvcursor_add(cursor, hf_pgm_opt_ccfeedbk_afi, 2, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_ccfeedbk_lossrate, 2, ENC_BIG_ENDIAN);
 
 			switch (optdata_afi) {
 
 			case AFNUM_INET:
-				ptvcursor_add(cursor, hf_pgm_opt_ccfeedbk_acker, 4, FALSE);
+				ptvcursor_add(cursor, hf_pgm_opt_ccfeedbk_acker, 4, ENC_BIG_ENDIAN);
 				break;
 
 			case AFNUM_INET6:
-				ptvcursor_add(cursor, hf_pgm_opt_ccfeedbk_acker6, 16, FALSE);
+				ptvcursor_add(cursor, hf_pgm_opt_ccfeedbk_acker6, 16, ENC_NA);
 				break;
 
 			default:
@@ -636,8 +636,8 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 			opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_nak_bo_ivl);
 			ptvcursor_set_tree(cursor, opt_tree);
 
-			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
+			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, ENC_BIG_ENDIAN);
 
 			if (genopts_len < PGM_OPT_NAK_BO_IVL_SIZE) {
 				proto_tree_add_uint_format(opt_tree, hf_pgm_genopt_len, tvb,
@@ -646,11 +646,11 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 					genopts_len, PGM_OPT_NAK_BO_IVL_SIZE);
 				break;
 			}
-			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_nak_bo_ivl_res, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_nak_bo_ivl_bo_ivl, 4, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_nak_bo_ivl_bo_ivl_sqn, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_nak_bo_ivl_res, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_nak_bo_ivl_bo_ivl, 4, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_nak_bo_ivl_bo_ivl_sqn, 4, ENC_BIG_ENDIAN);
 
 			break;
 		}
@@ -658,8 +658,8 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 			opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_nak_bo_rng);
 			ptvcursor_set_tree(cursor, opt_tree);
 
-			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
+			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, ENC_BIG_ENDIAN);
 
 			if (genopts_len < PGM_OPT_NAK_BO_RNG_SIZE) {
 				proto_tree_add_uint_format(opt_tree, hf_pgm_genopt_len, tvb,
@@ -668,11 +668,11 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 					genopts_len, PGM_OPT_NAK_BO_RNG_SIZE);
 				break;
 			}
-			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_nak_bo_rng_res, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_nak_bo_rng_min_bo_ivl, 4, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_nak_bo_rng_max_bo_ivl, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_nak_bo_rng_res, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_nak_bo_rng_min_bo_ivl, 4, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_nak_bo_rng_max_bo_ivl, 4, ENC_BIG_ENDIAN);
 
 			break;
 		}
@@ -682,8 +682,8 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 			opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_redirect);
 			ptvcursor_set_tree(cursor, opt_tree);
 
-			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
+			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, ENC_BIG_ENDIAN);
 
 			if (genopts_len < PGM_OPT_REDIRECT_SIZE) {
 				proto_tree_add_uint_format(opt_tree, hf_pgm_genopt_len, tvb,
@@ -692,21 +692,21 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 					genopts_len, PGM_OPT_REDIRECT_SIZE);
 				break;
 			}
-			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_redirect_res, 1, FALSE);
+			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_redirect_res, 1, ENC_BIG_ENDIAN);
 			optdata_afi = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
-			ptvcursor_add(cursor, hf_pgm_opt_redirect_afi, 2, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_redirect_res2, 2, FALSE);
+			ptvcursor_add(cursor, hf_pgm_opt_redirect_afi, 2, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_redirect_res2, 2, ENC_BIG_ENDIAN);
 
 			switch (optdata_afi) {
 
 			case AFNUM_INET:
-				ptvcursor_add(cursor, hf_pgm_opt_redirect_dlr, 4, FALSE);
+				ptvcursor_add(cursor, hf_pgm_opt_redirect_dlr, 4, ENC_BIG_ENDIAN);
 				break;
 
 			case AFNUM_INET6:
-				ptvcursor_add(cursor, hf_pgm_opt_redirect_dlr6, 16, FALSE);
+				ptvcursor_add(cursor, hf_pgm_opt_redirect_dlr6, 16, ENC_NA);
 				break;
 
 			default:
@@ -721,8 +721,8 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 			opt_tree = proto_item_add_subtree(tf, ett_pgm_opts_fragment);
 			ptvcursor_set_tree(cursor, opt_tree);
 
-			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, FALSE);
+			ptvcursor_add_no_advance(cursor, hf_pgm_genopt_end, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_type, 1, ENC_BIG_ENDIAN);
 
 			if (genopts_len < PGM_OPT_FRAGMENT_SIZE) {
 				proto_tree_add_uint_format(opt_tree, hf_pgm_genopt_len, tvb,
@@ -731,12 +731,12 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname)
 					genopts_len, PGM_OPT_FRAGMENT_SIZE);
 				break;
 			}
-			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_fragment_res, 1, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_fragment_first_sqn, 4, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_fragment_offset, 4, FALSE);
-			ptvcursor_add(cursor, hf_pgm_opt_fragment_total_length, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_genopt_len, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_genopt_opx, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_fragment_res, 1, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_fragment_first_sqn, 4, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_fragment_offset, 4, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_opt_fragment_total_length, 4, ENC_BIG_ENDIAN);
 
 			break;
 		}
@@ -901,9 +901,9 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		PROTO_ITEM_SET_HIDDEN(hidden_item);
 		hidden_item = proto_tree_add_item(pgm_tree, hf_pgm_port, tvb, 2, 2, ENC_BIG_ENDIAN);
 		PROTO_ITEM_SET_HIDDEN(hidden_item);
-		ptvcursor_add(cursor, hf_pgm_main_sport, 2, FALSE);
-		ptvcursor_add(cursor, hf_pgm_main_dport, 2, FALSE);
-		ptvcursor_add(cursor, hf_pgm_main_type, 1, FALSE);
+		ptvcursor_add(cursor, hf_pgm_main_sport, 2, ENC_BIG_ENDIAN);
+		ptvcursor_add(cursor, hf_pgm_main_dport, 2, ENC_BIG_ENDIAN);
+		ptvcursor_add(cursor, hf_pgm_main_type, 1, ENC_BIG_ENDIAN);
 
 		tf = proto_tree_add_uint_format(pgm_tree, hf_pgm_main_opts, tvb,
 			ptvcursor_current_offset(cursor), 1, pgmhdr_opts, "Options: %s (0x%x)",
@@ -911,10 +911,10 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		opt_tree = proto_item_add_subtree(tf, ett_pgm_optbits);
 		ptvcursor_set_tree(cursor, opt_tree);
 
-		ptvcursor_add_no_advance(cursor, hf_pgm_main_opts_opt, 1, FALSE);
-		ptvcursor_add_no_advance(cursor, hf_pgm_main_opts_netsig, 1, FALSE);
-		ptvcursor_add_no_advance(cursor, hf_pgm_main_opts_varlen, 1, FALSE);
-		ptvcursor_add(cursor, hf_pgm_main_opts_parity, 1, FALSE);
+		ptvcursor_add_no_advance(cursor, hf_pgm_main_opts_opt, 1, ENC_BIG_ENDIAN);
+		ptvcursor_add_no_advance(cursor, hf_pgm_main_opts_netsig, 1, ENC_BIG_ENDIAN);
+		ptvcursor_add_no_advance(cursor, hf_pgm_main_opts_varlen, 1, ENC_BIG_ENDIAN);
+		ptvcursor_add(cursor, hf_pgm_main_opts_parity, 1, ENC_BIG_ENDIAN);
 		ptvcursor_set_tree(cursor, pgm_tree);
 
 		/* Checksum may be 0 (not available), but not for DATA packets */
@@ -945,13 +945,13 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 						pgmhdr_cksum, in_cksum_shouldbe(pgmhdr_cksum, computed_cksum));
 				}
 			} else {
-				ptvcursor_add_no_advance(cursor, hf_pgm_main_cksum, 2, FALSE);
+				ptvcursor_add_no_advance(cursor, hf_pgm_main_cksum, 2, ENC_BIG_ENDIAN);
 			}
 		}
 		ptvcursor_advance(cursor, 2);
 
-		ptvcursor_add(cursor, hf_pgm_main_gsi, 6, FALSE);
-		ptvcursor_add(cursor, hf_pgm_main_tsdulen, 2, FALSE);
+		ptvcursor_add(cursor, hf_pgm_main_gsi, 6, ENC_NA);
+		ptvcursor_add(cursor, hf_pgm_main_tsdulen, 2, ENC_BIG_ENDIAN);
 
 		tf = proto_tree_add_text(pgm_tree, tvb, ptvcursor_current_offset(cursor), plen, "%s Packet", pktname);
 		switch(pgmhdr_type) {
@@ -959,20 +959,20 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			type_tree = proto_item_add_subtree(tf, ett_pgm_spm);
 			ptvcursor_set_tree(cursor, type_tree);
 
-			ptvcursor_add(cursor, hf_pgm_spm_sqn, 4, FALSE);
-			ptvcursor_add(cursor, hf_pgm_spm_trail, 4, FALSE);
-			ptvcursor_add(cursor, hf_pgm_spm_lead, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_spm_sqn, 4, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_spm_trail, 4, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_spm_lead, 4, ENC_BIG_ENDIAN);
 			afi = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
-			ptvcursor_add(cursor, hf_pgm_spm_pathafi, 2, FALSE);
-			ptvcursor_add(cursor, hf_pgm_spm_res, 2, FALSE);
+			ptvcursor_add(cursor, hf_pgm_spm_pathafi, 2, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_spm_res, 2, ENC_BIG_ENDIAN);
 
 			switch (afi) {
 			case AFNUM_INET:
-				ptvcursor_add(cursor, hf_pgm_spm_path, 4, FALSE);
+				ptvcursor_add(cursor, hf_pgm_spm_path, 4, ENC_BIG_ENDIAN);
 				break;
 
 			case AFNUM_INET6:
-				ptvcursor_add(cursor, hf_pgm_spm_path6, 16, FALSE);
+				ptvcursor_add(cursor, hf_pgm_spm_path6, 16, ENC_NA);
 				break;
 
 			default:
@@ -986,8 +986,8 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			type_tree = proto_item_add_subtree(tf, ett_pgm_data);
 			ptvcursor_set_tree(cursor, type_tree);
 
-			ptvcursor_add(cursor, hf_pgm_spm_sqn, 4, FALSE);
-			ptvcursor_add(cursor, hf_pgm_spm_trail, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_spm_sqn, 4, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_spm_trail, 4, ENC_BIG_ENDIAN);
 			break;
 		case PGM_NAK_PCKT:
 		case PGM_NNAK_PCKT:
@@ -995,18 +995,18 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			type_tree = proto_item_add_subtree(tf, ett_pgm_nak);
 			ptvcursor_set_tree(cursor, type_tree);
 
-			ptvcursor_add(cursor, hf_pgm_nak_sqn, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_nak_sqn, 4, ENC_BIG_ENDIAN);
 			afi = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
-			ptvcursor_add(cursor, hf_pgm_nak_srcafi, 2, FALSE);
-			ptvcursor_add(cursor, hf_pgm_nak_srcres, 2, FALSE);
+			ptvcursor_add(cursor, hf_pgm_nak_srcafi, 2, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_nak_srcres, 2, ENC_BIG_ENDIAN);
 
 			switch (afi) {
 			case AFNUM_INET:
-				ptvcursor_add(cursor, hf_pgm_nak_src, 4, FALSE);
+				ptvcursor_add(cursor, hf_pgm_nak_src, 4, ENC_BIG_ENDIAN);
 				break;
 
 			case AFNUM_INET6:
-				ptvcursor_add(cursor, hf_pgm_nak_src6, 16, FALSE);
+				ptvcursor_add(cursor, hf_pgm_nak_src6, 16, ENC_NA);
 				break;
 
 			default:
@@ -1016,16 +1016,16 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			}
 
 			afi = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
-			ptvcursor_add(cursor, hf_pgm_nak_grpafi, 2, FALSE);
-			ptvcursor_add(cursor, hf_pgm_nak_grpres, 2, FALSE);
+			ptvcursor_add(cursor, hf_pgm_nak_grpafi, 2, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_nak_grpres, 2, ENC_BIG_ENDIAN);
 
 			switch (afi) {
 			case AFNUM_INET:
-				ptvcursor_add(cursor, hf_pgm_nak_grp, 4, FALSE);
+				ptvcursor_add(cursor, hf_pgm_nak_grp, 4, ENC_BIG_ENDIAN);
 				break;
 
 			case AFNUM_INET6:
-				ptvcursor_add(cursor, hf_pgm_nak_grp6, 16, FALSE);
+				ptvcursor_add(cursor, hf_pgm_nak_grp6, 16, ENC_NA);
 				break;
 
 			default:
@@ -1038,20 +1038,20 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			type_tree = proto_item_add_subtree(tf, ett_pgm_poll);
 			ptvcursor_set_tree(cursor, type_tree);
 
-			ptvcursor_add(cursor, hf_pgm_poll_sqn, 4, FALSE);
-			ptvcursor_add(cursor, hf_pgm_poll_round, 2, FALSE);
-			ptvcursor_add(cursor, hf_pgm_poll_subtype, 2, FALSE);
+			ptvcursor_add(cursor, hf_pgm_poll_sqn, 4, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_poll_round, 2, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_poll_subtype, 2, ENC_BIG_ENDIAN);
 			afi = tvb_get_ntohs(tvb, ptvcursor_current_offset(cursor));
-			ptvcursor_add(cursor, hf_pgm_poll_pathafi, 2, FALSE);
-			ptvcursor_add(cursor, hf_pgm_poll_res, 2, FALSE);
+			ptvcursor_add(cursor, hf_pgm_poll_pathafi, 2, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_poll_res, 2, ENC_BIG_ENDIAN);
 
 			switch (afi) {
 			case AFNUM_INET:
-				ptvcursor_add(cursor, hf_pgm_poll_path, 4, FALSE);
+				ptvcursor_add(cursor, hf_pgm_poll_path, 4, ENC_BIG_ENDIAN);
 				break;
 
 			case AFNUM_INET6:
-				ptvcursor_add(cursor, hf_pgm_poll_path6, 16, FALSE);
+				ptvcursor_add(cursor, hf_pgm_poll_path6, 16, ENC_NA);
 				break;
 
 			default:
@@ -1060,24 +1060,24 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				break;
 			}
 
-			ptvcursor_add(cursor, hf_pgm_poll_backoff_ivl, 4, FALSE);
-			ptvcursor_add(cursor, hf_pgm_poll_rand_str, 4, FALSE);
-			ptvcursor_add(cursor, hf_pgm_poll_matching_bmask, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_poll_backoff_ivl, 4, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_poll_rand_str, 4, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_poll_matching_bmask, 4, ENC_BIG_ENDIAN);
 			break;
 		case PGM_POLR_PCKT:
 			type_tree = proto_item_add_subtree(tf, ett_pgm_polr);
 			ptvcursor_set_tree(cursor, type_tree);
 
-			ptvcursor_add(cursor, hf_pgm_polr_sqn, 4, FALSE);
-			ptvcursor_add(cursor, hf_pgm_polr_round, 2, FALSE);
-			ptvcursor_add(cursor, hf_pgm_polr_res, 2, FALSE);
+			ptvcursor_add(cursor, hf_pgm_polr_sqn, 4, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_polr_round, 2, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_polr_res, 2, ENC_BIG_ENDIAN);
 			break;
 		case PGM_ACK_PCKT:
 			type_tree = proto_item_add_subtree(tf, ett_pgm_ack);
 			ptvcursor_set_tree(cursor, type_tree);
 
-			ptvcursor_add(cursor, hf_pgm_ack_sqn, 4, FALSE);
-			ptvcursor_add(cursor, hf_pgm_ack_bitmap, 4, FALSE);
+			ptvcursor_add(cursor, hf_pgm_ack_sqn, 4, ENC_BIG_ENDIAN);
+			ptvcursor_add(cursor, hf_pgm_ack_bitmap, 4, ENC_BIG_ENDIAN);
 			break;
 		}
 
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index d122c2ec89..a47a084612 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -454,8 +454,8 @@ add_ppi_field_header(tvbuff_t *tvb, proto_tree *tree, int *offset)
     ptvcursor_t *csr = NULL;
 
     csr = ptvcursor_new(tree, tvb, *offset);
-    ptvcursor_add(csr, hf_ppi_field_type, 2, TRUE);
-    ptvcursor_add(csr, hf_ppi_field_len, 2, TRUE);
+    ptvcursor_add(csr, hf_ppi_field_type, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add(csr, hf_ppi_field_len, 2, ENC_LITTLE_ENDIAN);
     ptvcursor_free(csr);
     *offset=ptvcursor_current_offset(csr);
 }
@@ -494,10 +494,10 @@ dissect_80211_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
 
     ptvcursor_add_with_subtree(csr, hf_80211_common_flags, 2, TRUE,
                                ett_dot11_common_flags);
-    ptvcursor_add_no_advance(csr, hf_80211_common_flags_fcs, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211_common_flags_tsft, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211_common_flags_fcs_valid, 2, TRUE);
-    ptvcursor_add(csr, hf_80211_common_flags_phy_err, 2, TRUE);
+    ptvcursor_add_no_advance(csr, hf_80211_common_flags_fcs, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211_common_flags_tsft, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211_common_flags_fcs_valid, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add(csr, hf_80211_common_flags_phy_err, 2, ENC_LITTLE_ENDIAN);
     ptvcursor_pop_subtree(csr);
 
     rate_kbps = tvb_get_letohs(tvb, ptvcursor_current_offset(csr)) * 500;
@@ -523,19 +523,19 @@ dissect_80211_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
 
     ptvcursor_add_with_subtree(csr, hf_80211_common_chan_flags, 2, TRUE,
                                ett_dot11_common_channel_flags);
-    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_turbo, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_cck, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_ofdm, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_2ghz, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_5ghz, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_passive, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_dynamic, 2, TRUE);
-    ptvcursor_add(csr, hf_80211_common_chan_flags_gfsk, 2, TRUE);
+    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_turbo, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_cck, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_ofdm, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_2ghz, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_5ghz, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_passive, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211_common_chan_flags_dynamic, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add(csr, hf_80211_common_chan_flags_gfsk, 2, ENC_LITTLE_ENDIAN);
     ptvcursor_pop_subtree(csr);
 
 
-    ptvcursor_add(csr, hf_80211_common_fhss_hopset, 1, TRUE);
-    ptvcursor_add(csr, hf_80211_common_fhss_pattern, 1, TRUE);
+    ptvcursor_add(csr, hf_80211_common_fhss_hopset, 1, ENC_LITTLE_ENDIAN);
+    ptvcursor_add(csr, hf_80211_common_fhss_pattern, 1, ENC_LITTLE_ENDIAN);
 
     if (check_col(pinfo->cinfo, COL_RSSI)) {
         col_add_fstr(pinfo->cinfo, COL_RSSI, "%d",
@@ -574,20 +574,20 @@ dissect_80211n_mac(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int
 
     ptvcursor_add_with_subtree(csr, hf_80211n_mac_flags, 4, TRUE,
                                ett_dot11n_mac_flags);
-    ptvcursor_add_no_advance(csr, hf_80211n_mac_flags_greenfield, 4, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211n_mac_flags_ht20_40, 4, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211n_mac_flags_rx_guard_interval, 4, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211n_mac_flags_duplicate_rx, 4, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211n_mac_flags_aggregate, 4, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211n_mac_flags_more_aggregates, 4, TRUE);
-    ptvcursor_add(csr, hf_80211n_mac_flags_delimiter_crc_after, 4, TRUE); /* Last */
+    ptvcursor_add_no_advance(csr, hf_80211n_mac_flags_greenfield, 4, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211n_mac_flags_ht20_40, 4, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211n_mac_flags_rx_guard_interval, 4, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211n_mac_flags_duplicate_rx, 4, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211n_mac_flags_aggregate, 4, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211n_mac_flags_more_aggregates, 4, ENC_LITTLE_ENDIAN);
+    ptvcursor_add(csr, hf_80211n_mac_flags_delimiter_crc_after, 4, ENC_LITTLE_ENDIAN); /* Last */
     ptvcursor_pop_subtree(csr);
 
-    ptvcursor_add(csr, hf_80211n_mac_ampdu_id, 4, TRUE);
-    ptvcursor_add(csr, hf_80211n_mac_num_delimiters, 1, TRUE);
+    ptvcursor_add(csr, hf_80211n_mac_ampdu_id, 4, ENC_LITTLE_ENDIAN);
+    ptvcursor_add(csr, hf_80211n_mac_num_delimiters, 1, ENC_LITTLE_ENDIAN);
 
     if (add_subtree) {
-        ptvcursor_add(csr, hf_80211n_mac_reserved, 3, TRUE);
+        ptvcursor_add(csr, hf_80211n_mac_reserved, 3, ENC_LITTLE_ENDIAN);
     }
 
     ptvcursor_free(csr);
@@ -619,7 +619,7 @@ dissect_80211n_mac_phy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
     csr = ptvcursor_new(ftree, tvb, offset);
 
     ptvcursor_add_invalid_check(csr, hf_80211n_mac_phy_mcs, 1, 255);
-    ti = ptvcursor_add(csr, hf_80211n_mac_phy_num_streams, 1, TRUE);
+    ti = ptvcursor_add(csr, hf_80211n_mac_phy_num_streams, 1, ENC_LITTLE_ENDIAN);
     if (tvb_get_guint8(tvb, ptvcursor_current_offset(csr) - 1) == 0)
         proto_item_append_text(ti, " (unknown)");
     ptvcursor_add_invalid_check(csr, hf_80211n_mac_phy_rssi_combined, 1, 255);
@@ -641,14 +641,14 @@ dissect_80211n_mac_phy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
 
     ptvcursor_add_with_subtree(csr, hf_80211n_mac_phy_ext_chan_flags, 2, TRUE,
                                ett_dot11n_mac_phy_ext_channel_flags);
-    ptvcursor_add_no_advance(csr, hf_80211n_mac_phy_ext_chan_flags_turbo, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hhf_80211n_mac_phy_ext_chan_flags_cck, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211n_mac_phy_ext_chan_flags_ofdm, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hhf_80211n_mac_phy_ext_chan_flags_2ghz, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211n_mac_phy_ext_chan_flags_5ghz, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211n_mac_phy_ext_chan_flags_passive, 2, TRUE);
-    ptvcursor_add_no_advance(csr, hf_80211n_mac_phy_ext_chan_flags_dynamic, 2, TRUE);
-    ptvcursor_add(csr, hf_80211n_mac_phy_ext_chan_flags_gfsk, 2, TRUE);
+    ptvcursor_add_no_advance(csr, hf_80211n_mac_phy_ext_chan_flags_turbo, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hhf_80211n_mac_phy_ext_chan_flags_cck, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211n_mac_phy_ext_chan_flags_ofdm, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hhf_80211n_mac_phy_ext_chan_flags_2ghz, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211n_mac_phy_ext_chan_flags_5ghz, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211n_mac_phy_ext_chan_flags_passive, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_80211n_mac_phy_ext_chan_flags_dynamic, 2, ENC_LITTLE_ENDIAN);
+    ptvcursor_add(csr, hf_80211n_mac_phy_ext_chan_flags_gfsk, 2, ENC_LITTLE_ENDIAN);
     ptvcursor_pop_subtree(csr);
 
     ptvcursor_add_invalid_check(csr, hf_80211n_mac_phy_dbm_ant0signal, 1, 0x80); /* -128 */
@@ -686,7 +686,7 @@ dissect_aggregation_extension(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
 
     csr = ptvcursor_new(ftree, tvb, offset);
 
-    ptvcursor_add(csr, hf_aggregation_extension_interface_id, 4, TRUE); /* Last */
+    ptvcursor_add(csr, hf_aggregation_extension_interface_id, 4, ENC_LITTLE_ENDIAN); /* Last */
     ptvcursor_free(csr);
 }
 
@@ -710,14 +710,14 @@ dissect_8023_extension(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
     csr = ptvcursor_new(ftree, tvb, offset);
 
     ptvcursor_add_with_subtree(csr, hf_8023_extension_flags, 4, TRUE, ett_8023_extension_flags);
-    ptvcursor_add(csr, hf_8023_extension_flags_fcs_present, 4, TRUE);
+    ptvcursor_add(csr, hf_8023_extension_flags_fcs_present, 4, ENC_LITTLE_ENDIAN);
     ptvcursor_pop_subtree(csr);
 
     ptvcursor_add_with_subtree(csr, hf_8023_extension_errors, 4, TRUE, ett_8023_extension_errors);
-    ptvcursor_add_no_advance(csr, hf_8023_extension_errors_fcs, 4, TRUE);
-    ptvcursor_add_no_advance(csr, hf_8023_extension_errors_sequence, 4, TRUE);
-    ptvcursor_add_no_advance(csr, hf_8023_extension_errors_symbol, 4, TRUE);
-    ptvcursor_add(csr, hf_8023_extension_errors_data, 4, TRUE);
+    ptvcursor_add_no_advance(csr, hf_8023_extension_errors_fcs, 4, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_8023_extension_errors_sequence, 4, ENC_LITTLE_ENDIAN);
+    ptvcursor_add_no_advance(csr, hf_8023_extension_errors_symbol, 4, ENC_LITTLE_ENDIAN);
+    ptvcursor_add(csr, hf_8023_extension_errors_data, 4, ENC_LITTLE_ENDIAN);
     ptvcursor_pop_subtree(csr);
 
     ptvcursor_free(csr);
diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c
index 4cb9306c66..a4db0b1366 100644
--- a/epan/dissectors/packet-roofnet.c
+++ b/epan/dissectors/packet-roofnet.c
@@ -113,16 +113,16 @@ static void dissect_roofnet_header(proto_tree *tree, tvbuff_t *tvb, guint *offse
 {
   ptvcursor_t *cursor = ptvcursor_new(tree, tvb, *offset);
 
-  ptvcursor_add(cursor, hf_roofnet_version, 1, FALSE);
-  ptvcursor_add(cursor, hf_roofnet_type, 1, FALSE);
-  ptvcursor_add(cursor, hf_roofnet_nlinks, 1, FALSE);
-  ptvcursor_add(cursor, hf_roofnet_next, 1, FALSE);
-  ptvcursor_add(cursor, hf_roofnet_ttl, 2, FALSE);
-  ptvcursor_add(cursor, hf_roofnet_cksum, 2, FALSE);
-  ptvcursor_add(cursor, hf_roofnet_flags, 2, FALSE);
-  ptvcursor_add(cursor, hf_roofnet_data_length, 2, FALSE);
-  ptvcursor_add(cursor, hf_roofnet_query_dst, 4, FALSE);
-  ptvcursor_add(cursor, hf_roofnet_seq, 4, FALSE);
+  ptvcursor_add(cursor, hf_roofnet_version, 1, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_roofnet_type, 1, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_roofnet_nlinks, 1, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_roofnet_next, 1, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_roofnet_ttl, 2, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_roofnet_cksum, 2, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_roofnet_flags, 2, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_roofnet_data_length, 2, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_roofnet_query_dst, 4, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_roofnet_seq, 4, ENC_BIG_ENDIAN);
 
   *offset = ptvcursor_current_offset(cursor);
   ptvcursor_free(cursor);
@@ -156,10 +156,10 @@ static void dissect_roofnet_link(proto_tree *tree, tvbuff_t *tvb, guint *offset,
 
   cursor = ptvcursor_new(subtree, tvb, *offset);
 
-  ptvcursor_add(cursor, hf_roofnet_link_forward, 4, FALSE);
-  ptvcursor_add(cursor, hf_roofnet_link_rev, 4, FALSE);
-  ptvcursor_add(cursor, hf_roofnet_link_seq, 4, FALSE);
-  ptvcursor_add(cursor, hf_roofnet_link_age, 4, FALSE);
+  ptvcursor_add(cursor, hf_roofnet_link_forward, 4, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_roofnet_link_rev, 4, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_roofnet_link_seq, 4, ENC_BIG_ENDIAN);
+  ptvcursor_add(cursor, hf_roofnet_link_age, 4, ENC_BIG_ENDIAN);
 
   ptvcursor_free(cursor);
 
diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c
index 674c497c85..e9f4f32284 100644
--- a/epan/dissectors/packet-vicp.c
+++ b/epan/dissectors/packet-vicp.c
@@ -66,18 +66,18 @@ static void dissect_vicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
    vicp_tree = proto_item_add_subtree(ti, ett_vicp);
    cursor = ptvcursor_new(vicp_tree, tvb, 0);
 
-   ptvcursor_add(cursor, hf_vicp_operation, 1, FALSE);
-   ptvcursor_add(cursor, hf_vicp_version,   1, FALSE);
-   ptvcursor_add(cursor, hf_vicp_sequence,  1, FALSE);
-   ptvcursor_add(cursor, hf_vicp_unused,    1, FALSE);
+   ptvcursor_add(cursor, hf_vicp_operation, 1, ENC_BIG_ENDIAN);
+   ptvcursor_add(cursor, hf_vicp_version,   1, ENC_BIG_ENDIAN);
+   ptvcursor_add(cursor, hf_vicp_sequence,  1, ENC_BIG_ENDIAN);
+   ptvcursor_add(cursor, hf_vicp_unused,    1, ENC_BIG_ENDIAN);
 
    len=tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor));
-   ptvcursor_add(cursor, hf_vicp_length, 4, FALSE);
+   ptvcursor_add(cursor, hf_vicp_length, 4, ENC_BIG_ENDIAN);
 
    if(len==0)
       proto_tree_add_text(vicp_tree, tvb, 0, 0, "No data");
    else
-      ptvcursor_add(cursor, hf_vicp_data, len, FALSE);
+      ptvcursor_add(cursor, hf_vicp_data, len, ENC_NA);
 
    ptvcursor_free(cursor);
 }