DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH] cmdline: avoid name clash with Windows system types
@ 2020-08-21 18:48 Dmitry Kozlyuk
  2020-08-21 20:58 ` Jie Zhou
                   ` (2 more replies)
  0 siblings, 3 replies; 13+ messages in thread
From: Dmitry Kozlyuk @ 2020-08-21 18:48 UTC (permalink / raw)
  To: dev
  Cc: Jie Zhou, Dmitry Kozlyuk, Ranjit Menon, Olivier Matz, Wenzhuo Lu,
	Beilei Xing, Bernard Iremonger, Ori Kam, Marko Kovacevic,
	Bruce Richardson, Radu Nicolau, Akhil Goyal, Tomasz Kantecki,
	Sunil Kumar Kori, Pavan Nikhilesh, Cristian Dumitrescu,
	Jasvinder Singh, David Hunt

cmdline_numtype member names clash with Windows system identifiers.
Add CMDLINE_ prefix to cmdline constants to avoid this and possible
future conflicts.

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
---

This patch made some lines overlong. When breaking them, indentation
style is kept consistent with nearby code; it's weird in some places.

 app/test-cmdline/commands.c                   |   2 +-
 app/test-pmd/bpf_cmd.c                        |  10 +-
 app/test-pmd/cmdline.c                        | 715 ++++++++++--------
 app/test-pmd/cmdline_flow.c                   |   2 +-
 app/test-pmd/cmdline_mtr.c                    |  92 ++-
 app/test-pmd/cmdline_tm.c                     | 177 ++---
 app/test/test_cmdline_num.c                   |  48 +-
 examples/ethtool/ethtool-app/ethapp.c         |  19 +-
 examples/ipsec-secgw/parser.c                 |   2 +-
 examples/qos_sched/cmdline.c                  |  46 +-
 .../guest_cli/vm_power_cli_guest.c            |   2 +-
 examples/vm_power_manager/vm_power_cli.c      |   8 +-
 lib/librte_cmdline/cmdline_parse_num.c        |  65 +-
 lib/librte_cmdline/cmdline_parse_num.h        |  16 +-
 14 files changed, 627 insertions(+), 577 deletions(-)

diff --git a/app/test-cmdline/commands.c b/app/test-cmdline/commands.c
index d67c0ca6a..b6e13ca46 100644
--- a/app/test-cmdline/commands.c
+++ b/app/test-cmdline/commands.c
@@ -193,7 +193,7 @@ cmd_num_parsed(void *parsed_result,
 }
 
 cmdline_parse_token_num_t cmd_num_tok =
-	TOKEN_NUM_INITIALIZER(struct cmd_num_result, num, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_num_result, num, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_num = {
 	.f = cmd_num_parsed,  /* function to call */
diff --git a/app/test-pmd/bpf_cmd.c b/app/test-pmd/bpf_cmd.c
index 0f984ccf4..51b37a4d0 100644
--- a/app/test-pmd/bpf_cmd.c
+++ b/app/test-pmd/bpf_cmd.c
@@ -124,9 +124,9 @@ cmdline_parse_token_string_t cmd_load_bpf_dir =
 	TOKEN_STRING_INITIALIZER(struct cmd_bpf_ld_result,
 			dir, "rx#tx");
 cmdline_parse_token_num_t cmd_load_bpf_port =
-	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, port, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, port, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_load_bpf_queue =
-	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, queue, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, queue, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_load_bpf_flags =
 	TOKEN_STRING_INITIALIZER(struct cmd_bpf_ld_result,
 			flags, NULL);
@@ -180,9 +180,11 @@ cmdline_parse_token_string_t cmd_unload_bpf_dir =
 	TOKEN_STRING_INITIALIZER(struct cmd_bpf_unld_result,
 			dir, "rx#tx");
 cmdline_parse_token_num_t cmd_unload_bpf_port =
-	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, port, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result,
+			port, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_unload_bpf_queue =
-	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, queue, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result,
+			queue, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_operate_bpf_unld_parse = {
 	.f = cmd_operate_bpf_unld_parsed,
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 0a6ed85f3..455b0dd98 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1378,7 +1378,7 @@ cmdline_parse_token_string_t cmd_operate_specific_port_port =
 						name, "start#stop#close#reset");
 cmdline_parse_token_num_t cmd_operate_specific_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_operate_specific_port_result,
-							value, UINT8);
+							value, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_operate_specific_port = {
 	.f = cmd_operate_specific_port_parsed,
@@ -1516,7 +1516,7 @@ cmdline_parse_token_string_t cmd_operate_detach_port_keyword =
 			keyword, "detach");
 cmdline_parse_token_num_t cmd_operate_detach_port_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_operate_detach_port_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_operate_detach_port = {
 	.f = cmd_operate_detach_port_parsed,
@@ -1740,7 +1740,8 @@ cmdline_parse_token_string_t cmd_config_speed_specific_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, keyword,
 								"config");
 cmdline_parse_token_num_t cmd_config_speed_specific_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_speed_specific, id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_speed_specific, id,
+							CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_speed_specific_item1 =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, item1,
 								"speed");
@@ -1812,7 +1813,8 @@ cmdline_parse_token_string_t cmd_config_loopback_all_item =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_loopback_all, item,
 							"loopback");
 cmdline_parse_token_num_t cmd_config_loopback_all_mode =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_all, mode, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_all, mode,
+							CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_config_loopback_all = {
 	.f = cmd_config_loopback_all_parsed,
@@ -1866,13 +1868,13 @@ cmdline_parse_token_string_t cmd_config_loopback_specific_keyword =
 								"config");
 cmdline_parse_token_num_t cmd_config_loopback_specific_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_specific, port_id,
-								UINT16);
+								CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_loopback_specific_item =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_loopback_specific, item,
 								"loopback");
 cmdline_parse_token_num_t cmd_config_loopback_specific_mode =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_specific, mode,
-			      UINT32);
+			      CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_config_loopback_specific = {
 	.f = cmd_config_loopback_specific_parsed,
@@ -1957,7 +1959,7 @@ cmdline_parse_token_string_t cmd_config_rx_tx_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rx_tx, name,
 						"rxq#txq#rxd#txd");
 cmdline_parse_token_num_t cmd_config_rx_tx_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rx_tx, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rx_tx, value, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_config_rx_tx = {
 	.f = cmd_config_rx_tx_parsed,
@@ -2039,7 +2041,7 @@ cmdline_parse_token_string_t cmd_config_max_pkt_len_name =
 								"max-pkt-len");
 cmdline_parse_token_num_t cmd_config_max_pkt_len_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_max_pkt_len_result, value,
-								UINT32);
+								CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_config_max_pkt_len = {
 	.f = cmd_config_max_pkt_len_parsed,
@@ -2111,7 +2113,7 @@ cmdline_parse_token_string_t cmd_config_max_lro_pkt_size_name =
 				 name, "max-lro-pkt-size");
 cmdline_parse_token_num_t cmd_config_max_lro_pkt_size_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_max_lro_pkt_size_result,
-			      value, UINT32);
+			      value, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_config_max_lro_pkt_size = {
 	.f = cmd_config_max_lro_pkt_size_parsed,
@@ -2160,9 +2162,11 @@ cmdline_parse_token_string_t cmd_config_mtu_mtu =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_mtu_result, keyword,
 				 "mtu");
 cmdline_parse_token_num_t cmd_config_mtu_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_config_mtu_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value,
+				 CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_config_mtu = {
 	.f = cmd_config_mtu_parsed,
@@ -2493,7 +2497,8 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_config =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, config,
 				 "config");
 cmdline_parse_token_num_t cmd_config_rss_hash_key_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_hash_key =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key,
 				 rss_hash_key, "rss-hash-key");
@@ -2597,19 +2602,19 @@ cmdline_parse_token_string_t cmd_config_rxtx_ring_size_config =
 				 config, "config");
 cmdline_parse_token_num_t cmd_config_rxtx_ring_size_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
-				 portid, UINT16);
+				 portid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rxtxq =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
 				 rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_rxtx_ring_size_qid =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
-			      qid, UINT16);
+			      qid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rsize =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
 				 rsize, "ring_size");
 cmdline_parse_token_num_t cmd_config_rxtx_ring_size_size =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
-			      size, UINT16);
+			      size, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_config_rxtx_ring_size = {
 	.f = cmd_config_rxtx_ring_size_parsed,
@@ -2698,11 +2703,13 @@ cmd_config_rxtx_queue_parsed(void *parsed_result,
 cmdline_parse_token_string_t cmd_config_rxtx_queue_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, port, "port");
 cmdline_parse_token_num_t cmd_config_rxtx_queue_portid =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid,
+						CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_queue_rxtxq =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_rxtx_queue_qid =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid,
+						CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_queue_opname =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, opname,
 						"start#stop");
@@ -2778,13 +2785,13 @@ cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_port =
 						port, "port");
 cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
-						port_id, UINT16);
+						port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_rxtxq =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
 						rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_qid =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
-						qid, UINT16);
+						qid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_opname =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
 						opname, "deferred_start");
@@ -2820,11 +2827,12 @@ struct cmd_setup_rxtx_queue {
 cmdline_parse_token_string_t cmd_setup_rxtx_queue_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, port, "port");
 cmdline_parse_token_num_t cmd_setup_rxtx_queue_portid =
-	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, portid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, portid,
+		CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setup_rxtx_queue_rxtxq =
 	TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_setup_rxtx_queue_qid =
-	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, qid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, qid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setup_rxtx_queue_setup =
 	TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, setup, "setup");
 
@@ -3033,7 +3041,8 @@ cmdline_parse_token_string_t cmd_config_rss_reta_port =
 cmdline_parse_token_string_t cmd_config_rss_reta_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, keyword, "config");
 cmdline_parse_token_num_t cmd_config_rss_reta_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_rss_reta_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, name, "rss");
 cmdline_parse_token_string_t cmd_config_rss_reta_list_name =
@@ -3144,13 +3153,14 @@ cmdline_parse_token_string_t cmd_showport_reta_show =
 cmdline_parse_token_string_t cmd_showport_reta_port =
 	TOKEN_STRING_INITIALIZER(struct  cmd_showport_reta, port, "port");
 cmdline_parse_token_num_t cmd_showport_reta_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id,
+					CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_showport_reta_rss =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, rss, "rss");
 cmdline_parse_token_string_t cmd_showport_reta_reta =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, reta, "reta");
 cmdline_parse_token_num_t cmd_showport_reta_size =
-	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_showport_reta_list_of_items =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_reta,
 					list_of_items, NULL);
@@ -3195,7 +3205,8 @@ cmdline_parse_token_string_t cmd_showport_rss_hash_show =
 cmdline_parse_token_string_t cmd_showport_rss_hash_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, port, "port");
 cmdline_parse_token_num_t cmd_showport_rss_hash_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_showport_rss_hash_rss_hash =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, rss_hash,
 				 "rss-hash");
@@ -3299,7 +3310,7 @@ cmdline_parse_token_string_t cmd_config_dcb_port =
 cmdline_parse_token_string_t cmd_config_dcb_config =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, config, "config");
 cmdline_parse_token_num_t cmd_config_dcb_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_dcb_dcb =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, dcb, "dcb");
 cmdline_parse_token_string_t cmd_config_dcb_vt =
@@ -3307,7 +3318,7 @@ cmdline_parse_token_string_t cmd_config_dcb_vt =
 cmdline_parse_token_string_t cmd_config_dcb_vt_en =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, vt_en, "on#off");
 cmdline_parse_token_num_t cmd_config_dcb_num_tcs =
-        TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, num_tcs, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, num_tcs, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_config_dcb_pfc=
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, pfc, "pfc");
 cmdline_parse_token_string_t cmd_config_dcb_pfc_en =
@@ -3406,7 +3417,7 @@ cmdline_parse_token_string_t cmd_config_burst_all =
 cmdline_parse_token_string_t cmd_config_burst_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_burst, name, "burst");
 cmdline_parse_token_num_t cmd_config_burst_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_burst, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_burst, value, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_config_burst = {
 	.f = cmd_config_burst_parsed,
@@ -3475,7 +3486,7 @@ cmdline_parse_token_string_t cmd_config_thresh_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_thresh, name,
 				"txpt#txht#txwt#rxpt#rxht#rxwt");
 cmdline_parse_token_num_t cmd_config_thresh_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_thresh, value, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_thresh, value, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_config_thresh = {
 	.f = cmd_config_thresh_parsed,
@@ -3539,7 +3550,8 @@ cmdline_parse_token_string_t cmd_config_threshold_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_threshold, name,
 						"txfreet#txrst#rxfreet");
 cmdline_parse_token_num_t cmd_config_threshold_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_threshold, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_threshold, value,
+						CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_config_threshold = {
 	.f = cmd_config_threshold_parsed,
@@ -3745,7 +3757,8 @@ cmdline_parse_token_string_t cmd_setmask_mask =
 	TOKEN_STRING_INITIALIZER(struct cmd_setmask_result, mask,
 				 "coremask#portmask");
 cmdline_parse_token_num_t cmd_setmask_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_setmask_result, hexavalue, UINT64);
+	TOKEN_NUM_INITIALIZER(struct cmd_setmask_result, hexavalue,
+				 CMDLINE_UINT64);
 
 cmdline_parse_inst_t cmd_set_fwd_mask = {
 	.f = cmd_set_mask_parsed,
@@ -3791,7 +3804,7 @@ cmdline_parse_token_string_t cmd_set_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_result, what,
 				 "nbport#nbcore#burst#verbose");
 cmdline_parse_token_num_t cmd_set_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_result, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_result, value, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_set_numbers = {
 	.f = cmd_set_parsed,
@@ -3839,7 +3852,7 @@ cmdline_parse_token_string_t cmd_set_log_log =
 cmdline_parse_token_string_t cmd_set_log_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_log_result, type, NULL);
 cmdline_parse_token_num_t cmd_set_log_level =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_set_log = {
 	.f = cmd_set_log_parsed,
@@ -4019,7 +4032,7 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_all_all =
 				 all, "all");
 cmdline_parse_token_num_t cmd_rx_vlan_filter_all_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_all_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_rx_vlan_filter_all = {
 	.f = cmd_rx_vlan_filter_all_parsed,
@@ -4183,10 +4196,10 @@ cmdline_parse_token_string_t cmd_vlan_tpid_what =
 				 what, "tpid");
 cmdline_parse_token_num_t cmd_vlan_tpid_tpid =
 	TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
-			      tp_id, UINT16);
+			      tp_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vlan_tpid_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_vlan_tpid = {
 	.f = cmd_vlan_tpid_parsed,
@@ -4233,10 +4246,10 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_what =
 				 what, "add#rm");
 cmdline_parse_token_num_t cmd_rx_vlan_filter_vlanid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result,
-			      vlan_id, UINT16);
+			      vlan_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_rx_vlan_filter_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_rx_vlan_filter = {
 	.f = cmd_rx_vlan_filter_parsed,
@@ -4286,10 +4299,10 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_set =
 				 set, "set");
 cmdline_parse_token_num_t cmd_tx_vlan_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_vlanid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
-			      vlan_id, UINT16);
+			      vlan_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_set = {
 	.f = cmd_tx_vlan_set_parsed,
@@ -4340,13 +4353,13 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_qinq_set =
 		set, "set");
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-		vlan_id, UINT16);
+		vlan_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid_outer =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-		vlan_id_outer, UINT16);
+		vlan_id_outer, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_set_qinq = {
 	.f = cmd_tx_vlan_set_qinq_parsed,
@@ -4398,10 +4411,10 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_pvid =
 				 pvid, "pvid");
 cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
-			     port_id, UINT16);
+			     port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_vlan_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
-			      vlan_id, UINT16);
+			      vlan_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
 				 mode, "on#off");
@@ -4453,7 +4466,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_reset_reset =
 				 reset, "reset");
 cmdline_parse_token_num_t cmd_tx_vlan_reset_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_reset_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_reset = {
 	.f = cmd_tx_vlan_reset_parsed,
@@ -4659,7 +4672,7 @@ cmdline_parse_token_string_t cmd_csum_hwsw =
 				hwsw, "hw#sw");
 cmdline_parse_token_num_t cmd_csum_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_csum_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_csum_set = {
 	.f = cmd_csum_parsed,
@@ -4730,7 +4743,7 @@ cmdline_parse_token_string_t cmd_csum_tunnel_onoff =
 				onoff, "on#off");
 cmdline_parse_token_num_t cmd_csum_tunnel_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_csum_tunnel_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_csum_tunnel = {
 	.f = cmd_csum_tunnel_parsed,
@@ -4818,10 +4831,10 @@ cmdline_parse_token_string_t cmd_tso_set_mode =
 				mode, "set");
 cmdline_parse_token_num_t cmd_tso_set_tso_segsz =
 	TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
-				tso_segsz, UINT16);
+				tso_segsz, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tso_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tso_set = {
 	.f = cmd_tso_set_parsed,
@@ -4967,10 +4980,10 @@ cmdline_parse_token_string_t cmd_tunnel_tso_set_mode =
 				mode, "set");
 cmdline_parse_token_num_t cmd_tunnel_tso_set_tso_segsz =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
-				tso_segsz, UINT16);
+				tso_segsz, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tunnel_tso_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_tso_set = {
 	.f = cmd_tunnel_tso_set_parsed,
@@ -5034,7 +5047,7 @@ cmdline_parse_token_string_t cmd_gro_enable_port =
 			cmd_keyword, "port");
 cmdline_parse_token_num_t cmd_gro_enable_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_gro_enable_result,
-			cmd_pid, UINT16);
+			cmd_pid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_gro_enable_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_gro_enable_result,
 			cmd_keyword, "gro");
@@ -5084,7 +5097,7 @@ cmdline_parse_token_string_t cmd_gro_show_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_gro_show_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_gro_show_result,
-			cmd_pid, UINT16);
+			cmd_pid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_gro_show_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_gro_show_result,
 			cmd_keyword, "gro");
@@ -5134,7 +5147,7 @@ cmdline_parse_token_string_t cmd_gro_flush_flush =
 			cmd_flush, "flush");
 cmdline_parse_token_num_t cmd_gro_flush_cycles =
 	TOKEN_NUM_INITIALIZER(struct cmd_gro_flush_result,
-			cmd_cycles, UINT8);
+			cmd_cycles, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_gro_flush = {
 	.f = cmd_gro_flush_parsed,
@@ -5184,7 +5197,7 @@ cmdline_parse_token_string_t cmd_gso_enable_mode =
 			cmd_mode, "on#off");
 cmdline_parse_token_num_t cmd_gso_enable_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_gso_enable_result,
-			cmd_pid, UINT16);
+			cmd_pid, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_gso_enable = {
 	.f = cmd_gso_enable_parsed,
@@ -5243,7 +5256,7 @@ cmdline_parse_token_string_t cmd_gso_size_segsz =
 				cmd_segsz, "segsz");
 cmdline_parse_token_num_t cmd_gso_size_size =
 	TOKEN_NUM_INITIALIZER(struct cmd_gso_size_result,
-				cmd_size, UINT16);
+				cmd_size, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_gso_size = {
 	.f = cmd_gso_size_parsed,
@@ -5301,7 +5314,7 @@ cmdline_parse_token_string_t cmd_gso_show_keyword =
 				cmd_keyword, "gso");
 cmdline_parse_token_num_t cmd_gso_show_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_gso_show_result,
-				cmd_pid, UINT16);
+				cmd_pid, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_gso_show = {
 	.f = cmd_gso_show_parsed,
@@ -5444,7 +5457,7 @@ cmdline_parse_token_string_t cmd_setbypass_mode_value =
 			value, "normal#bypass#isolate");
 cmdline_parse_token_num_t cmd_setbypass_mode_port =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_mode_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bypass_mode = {
 	.f = cmd_set_bypass_mode_parsed,
@@ -5550,7 +5563,7 @@ cmdline_parse_token_string_t cmd_setbypass_event_mode_value =
 			mode_value, "normal#bypass#isolate");
 cmdline_parse_token_num_t cmd_setbypass_event_port =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_event_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bypass_event = {
 	.f = cmd_set_bypass_event_parsed,
@@ -5716,7 +5729,7 @@ cmdline_parse_token_string_t cmd_showbypass_config_config =
 			config, "config");
 cmdline_parse_token_num_t cmd_showbypass_config_port =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_bypass_config_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_show_bypass_config = {
 	.f = cmd_show_bypass_config_parsed,
@@ -5765,10 +5778,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result,
 		mode, "mode");
 cmdline_parse_token_num_t cmd_setbonding_mode_value =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
-		value, UINT8);
+		value, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_setbonding_mode_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bonding_mode = {
 		.f = cmd_set_bonding_mode_parsed,
@@ -5842,7 +5855,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
 		dedicated_queues, "dedicated_queues");
 cmdline_parse_token_num_t cmd_setbonding_lacp_dedicated_queues_port_id =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setbonding_lacp_dedicated_queues_mode =
 TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
 		mode, "enable#disable");
@@ -5910,7 +5923,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
 		balance_xmit_policy, "balance_xmit_policy");
 cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy =
 TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
 		policy, "l2#l23#l34");
@@ -6058,7 +6071,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result,
 		config, "config");
 cmdline_parse_token_num_t cmd_showbonding_config_port =
 TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_show_bonding_config = {
 		.f = cmd_show_bonding_config_parsed,
@@ -6111,10 +6124,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result,
 		primary, "primary");
 cmdline_parse_token_num_t cmd_setbonding_primary_slave =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
-		slave_id, UINT16);
+		slave_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_setbonding_primary_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bonding_primary = {
 		.f = cmd_set_bonding_primary_parsed,
@@ -6169,10 +6182,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result,
 		slave, "slave");
 cmdline_parse_token_num_t cmd_addbonding_slave_slaveid =
 TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
-		slave_id, UINT16);
+		slave_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_addbonding_slave_port =
 TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_add_bonding_slave = {
 		.f = cmd_add_bonding_slave_parsed,
@@ -6227,10 +6240,10 @@ cmdline_parse_token_string_t cmd_removebonding_slave_slave =
 				slave, "slave");
 cmdline_parse_token_num_t cmd_removebonding_slave_slaveid =
 		TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
-				slave_id, UINT16);
+				slave_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_removebonding_slave_port =
 		TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_remove_bonding_slave = {
 		.f = cmd_remove_bonding_slave_parsed,
@@ -6309,10 +6322,10 @@ cmdline_parse_token_string_t cmd_createbonded_device_device =
 				device, "device");
 cmdline_parse_token_num_t cmd_createbonded_device_mode =
 		TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result,
-				mode, UINT8);
+				mode, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_createbonded_device_socket =
 		TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result,
-				socket, UINT8);
+				socket, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_create_bonded_device = {
 		.f = cmd_create_bonded_device_parsed,
@@ -6365,7 +6378,7 @@ cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac =
 				"mac_addr");
 cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result,
-				port_num, UINT16);
+				port_num, CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr =
 		TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address);
 
@@ -6418,10 +6431,10 @@ cmdline_parse_token_string_t cmd_set_bond_mon_period_mon_period =
 				mon_period,	"mon_period");
 cmdline_parse_token_num_t cmd_set_bond_mon_period_portnum =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
-				port_num, UINT16);
+				port_num, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_bond_mon_period_period_ms =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
-				period_ms, UINT32);
+				period_ms, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_set_bond_mon_period = {
 		.f = cmd_set_bond_mon_period_parsed,
@@ -6480,7 +6493,7 @@ cmdline_parse_token_string_t cmd_set_bonding_agg_mode_agg_mode =
 
 cmdline_parse_token_num_t cmd_set_bonding_agg_mode_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_agg_mode_policy_result,
-				port_num, UINT16);
+				port_num, CMDLINE_UINT16);
 
 cmdline_parse_token_string_t cmd_set_bonding_agg_mode_policy_string =
 	TOKEN_STRING_INITIALIZER(
@@ -6668,11 +6681,13 @@ cmdline_parse_token_string_t cmd_set_burst_tx_retry_tx =
 cmdline_parse_token_string_t cmd_set_burst_tx_retry_delay =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, delay, "delay");
 cmdline_parse_token_num_t cmd_set_burst_tx_retry_time =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time,
+				 CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_set_burst_tx_retry_retry =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry, "retry");
 cmdline_parse_token_num_t cmd_set_burst_tx_retry_retry_num =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num,
+				 CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_set_burst_tx_retry = {
 	.f = cmd_set_burst_tx_retry_parsed,
@@ -6730,7 +6745,7 @@ cmdline_parse_token_string_t cmd_setpromisc_portall =
 				 "all");
 cmdline_parse_token_num_t cmd_setpromisc_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_promisc_mode_result, port_num,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setpromisc_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, mode,
 				 "on#off");
@@ -6804,7 +6819,7 @@ cmdline_parse_token_string_t cmd_setallmulti_portall =
 				 "all");
 cmdline_parse_token_num_t cmd_setallmulti_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_allmulti_mode_result, port_num,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setallmulti_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_allmulti_mode_result, mode,
 				 "on#off");
@@ -6882,25 +6897,25 @@ cmdline_parse_token_string_t cmd_lfc_set_high_water_str =
 				hw_str, "high_water");
 cmdline_parse_token_num_t cmd_lfc_set_high_water =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				high_water, UINT32);
+				high_water, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_lfc_set_low_water_str =
 	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
 				lw_str, "low_water");
 cmdline_parse_token_num_t cmd_lfc_set_low_water =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				low_water, UINT32);
+				low_water, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_lfc_set_pause_time_str =
 	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
 				pt_str, "pause_time");
 cmdline_parse_token_num_t cmd_lfc_set_pause_time =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				pause_time, UINT16);
+				pause_time, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_lfc_set_send_xon_str =
 	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
 				xon_str, "send_xon");
 cmdline_parse_token_num_t cmd_lfc_set_send_xon =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				send_xon, UINT16);
+				send_xon, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_lfc_set_mac_ctrl_frame_fwd_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
 				mac_ctrl_frame_fwd, "mac_ctrl_frame_fwd");
@@ -6915,7 +6930,7 @@ cmdline_parse_token_string_t cmd_lfc_set_autoneg =
 				autoneg, "on#off");
 cmdline_parse_token_num_t cmd_lfc_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 /* forward declaration */
 static void
@@ -7211,19 +7226,19 @@ cmdline_parse_token_string_t cmd_pfc_set_tx_mode =
 				tx_pfc_mode, "on#off");
 cmdline_parse_token_num_t cmd_pfc_set_high_water =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				high_water, UINT32);
+				high_water, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_pfc_set_low_water =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				low_water, UINT32);
+				low_water, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_pfc_set_pause_time =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				pause_time, UINT16);
+				pause_time, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_pfc_set_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				priority, UINT8);
+				priority, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_pfc_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_priority_flow_control_set = {
 	.f = cmd_priority_flow_ctrl_set_parsed,
@@ -7361,7 +7376,7 @@ cmdline_parse_token_string_t cmd_start_tx_first_n_tx_first =
 			tx_first, "tx_first");
 cmdline_parse_token_num_t cmd_start_tx_first_n_tx_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_start_tx_first_n_result,
-			tx_num, UINT32);
+			tx_num, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_start_tx_first_n = {
 	.f = cmd_start_tx_first_n_parsed,
@@ -7392,7 +7407,8 @@ cmdline_parse_token_string_t cmd_set_link_up_link_up =
 cmdline_parse_token_string_t cmd_set_link_up_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_link_up_result, port, "port");
 cmdline_parse_token_num_t cmd_set_link_up_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id,
+				CMDLINE_UINT16);
 
 static void cmd_set_link_up_parsed(__rte_unused void *parsed_result,
 			     __rte_unused struct cmdline *cl,
@@ -7431,7 +7447,8 @@ cmdline_parse_token_string_t cmd_set_link_down_link_down =
 cmdline_parse_token_string_t cmd_set_link_down_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_link_down_result, port, "port");
 cmdline_parse_token_num_t cmd_set_link_down_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id,
+				CMDLINE_UINT16);
 
 static void cmd_set_link_down_parsed(
 				__rte_unused void *parsed_result,
@@ -7620,7 +7637,8 @@ cmdline_parse_token_string_t cmd_showport_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_result, what,
 				 "info#summary#stats#xstats#fdir#stat_qmap#dcb_tc#cap");
 cmdline_parse_token_num_t cmd_showport_portnum =
-	TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum,
+				 CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_showport = {
 	.f = cmd_showport_parsed,
@@ -7711,9 +7729,11 @@ cmdline_parse_token_string_t cmd_showqueue_type =
 cmdline_parse_token_string_t cmd_showqueue_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_showqueue_result, what, "info");
 cmdline_parse_token_num_t cmd_showqueue_portnum =
-	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_showqueue_queuenum =
-	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum,
+		CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_showqueue = {
 	.f = cmd_showqueue_parsed,
@@ -7794,9 +7814,11 @@ cmdline_parse_token_string_t cmd_read_reg_read =
 cmdline_parse_token_string_t cmd_read_reg_reg =
 	TOKEN_STRING_INITIALIZER(struct cmd_read_reg_result, reg, "reg");
 cmdline_parse_token_num_t cmd_read_reg_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_read_reg_reg_off =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off,
+		CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_read_reg = {
 	.f = cmd_read_reg_parsed,
@@ -7839,16 +7861,16 @@ cmdline_parse_token_string_t cmd_read_reg_bit_field_regfield =
 				 regfield, "regfield");
 cmdline_parse_token_num_t cmd_read_reg_bit_field_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, port_id,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_reg_off =
 	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, reg_off,
-			      UINT32);
+			      CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_bit1_pos =
 	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, bit1_pos,
-			      UINT8);
+			      CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_bit2_pos =
 	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, bit2_pos,
-			      UINT8);
+			      CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_read_reg_bit_field = {
 	.f = cmd_read_reg_bit_field_parsed,
@@ -7890,11 +7912,14 @@ cmdline_parse_token_string_t cmd_read_reg_bit_regbit =
 	TOKEN_STRING_INITIALIZER(struct cmd_read_reg_bit_result,
 				 regbit, "regbit");
 cmdline_parse_token_num_t cmd_read_reg_bit_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_read_reg_bit_reg_off =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off,
+				 CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_read_reg_bit_bit_pos =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, bit_pos, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, bit_pos,
+				 CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_read_reg_bit = {
 	.f = cmd_read_reg_bit_parsed,
@@ -7933,11 +7958,14 @@ cmdline_parse_token_string_t cmd_write_reg_write =
 cmdline_parse_token_string_t cmd_write_reg_reg =
 	TOKEN_STRING_INITIALIZER(struct cmd_write_reg_result, reg, "reg");
 cmdline_parse_token_num_t cmd_write_reg_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_write_reg_reg_off =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off,
+		CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_write_reg_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, value, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, value,
+		CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_write_reg = {
 	.f = cmd_write_reg_parsed,
@@ -7982,19 +8010,19 @@ cmdline_parse_token_string_t cmd_write_reg_bit_field_regfield =
 				 regfield, "regfield");
 cmdline_parse_token_num_t cmd_write_reg_bit_field_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, port_id,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_reg_off =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, reg_off,
-			      UINT32);
+			      CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_bit1_pos =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, bit1_pos,
-			      UINT8);
+			      CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_bit2_pos =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, bit2_pos,
-			      UINT8);
+			      CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, value,
-			      UINT32);
+			      CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_write_reg_bit_field = {
 	.f = cmd_write_reg_bit_field_parsed,
@@ -8040,13 +8068,17 @@ cmdline_parse_token_string_t cmd_write_reg_bit_regbit =
 	TOKEN_STRING_INITIALIZER(struct cmd_write_reg_bit_result,
 				 regbit, "regbit");
 cmdline_parse_token_num_t cmd_write_reg_bit_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_write_reg_bit_reg_off =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off,
+				 CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_write_reg_bit_bit_pos =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, bit_pos, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, bit_pos,
+				 CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_write_reg_bit_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, value, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, value,
+				 CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_write_reg_bit = {
 	.f = cmd_write_reg_bit_parsed,
@@ -8092,11 +8124,14 @@ cmdline_parse_token_string_t cmd_read_rxd_txd_rxd_txd =
 	TOKEN_STRING_INITIALIZER(struct cmd_read_rxd_txd_result, rxd_txd,
 				 "rxd#txd");
 cmdline_parse_token_num_t cmd_read_rxd_txd_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_read_rxd_txd_queue_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_read_rxd_txd_desc_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, desc_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, desc_id,
+				 CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_read_rxd_txd = {
 	.f = cmd_read_rxd_txd_parsed,
@@ -8174,7 +8209,7 @@ cmdline_parse_token_string_t cmd_mac_addr_what =
 				"add#remove#set");
 cmdline_parse_token_num_t cmd_mac_addr_portnum =
 		TOKEN_NUM_INITIALIZER(struct cmd_mac_addr_result, port_num,
-					UINT16);
+					CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_mac_addr_addr =
 		TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
 
@@ -8220,7 +8255,8 @@ cmdline_parse_token_string_t cmd_eth_peer_set =
 cmdline_parse_token_string_t cmd_eth_peer =
 	TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, eth_peer, "eth-peer");
 cmdline_parse_token_num_t cmd_eth_peer_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_eth_peer_addr =
 	TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, peer_addr, NULL);
 
@@ -8269,13 +8305,13 @@ cmdline_parse_token_string_t cmd_setqmap_what =
 				 what, "tx#rx");
 cmdline_parse_token_num_t cmd_setqmap_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_setqmap_queueid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-			      queue_id, UINT16);
+			      queue_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_setqmap_mapvalue =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-			      map_value, UINT8);
+			      map_value, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_set_qmap = {
 	.f = cmd_set_qmap_parsed,
@@ -8371,7 +8407,7 @@ cmdline_parse_token_string_t cmd_set_uc_hash_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_set_uc_hash_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_uc_hash_table,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_uc_hash_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
 				 what, "uta");
@@ -8432,7 +8468,7 @@ cmdline_parse_token_string_t cmd_set_uc_all_hash_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_set_uc_all_hash_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_uc_all_hash_table,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_uc_all_hash_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
 				 what, "uta");
@@ -8524,13 +8560,13 @@ cmdline_parse_token_string_t cmd_set_vf_macvlan_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_set_vf_macvlan_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_macvlan_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_macvlan_filter,
 				 vf, "vf");
 cmdline_parse_token_num_t cmd_set_vf_macvlan_vf_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter,
-				vf_id, UINT8);
+				vf_id, CMDLINE_UINT8);
 cmdline_parse_token_etheraddr_t cmd_set_vf_macvlan_mac =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_macvlan_filter,
 				address);
@@ -8593,13 +8629,13 @@ cmdline_parse_token_string_t cmd_setvf_traffic_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_setvf_traffic_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setvf_traffic_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
 				 vf, "vf");
 cmdline_parse_token_num_t cmd_setvf_traffic_vfid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
-			      vf_id, UINT8);
+			      vf_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_setvf_traffic_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
 				 what, "tx#rx");
@@ -8681,13 +8717,13 @@ cmdline_parse_token_string_t cmd_set_vf_rxmode_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_set_vf_rxmode_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_rxmode_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
 				 vf, "vf");
 cmdline_parse_token_num_t cmd_set_vf_rxmode_vfid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
-			      vf_id, UINT8);
+			      vf_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_set_vf_rxmode_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
 				 what, "rxmode");
@@ -8764,13 +8800,13 @@ cmdline_parse_token_string_t cmd_vf_mac_addr_port =
 				port,"port");
 cmdline_parse_token_num_t cmd_vf_mac_addr_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
-				port_num, UINT16);
+				port_num, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_mac_addr_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
 				vf,"vf");
 cmdline_parse_token_num_t cmd_vf_mac_addr_vfnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
-				vf_num, UINT8);
+				vf_num, CMDLINE_UINT8);
 cmdline_parse_token_etheraddr_t cmd_vf_mac_addr_addr =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_vf_mac_addr_result,
 				address);
@@ -8855,19 +8891,19 @@ cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_what =
 				 what, "add#rm");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vlanid =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-			      vlan_id, UINT16);
+			      vlan_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
 				 port, "port");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
 				 vf, "vf");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vf_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-			      vf_mask, UINT64);
+			      vf_mask, CMDLINE_UINT64);
 
 cmdline_parse_inst_t cmd_vf_rxvlan_filter = {
 	.f = cmd_vf_rx_vlan_filter_parsed,
@@ -8922,19 +8958,19 @@ cmdline_parse_token_string_t cmd_queue_rate_limit_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_queue_rate_limit_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-				port_num, UINT16);
+				port_num, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_queue_rate_limit_queue =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
 				queue, "queue");
 cmdline_parse_token_num_t cmd_queue_rate_limit_queuenum =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-				queue_num, UINT8);
+				queue_num, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_queue_rate_limit_rate =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
 				rate, "rate");
 cmdline_parse_token_num_t cmd_queue_rate_limit_ratenum =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-				rate_num, UINT16);
+				rate_num, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_queue_rate_limit = {
 	.f = cmd_queue_rate_limit_parsed,
@@ -8992,25 +9028,25 @@ cmdline_parse_token_string_t cmd_vf_rate_limit_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_vf_rate_limit_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-				port_num, UINT16);
+				port_num, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rate_limit_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
 				vf, "vf");
 cmdline_parse_token_num_t cmd_vf_rate_limit_vfnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-				vf_num, UINT8);
+				vf_num, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_vf_rate_limit_rate =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
 				rate, "rate");
 cmdline_parse_token_num_t cmd_vf_rate_limit_ratenum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-				rate_num, UINT16);
+				rate_num, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rate_limit_q_msk =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
 				q_msk, "queue_mask");
 cmdline_parse_token_num_t cmd_vf_rate_limit_q_msk_val =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-				q_msk_val, UINT64);
+				q_msk_val, CMDLINE_UINT64);
 
 cmdline_parse_inst_t cmd_vf_rate_limit = {
 	.f = cmd_vf_rate_limit_parsed,
@@ -9132,7 +9168,7 @@ cmdline_parse_token_string_t cmd_tunnel_filter_what =
 	what, "add#rm");
 cmdline_parse_token_num_t cmd_tunnel_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-	port_id, UINT16);
+	port_id, CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_tunnel_filter_outer_mac =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_tunnel_filter_result,
 	outer_mac);
@@ -9141,7 +9177,7 @@ cmdline_parse_token_etheraddr_t cmd_tunnel_filter_inner_mac =
 	inner_mac);
 cmdline_parse_token_num_t cmd_tunnel_filter_innner_vlan =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-	inner_vlan, UINT16);
+	inner_vlan, CMDLINE_UINT16);
 cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =
 	TOKEN_IPADDR_INITIALIZER(struct cmd_tunnel_filter_result,
 	ip_value);
@@ -9155,10 +9191,10 @@ cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
 		"imac#omac-imac-tenid");
 cmdline_parse_token_num_t cmd_tunnel_filter_tenant_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-	tenant_id, UINT32);
+	tenant_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_tunnel_filter_queue_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-	queue_num, UINT16);
+	queue_num, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_filter = {
 	.f = cmd_tunnel_filter_parsed,
@@ -9224,10 +9260,10 @@ cmdline_parse_token_string_t cmd_tunnel_udp_config_what =
 				what, "add#rm");
 cmdline_parse_token_num_t cmd_tunnel_udp_config_udp_port =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
-				udp_port, UINT16);
+				udp_port, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tunnel_udp_config_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_udp_config = {
 	.f = cmd_tunnel_udp_config_parsed,
@@ -9297,7 +9333,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_config =
 				 "config");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, port_id,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port,
 				 udp_tunnel_port,
@@ -9310,7 +9346,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type =
 				 "vxlan#geneve#vxlan-gpe");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_port,
-			      UINT16);
+			      CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
 	.f = cmd_cfg_tunnel_udp_port_parsed,
@@ -9363,13 +9399,13 @@ cmdline_parse_token_string_t cmd_global_config_cmd =
 		"global_config");
 cmdline_parse_token_num_t cmd_global_config_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_global_config_result, port_id,
-			       UINT16);
+			       CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_global_config_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_global_config_result,
 		cfg_type, "gre-key-len");
 cmdline_parse_token_num_t cmd_global_config_gre_key_len =
 	TOKEN_NUM_INITIALIZER(struct cmd_global_config_result,
-		len, UINT8);
+		len, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_global_config = {
 	.f = cmd_global_config_parsed,
@@ -9406,13 +9442,13 @@ cmdline_parse_token_string_t cmd_mirror_mask_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_mirror_mask_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_mirror_mask_mirror =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
 				mirror, "mirror-rule");
 cmdline_parse_token_num_t cmd_mirror_mask_ruleid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-				rule_id, UINT8);
+				rule_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_mask_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
 				what, "pool-mirror-up#pool-mirror-down"
@@ -9425,7 +9461,7 @@ cmdline_parse_token_string_t cmd_mirror_mask_dstpool =
 				dstpool, "dst-pool");
 cmdline_parse_token_num_t cmd_mirror_mask_poolid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-				dstpool_id, UINT8);
+				dstpool_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_mask_on =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
 				on, "on#off");
@@ -9521,13 +9557,13 @@ cmdline_parse_token_string_t cmd_mirror_link_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_mirror_link_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_mirror_link_mirror =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
 				mirror, "mirror-rule");
 cmdline_parse_token_num_t cmd_mirror_link_ruleid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-			    rule_id, UINT8);
+			    rule_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_link_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
 				what, "uplink-mirror#downlink-mirror");
@@ -9536,7 +9572,7 @@ cmdline_parse_token_string_t cmd_mirror_link_dstpool =
 				dstpool, "dst-pool");
 cmdline_parse_token_num_t cmd_mirror_link_poolid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-				dstpool_id, UINT8);
+				dstpool_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_link_on =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
 				on, "on#off");
@@ -9607,13 +9643,13 @@ cmdline_parse_token_string_t cmd_rm_mirror_rule_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_rm_mirror_rule_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_rm_mirror_rule_mirror =
 	TOKEN_STRING_INITIALIZER(struct cmd_rm_mirror_rule_result,
 				mirror, "mirror-rule");
 cmdline_parse_token_num_t cmd_rm_mirror_rule_ruleid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
-				rule_id, UINT8);
+				rule_id, CMDLINE_UINT8);
 
 static void
 cmd_reset_mirror_rule_parsed(void *parsed_result,
@@ -9859,7 +9895,7 @@ cmdline_parse_token_string_t cmd_syn_filter_filter =
 	filter, "syn_filter");
 cmdline_parse_token_num_t cmd_syn_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_syn_filter_result,
-	port_id, UINT16);
+	port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_syn_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_syn_filter_result,
 	ops, "add#del");
@@ -9874,7 +9910,7 @@ cmdline_parse_token_string_t cmd_syn_filter_queue =
 				queue, "queue");
 cmdline_parse_token_num_t cmd_syn_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_syn_filter_result,
-				queue_id, UINT16);
+				queue_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_syn_filter = {
 	.f = cmd_syn_filter_parsed,
@@ -9951,7 +9987,7 @@ cmdline_parse_token_string_t cmd_queue_region_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result, port, "port");
 cmdline_parse_token_num_t cmd_queue_region_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_queue_region_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
 				 cmd, "queue-region");
@@ -9960,19 +9996,19 @@ cmdline_parse_token_string_t cmd_queue_region_id =
 				region, "region_id");
 cmdline_parse_token_num_t cmd_queue_region_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-				region_id, UINT8);
+				region_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_queue_region_queue_start_index =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
 				queue_start_index, "queue_start_index");
 cmdline_parse_token_num_t cmd_queue_region_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-				queue_id, UINT8);
+				queue_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_queue_region_queue_num =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
 				queue_num, "queue_num");
 cmdline_parse_token_num_t cmd_queue_region_queue_num_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-				queue_num_value, UINT8);
+				queue_num_value, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_queue_region = {
 	.f = cmd_queue_region_parsed,
@@ -10051,7 +10087,7 @@ cmdline_parse_token_string_t cmd_region_flowtype_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_region_flowtype_port_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_region_flowtype_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
 				cmd, "queue-region");
@@ -10060,13 +10096,13 @@ cmdline_parse_token_string_t cmd_region_flowtype_index =
 				region, "region_id");
 cmdline_parse_token_num_t cmd_region_flowtype_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
-				region_id, UINT8);
+				region_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_region_flowtype_flow_index =
 	TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
 				flowtype, "flowtype");
 cmdline_parse_token_num_t cmd_region_flowtype_flow_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
-				flowtype_id, UINT8);
+				flowtype_id, CMDLINE_UINT8);
 cmdline_parse_inst_t cmd_region_flowtype = {
 	.f = cmd_region_flowtype_parsed,
 	.data = NULL,
@@ -10142,7 +10178,7 @@ cmdline_parse_token_string_t cmd_user_priority_region_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_user_priority_region_port_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_user_priority_region_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
 				cmd, "queue-region");
@@ -10151,13 +10187,13 @@ cmdline_parse_token_string_t cmd_user_priority_region_UP =
 				user_priority, "UP");
 cmdline_parse_token_num_t cmd_user_priority_region_UP_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
-				user_priority_id, UINT8);
+				user_priority_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_user_priority_region_region =
 	TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
 				region, "region_id");
 cmdline_parse_token_num_t cmd_user_priority_region_region_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
-				region_id, UINT8);
+				region_id, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_user_priority_region = {
 	.f = cmd_user_priority_region_parsed,
@@ -10235,7 +10271,7 @@ cmdline_parse_token_string_t cmd_flush_queue_region_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_flush_queue_region_port_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_flush_queue_region_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flush_queue_region_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
 				cmd, "queue-region");
@@ -10316,7 +10352,7 @@ cmdline_parse_token_string_t cmd_show_queue_region_info_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_show_queue_region_info_port_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_queue_region_info,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_queue_region_info_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_queue_region_info,
 				cmd, "queue-region");
@@ -10417,7 +10453,7 @@ cmdline_parse_token_string_t cmd_2tuple_filter_filter =
 				 filter, "2tuple_filter");
 cmdline_parse_token_num_t cmd_2tuple_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_2tuple_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				 ops, "add#del");
@@ -10426,37 +10462,37 @@ cmdline_parse_token_string_t cmd_2tuple_filter_dst_port =
 				dst_port, "dst_port");
 cmdline_parse_token_num_t cmd_2tuple_filter_dst_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				dst_port_value, UINT16);
+				dst_port_value, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_2tuple_filter_protocol =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				protocol, "protocol");
 cmdline_parse_token_num_t cmd_2tuple_filter_protocol_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				protocol_value, UINT8);
+				protocol_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_2tuple_filter_mask =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				mask, "mask");
 cmdline_parse_token_num_t cmd_2tuple_filter_mask_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				mask_value, INT8);
+				mask_value, CMDLINE_INT8);
 cmdline_parse_token_string_t cmd_2tuple_filter_tcp_flags =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				tcp_flags, "tcp_flags");
 cmdline_parse_token_num_t cmd_2tuple_filter_tcp_flags_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				tcp_flags_value, UINT8);
+				tcp_flags_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_2tuple_filter_priority =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				priority, "priority");
 cmdline_parse_token_num_t cmd_2tuple_filter_priority_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				priority_value, UINT8);
+				priority_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_2tuple_filter_queue =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				queue, "queue");
 cmdline_parse_token_num_t cmd_2tuple_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				queue_id, UINT16);
+				queue_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_2tuple_filter = {
 	.f = cmd_2tuple_filter_parsed,
@@ -10596,7 +10632,7 @@ cmdline_parse_token_string_t cmd_5tuple_filter_filter =
 				 filter, "5tuple_filter");
 cmdline_parse_token_num_t cmd_5tuple_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_5tuple_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				 ops, "add#del");
@@ -10617,43 +10653,43 @@ cmdline_parse_token_string_t cmd_5tuple_filter_dst_port =
 				dst_port, "dst_port");
 cmdline_parse_token_num_t cmd_5tuple_filter_dst_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				dst_port_value, UINT16);
+				dst_port_value, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_5tuple_filter_src_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				src_port, "src_port");
 cmdline_parse_token_num_t cmd_5tuple_filter_src_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				src_port_value, UINT16);
+				src_port_value, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_5tuple_filter_protocol =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				protocol, "protocol");
 cmdline_parse_token_num_t cmd_5tuple_filter_protocol_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				protocol_value, UINT8);
+				protocol_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_5tuple_filter_mask =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				mask, "mask");
 cmdline_parse_token_num_t cmd_5tuple_filter_mask_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				mask_value, INT8);
+				mask_value, CMDLINE_INT8);
 cmdline_parse_token_string_t cmd_5tuple_filter_tcp_flags =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				tcp_flags, "tcp_flags");
 cmdline_parse_token_num_t cmd_5tuple_filter_tcp_flags_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				tcp_flags_value, UINT8);
+				tcp_flags_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_5tuple_filter_priority =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				priority, "priority");
 cmdline_parse_token_num_t cmd_5tuple_filter_priority_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				priority_value, UINT8);
+				priority_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_5tuple_filter_queue =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				queue, "queue");
 cmdline_parse_token_num_t cmd_5tuple_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				queue_id, UINT16);
+				queue_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_5tuple_filter = {
 	.f = cmd_5tuple_filter_parsed,
@@ -10819,7 +10855,7 @@ cmdline_parse_token_string_t cmd_flex_filter_filter =
 				filter, "flex_filter");
 cmdline_parse_token_num_t cmd_flex_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flex_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
 				ops, "add#del");
@@ -10828,7 +10864,7 @@ cmdline_parse_token_string_t cmd_flex_filter_len =
 				len, "len");
 cmdline_parse_token_num_t cmd_flex_filter_len_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-				len_value, UINT8);
+				len_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flex_filter_bytes =
 	TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
 				bytes, "bytes");
@@ -10846,13 +10882,13 @@ cmdline_parse_token_string_t cmd_flex_filter_priority =
 				priority, "priority");
 cmdline_parse_token_num_t cmd_flex_filter_priority_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-				priority_value, UINT8);
+				priority_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flex_filter_queue =
 	TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
 				queue, "queue");
 cmdline_parse_token_num_t cmd_flex_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-				queue_id, UINT16);
+				queue_id, CMDLINE_UINT16);
 cmdline_parse_inst_t cmd_flex_filter = {
 	.f = cmd_flex_filter_parsed,
 	.data = NULL,
@@ -10898,7 +10934,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_filter =
 				 filter, "ethertype_filter");
 cmdline_parse_token_num_t cmd_ethertype_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_ethertype_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
 				 ops, "add#del");
@@ -10913,7 +10949,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_ethertype =
 				 ethertype, "ethertype");
 cmdline_parse_token_num_t cmd_ethertype_filter_ethertype_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-			      ethertype_value, UINT16);
+			      ethertype_value, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_ethertype_filter_drop =
 	TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
 				 drop, "drop#fwd");
@@ -10922,7 +10958,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_queue =
 				 queue, "queue");
 cmdline_parse_token_num_t cmd_ethertype_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-			      queue_id, UINT16);
+			      queue_id, CMDLINE_UINT16);
 
 static void
 cmd_ethertype_filter_parsed(void *parsed_result,
@@ -11401,7 +11437,7 @@ cmdline_parse_token_string_t cmd_flow_director_filter =
 				 flow_director_filter, "flow_director_filter");
 cmdline_parse_token_num_t cmd_flow_director_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 ops, "add#del#update");
@@ -11416,7 +11452,7 @@ cmdline_parse_token_string_t cmd_flow_director_ether =
 				 ether, "ether");
 cmdline_parse_token_num_t cmd_flow_director_ether_type =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      ether_type, UINT16);
+			      ether_type, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 src, "src");
@@ -11425,7 +11461,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_ip_src =
 				 ip_src);
 cmdline_parse_token_num_t cmd_flow_director_port_src =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      port_src, UINT16);
+			      port_src, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_dst =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 dst, "dst");
@@ -11434,37 +11470,37 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_ip_dst =
 				 ip_dst);
 cmdline_parse_token_num_t cmd_flow_director_port_dst =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      port_dst, UINT16);
+			      port_dst, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_verify_tag =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				  verify_tag, "verify_tag");
 cmdline_parse_token_num_t cmd_flow_director_verify_tag_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      verify_tag_value, UINT32);
+			      verify_tag_value, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_flow_director_tos =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 tos, "tos");
 cmdline_parse_token_num_t cmd_flow_director_tos_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      tos_value, UINT8);
+			      tos_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_proto =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 proto, "proto");
 cmdline_parse_token_num_t cmd_flow_director_proto_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      proto_value, UINT8);
+			      proto_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_ttl =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 ttl, "ttl");
 cmdline_parse_token_num_t cmd_flow_director_ttl_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      ttl_value, UINT8);
+			      ttl_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 vlan, "vlan");
 cmdline_parse_token_num_t cmd_flow_director_vlan_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      vlan_value, UINT16);
+			      vlan_value, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexbytes =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 flexbytes, "flexbytes");
@@ -11482,13 +11518,13 @@ cmdline_parse_token_string_t cmd_flow_director_queue =
 				 queue, "queue");
 cmdline_parse_token_num_t cmd_flow_director_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      queue_id, UINT16);
+			      queue_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_fd_id =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 fd_id, "fd_id");
 cmdline_parse_token_num_t cmd_flow_director_fd_id_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      fd_id_value, UINT32);
+			      fd_id_value, CMDLINE_UINT32);
 
 cmdline_parse_token_string_t cmd_flow_director_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
@@ -11522,7 +11558,7 @@ cmdline_parse_token_string_t cmd_flow_director_tunnel_id =
 				 tunnel_id, "tunnel-id");
 cmdline_parse_token_num_t cmd_flow_director_tunnel_id_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      tunnel_id_value, UINT32);
+			      tunnel_id_value, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_flow_director_packet =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 packet, "packet");
@@ -11766,7 +11802,7 @@ cmdline_parse_token_string_t cmd_flush_flow_director_flush =
 				 flush_flow_director, "flush_flow_director");
 cmdline_parse_token_num_t cmd_flush_flow_director_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flush_flow_director_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 static void
 cmd_flush_flow_director_parsed(void *parsed_result,
@@ -11884,13 +11920,13 @@ cmdline_parse_token_string_t cmd_flow_director_mask =
 				 flow_director_mask, "flow_director_mask");
 cmdline_parse_token_num_t cmd_flow_director_mask_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 vlan, "vlan");
 cmdline_parse_token_num_t cmd_flow_director_mask_vlan_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      vlan_mask, UINT16);
+			      vlan_mask, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 src_mask, "src_mask");
@@ -11902,7 +11938,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_mask_ipv6_src =
 				 ipv6_src);
 cmdline_parse_token_num_t cmd_flow_director_mask_port_src =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      port_src, UINT16);
+			      port_src, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_dst =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 dst_mask, "dst_mask");
@@ -11914,7 +11950,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_mask_ipv6_dst =
 				 ipv6_dst);
 cmdline_parse_token_num_t cmd_flow_director_mask_port_dst =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      port_dst, UINT16);
+			      port_dst, CMDLINE_UINT16);
 
 cmdline_parse_token_string_t cmd_flow_director_mask_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
@@ -11933,19 +11969,19 @@ cmdline_parse_token_string_t cmd_flow_director_mask_mac =
 				 mac, "mac");
 cmdline_parse_token_num_t cmd_flow_director_mask_mac_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      mac_addr_byte_mask, UINT8);
+			      mac_addr_byte_mask, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_mask_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 tunnel_type, "tunnel-type");
 cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_type_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      tunnel_type_mask, UINT8);
+			      tunnel_type_mask, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_mask_tunnel_id =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 tunnel_id, "tunnel-id");
 cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_id_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      tunnel_id_mask, UINT32);
+			      tunnel_id_mask, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_set_flow_director_ip_mask = {
 	.f = cmd_flow_director_mask_parsed,
@@ -12099,7 +12135,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexmask =
 				 "flow_director_flex_mask");
 cmdline_parse_token_num_t cmd_flow_director_flexmask_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flex_mask_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexmask_flow =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
 				 flow, "flow");
@@ -12217,7 +12253,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexpayload =
 				 "flow_director_flex_payload");
 cmdline_parse_token_num_t cmd_flow_director_flexpayload_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flexpayload_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexpayload_payload_layer =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flexpayload_result,
 				 payload_layer, "raw#l2#l3#l4");
@@ -12285,7 +12321,7 @@ cmdline_parse_token_string_t cmd_get_sym_hash_ena_per_port_all =
 		get_sym_hash_ena_per_port, "get_sym_hash_ena_per_port");
 cmdline_parse_token_num_t cmd_get_sym_hash_ena_per_port_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_get_sym_hash_ena_per_port_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_get_sym_hash_ena_per_port = {
 	.f = cmd_get_sym_hash_per_port_parsed,
@@ -12341,7 +12377,7 @@ cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_all =
 		set_sym_hash_ena_per_port, "set_sym_hash_ena_per_port");
 cmdline_parse_token_num_t cmd_set_sym_hash_ena_per_port_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_enable =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
 		enable, "enable#disable");
@@ -12466,7 +12502,7 @@ cmdline_parse_token_string_t cmd_get_hash_global_config_all =
 		get_hash_global_config, "get_hash_global_config");
 cmdline_parse_token_num_t cmd_get_hash_global_config_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_get_hash_global_config_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_get_hash_global_config = {
 	.f = cmd_get_hash_global_config_parsed,
@@ -12541,7 +12577,7 @@ cmdline_parse_token_string_t cmd_set_hash_global_config_all =
 		set_hash_global_config, "set_hash_global_config");
 cmdline_parse_token_num_t cmd_set_hash_global_config_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_hash_global_config_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_hash_global_config_hash_func =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_hash_global_config_result,
 		hash_func, "toeplitz#simple_xor#symmetric_toeplitz#default");
@@ -12657,7 +12693,7 @@ cmdline_parse_token_string_t cmd_set_hash_input_set_cmd =
 		set_hash_input_set, "set_hash_input_set");
 cmdline_parse_token_num_t cmd_set_hash_input_set_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_hash_input_set_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_hash_input_set_flow_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_hash_input_set_result,
 		flow_type, NULL);
@@ -12730,7 +12766,7 @@ cmdline_parse_token_string_t cmd_set_fdir_input_set_cmd =
 	set_fdir_input_set, "set_fdir_input_set");
 cmdline_parse_token_num_t cmd_set_fdir_input_set_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_fdir_input_set_result,
-	port_id, UINT16);
+	port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_fdir_input_set_flow_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result,
 	flow_type,
@@ -12803,7 +12839,8 @@ cmdline_parse_token_string_t cmd_mcast_addr_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result, what,
 				 "add#remove");
 cmdline_parse_token_num_t cmd_mcast_addr_portnum =
-	TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num,
+				 CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_mcast_addr_addr =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
 
@@ -12852,7 +12889,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_all_str =
 cmdline_parse_token_num_t cmd_config_l2_tunnel_eth_type_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_l2_tunnel_eth_type_result,
-		 id, UINT16);
+		 id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_l2_tunnel =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_l2_tunnel_eth_type_result,
@@ -12868,7 +12905,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_eth_type =
 cmdline_parse_token_num_t cmd_config_l2_tunnel_eth_type_eth_type_val =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_l2_tunnel_eth_type_result,
-		 eth_type_val, UINT16);
+		 eth_type_val, CMDLINE_UINT16);
 
 static enum rte_eth_tunnel_type
 str2fdir_l2_tunnel_type(char *string)
@@ -12986,7 +13023,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_all_str =
 cmdline_parse_token_num_t cmd_config_l2_tunnel_en_dis_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_l2_tunnel_en_dis_result,
-		 id, UINT16);
+		 id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_l2_tunnel =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_l2_tunnel_en_dis_result,
@@ -13164,7 +13201,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_port_tag_id =
 cmdline_parse_token_num_t cmd_config_e_tag_port_tag_id_val =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 port_tag_id_val, UINT32);
+		 port_tag_id_val, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_config_e_tag_e_tag_id =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_e_tag_result,
@@ -13172,7 +13209,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_e_tag_id =
 cmdline_parse_token_num_t cmd_config_e_tag_e_tag_id_val =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 e_tag_id_val, UINT16);
+		 e_tag_id_val, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_e_tag_dst_pool =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_e_tag_result,
@@ -13180,7 +13217,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_dst_pool =
 cmdline_parse_token_num_t cmd_config_e_tag_dst_pool_val =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 dst_pool_val, UINT8);
+		 dst_pool_val, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_config_e_tag_port =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_e_tag_result,
@@ -13188,7 +13225,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_port =
 cmdline_parse_token_num_t cmd_config_e_tag_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_e_tag_vf =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_e_tag_result,
@@ -13196,7 +13233,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_vf =
 cmdline_parse_token_num_t cmd_config_e_tag_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 vf_id, UINT8);
+		 vf_id, CMDLINE_UINT8);
 
 /* E-tag insertion configuration */
 static void
@@ -13515,11 +13552,11 @@ cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_antispoof =
 cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_anti_spoof_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_anti_spoof_result,
-		 vf_id, UINT32);
+		 vf_id, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_vlan_anti_spoof_result,
@@ -13621,11 +13658,11 @@ cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_antispoof =
 cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_mac_anti_spoof_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_mac_anti_spoof_result,
-		 vf_id, UINT32);
+		 vf_id, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_mac_anti_spoof_result,
@@ -13727,11 +13764,11 @@ cmdline_parse_token_string_t cmd_vf_vlan_stripq_stripq =
 cmdline_parse_token_num_t cmd_vf_vlan_stripq_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_stripq_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_stripq_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_stripq_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_vlan_stripq_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_vlan_stripq_result,
@@ -13833,15 +13870,15 @@ cmdline_parse_token_string_t cmd_vf_vlan_insert_insert =
 cmdline_parse_token_num_t cmd_vf_vlan_insert_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_insert_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_insert_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_insert_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_insert_vlan_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_insert_result,
-		 vlan_id, UINT16);
+		 vlan_id, CMDLINE_UINT16);
 
 static void
 cmd_set_vf_vlan_insert_parsed(
@@ -13931,7 +13968,7 @@ cmdline_parse_token_string_t cmd_tx_loopback_loopback =
 cmdline_parse_token_num_t cmd_tx_loopback_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_tx_loopback_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_tx_loopback_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_tx_loopback_result,
@@ -14031,7 +14068,7 @@ cmdline_parse_token_string_t cmd_all_queues_drop_en_drop =
 cmdline_parse_token_num_t cmd_all_queues_drop_en_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_all_queues_drop_en_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_all_queues_drop_en_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_all_queues_drop_en_result,
@@ -14123,11 +14160,11 @@ cmdline_parse_token_string_t cmd_vf_split_drop_en_drop =
 cmdline_parse_token_num_t cmd_vf_split_drop_en_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_split_drop_en_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_split_drop_en_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_split_drop_en_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_split_drop_en_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_split_drop_en_result,
@@ -14217,11 +14254,11 @@ cmdline_parse_token_string_t cmd_set_vf_mac_addr_addr =
 cmdline_parse_token_num_t cmd_set_vf_mac_addr_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_mac_addr_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_vf_mac_addr_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_mac_addr_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_set_vf_mac_addr_mac_addr =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_mac_addr_result,
 		 mac_addr);
@@ -14318,7 +14355,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_on_offload =
 cmdline_parse_token_num_t cmd_macsec_offload_on_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_offload_on_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_macsec_offload_on_on =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_macsec_offload_on_result,
@@ -14433,7 +14470,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_off_offload =
 cmdline_parse_token_num_t cmd_macsec_offload_off_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_offload_off_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_macsec_offload_off_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_macsec_offload_off_result,
@@ -14528,7 +14565,7 @@ cmdline_parse_token_string_t cmd_macsec_sc_tx_rx =
 cmdline_parse_token_num_t cmd_macsec_sc_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sc_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
 	TOKEN_ETHERADDR_INITIALIZER
 		(struct cmd_macsec_sc_result,
@@ -14536,7 +14573,7 @@ cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
 cmdline_parse_token_num_t cmd_macsec_sc_pi =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sc_result,
-		 pi, UINT16);
+		 pi, CMDLINE_UINT16);
 
 static void
 cmd_set_macsec_sc_parsed(
@@ -14620,19 +14657,19 @@ cmdline_parse_token_string_t cmd_macsec_sa_tx_rx =
 cmdline_parse_token_num_t cmd_macsec_sa_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sa_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_macsec_sa_idx =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sa_result,
-		 idx, UINT8);
+		 idx, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_macsec_sa_an =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sa_result,
-		 an, UINT8);
+		 an, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_macsec_sa_pn =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sa_result,
-		 pn, UINT32);
+		 pn, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_macsec_sa_key =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_macsec_sa_result,
@@ -14740,11 +14777,11 @@ cmdline_parse_token_string_t cmd_vf_promisc_promisc =
 cmdline_parse_token_num_t cmd_vf_promisc_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_promisc_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_promisc_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_promisc_result,
-		 vf_id, UINT32);
+		 vf_id, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_vf_promisc_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_promisc_result,
@@ -14830,11 +14867,11 @@ cmdline_parse_token_string_t cmd_vf_allmulti_allmulti =
 cmdline_parse_token_num_t cmd_vf_allmulti_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_allmulti_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_allmulti_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_allmulti_result,
-		 vf_id, UINT32);
+		 vf_id, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_vf_allmulti_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_allmulti_result,
@@ -14920,11 +14957,11 @@ cmdline_parse_token_string_t cmd_set_vf_broadcast_broadcast =
 cmdline_parse_token_num_t cmd_set_vf_broadcast_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_broadcast_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_vf_broadcast_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_broadcast_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_broadcast_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_set_vf_broadcast_result,
@@ -15014,11 +15051,11 @@ cmdline_parse_token_string_t cmd_set_vf_vlan_tag_tag =
 cmdline_parse_token_num_t cmd_set_vf_vlan_tag_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_vlan_tag_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_vf_vlan_tag_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_vlan_tag_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_vlan_tag_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_set_vf_vlan_tag_result,
@@ -15124,19 +15161,19 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_max_bw =
 cmdline_parse_token_num_t cmd_vf_tc_bw_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_tc_bw_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_tc_bw_tc_no =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 tc_no, UINT8);
+		 tc_no, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_vf_tc_bw_bw =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 bw, UINT32);
+		 bw, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
@@ -15144,7 +15181,7 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list =
 cmdline_parse_token_num_t cmd_vf_tc_bw_tc_map =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 tc_map, UINT8);
+		 tc_map, CMDLINE_UINT8);
 
 /* VF max bandwidth setting */
 static void
@@ -15455,27 +15492,29 @@ cmdline_parse_token_string_t cmd_set_vxlan_vni =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "vni");
 cmdline_parse_token_num_t cmd_set_vxlan_vni_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, vni, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, vni, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_set_vxlan_udp_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "udp-src");
 cmdline_parse_token_num_t cmd_set_vxlan_udp_src_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src,
+				 CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vxlan_udp_dst =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "udp-dst");
 cmdline_parse_token_num_t cmd_set_vxlan_udp_dst_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst,
+				 CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vxlan_ip_tos =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "ip-tos");
 cmdline_parse_token_num_t cmd_set_vxlan_ip_tos_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_set_vxlan_ip_ttl =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "ip-ttl");
 cmdline_parse_token_num_t cmd_set_vxlan_ip_ttl_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_set_vxlan_ip_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "ip-src");
@@ -15490,7 +15529,7 @@ cmdline_parse_token_string_t cmd_set_vxlan_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "vlan-tci");
 cmdline_parse_token_num_t cmd_set_vxlan_vlan_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vxlan_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "eth-src");
@@ -15675,7 +15714,7 @@ cmdline_parse_token_string_t cmd_set_nvgre_tni =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
 				 "tni");
 cmdline_parse_token_num_t cmd_set_nvgre_tni_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_set_nvgre_ip_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
 				 "ip-src");
@@ -15690,7 +15729,7 @@ cmdline_parse_token_string_t cmd_set_nvgre_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
 				 "vlan-tci");
 cmdline_parse_token_num_t cmd_set_nvgre_vlan_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_nvgre_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
 				 "eth-src");
@@ -15821,7 +15860,8 @@ cmdline_parse_token_string_t cmd_set_l2_encap_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
 				 "vlan-tci");
 cmdline_parse_token_num_t cmd_set_l2_encap_vlan_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_l2_encap_result, tci, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_l2_encap_result, tci,
+				 CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_l2_encap_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
 				 "eth-src");
@@ -15981,7 +16021,7 @@ cmdline_parse_token_string_t cmd_set_mplsogre_encap_label =
 				 pos_token, "label");
 cmdline_parse_token_num_t cmd_set_mplsogre_encap_label_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, label,
-			      UINT32);
+			      CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_set_mplsogre_encap_ip_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
 				 pos_token, "ip-src");
@@ -15997,7 +16037,7 @@ cmdline_parse_token_string_t cmd_set_mplsogre_encap_vlan =
 				 pos_token, "vlan-tci");
 cmdline_parse_token_num_t cmd_set_mplsogre_encap_vlan_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, tci,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsogre_encap_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
 				 pos_token, "eth-src");
@@ -16205,19 +16245,19 @@ cmdline_parse_token_string_t cmd_set_mplsoudp_encap_label =
 				 pos_token, "label");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_label_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, label,
-			      UINT32);
+			      CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
 				 pos_token, "udp-src");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_src_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_src,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_dst =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
 				 pos_token, "udp-dst");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_dst_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_dst,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_ip_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
 				 pos_token, "ip-src");
@@ -16233,7 +16273,7 @@ cmdline_parse_token_string_t cmd_set_mplsoudp_encap_vlan =
 				 pos_token, "vlan-tci");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_vlan_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, tci,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
 				 pos_token, "eth-src");
@@ -16476,7 +16516,8 @@ cmdline_parse_token_string_t cmd_ddp_add_ddp =
 cmdline_parse_token_string_t cmd_ddp_add_add =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, add, "add");
 cmdline_parse_token_num_t cmd_ddp_add_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_ddp_add_filepath =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, filepath, NULL);
 
@@ -16556,7 +16597,8 @@ cmdline_parse_token_string_t cmd_ddp_del_ddp =
 cmdline_parse_token_string_t cmd_ddp_del_del =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, del, "del");
 cmdline_parse_token_num_t cmd_ddp_del_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_ddp_del_filepath =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, filepath, NULL);
 
@@ -16863,7 +16905,8 @@ cmdline_parse_token_string_t cmd_ddp_get_list_get =
 cmdline_parse_token_string_t cmd_ddp_get_list_list =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_get_list_result, list, "list");
 cmdline_parse_token_num_t cmd_ddp_get_list_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id,
+		CMDLINE_UINT16);
 
 static void
 cmd_ddp_get_list_parsed(
@@ -17014,13 +17057,13 @@ cmdline_parse_token_string_t cmd_cfg_input_set_cfg =
 				 cfg, "config");
 cmdline_parse_token_num_t cmd_cfg_input_set_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_cfg_input_set_pctype =
 	TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
 				 pctype, "pctype");
 cmdline_parse_token_num_t cmd_cfg_input_set_pctype_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
-			      pctype_id, UINT8);
+			      pctype_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_cfg_input_set_inset_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
 				 inset_type,
@@ -17033,7 +17076,7 @@ cmdline_parse_token_string_t cmd_cfg_input_set_field =
 				 field, "field");
 cmdline_parse_token_num_t cmd_cfg_input_set_field_idx =
 	TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
-			      field_idx, UINT8);
+			      field_idx, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_cfg_input_set = {
 	.f = cmd_cfg_input_set_parsed,
@@ -17115,13 +17158,13 @@ cmdline_parse_token_string_t cmd_clear_input_set_cfg =
 				 cfg, "config");
 cmdline_parse_token_num_t cmd_clear_input_set_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_clear_input_set_pctype =
 	TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
 				 pctype, "pctype");
 cmdline_parse_token_num_t cmd_clear_input_set_pctype_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result,
-			      pctype_id, UINT8);
+			      pctype_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_clear_input_set_inset_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
 				 inset_type,
@@ -17178,11 +17221,11 @@ cmdline_parse_token_string_t cmd_show_vf_stats_stats =
 cmdline_parse_token_num_t cmd_show_vf_stats_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_show_vf_stats_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_show_vf_stats_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_show_vf_stats_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 
 static void
 cmd_show_vf_stats_parsed(
@@ -17287,11 +17330,11 @@ cmdline_parse_token_string_t cmd_clear_vf_stats_stats =
 cmdline_parse_token_num_t cmd_clear_vf_stats_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_clear_vf_stats_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_clear_vf_stats_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_clear_vf_stats_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 
 static void
 cmd_clear_vf_stats_parsed(
@@ -17371,7 +17414,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_reset_config =
 cmdline_parse_token_num_t cmd_pctype_mapping_reset_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_pctype_mapping_reset_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_reset_pctype =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_pctype_mapping_reset_result,
@@ -17453,7 +17496,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_get_port =
 cmdline_parse_token_num_t cmd_pctype_mapping_get_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_pctype_mapping_get_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_get_pctype =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_pctype_mapping_get_result,
@@ -17557,7 +17600,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_config =
 cmdline_parse_token_num_t cmd_pctype_mapping_update_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_pctype_mapping_update_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_update_pctype =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_pctype_mapping_update_result,
@@ -17577,7 +17620,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_pc_type =
 cmdline_parse_token_num_t cmd_pctype_mapping_update_flow_type =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_pctype_mapping_update_result,
-		 flow_type, UINT16);
+		 flow_type, CMDLINE_UINT16);
 
 static void
 cmd_pctype_mapping_update_parsed(
@@ -17671,11 +17714,11 @@ cmdline_parse_token_string_t cmd_ptype_mapping_get_get =
 cmdline_parse_token_num_t cmd_ptype_mapping_get_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_get_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_get_valid_only =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_get_result,
-		 valid_only, UINT8);
+		 valid_only, CMDLINE_UINT8);
 
 static void
 cmd_ptype_mapping_get_parsed(
@@ -17768,19 +17811,19 @@ cmdline_parse_token_string_t cmd_ptype_mapping_replace_replace =
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_replace_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_target =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_replace_result,
-		 target, UINT32);
+		 target, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_mask =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_replace_result,
-		 mask, UINT8);
+		 mask, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_pkt_type =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_replace_result,
-		 pkt_type, UINT32);
+		 pkt_type, CMDLINE_UINT32);
 
 static void
 cmd_ptype_mapping_replace_parsed(
@@ -17862,7 +17905,7 @@ cmdline_parse_token_string_t cmd_ptype_mapping_reset_reset =
 cmdline_parse_token_num_t cmd_ptype_mapping_reset_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_reset_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 
 static void
 cmd_ptype_mapping_reset_parsed(
@@ -17935,15 +17978,15 @@ cmdline_parse_token_string_t cmd_ptype_mapping_update_update =
 cmdline_parse_token_num_t cmd_ptype_mapping_update_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_update_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_update_hw_ptype =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_update_result,
-		 hw_ptype, UINT8);
+		 hw_ptype, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_ptype_mapping_update_sw_ptype =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_update_result,
-		 sw_ptype, UINT32);
+		 sw_ptype, CMDLINE_UINT32);
 
 static void
 cmd_ptype_mapping_update_parsed(
@@ -18054,7 +18097,7 @@ cmdline_parse_token_string_t cmd_rx_offload_get_capa_port =
 cmdline_parse_token_num_t cmd_rx_offload_get_capa_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_rx_offload_get_capa_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_rx_offload_get_capa_rx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_rx_offload_get_capa_result,
@@ -18151,7 +18194,7 @@ cmdline_parse_token_string_t cmd_rx_offload_get_configuration_port =
 cmdline_parse_token_num_t cmd_rx_offload_get_configuration_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_rx_offload_get_configuration_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_rx_offload_get_configuration_rx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_rx_offload_get_configuration_result,
@@ -18233,7 +18276,7 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_config =
 cmdline_parse_token_num_t cmd_config_per_port_rx_offload_result_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_port_rx_offload_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_rx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_port_rx_offload_result,
@@ -18355,7 +18398,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_port =
 cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
@@ -18363,7 +18406,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq =
 cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_queue_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
-		 queue_id, UINT16);
+		 queue_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxoffload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
@@ -18464,7 +18507,7 @@ cmdline_parse_token_string_t cmd_tx_offload_get_capa_port =
 cmdline_parse_token_num_t cmd_tx_offload_get_capa_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_tx_offload_get_capa_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_tx_offload_get_capa_tx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_tx_offload_get_capa_result,
@@ -18561,7 +18604,7 @@ cmdline_parse_token_string_t cmd_tx_offload_get_configuration_port =
 cmdline_parse_token_num_t cmd_tx_offload_get_configuration_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_tx_offload_get_configuration_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_tx_offload_get_configuration_tx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_tx_offload_get_configuration_result,
@@ -18643,7 +18686,7 @@ cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_config =
 cmdline_parse_token_num_t cmd_config_per_port_tx_offload_result_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_port_tx_offload_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_tx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_port_tx_offload_result,
@@ -18772,7 +18815,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_port =
 cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_queue_tx_offload_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_tx_offload_result,
@@ -18780,7 +18823,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq =
 cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_queue_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_queue_tx_offload_result,
-		 queue_id, UINT16);
+		 queue_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txoffload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_tx_offload_result,
@@ -18898,13 +18941,13 @@ cmdline_parse_token_string_t cmd_config_tx_metadata_specific_keyword =
 			keyword, "config");
 cmdline_parse_token_num_t cmd_config_tx_metadata_specific_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_tx_metadata_specific_item =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
 			item, "tx_metadata");
 cmdline_parse_token_num_t cmd_config_tx_metadata_specific_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
-			value, UINT32);
+			value, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_config_tx_metadata_specific = {
 	.f = cmd_config_tx_metadata_specific_parsed,
@@ -18977,7 +19020,7 @@ cmdline_parse_token_string_t cmd_config_tx_dynf_specific_keyword =
 			keyword, "config");
 cmdline_parse_token_num_t cmd_config_tx_dynf_specific_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tx_dynf_specific_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_tx_dynf_specific_item =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tx_dynf_specific_result,
 			item, "dynf");
@@ -19036,7 +19079,7 @@ cmdline_parse_token_string_t cmd_show_tx_metadata_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_show_tx_metadata_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_tx_metadata_result,
-			cmd_pid, UINT16);
+			cmd_pid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_tx_metadata_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_tx_metadata_result,
 			cmd_keyword, "tx_metadata");
@@ -19076,7 +19119,7 @@ cmdline_parse_token_string_t cmd_show_port_supported_ptypes_port =
 cmdline_parse_token_num_t cmd_show_port_supported_ptypes_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_show_port_supported_ptypes_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_port_supported_ptypes_ptypes =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_show_port_supported_ptypes_result,
@@ -19224,19 +19267,19 @@ cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
-			cmd_pid, UINT16);
+			cmd_pid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
 			cmd_keyword, "rxq#txq");
 cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_qid =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
-			cmd_qid, UINT16);
+			cmd_qid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_desc =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
 			cmd_desc, "desc");
 cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_did =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
-			cmd_did, UINT16);
+			cmd_did, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_status =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
 			cmd_status, "status");
@@ -19279,7 +19322,7 @@ cmdline_parse_token_string_t cmd_set_port_ptypes_port =
 cmdline_parse_token_num_t cmd_set_port_ptypes_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_port_ptypes_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_port_ptypes_mask_str =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_set_port_ptypes_result,
@@ -19287,7 +19330,7 @@ cmdline_parse_token_string_t cmd_set_port_ptypes_mask_str =
 cmdline_parse_token_num_t cmd_set_port_ptypes_mask_u32 =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_port_ptypes_result,
-		 mask, UINT32);
+		 mask, CMDLINE_UINT32);
 
 static void
 cmd_set_port_ptypes_parsed(
@@ -19372,7 +19415,7 @@ cmdline_parse_token_string_t cmd_showport_macs_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_showport_macs_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_showport_macs_result,
-			cmd_pid, UINT16);
+			cmd_pid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_showport_macs_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_macs_result,
 			cmd_keyword, "macs#mcast_macs");
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 6263d307e..93b5878c4 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -7004,7 +7004,7 @@ cmdline_parse_token_string_t cmd_show_set_raw_cmd_what =
 			cmd_what, "raw_encap#raw_decap");
 cmdline_parse_token_num_t cmd_show_set_raw_cmd_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_set_raw_result,
-			cmd_index, UINT16);
+			cmd_index, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_set_raw_cmd_all =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_set_raw_result,
 			cmd_all, "all");
diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c
index ee16244de..06db0ca2d 100644
--- a/app/test-pmd/cmdline_mtr.c
+++ b/app/test-pmd/cmdline_mtr.c
@@ -253,7 +253,7 @@ cmdline_parse_token_string_t cmd_show_port_meter_cap_cap =
 		struct cmd_show_port_meter_cap_result, cap, "cap");
 cmdline_parse_token_num_t cmd_show_port_meter_cap_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_show_port_meter_cap_result, port_id, UINT16);
+		struct cmd_show_port_meter_cap_result, port_id, CMDLINE_UINT16);
 
 static void cmd_show_port_meter_cap_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -359,23 +359,23 @@ cmdline_parse_token_string_t cmd_add_port_meter_profile_srtcm_srtcm_rfc2697 =
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			profile_id, UINT32);
+			profile_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_cir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			cir, UINT64);
+			cir, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_cbs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			cbs, UINT64);
+			cbs, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_ebs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			ebs, UINT64);
+			ebs, CMDLINE_UINT64);
 
 static void cmd_add_port_meter_profile_srtcm_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -461,27 +461,27 @@ cmdline_parse_token_string_t cmd_add_port_meter_profile_trtcm_trtcm_rfc2698 =
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			profile_id, UINT32);
+			profile_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_cir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			cir, UINT64);
+			cir, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_pir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			pir, UINT64);
+			pir, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_cbs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			cbs, UINT64);
+			cbs, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_pbs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			pbs, UINT64);
+			pbs, CMDLINE_UINT64);
 
 static void cmd_add_port_meter_profile_trtcm_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -571,27 +571,27 @@ cmdline_parse_token_string_t
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			profile_id, UINT32);
+			profile_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_cir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			cir, UINT64);
+			cir, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_eir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			eir, UINT64);
+			eir, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_cbs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			cbs, UINT64);
+			cbs, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_ebs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			ebs, UINT64);
+			ebs, CMDLINE_UINT64);
 
 static void cmd_add_port_meter_profile_trtcm_rfc4115_parsed(
 	void *parsed_result,
@@ -672,11 +672,11 @@ cmdline_parse_token_string_t cmd_del_port_meter_profile_profile =
 cmdline_parse_token_num_t cmd_del_port_meter_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_meter_profile_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_meter_profile_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_meter_profile_result,
-			profile_id, UINT32);
+			profile_id, CMDLINE_UINT32);
 
 static void cmd_del_port_meter_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -742,13 +742,14 @@ cmdline_parse_token_string_t cmd_create_port_meter_meter =
 		struct cmd_create_port_meter_result, meter, "meter");
 cmdline_parse_token_num_t cmd_create_port_meter_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_create_port_meter_result, port_id, UINT16);
+		struct cmd_create_port_meter_result, port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_create_port_meter_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_create_port_meter_result, mtr_id, UINT32);
+		struct cmd_create_port_meter_result, mtr_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_create_port_meter_profile_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_create_port_meter_result, profile_id, UINT32);
+		struct cmd_create_port_meter_result, profile_id,
+		CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_create_port_meter_meter_enable =
 	TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result,
 		meter_enable, "yes#no");
@@ -763,10 +764,10 @@ cmdline_parse_token_string_t cmd_create_port_meter_r_action =
 		r_action, "R#Y#G#D#r#y#g#d");
 cmdline_parse_token_num_t cmd_create_port_meter_statistics_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_create_port_meter_result,
-		statistics_mask, UINT64);
+		statistics_mask, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_create_port_meter_shared =
 	TOKEN_NUM_INITIALIZER(struct cmd_create_port_meter_result,
-		shared, UINT32);
+		shared, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_create_port_meter_input_color =
 	TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result,
 		meter_input_color, TOKEN_STRING_MULTI);
@@ -866,10 +867,10 @@ cmdline_parse_token_string_t cmd_enable_port_meter_meter =
 		struct cmd_enable_port_meter_result, meter, "meter");
 cmdline_parse_token_num_t cmd_enable_port_meter_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_enable_port_meter_result, port_id, UINT16);
+		struct cmd_enable_port_meter_result, port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_enable_port_meter_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_enable_port_meter_result, mtr_id, UINT32);
+		struct cmd_enable_port_meter_result, mtr_id, CMDLINE_UINT32);
 
 static void cmd_enable_port_meter_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -927,10 +928,10 @@ cmdline_parse_token_string_t cmd_disable_port_meter_meter =
 		struct cmd_disable_port_meter_result, meter, "meter");
 cmdline_parse_token_num_t cmd_disable_port_meter_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_disable_port_meter_result, port_id, UINT16);
+		struct cmd_disable_port_meter_result, port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_disable_port_meter_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_disable_port_meter_result, mtr_id, UINT32);
+		struct cmd_disable_port_meter_result, mtr_id, CMDLINE_UINT32);
 
 static void cmd_disable_port_meter_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -988,10 +989,10 @@ cmdline_parse_token_string_t cmd_del_port_meter_meter =
 		struct cmd_del_port_meter_result, meter, "meter");
 cmdline_parse_token_num_t cmd_del_port_meter_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_del_port_meter_result, port_id, UINT16);
+		struct cmd_del_port_meter_result, port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_meter_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_del_port_meter_result, mtr_id, UINT32);
+		struct cmd_del_port_meter_result, mtr_id, CMDLINE_UINT32);
 
 static void cmd_del_port_meter_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1054,13 +1055,16 @@ cmdline_parse_token_string_t cmd_set_port_meter_profile_profile =
 		struct cmd_set_port_meter_profile_result, profile, "profile");
 cmdline_parse_token_num_t cmd_set_port_meter_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_profile_result, port_id, UINT16);
+		struct cmd_set_port_meter_profile_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_meter_profile_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_profile_result, mtr_id, UINT32);
+		struct cmd_set_port_meter_profile_result, mtr_id,
+		CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_meter_profile_profile_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_profile_result, profile_id, UINT32);
+		struct cmd_set_port_meter_profile_result, profile_id,
+		CMDLINE_UINT32);
 
 static void cmd_set_port_meter_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1208,15 +1212,15 @@ cmdline_parse_token_string_t cmd_set_port_meter_policer_action_action =
 cmdline_parse_token_num_t cmd_set_port_meter_policer_action_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_meter_policer_action_result, port_id,
-		UINT16);
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_meter_policer_action_mtr_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_meter_policer_action_result, mtr_id,
-		UINT32);
+		CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_meter_policer_action_action_mask =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_meter_policer_action_result, action_mask,
-		UINT32);
+		CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_set_port_meter_policer_action_policer_action =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_set_port_meter_policer_action_result,
@@ -1317,14 +1321,16 @@ cmdline_parse_token_string_t cmd_set_port_meter_stats_mask_mask =
 		struct cmd_set_port_meter_stats_mask_result, mask, "mask");
 cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_stats_mask_result, port_id, UINT16);
+		struct cmd_set_port_meter_stats_mask_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_stats_mask_result, mtr_id, UINT32);
+		struct cmd_set_port_meter_stats_mask_result, mtr_id,
+		CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_stats_mask =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_meter_stats_mask_result, stats_mask,
-		UINT64);
+		CMDLINE_UINT64);
 
 static void cmd_set_port_meter_stats_mask_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1389,10 +1395,12 @@ cmdline_parse_token_string_t cmd_show_port_meter_stats_stats =
 		struct cmd_show_port_meter_stats_result, stats, "stats");
 cmdline_parse_token_num_t cmd_show_port_meter_stats_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_show_port_meter_stats_result, port_id, UINT16);
+		struct cmd_show_port_meter_stats_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_meter_stats_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_show_port_meter_stats_result, mtr_id, UINT32);
+		struct cmd_show_port_meter_stats_result, mtr_id,
+		CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_show_port_meter_stats_clear =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_show_port_meter_stats_result, clear, "yes#no");
diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c
index 6951beb58..cdc3ca48e 100644
--- a/app/test-pmd/cmdline_tm.c
+++ b/app/test-pmd/cmdline_tm.c
@@ -217,7 +217,7 @@ cmdline_parse_token_string_t cmd_show_port_tm_cap_cap =
 		cap, "cap");
 cmdline_parse_token_num_t cmd_show_port_tm_cap_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_cap_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 
 static void cmd_show_port_tm_cap_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -354,10 +354,10 @@ cmdline_parse_token_string_t cmd_show_port_tm_level_cap_cap =
 		cap, "cap");
 cmdline_parse_token_num_t cmd_show_port_tm_level_cap_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_tm_level_cap_level_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
-		 level_id, UINT32);
+		 level_id, CMDLINE_UINT32);
 
 
 static void cmd_show_port_tm_level_cap_parsed(void *parsed_result,
@@ -481,10 +481,10 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_cap_cap =
 		cap, "cap");
 cmdline_parse_token_num_t cmd_show_port_tm_node_cap_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_tm_node_cap_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
-		 node_id, UINT32);
+		 node_id, CMDLINE_UINT32);
 
 static void cmd_show_port_tm_node_cap_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -593,14 +593,15 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_stats_stats =
 		struct cmd_show_port_tm_node_stats_result, stats, "stats");
 cmdline_parse_token_num_t cmd_show_port_tm_node_stats_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_stats_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_tm_node_stats_node_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_show_port_tm_node_stats_result,
-			node_id, UINT32);
+			node_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_show_port_tm_node_stats_clear =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_show_port_tm_node_stats_result, clear, UINT32);
+		struct cmd_show_port_tm_node_stats_result, clear,
+			CMDLINE_UINT32);
 
 static void cmd_show_port_tm_node_stats_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -712,11 +713,11 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_type_type =
 cmdline_parse_token_num_t cmd_show_port_tm_node_type_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_show_port_tm_node_type_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_tm_node_type_node_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_show_port_tm_node_type_result,
-			node_id, UINT32);
+			node_id, CMDLINE_UINT32);
 
 static void cmd_show_port_tm_node_type_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -804,31 +805,31 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_profile =
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_shaper_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			shaper_id, UINT32);
+			shaper_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_rate =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			cmit_tb_rate, UINT64);
+			cmit_tb_rate, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_size =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			cmit_tb_size, UINT64);
+			cmit_tb_size, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_rate =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			peak_tb_rate, UINT64);
+			peak_tb_rate, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_size =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			peak_tb_size, UINT64);
+			peak_tb_size, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_pktlen_adjust =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			pktlen_adjust, UINT32);
+			pktlen_adjust, CMDLINE_UINT32);
 
 static void cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -920,11 +921,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_profile =
 cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_shaper_profile_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_shaper_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_shaper_profile_result,
-			shaper_id, UINT32);
+			shaper_id, CMDLINE_UINT32);
 
 static void cmd_del_port_tm_node_shaper_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1001,15 +1002,15 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_shaper =
 cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shared_shaper_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shared_shaper_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shared_shaper_result,
-			shared_shaper_id, UINT32);
+			shared_shaper_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shaper_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shared_shaper_result,
-			shaper_profile_id, UINT32);
+			shaper_profile_id, CMDLINE_UINT32);
 
 static void cmd_add_port_tm_node_shared_shaper_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1101,11 +1102,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_shaper =
 cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_shared_shaper_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_shared_shaper_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_shared_shaper_result,
-			shared_shaper_id, UINT32);
+			shared_shaper_id, CMDLINE_UINT32);
 
 static void cmd_del_port_tm_node_shared_shaper_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1194,11 +1195,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_profile =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wred_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			wred_profile_id, UINT32);
+			wred_profile_id, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
@@ -1206,19 +1207,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			min_th_g, UINT64);
+			min_th_g, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			max_th_g, UINT64);
+			max_th_g, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			maxp_inv_g, UINT16);
+			maxp_inv_g, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			wq_log2_g, UINT16);
+			wq_log2_g, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
@@ -1226,19 +1227,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			min_th_y, UINT64);
+			min_th_y, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			max_th_y, UINT64);
+			max_th_y, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			maxp_inv_y, UINT16);
+			maxp_inv_y, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			wq_log2_y, UINT16);
+			wq_log2_y, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
@@ -1246,19 +1247,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			min_th_r, UINT64);
+			min_th_r, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			max_th_r, UINT64);
+			max_th_r, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			maxp_inv_r, UINT16);
+			maxp_inv_r, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			wq_log2_r, UINT16);
+			wq_log2_r, CMDLINE_UINT16);
 
 
 static void cmd_add_port_tm_node_wred_profile_parsed(void *parsed_result,
@@ -1374,11 +1375,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_profile =
 cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_wred_profile_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_wred_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_wred_profile_result,
-			wred_profile_id, UINT32);
+			wred_profile_id, CMDLINE_UINT32);
 
 static void cmd_del_port_tm_node_wred_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1456,15 +1457,15 @@ cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_profile =
 cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_tm_node_shaper_profile_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_shaper_profile_result,
-		node_id, UINT32);
+		node_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t
 	cmd_set_port_tm_node_shaper_shaper_profile_profile_id =
 		TOKEN_NUM_INITIALIZER(
 			struct cmd_set_port_tm_node_shaper_profile_result,
-			shaper_profile_id, UINT32);
+			shaper_profile_id, CMDLINE_UINT32);
 
 static void cmd_set_port_tm_node_shaper_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1550,31 +1551,31 @@ cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_node =
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_nonleaf_node_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 node_id, UINT32);
+		 node_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_parent_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 parent_node_id, INT32);
+		 parent_node_id, CMDLINE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 priority, UINT32);
+		 priority, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_weight =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 weight, UINT32);
+		 weight, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_level_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 level_id, UINT32);
+		 level_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_shaper_profile_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 shaper_profile_id, INT32);
+		 shaper_profile_id, CMDLINE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_n_sp_priorities =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 n_sp_priorities, UINT32);
+		 n_sp_priorities, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_stats_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 stats_mask, UINT64);
+		 stats_mask, CMDLINE_UINT64);
 cmdline_parse_token_string_t
 	cmd_add_port_tm_nonleaf_node_multi_shared_shaper_id =
 	TOKEN_STRING_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
@@ -1708,34 +1709,34 @@ cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_node =
 		struct cmd_add_port_tm_leaf_node_result, node, "node");
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 node_id, UINT32);
+		 node_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_parent_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 parent_node_id, INT32);
+		 parent_node_id, CMDLINE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 priority, UINT32);
+		 priority, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_weight =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 weight, UINT32);
+		 weight, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_level_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 level_id, UINT32);
+		 level_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_shaper_profile_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 shaper_profile_id, INT32);
+		 shaper_profile_id, CMDLINE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_cman_mode =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 cman_mode, UINT32);
+		 cman_mode, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_wred_profile_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 wred_profile_id, UINT32);
+		 wred_profile_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_stats_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 stats_mask, UINT64);
+		 stats_mask, CMDLINE_UINT64);
 cmdline_parse_token_string_t
 	cmd_add_port_tm_leaf_node_multi_shared_shaper_id =
 	TOKEN_STRING_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
@@ -1858,10 +1859,10 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_node =
 		struct cmd_del_port_tm_node_result, node, "node");
 cmdline_parse_token_num_t cmd_del_port_tm_node_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_del_port_tm_node_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_tm_node_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_del_port_tm_node_result,
-		node_id, UINT32);
+		node_id, CMDLINE_UINT32);
 
 static void cmd_del_port_tm_node_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1936,19 +1937,21 @@ cmdline_parse_token_string_t cmd_set_port_tm_node_parent_parent =
 		struct cmd_set_port_tm_node_parent_result, parent, "parent");
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_tm_node_parent_result, port_id, UINT16);
+		struct cmd_set_port_tm_node_parent_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_node_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_tm_node_parent_result, node_id, UINT32);
+		struct cmd_set_port_tm_node_parent_result, node_id,
+		CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_parent_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
-		parent_id, UINT32);
+		parent_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
-		priority, UINT32);
+		priority, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_weight =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
-		weight, UINT32);
+		weight, CMDLINE_UINT32);
 
 static void cmd_set_port_tm_node_parent_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2024,10 +2027,12 @@ cmdline_parse_token_string_t cmd_suspend_port_tm_node_node =
 		struct cmd_suspend_port_tm_node_result, node, "node");
 cmdline_parse_token_num_t cmd_suspend_port_tm_node_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_suspend_port_tm_node_result, port_id, UINT16);
+		struct cmd_suspend_port_tm_node_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_suspend_port_tm_node_node_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_suspend_port_tm_node_result, node_id, UINT32);
+		struct cmd_suspend_port_tm_node_result, node_id,
+		CMDLINE_UINT32);
 
 static void cmd_suspend_port_tm_node_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2089,10 +2094,10 @@ cmdline_parse_token_string_t cmd_resume_port_tm_node_node =
 		struct cmd_resume_port_tm_node_result, node, "node");
 cmdline_parse_token_num_t cmd_resume_port_tm_node_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_resume_port_tm_node_result, port_id, UINT16);
+		struct cmd_resume_port_tm_node_result, port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_resume_port_tm_node_node_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_resume_port_tm_node_result, node_id, UINT32);
+		struct cmd_resume_port_tm_node_result, node_id, CMDLINE_UINT32);
 
 static void cmd_resume_port_tm_node_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2156,7 +2161,7 @@ cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_commit =
 cmdline_parse_token_num_t cmd_port_tm_hierarchy_commit_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_port_tm_hierarchy_commit_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_clean_on_fail =
 	TOKEN_STRING_INITIALIZER(struct cmd_port_tm_hierarchy_commit_result,
 		 clean_on_fail, "yes#no");
@@ -2236,17 +2241,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_ip_ecn =
 				 ip_ecn, "ip_ecn");
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_green =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-			      green, UINT16);
+			      green, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_yellow =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-			      yellow, UINT16);
+			      yellow, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_red =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-				red, UINT16);
+				red, CMDLINE_UINT16);
 
 static void cmd_port_tm_mark_ip_ecn_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2323,17 +2328,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_ip_dscp =
 				 ip_dscp, "ip_dscp");
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_green =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-				green, UINT16);
+				green, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_yellow =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-				yellow, UINT16);
+				yellow, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_red =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-				red, UINT16);
+				red, CMDLINE_UINT16);
 
 static void cmd_port_tm_mark_ip_dscp_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2410,17 +2415,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_vlan_dei =
 				 vlan_dei, "vlan_dei");
 cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_green =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-				green, UINT16);
+				green, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_yellow =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-				yellow, UINT16);
+				yellow, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_red =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-				red, UINT16);
+				red, CMDLINE_UINT16);
 
 static void cmd_port_tm_mark_vlan_dei_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
diff --git a/app/test/test_cmdline_num.c b/app/test/test_cmdline_num.c
index a6ad95507..a2f79ae85 100644
--- a/app/test/test_cmdline_num.c
+++ b/app/test/test_cmdline_num.c
@@ -220,31 +220,31 @@ static int
 can_parse_unsigned(uint64_t expected_result, enum cmdline_numtype type)
 {
 	switch (type) {
-	case UINT8:
+	case CMDLINE_UINT8:
 		if (expected_result > UINT8_MAX)
 			return 0;
 		break;
-	case UINT16:
+	case CMDLINE_UINT16:
 		if (expected_result > UINT16_MAX)
 			return 0;
 		break;
-	case UINT32:
+	case CMDLINE_UINT32:
 		if (expected_result > UINT32_MAX)
 			return 0;
 		break;
-	case INT8:
+	case CMDLINE_INT8:
 		if (expected_result > INT8_MAX)
 			return 0;
 		break;
-	case INT16:
+	case CMDLINE_INT16:
 		if (expected_result > INT16_MAX)
 			return 0;
 		break;
-	case INT32:
+	case CMDLINE_INT32:
 		if (expected_result > INT32_MAX)
 			return 0;
 		break;
-	case INT64:
+	case CMDLINE_INT64:
 		if (expected_result > INT64_MAX)
 			return 0;
 		break;
@@ -258,31 +258,31 @@ static int
 can_parse_signed(int64_t expected_result, enum cmdline_numtype type)
 {
 	switch (type) {
-	case UINT8:
+	case CMDLINE_UINT8:
 		if (expected_result > UINT8_MAX || expected_result < 0)
 			return 0;
 		break;
-	case UINT16:
+	case CMDLINE_UINT16:
 		if (expected_result > UINT16_MAX || expected_result < 0)
 			return 0;
 		break;
-	case UINT32:
+	case CMDLINE_UINT32:
 		if (expected_result > UINT32_MAX || expected_result < 0)
 			return 0;
 		break;
-	case UINT64:
+	case CMDLINE_UINT64:
 		if (expected_result < 0)
 			return 0;
 		break;
-	case INT8:
+	case CMDLINE_INT8:
 		if (expected_result > INT8_MAX || expected_result < INT8_MIN)
 			return 0;
 		break;
-	case INT16:
+	case CMDLINE_INT16:
 		if (expected_result > INT16_MAX || expected_result < INT16_MIN)
 			return 0;
 		break;
-	case INT32:
+	case CMDLINE_INT32:
 		if (expected_result > INT32_MAX || expected_result < INT32_MIN)
 			return 0;
 		break;
@@ -302,7 +302,7 @@ test_parse_num_invalid_param(void)
 	int ret = 0;
 
 	/* set up a token */
-	token.num_data.type = UINT32;
+	token.num_data.type = CMDLINE_UINT32;
 
 	/* copy string to buffer */
 	strlcpy(buf, num_valid_positive_strs[0].str, sizeof(buf));
@@ -375,7 +375,7 @@ test_parse_num_invalid_data(void)
 	cmdline_parse_token_num_t token;
 
 	/* cycle through all possible parsed types */
-	for (type = UINT8; type <= INT64; type++) {
+	for (type = CMDLINE_UINT8; type <= CMDLINE_INT64; type++) {
 		token.num_data.type = type;
 
 		/* test full strings */
@@ -414,7 +414,7 @@ test_parse_num_valid(void)
 	/** valid strings **/
 
 	/* cycle through all possible parsed types */
-	for (type = UINT8; type <= INT64; type++) {
+	for (type = CMDLINE_UINT8; type <= CMDLINE_INT64; type++) {
 		token.num_data.type = type;
 
 		/* test positive strings */
@@ -468,13 +468,13 @@ test_parse_num_valid(void)
 			if (ret > 0) {
 				/* detect negative */
 				switch (type) {
-				case INT8:
+				case CMDLINE_INT8:
 					result = (int8_t) result;
 					break;
-				case INT16:
+				case CMDLINE_INT16:
 					result = (int16_t) result;
 					break;
-				case INT32:
+				case CMDLINE_INT32:
 					result = (int32_t) result;
 					break;
 				default:
@@ -492,7 +492,7 @@ test_parse_num_valid(void)
 	/** garbage strings **/
 
 	/* cycle through all possible parsed types */
-	for (type = UINT8; type <= INT64; type++) {
+	for (type = CMDLINE_UINT8; type <= CMDLINE_INT64; type++) {
 		token.num_data.type = type;
 
 		/* test positive garbage strings */
@@ -546,15 +546,15 @@ test_parse_num_valid(void)
 			if (ret > 0) {
 				/* detect negative */
 				switch (type) {
-				case INT8:
+				case CMDLINE_INT8:
 					if (result & (INT8_MAX + 1))
 						result |= 0xFFFFFFFFFFFFFF00ULL;
 					break;
-				case INT16:
+				case CMDLINE_INT16:
 					if (result & (INT16_MAX + 1))
 						result |= 0xFFFFFFFFFFFF0000ULL;
 					break;
-				case INT32:
+				case CMDLINE_INT32:
 					if (result & (INT32_MAX + 1ULL))
 						result |= 0xFFFFFFFF00000000ULL;
 					break;
diff --git a/examples/ethtool/ethtool-app/ethapp.c b/examples/ethtool/ethtool-app/ethapp.c
index b6b967118..272e86966 100644
--- a/examples/ethtool/ethtool-app/ethapp.c
+++ b/examples/ethtool/ethtool-app/ethapp.c
@@ -70,7 +70,7 @@ cmdline_parse_token_string_t pcmd_rxmode_token_cmd =
 cmdline_parse_token_string_t pcmd_portstats_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_int_params, cmd, "portstats");
 cmdline_parse_token_num_t pcmd_int_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_int_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_int_params, port, CMDLINE_UINT16);
 
 /* Commands taking port id and string */
 cmdline_parse_token_string_t pcmd_eeprom_token_cmd =
@@ -84,7 +84,7 @@ cmdline_parse_token_string_t pcmd_regs_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, cmd, "regs");
 
 cmdline_parse_token_num_t pcmd_intstr_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, CMDLINE_UINT16);
 cmdline_parse_token_string_t pcmd_intstr_token_opt =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, opt, NULL);
 
@@ -92,7 +92,7 @@ cmdline_parse_token_string_t pcmd_intstr_token_opt =
 cmdline_parse_token_string_t pcmd_macaddr_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intmac_params, cmd, "macaddr");
 cmdline_parse_token_num_t pcmd_intmac_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intmac_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intmac_params, port, CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t pcmd_intmac_token_mac =
 	TOKEN_ETHERADDR_INITIALIZER(struct pcmd_intmac_params, mac);
 
@@ -106,18 +106,19 @@ cmdline_parse_token_string_t pcmd_ringparam_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intintint_params, cmd,
 		"ringparam");
 cmdline_parse_token_num_t pcmd_intintint_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, port,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t pcmd_intintint_token_tx =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, tx, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, tx, CMDLINE_UINT16);
 cmdline_parse_token_num_t pcmd_intintint_token_rx =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, rx, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, rx, CMDLINE_UINT16);
 
 
 /* Pause commands */
 cmdline_parse_token_string_t pcmd_pause_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, cmd, "pause");
 cmdline_parse_token_num_t pcmd_pause_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, CMDLINE_UINT16);
 cmdline_parse_token_string_t pcmd_pause_token_opt =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params,
 		opt, "all#tx#rx#none");
@@ -126,11 +127,11 @@ cmdline_parse_token_string_t pcmd_pause_token_opt =
 cmdline_parse_token_string_t pcmd_vlan_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_vlan_params, cmd, "vlan");
 cmdline_parse_token_num_t pcmd_vlan_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, port, CMDLINE_UINT16);
 cmdline_parse_token_string_t pcmd_vlan_token_mode =
 	TOKEN_STRING_INITIALIZER(struct pcmd_vlan_params, mode, "add#del");
 cmdline_parse_token_num_t pcmd_vlan_token_vid =
-	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, vid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, vid, CMDLINE_UINT16);
 
 
 static void
diff --git a/examples/ipsec-secgw/parser.c b/examples/ipsec-secgw/parser.c
index 8f6666032..4d8fcf32b 100644
--- a/examples/ipsec-secgw/parser.c
+++ b/examples/ipsec-secgw/parser.c
@@ -560,7 +560,7 @@ cmdline_parse_token_string_t cfg_add_neigh_start =
 cmdline_parse_token_string_t cfg_add_neigh_pstr =
 	TOKEN_STRING_INITIALIZER(struct cfg_neigh_add_item, pstr, "port");
 cmdline_parse_token_num_t cfg_add_neigh_port =
-	TOKEN_NUM_INITIALIZER(struct cfg_neigh_add_item, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cfg_neigh_add_item, port, CMDLINE_UINT16);
 cmdline_parse_token_string_t cfg_add_neigh_mac =
 	TOKEN_STRING_INITIALIZER(struct cfg_neigh_add_item, mac, NULL);
 
diff --git a/examples/qos_sched/cmdline.c b/examples/qos_sched/cmdline.c
index ba68e0d02..7bb8058f8 100644
--- a/examples/qos_sched/cmdline.c
+++ b/examples/qos_sched/cmdline.c
@@ -113,7 +113,7 @@ cmdline_parse_token_string_t cmd_setqavg_param_string =
                                 "period#n");
 cmdline_parse_token_num_t cmd_setqavg_number =
         TOKEN_NUM_INITIALIZER(struct cmd_setqavg_result, number,
-                                UINT32);
+				CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_setqavg = {
         .f = cmd_setqavg_parsed,
@@ -188,10 +188,10 @@ cmdline_parse_token_string_t cmd_subportstats_subport_string =
                                 "subport");
 cmdline_parse_token_num_t cmd_subportstats_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_subportstats_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_subportstats_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_subportstats_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_subportstats = {
         .f = cmd_subportstats_parsed,
@@ -236,19 +236,19 @@ cmdline_parse_token_string_t cmd_pipestats_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_pipestats_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_pipestats_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_pipestats_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_pipestats_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_pipestats_pipe_string =
         TOKEN_STRING_INITIALIZER(struct cmd_pipestats_result, pipe_string,
                                 "pipe");
 cmdline_parse_token_num_t cmd_pipestats_pipe_number =
         TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, pipe_number,
-                                UINT32);
+				CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_pipestats = {
         .f = cmd_pipestats_parsed,
@@ -299,31 +299,31 @@ cmdline_parse_token_string_t cmd_avg_q_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_q_port_number =
 	TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_avg_q_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_q_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_avg_q_pipe_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, pipe_string,
                                 "pipe");
 cmdline_parse_token_num_t cmd_avg_q_pipe_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, pipe_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_avg_q_tc_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, tc_string,
                                 "tc");
 cmdline_parse_token_num_t cmd_avg_q_tc_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, tc_number,
-                                UINT8);
+				CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_avg_q_q_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, q_string,
                                 "q");
 cmdline_parse_token_num_t cmd_avg_q_q_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, q_number,
-                                UINT8);
+				CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_avg_q = {
         .f = cmd_avg_q_parsed,
@@ -376,25 +376,25 @@ cmdline_parse_token_string_t cmd_avg_tcpipe_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_tcpipe_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_avg_tcpipe_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_tcpipe_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_avg_tcpipe_pipe_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, pipe_string,
                                 "pipe");
 cmdline_parse_token_num_t cmd_avg_tcpipe_pipe_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, pipe_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_avg_tcpipe_tc_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, tc_string,
                                 "tc");
 cmdline_parse_token_num_t cmd_avg_tcpipe_tc_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, tc_number,
-                                UINT8);
+				CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_avg_tcpipe = {
         .f = cmd_avg_tcpipe_parsed,
@@ -443,19 +443,19 @@ cmdline_parse_token_string_t cmd_avg_pipe_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_pipe_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_avg_pipe_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_pipe_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_pipe_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_avg_pipe_pipe_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_pipe_result, pipe_string,
                                 "pipe");
 cmdline_parse_token_num_t cmd_avg_pipe_pipe_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, pipe_number,
-                                UINT32);
+				CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_avg_pipe = {
         .f = cmd_avg_pipe_parsed,
@@ -502,19 +502,19 @@ cmdline_parse_token_string_t cmd_avg_tcsubport_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_tcsubport_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_avg_tcsubport_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcsubport_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_tcsubport_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_avg_tcsubport_tc_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcsubport_result, tc_string,
                                 "tc");
 cmdline_parse_token_num_t cmd_avg_tcsubport_tc_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, tc_number,
-                                UINT8);
+				CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_avg_tcsubport = {
         .f = cmd_avg_tcsubport_parsed,
@@ -559,13 +559,13 @@ cmdline_parse_token_string_t cmd_avg_subport_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_subport_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_subport_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_avg_subport_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_subport_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_subport_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_subport_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_avg_subport = {
         .f = cmd_avg_subport_parsed,
diff --git a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
index 96c1a1ff6..d15e0fc1f 100644
--- a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
+++ b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
@@ -446,7 +446,7 @@ cmdline_parse_token_string_t cmd_set_cpu_freq =
 			set_cpu_freq, "set_cpu_freq");
 cmdline_parse_token_num_t cmd_set_cpu_freq_core_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_cpu_freq_result,
-			lcore_id, UINT8);
+			lcore_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result,
 			cmd, "up#down#min#max#enable_turbo#disable_turbo");
diff --git a/examples/vm_power_manager/vm_power_cli.c b/examples/vm_power_manager/vm_power_cli.c
index 7edeaccda..0128f047f 100644
--- a/examples/vm_power_manager/vm_power_cli.c
+++ b/examples/vm_power_manager/vm_power_cli.c
@@ -155,10 +155,10 @@ cmdline_parse_token_string_t cmd_set_pcpu_vm_name =
 				vm_name, NULL);
 cmdline_parse_token_num_t set_pcpu_vcpu =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_pcpu_result,
-				vcpu, UINT8);
+				vcpu, CMDLINE_UINT8);
 cmdline_parse_token_num_t set_pcpu_core =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_pcpu_result,
-				core, UINT64);
+				core, CMDLINE_UINT64);
 
 
 cmdline_parse_inst_t cmd_set_pcpu_set = {
@@ -455,7 +455,7 @@ cmdline_parse_token_string_t cmd_show_cpu_freq =
 
 cmdline_parse_token_num_t cmd_show_cpu_freq_core_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_cpu_freq_result,
-			core_num, UINT8);
+			core_num, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_show_cpu_freq_set = {
 	.f = cmd_show_cpu_freq_parsed,
@@ -504,7 +504,7 @@ cmdline_parse_token_string_t cmd_set_cpu_freq =
 			set_cpu_freq, "set_cpu_freq");
 cmdline_parse_token_num_t cmd_set_cpu_freq_core_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_cpu_freq_result,
-			core_num, UINT8);
+			core_num, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result,
 			cmd, "up#down#min#max#enable_turbo#disable_turbo");
diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/librte_cmdline/cmdline_parse_num.c
index 478f181b4..e96cddc9f 100644
--- a/lib/librte_cmdline/cmdline_parse_num.c
+++ b/lib/librte_cmdline/cmdline_parse_num.c
@@ -57,9 +57,8 @@ static inline int
 add_to_res(unsigned int c, uint64_t *res, unsigned int base)
 {
 	/* overflow */
-	if ( (UINT64_MAX - c) / base < *res ) {
+	if ((UINT64_MAX - c) / base < *res)
 		return -1;
-	}
 
 	*res = (uint64_t) (*res * base + c);
 	return 0;
@@ -69,23 +68,23 @@ static int
 check_res_size(struct cmdline_token_num_data *nd, unsigned ressize)
 {
 	switch (nd->type) {
-	case INT8:
-	case UINT8:
+	case CMDLINE_INT8:
+	case CMDLINE_UINT8:
 		if (ressize < sizeof(int8_t))
 			return -1;
 		break;
-	case INT16:
-	case UINT16:
+	case CMDLINE_INT16:
+	case CMDLINE_UINT16:
 		if (ressize < sizeof(int16_t))
 			return -1;
 		break;
-	case INT32:
-	case UINT32:
+	case CMDLINE_INT32:
+	case CMDLINE_UINT32:
 		if (ressize < sizeof(int32_t))
 			return -1;
 		break;
-	case INT64:
-	case UINT64:
+	case CMDLINE_INT64:
+	case CMDLINE_UINT64:
 		if (ressize < sizeof(int64_t))
 			return -1;
 		break;
@@ -123,7 +122,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res,
 			return -1;
 	}
 
-	while ( st != ERROR && c && ! cmdline_isendoftoken(c) ) {
+	while (st != ERROR && c && !cmdline_isendoftoken(c)) {
 		debug_printf("%c %x -> ", c, c);
 		switch (st) {
 		case START:
@@ -259,61 +258,53 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res,
 	case HEX_OK:
 	case OCTAL_OK:
 	case BIN_OK:
-		if ( nd.type == INT8 && res1 <= INT8_MAX ) {
+		if (nd.type == CMDLINE_INT8 && res1 <= INT8_MAX) {
 			if (res) *(int8_t *)res = (int8_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT16 && res1 <= INT16_MAX ) {
+		} else if (nd.type == CMDLINE_INT16 && res1 <= INT16_MAX) {
 			if (res) *(int16_t *)res = (int16_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT32 && res1 <= INT32_MAX ) {
+		} else if (nd.type == CMDLINE_INT32 && res1 <= INT32_MAX) {
 			if (res) *(int32_t *)res = (int32_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT64 && res1 <= INT64_MAX ) {
+		} else if (nd.type == CMDLINE_INT64 && res1 <= INT64_MAX) {
 			if (res) *(int64_t *)res = (int64_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == UINT8 && res1 <= UINT8_MAX ) {
+		} else if (nd.type == CMDLINE_UINT8 && res1 <= UINT8_MAX) {
 			if (res) *(uint8_t *)res = (uint8_t) res1;
 			return buf-srcbuf;
-		}
-		else if (nd.type == UINT16  && res1 <= UINT16_MAX ) {
+		} else if (nd.type == CMDLINE_UINT16  && res1 <= UINT16_MAX) {
 			if (res) *(uint16_t *)res = (uint16_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == UINT32 && res1 <= UINT32_MAX ) {
+		} else if (nd.type == CMDLINE_UINT32 && res1 <= UINT32_MAX) {
 			if (res) *(uint32_t *)res = (uint32_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == UINT64 ) {
+		} else if (nd.type == CMDLINE_UINT64) {
 			if (res) *(uint64_t *)res = res1;
 			return buf-srcbuf;
-		}
-		else {
+		} else {
 			return -1;
 		}
 		break;
 
 	case DEC_NEG_OK:
-		if ( nd.type == INT8 && res1 <= INT8_MAX + 1 ) {
+		if (nd.type == CMDLINE_INT8 &&
+				res1 <= INT8_MAX + 1) {
 			if (res) *(int8_t *)res = (int8_t) (-res1);
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT16 && res1 <= (uint16_t)INT16_MAX + 1 ) {
+		} else if (nd.type == CMDLINE_INT16 &&
+				res1 <= (uint16_t)INT16_MAX + 1) {
 			if (res) *(int16_t *)res = (int16_t) (-res1);
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT32 && res1 <= (uint32_t)INT32_MAX + 1 ) {
+		} else if (nd.type == CMDLINE_INT32 &&
+				res1 <= (uint32_t)INT32_MAX + 1) {
 			if (res) *(int32_t *)res = (int32_t) (-res1);
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT64 && res1 <= (uint64_t)INT64_MAX + 1 ) {
+		} else if (nd.type == CMDLINE_INT64 &&
+				res1 <= (uint64_t)INT64_MAX + 1) {
 			if (res) *(int64_t *)res = (int64_t) (-res1);
 			return buf-srcbuf;
-		}
-		else {
+		} else {
 			return -1;
 		}
 		break;
diff --git a/lib/librte_cmdline/cmdline_parse_num.h b/lib/librte_cmdline/cmdline_parse_num.h
index 58b28cad7..28b04520f 100644
--- a/lib/librte_cmdline/cmdline_parse_num.h
+++ b/lib/librte_cmdline/cmdline_parse_num.h
@@ -14,14 +14,14 @@ extern "C" {
 #endif
 
 enum cmdline_numtype {
-	UINT8 = 0,
-	UINT16,
-	UINT32,
-	UINT64,
-	INT8,
-	INT16,
-	INT32,
-	INT64
+	CMDLINE_UINT8 = 0,
+	CMDLINE_UINT16,
+	CMDLINE_UINT32,
+	CMDLINE_UINT64,
+	CMDLINE_INT8,
+	CMDLINE_INT16,
+	CMDLINE_INT32,
+	CMDLINE_INT64
 };
 
 struct cmdline_token_num_data {
-- 
2.25.4


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [dpdk-dev] [PATCH] cmdline: avoid name clash with Windows system types
  2020-08-21 18:48 [dpdk-dev] [PATCH] cmdline: avoid name clash with Windows system types Dmitry Kozlyuk
@ 2020-08-21 20:58 ` Jie Zhou
  2020-08-22  0:43 ` Ranjit Menon
  2020-09-02 18:38 ` [dpdk-dev] [PATCH v2] " Dmitry Kozlyuk
  2 siblings, 0 replies; 13+ messages in thread
From: Jie Zhou @ 2020-08-21 20:58 UTC (permalink / raw)
  To: Dmitry Kozlyuk, dev

Tested-by: Jie Zhou (jizh@microsoft.com).
Verified: No number type redefinition compliation errors anymore at compiling test-pmd.


Fri, Aug 21, 2020 at 09:48:55PM +0300, Dmitry Kozlyuk wrote:
> cmdline_numtype member names clash with Windows system identifiers.
> Add CMDLINE_ prefix to cmdline constants to avoid this and possible
> future conflicts.
> 
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
> ---
> 
> This patch made some lines overlong. When breaking them, indentation
> style is kept consistent with nearby code; it's weird in some places.
> 
>  app/test-cmdline/commands.c                   |   2 +-
>  app/test-pmd/bpf_cmd.c                        |  10 +-
>  app/test-pmd/cmdline.c                        | 715 ++++++++++--------
>  app/test-pmd/cmdline_flow.c                   |   2 +-
>  app/test-pmd/cmdline_mtr.c                    |  92 ++-
>  app/test-pmd/cmdline_tm.c                     | 177 ++---
>  app/test/test_cmdline_num.c                   |  48 +-
>  examples/ethtool/ethtool-app/ethapp.c         |  19 +-
>  examples/ipsec-secgw/parser.c                 |   2 +-
>  examples/qos_sched/cmdline.c                  |  46 +-
>  .../guest_cli/vm_power_cli_guest.c            |   2 +-
>  examples/vm_power_manager/vm_power_cli.c      |   8 +-
>  lib/librte_cmdline/cmdline_parse_num.c        |  65 +-
>  lib/librte_cmdline/cmdline_parse_num.h        |  16 +-
>  14 files changed, 627 insertions(+), 577 deletions(-)
> 
> diff --git a/app/test-cmdline/commands.c b/app/test-cmdline/commands.c
> index d67c0ca6a..b6e13ca46 100644
> --- a/app/test-cmdline/commands.c
> +++ b/app/test-cmdline/commands.c
> @@ -193,7 +193,7 @@ cmd_num_parsed(void *parsed_result,
>  }
>  
>  cmdline_parse_token_num_t cmd_num_tok =
> -	TOKEN_NUM_INITIALIZER(struct cmd_num_result, num, UINT32);
> +	TOKEN_NUM_INITIALIZER(struct cmd_num_result, num, CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_num = {
>  	.f = cmd_num_parsed,  /* function to call */
> diff --git a/app/test-pmd/bpf_cmd.c b/app/test-pmd/bpf_cmd.c
> index 0f984ccf4..51b37a4d0 100644
> --- a/app/test-pmd/bpf_cmd.c
> +++ b/app/test-pmd/bpf_cmd.c
> @@ -124,9 +124,9 @@ cmdline_parse_token_string_t cmd_load_bpf_dir =
>  	TOKEN_STRING_INITIALIZER(struct cmd_bpf_ld_result,
>  			dir, "rx#tx");
>  cmdline_parse_token_num_t cmd_load_bpf_port =
> -	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, port, UINT8);
> +	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, port, CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_load_bpf_queue =
> -	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, queue, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, queue, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_load_bpf_flags =
>  	TOKEN_STRING_INITIALIZER(struct cmd_bpf_ld_result,
>  			flags, NULL);
> @@ -180,9 +180,11 @@ cmdline_parse_token_string_t cmd_unload_bpf_dir =
>  	TOKEN_STRING_INITIALIZER(struct cmd_bpf_unld_result,
>  			dir, "rx#tx");
>  cmdline_parse_token_num_t cmd_unload_bpf_port =
> -	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, port, UINT8);
> +	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result,
> +			port, CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_unload_bpf_queue =
> -	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, queue, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result,
> +			queue, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_operate_bpf_unld_parse = {
>  	.f = cmd_operate_bpf_unld_parsed,
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index 0a6ed85f3..455b0dd98 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -1378,7 +1378,7 @@ cmdline_parse_token_string_t cmd_operate_specific_port_port =
>  						name, "start#stop#close#reset");
>  cmdline_parse_token_num_t cmd_operate_specific_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_operate_specific_port_result,
> -							value, UINT8);
> +							value, CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_operate_specific_port = {
>  	.f = cmd_operate_specific_port_parsed,
> @@ -1516,7 +1516,7 @@ cmdline_parse_token_string_t cmd_operate_detach_port_keyword =
>  			keyword, "detach");
>  cmdline_parse_token_num_t cmd_operate_detach_port_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_operate_detach_port_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_operate_detach_port = {
>  	.f = cmd_operate_detach_port_parsed,
> @@ -1740,7 +1740,8 @@ cmdline_parse_token_string_t cmd_config_speed_specific_keyword =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, keyword,
>  								"config");
>  cmdline_parse_token_num_t cmd_config_speed_specific_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_speed_specific, id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_speed_specific, id,
> +							CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_speed_specific_item1 =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, item1,
>  								"speed");
> @@ -1812,7 +1813,8 @@ cmdline_parse_token_string_t cmd_config_loopback_all_item =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_loopback_all, item,
>  							"loopback");
>  cmdline_parse_token_num_t cmd_config_loopback_all_mode =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_all, mode, UINT32);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_all, mode,
> +							CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_config_loopback_all = {
>  	.f = cmd_config_loopback_all_parsed,
> @@ -1866,13 +1868,13 @@ cmdline_parse_token_string_t cmd_config_loopback_specific_keyword =
>  								"config");
>  cmdline_parse_token_num_t cmd_config_loopback_specific_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_specific, port_id,
> -								UINT16);
> +								CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_loopback_specific_item =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_loopback_specific, item,
>  								"loopback");
>  cmdline_parse_token_num_t cmd_config_loopback_specific_mode =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_specific, mode,
> -			      UINT32);
> +			      CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_config_loopback_specific = {
>  	.f = cmd_config_loopback_specific_parsed,
> @@ -1957,7 +1959,7 @@ cmdline_parse_token_string_t cmd_config_rx_tx_name =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_rx_tx, name,
>  						"rxq#txq#rxd#txd");
>  cmdline_parse_token_num_t cmd_config_rx_tx_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_rx_tx, value, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_rx_tx, value, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_config_rx_tx = {
>  	.f = cmd_config_rx_tx_parsed,
> @@ -2039,7 +2041,7 @@ cmdline_parse_token_string_t cmd_config_max_pkt_len_name =
>  								"max-pkt-len");
>  cmdline_parse_token_num_t cmd_config_max_pkt_len_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_max_pkt_len_result, value,
> -								UINT32);
> +								CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_config_max_pkt_len = {
>  	.f = cmd_config_max_pkt_len_parsed,
> @@ -2111,7 +2113,7 @@ cmdline_parse_token_string_t cmd_config_max_lro_pkt_size_name =
>  				 name, "max-lro-pkt-size");
>  cmdline_parse_token_num_t cmd_config_max_lro_pkt_size_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_max_lro_pkt_size_result,
> -			      value, UINT32);
> +			      value, CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_config_max_lro_pkt_size = {
>  	.f = cmd_config_max_lro_pkt_size_parsed,
> @@ -2160,9 +2162,11 @@ cmdline_parse_token_string_t cmd_config_mtu_mtu =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_mtu_result, keyword,
>  				 "mtu");
>  cmdline_parse_token_num_t cmd_config_mtu_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id,
> +				 CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_config_mtu_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value,
> +				 CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_config_mtu = {
>  	.f = cmd_config_mtu_parsed,
> @@ -2493,7 +2497,8 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_config =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, config,
>  				 "config");
>  cmdline_parse_token_num_t cmd_config_rss_hash_key_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id,
> +				 CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_hash_key =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key,
>  				 rss_hash_key, "rss-hash-key");
> @@ -2597,19 +2602,19 @@ cmdline_parse_token_string_t cmd_config_rxtx_ring_size_config =
>  				 config, "config");
>  cmdline_parse_token_num_t cmd_config_rxtx_ring_size_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
> -				 portid, UINT16);
> +				 portid, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rxtxq =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
>  				 rxtxq, "rxq#txq");
>  cmdline_parse_token_num_t cmd_config_rxtx_ring_size_qid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
> -			      qid, UINT16);
> +			      qid, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rsize =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
>  				 rsize, "ring_size");
>  cmdline_parse_token_num_t cmd_config_rxtx_ring_size_size =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
> -			      size, UINT16);
> +			      size, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_config_rxtx_ring_size = {
>  	.f = cmd_config_rxtx_ring_size_parsed,
> @@ -2698,11 +2703,13 @@ cmd_config_rxtx_queue_parsed(void *parsed_result,
>  cmdline_parse_token_string_t cmd_config_rxtx_queue_port =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, port, "port");
>  cmdline_parse_token_num_t cmd_config_rxtx_queue_portid =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid,
> +						CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_rxtx_queue_rxtxq =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, rxtxq, "rxq#txq");
>  cmdline_parse_token_num_t cmd_config_rxtx_queue_qid =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid,
> +						CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_rxtx_queue_opname =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, opname,
>  						"start#stop");
> @@ -2778,13 +2785,13 @@ cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_port =
>  						port, "port");
>  cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
> -						port_id, UINT16);
> +						port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_rxtxq =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
>  						rxtxq, "rxq#txq");
>  cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_qid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
> -						qid, UINT16);
> +						qid, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_opname =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
>  						opname, "deferred_start");
> @@ -2820,11 +2827,12 @@ struct cmd_setup_rxtx_queue {
>  cmdline_parse_token_string_t cmd_setup_rxtx_queue_port =
>  	TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, port, "port");
>  cmdline_parse_token_num_t cmd_setup_rxtx_queue_portid =
> -	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, portid, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, portid,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_setup_rxtx_queue_rxtxq =
>  	TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, rxtxq, "rxq#txq");
>  cmdline_parse_token_num_t cmd_setup_rxtx_queue_qid =
> -	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, qid, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, qid, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_setup_rxtx_queue_setup =
>  	TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, setup, "setup");
>  
> @@ -3033,7 +3041,8 @@ cmdline_parse_token_string_t cmd_config_rss_reta_port =
>  cmdline_parse_token_string_t cmd_config_rss_reta_keyword =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, keyword, "config");
>  cmdline_parse_token_num_t cmd_config_rss_reta_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id,
> +				 CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_rss_reta_name =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, name, "rss");
>  cmdline_parse_token_string_t cmd_config_rss_reta_list_name =
> @@ -3144,13 +3153,14 @@ cmdline_parse_token_string_t cmd_showport_reta_show =
>  cmdline_parse_token_string_t cmd_showport_reta_port =
>  	TOKEN_STRING_INITIALIZER(struct  cmd_showport_reta, port, "port");
>  cmdline_parse_token_num_t cmd_showport_reta_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id,
> +					CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_showport_reta_rss =
>  	TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, rss, "rss");
>  cmdline_parse_token_string_t cmd_showport_reta_reta =
>  	TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, reta, "reta");
>  cmdline_parse_token_num_t cmd_showport_reta_size =
> -	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_showport_reta_list_of_items =
>  	TOKEN_STRING_INITIALIZER(struct cmd_showport_reta,
>  					list_of_items, NULL);
> @@ -3195,7 +3205,8 @@ cmdline_parse_token_string_t cmd_showport_rss_hash_show =
>  cmdline_parse_token_string_t cmd_showport_rss_hash_port =
>  	TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, port, "port");
>  cmdline_parse_token_num_t cmd_showport_rss_hash_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id,
> +				 CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_showport_rss_hash_rss_hash =
>  	TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, rss_hash,
>  				 "rss-hash");
> @@ -3299,7 +3310,7 @@ cmdline_parse_token_string_t cmd_config_dcb_port =
>  cmdline_parse_token_string_t cmd_config_dcb_config =
>          TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, config, "config");
>  cmdline_parse_token_num_t cmd_config_dcb_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_dcb_dcb =
>          TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, dcb, "dcb");
>  cmdline_parse_token_string_t cmd_config_dcb_vt =
> @@ -3307,7 +3318,7 @@ cmdline_parse_token_string_t cmd_config_dcb_vt =
>  cmdline_parse_token_string_t cmd_config_dcb_vt_en =
>          TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, vt_en, "on#off");
>  cmdline_parse_token_num_t cmd_config_dcb_num_tcs =
> -        TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, num_tcs, UINT8);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, num_tcs, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_config_dcb_pfc=
>          TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, pfc, "pfc");
>  cmdline_parse_token_string_t cmd_config_dcb_pfc_en =
> @@ -3406,7 +3417,7 @@ cmdline_parse_token_string_t cmd_config_burst_all =
>  cmdline_parse_token_string_t cmd_config_burst_name =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_burst, name, "burst");
>  cmdline_parse_token_num_t cmd_config_burst_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_burst, value, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_burst, value, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_config_burst = {
>  	.f = cmd_config_burst_parsed,
> @@ -3475,7 +3486,7 @@ cmdline_parse_token_string_t cmd_config_thresh_name =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_thresh, name,
>  				"txpt#txht#txwt#rxpt#rxht#rxwt");
>  cmdline_parse_token_num_t cmd_config_thresh_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_thresh, value, UINT8);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_thresh, value, CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_config_thresh = {
>  	.f = cmd_config_thresh_parsed,
> @@ -3539,7 +3550,8 @@ cmdline_parse_token_string_t cmd_config_threshold_name =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_threshold, name,
>  						"txfreet#txrst#rxfreet");
>  cmdline_parse_token_num_t cmd_config_threshold_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_config_threshold, value, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_config_threshold, value,
> +						CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_config_threshold = {
>  	.f = cmd_config_threshold_parsed,
> @@ -3745,7 +3757,8 @@ cmdline_parse_token_string_t cmd_setmask_mask =
>  	TOKEN_STRING_INITIALIZER(struct cmd_setmask_result, mask,
>  				 "coremask#portmask");
>  cmdline_parse_token_num_t cmd_setmask_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_setmask_result, hexavalue, UINT64);
> +	TOKEN_NUM_INITIALIZER(struct cmd_setmask_result, hexavalue,
> +				 CMDLINE_UINT64);
>  
>  cmdline_parse_inst_t cmd_set_fwd_mask = {
>  	.f = cmd_set_mask_parsed,
> @@ -3791,7 +3804,7 @@ cmdline_parse_token_string_t cmd_set_what =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_result, what,
>  				 "nbport#nbcore#burst#verbose");
>  cmdline_parse_token_num_t cmd_set_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_result, value, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_result, value, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_set_numbers = {
>  	.f = cmd_set_parsed,
> @@ -3839,7 +3852,7 @@ cmdline_parse_token_string_t cmd_set_log_log =
>  cmdline_parse_token_string_t cmd_set_log_type =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_log_result, type, NULL);
>  cmdline_parse_token_num_t cmd_set_log_level =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, UINT32);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_set_log = {
>  	.f = cmd_set_log_parsed,
> @@ -4019,7 +4032,7 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_all_all =
>  				 all, "all");
>  cmdline_parse_token_num_t cmd_rx_vlan_filter_all_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_all_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_rx_vlan_filter_all = {
>  	.f = cmd_rx_vlan_filter_all_parsed,
> @@ -4183,10 +4196,10 @@ cmdline_parse_token_string_t cmd_vlan_tpid_what =
>  				 what, "tpid");
>  cmdline_parse_token_num_t cmd_vlan_tpid_tpid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
> -			      tp_id, UINT16);
> +			      tp_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_vlan_tpid_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_vlan_tpid = {
>  	.f = cmd_vlan_tpid_parsed,
> @@ -4233,10 +4246,10 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_what =
>  				 what, "add#rm");
>  cmdline_parse_token_num_t cmd_rx_vlan_filter_vlanid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result,
> -			      vlan_id, UINT16);
> +			      vlan_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_rx_vlan_filter_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_rx_vlan_filter = {
>  	.f = cmd_rx_vlan_filter_parsed,
> @@ -4286,10 +4299,10 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_set =
>  				 set, "set");
>  cmdline_parse_token_num_t cmd_tx_vlan_set_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_tx_vlan_set_vlanid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
> -			      vlan_id, UINT16);
> +			      vlan_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_tx_vlan_set = {
>  	.f = cmd_tx_vlan_set_parsed,
> @@ -4340,13 +4353,13 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_qinq_set =
>  		set, "set");
>  cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
> -		port_id, UINT16);
> +		port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
> -		vlan_id, UINT16);
> +		vlan_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid_outer =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
> -		vlan_id_outer, UINT16);
> +		vlan_id_outer, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_tx_vlan_set_qinq = {
>  	.f = cmd_tx_vlan_set_qinq_parsed,
> @@ -4398,10 +4411,10 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_pvid =
>  				 pvid, "pvid");
>  cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
> -			     port_id, UINT16);
> +			     port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_vlan_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
> -			      vlan_id, UINT16);
> +			      vlan_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_mode =
>  	TOKEN_STRING_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
>  				 mode, "on#off");
> @@ -4453,7 +4466,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_reset_reset =
>  				 reset, "reset");
>  cmdline_parse_token_num_t cmd_tx_vlan_reset_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_reset_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_tx_vlan_reset = {
>  	.f = cmd_tx_vlan_reset_parsed,
> @@ -4659,7 +4672,7 @@ cmdline_parse_token_string_t cmd_csum_hwsw =
>  				hwsw, "hw#sw");
>  cmdline_parse_token_num_t cmd_csum_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_csum_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_csum_set = {
>  	.f = cmd_csum_parsed,
> @@ -4730,7 +4743,7 @@ cmdline_parse_token_string_t cmd_csum_tunnel_onoff =
>  				onoff, "on#off");
>  cmdline_parse_token_num_t cmd_csum_tunnel_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_csum_tunnel_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_csum_tunnel = {
>  	.f = cmd_csum_tunnel_parsed,
> @@ -4818,10 +4831,10 @@ cmdline_parse_token_string_t cmd_tso_set_mode =
>  				mode, "set");
>  cmdline_parse_token_num_t cmd_tso_set_tso_segsz =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
> -				tso_segsz, UINT16);
> +				tso_segsz, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_tso_set_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_tso_set = {
>  	.f = cmd_tso_set_parsed,
> @@ -4967,10 +4980,10 @@ cmdline_parse_token_string_t cmd_tunnel_tso_set_mode =
>  				mode, "set");
>  cmdline_parse_token_num_t cmd_tunnel_tso_set_tso_segsz =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
> -				tso_segsz, UINT16);
> +				tso_segsz, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_tunnel_tso_set_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_tunnel_tso_set = {
>  	.f = cmd_tunnel_tso_set_parsed,
> @@ -5034,7 +5047,7 @@ cmdline_parse_token_string_t cmd_gro_enable_port =
>  			cmd_keyword, "port");
>  cmdline_parse_token_num_t cmd_gro_enable_pid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_gro_enable_result,
> -			cmd_pid, UINT16);
> +			cmd_pid, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_gro_enable_keyword =
>  	TOKEN_STRING_INITIALIZER(struct cmd_gro_enable_result,
>  			cmd_keyword, "gro");
> @@ -5084,7 +5097,7 @@ cmdline_parse_token_string_t cmd_gro_show_port =
>  			cmd_port, "port");
>  cmdline_parse_token_num_t cmd_gro_show_pid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_gro_show_result,
> -			cmd_pid, UINT16);
> +			cmd_pid, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_gro_show_keyword =
>  	TOKEN_STRING_INITIALIZER(struct cmd_gro_show_result,
>  			cmd_keyword, "gro");
> @@ -5134,7 +5147,7 @@ cmdline_parse_token_string_t cmd_gro_flush_flush =
>  			cmd_flush, "flush");
>  cmdline_parse_token_num_t cmd_gro_flush_cycles =
>  	TOKEN_NUM_INITIALIZER(struct cmd_gro_flush_result,
> -			cmd_cycles, UINT8);
> +			cmd_cycles, CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_gro_flush = {
>  	.f = cmd_gro_flush_parsed,
> @@ -5184,7 +5197,7 @@ cmdline_parse_token_string_t cmd_gso_enable_mode =
>  			cmd_mode, "on#off");
>  cmdline_parse_token_num_t cmd_gso_enable_pid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_gso_enable_result,
> -			cmd_pid, UINT16);
> +			cmd_pid, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_gso_enable = {
>  	.f = cmd_gso_enable_parsed,
> @@ -5243,7 +5256,7 @@ cmdline_parse_token_string_t cmd_gso_size_segsz =
>  				cmd_segsz, "segsz");
>  cmdline_parse_token_num_t cmd_gso_size_size =
>  	TOKEN_NUM_INITIALIZER(struct cmd_gso_size_result,
> -				cmd_size, UINT16);
> +				cmd_size, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_gso_size = {
>  	.f = cmd_gso_size_parsed,
> @@ -5301,7 +5314,7 @@ cmdline_parse_token_string_t cmd_gso_show_keyword =
>  				cmd_keyword, "gso");
>  cmdline_parse_token_num_t cmd_gso_show_pid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_gso_show_result,
> -				cmd_pid, UINT16);
> +				cmd_pid, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_gso_show = {
>  	.f = cmd_gso_show_parsed,
> @@ -5444,7 +5457,7 @@ cmdline_parse_token_string_t cmd_setbypass_mode_value =
>  			value, "normal#bypass#isolate");
>  cmdline_parse_token_num_t cmd_setbypass_mode_port =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_mode_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_set_bypass_mode = {
>  	.f = cmd_set_bypass_mode_parsed,
> @@ -5550,7 +5563,7 @@ cmdline_parse_token_string_t cmd_setbypass_event_mode_value =
>  			mode_value, "normal#bypass#isolate");
>  cmdline_parse_token_num_t cmd_setbypass_event_port =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_event_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_set_bypass_event = {
>  	.f = cmd_set_bypass_event_parsed,
> @@ -5716,7 +5729,7 @@ cmdline_parse_token_string_t cmd_showbypass_config_config =
>  			config, "config");
>  cmdline_parse_token_num_t cmd_showbypass_config_port =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_bypass_config_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_show_bypass_config = {
>  	.f = cmd_show_bypass_config_parsed,
> @@ -5765,10 +5778,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result,
>  		mode, "mode");
>  cmdline_parse_token_num_t cmd_setbonding_mode_value =
>  TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
> -		value, UINT8);
> +		value, CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_setbonding_mode_port =
>  TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
> -		port_id, UINT16);
> +		port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_set_bonding_mode = {
>  		.f = cmd_set_bonding_mode_parsed,
> @@ -5842,7 +5855,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
>  		dedicated_queues, "dedicated_queues");
>  cmdline_parse_token_num_t cmd_setbonding_lacp_dedicated_queues_port_id =
>  TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
> -		port_id, UINT16);
> +		port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_setbonding_lacp_dedicated_queues_mode =
>  TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
>  		mode, "enable#disable");
> @@ -5910,7 +5923,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
>  		balance_xmit_policy, "balance_xmit_policy");
>  cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port =
>  TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
> -		port_id, UINT16);
> +		port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy =
>  TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
>  		policy, "l2#l23#l34");
> @@ -6058,7 +6071,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result,
>  		config, "config");
>  cmdline_parse_token_num_t cmd_showbonding_config_port =
>  TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result,
> -		port_id, UINT16);
> +		port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_show_bonding_config = {
>  		.f = cmd_show_bonding_config_parsed,
> @@ -6111,10 +6124,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result,
>  		primary, "primary");
>  cmdline_parse_token_num_t cmd_setbonding_primary_slave =
>  TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
> -		slave_id, UINT16);
> +		slave_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_setbonding_primary_port =
>  TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
> -		port_id, UINT16);
> +		port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_set_bonding_primary = {
>  		.f = cmd_set_bonding_primary_parsed,
> @@ -6169,10 +6182,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result,
>  		slave, "slave");
>  cmdline_parse_token_num_t cmd_addbonding_slave_slaveid =
>  TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
> -		slave_id, UINT16);
> +		slave_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_addbonding_slave_port =
>  TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
> -		port_id, UINT16);
> +		port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_add_bonding_slave = {
>  		.f = cmd_add_bonding_slave_parsed,
> @@ -6227,10 +6240,10 @@ cmdline_parse_token_string_t cmd_removebonding_slave_slave =
>  				slave, "slave");
>  cmdline_parse_token_num_t cmd_removebonding_slave_slaveid =
>  		TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
> -				slave_id, UINT16);
> +				slave_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_removebonding_slave_port =
>  		TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_remove_bonding_slave = {
>  		.f = cmd_remove_bonding_slave_parsed,
> @@ -6309,10 +6322,10 @@ cmdline_parse_token_string_t cmd_createbonded_device_device =
>  				device, "device");
>  cmdline_parse_token_num_t cmd_createbonded_device_mode =
>  		TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result,
> -				mode, UINT8);
> +				mode, CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_createbonded_device_socket =
>  		TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result,
> -				socket, UINT8);
> +				socket, CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_create_bonded_device = {
>  		.f = cmd_create_bonded_device_parsed,
> @@ -6365,7 +6378,7 @@ cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac =
>  				"mac_addr");
>  cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum =
>  		TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result,
> -				port_num, UINT16);
> +				port_num, CMDLINE_UINT16);
>  cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr =
>  		TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address);
>  
> @@ -6418,10 +6431,10 @@ cmdline_parse_token_string_t cmd_set_bond_mon_period_mon_period =
>  				mon_period,	"mon_period");
>  cmdline_parse_token_num_t cmd_set_bond_mon_period_portnum =
>  		TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
> -				port_num, UINT16);
> +				port_num, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_set_bond_mon_period_period_ms =
>  		TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
> -				period_ms, UINT32);
> +				period_ms, CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_set_bond_mon_period = {
>  		.f = cmd_set_bond_mon_period_parsed,
> @@ -6480,7 +6493,7 @@ cmdline_parse_token_string_t cmd_set_bonding_agg_mode_agg_mode =
>  
>  cmdline_parse_token_num_t cmd_set_bonding_agg_mode_portnum =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_agg_mode_policy_result,
> -				port_num, UINT16);
> +				port_num, CMDLINE_UINT16);
>  
>  cmdline_parse_token_string_t cmd_set_bonding_agg_mode_policy_string =
>  	TOKEN_STRING_INITIALIZER(
> @@ -6668,11 +6681,13 @@ cmdline_parse_token_string_t cmd_set_burst_tx_retry_tx =
>  cmdline_parse_token_string_t cmd_set_burst_tx_retry_delay =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, delay, "delay");
>  cmdline_parse_token_num_t cmd_set_burst_tx_retry_time =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time, UINT32);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time,
> +				 CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_set_burst_tx_retry_retry =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry, "retry");
>  cmdline_parse_token_num_t cmd_set_burst_tx_retry_retry_num =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num, UINT32);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num,
> +				 CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_set_burst_tx_retry = {
>  	.f = cmd_set_burst_tx_retry_parsed,
> @@ -6730,7 +6745,7 @@ cmdline_parse_token_string_t cmd_setpromisc_portall =
>  				 "all");
>  cmdline_parse_token_num_t cmd_setpromisc_portnum =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_promisc_mode_result, port_num,
> -			      UINT16);
> +			      CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_setpromisc_mode =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, mode,
>  				 "on#off");
> @@ -6804,7 +6819,7 @@ cmdline_parse_token_string_t cmd_setallmulti_portall =
>  				 "all");
>  cmdline_parse_token_num_t cmd_setallmulti_portnum =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_allmulti_mode_result, port_num,
> -			      UINT16);
> +			      CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_setallmulti_mode =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_allmulti_mode_result, mode,
>  				 "on#off");
> @@ -6882,25 +6897,25 @@ cmdline_parse_token_string_t cmd_lfc_set_high_water_str =
>  				hw_str, "high_water");
>  cmdline_parse_token_num_t cmd_lfc_set_high_water =
>  	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
> -				high_water, UINT32);
> +				high_water, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_lfc_set_low_water_str =
>  	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
>  				lw_str, "low_water");
>  cmdline_parse_token_num_t cmd_lfc_set_low_water =
>  	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
> -				low_water, UINT32);
> +				low_water, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_lfc_set_pause_time_str =
>  	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
>  				pt_str, "pause_time");
>  cmdline_parse_token_num_t cmd_lfc_set_pause_time =
>  	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
> -				pause_time, UINT16);
> +				pause_time, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_lfc_set_send_xon_str =
>  	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
>  				xon_str, "send_xon");
>  cmdline_parse_token_num_t cmd_lfc_set_send_xon =
>  	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
> -				send_xon, UINT16);
> +				send_xon, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_lfc_set_mac_ctrl_frame_fwd_mode =
>  	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
>  				mac_ctrl_frame_fwd, "mac_ctrl_frame_fwd");
> @@ -6915,7 +6930,7 @@ cmdline_parse_token_string_t cmd_lfc_set_autoneg =
>  				autoneg, "on#off");
>  cmdline_parse_token_num_t cmd_lfc_set_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  
>  /* forward declaration */
>  static void
> @@ -7211,19 +7226,19 @@ cmdline_parse_token_string_t cmd_pfc_set_tx_mode =
>  				tx_pfc_mode, "on#off");
>  cmdline_parse_token_num_t cmd_pfc_set_high_water =
>  	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
> -				high_water, UINT32);
> +				high_water, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_pfc_set_low_water =
>  	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
> -				low_water, UINT32);
> +				low_water, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_pfc_set_pause_time =
>  	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
> -				pause_time, UINT16);
> +				pause_time, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_pfc_set_priority =
>  	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
> -				priority, UINT8);
> +				priority, CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_pfc_set_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_priority_flow_control_set = {
>  	.f = cmd_priority_flow_ctrl_set_parsed,
> @@ -7361,7 +7376,7 @@ cmdline_parse_token_string_t cmd_start_tx_first_n_tx_first =
>  			tx_first, "tx_first");
>  cmdline_parse_token_num_t cmd_start_tx_first_n_tx_num =
>  	TOKEN_NUM_INITIALIZER(struct cmd_start_tx_first_n_result,
> -			tx_num, UINT32);
> +			tx_num, CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_start_tx_first_n = {
>  	.f = cmd_start_tx_first_n_parsed,
> @@ -7392,7 +7407,8 @@ cmdline_parse_token_string_t cmd_set_link_up_link_up =
>  cmdline_parse_token_string_t cmd_set_link_up_port =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_link_up_result, port, "port");
>  cmdline_parse_token_num_t cmd_set_link_up_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id,
> +				CMDLINE_UINT16);
>  
>  static void cmd_set_link_up_parsed(__rte_unused void *parsed_result,
>  			     __rte_unused struct cmdline *cl,
> @@ -7431,7 +7447,8 @@ cmdline_parse_token_string_t cmd_set_link_down_link_down =
>  cmdline_parse_token_string_t cmd_set_link_down_port =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_link_down_result, port, "port");
>  cmdline_parse_token_num_t cmd_set_link_down_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id,
> +				CMDLINE_UINT16);
>  
>  static void cmd_set_link_down_parsed(
>  				__rte_unused void *parsed_result,
> @@ -7620,7 +7637,8 @@ cmdline_parse_token_string_t cmd_showport_what =
>  	TOKEN_STRING_INITIALIZER(struct cmd_showport_result, what,
>  				 "info#summary#stats#xstats#fdir#stat_qmap#dcb_tc#cap");
>  cmdline_parse_token_num_t cmd_showport_portnum =
> -	TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum,
> +				 CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_showport = {
>  	.f = cmd_showport_parsed,
> @@ -7711,9 +7729,11 @@ cmdline_parse_token_string_t cmd_showqueue_type =
>  cmdline_parse_token_string_t cmd_showqueue_what =
>  	TOKEN_STRING_INITIALIZER(struct cmd_showqueue_result, what, "info");
>  cmdline_parse_token_num_t cmd_showqueue_portnum =
> -	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_showqueue_queuenum =
> -	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum,
> +		CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_showqueue = {
>  	.f = cmd_showqueue_parsed,
> @@ -7794,9 +7814,11 @@ cmdline_parse_token_string_t cmd_read_reg_read =
>  cmdline_parse_token_string_t cmd_read_reg_reg =
>  	TOKEN_STRING_INITIALIZER(struct cmd_read_reg_result, reg, "reg");
>  cmdline_parse_token_num_t cmd_read_reg_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_read_reg_reg_off =
> -	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off, UINT32);
> +	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off,
> +		CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_read_reg = {
>  	.f = cmd_read_reg_parsed,
> @@ -7839,16 +7861,16 @@ cmdline_parse_token_string_t cmd_read_reg_bit_field_regfield =
>  				 regfield, "regfield");
>  cmdline_parse_token_num_t cmd_read_reg_bit_field_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, port_id,
> -			      UINT16);
> +			      CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_read_reg_bit_field_reg_off =
>  	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, reg_off,
> -			      UINT32);
> +			      CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_read_reg_bit_field_bit1_pos =
>  	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, bit1_pos,
> -			      UINT8);
> +			      CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_read_reg_bit_field_bit2_pos =
>  	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, bit2_pos,
> -			      UINT8);
> +			      CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_read_reg_bit_field = {
>  	.f = cmd_read_reg_bit_field_parsed,
> @@ -7890,11 +7912,14 @@ cmdline_parse_token_string_t cmd_read_reg_bit_regbit =
>  	TOKEN_STRING_INITIALIZER(struct cmd_read_reg_bit_result,
>  				 regbit, "regbit");
>  cmdline_parse_token_num_t cmd_read_reg_bit_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id,
> +				 CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_read_reg_bit_reg_off =
> -	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off, UINT32);
> +	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off,
> +				 CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_read_reg_bit_bit_pos =
> -	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, bit_pos, UINT8);
> +	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, bit_pos,
> +				 CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_read_reg_bit = {
>  	.f = cmd_read_reg_bit_parsed,
> @@ -7933,11 +7958,14 @@ cmdline_parse_token_string_t cmd_write_reg_write =
>  cmdline_parse_token_string_t cmd_write_reg_reg =
>  	TOKEN_STRING_INITIALIZER(struct cmd_write_reg_result, reg, "reg");
>  cmdline_parse_token_num_t cmd_write_reg_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_write_reg_reg_off =
> -	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off, UINT32);
> +	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off,
> +		CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_write_reg_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, value, UINT32);
> +	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, value,
> +		CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_write_reg = {
>  	.f = cmd_write_reg_parsed,
> @@ -7982,19 +8010,19 @@ cmdline_parse_token_string_t cmd_write_reg_bit_field_regfield =
>  				 regfield, "regfield");
>  cmdline_parse_token_num_t cmd_write_reg_bit_field_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, port_id,
> -			      UINT16);
> +			      CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_write_reg_bit_field_reg_off =
>  	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, reg_off,
> -			      UINT32);
> +			      CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_write_reg_bit_field_bit1_pos =
>  	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, bit1_pos,
> -			      UINT8);
> +			      CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_write_reg_bit_field_bit2_pos =
>  	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, bit2_pos,
> -			      UINT8);
> +			      CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_write_reg_bit_field_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, value,
> -			      UINT32);
> +			      CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_write_reg_bit_field = {
>  	.f = cmd_write_reg_bit_field_parsed,
> @@ -8040,13 +8068,17 @@ cmdline_parse_token_string_t cmd_write_reg_bit_regbit =
>  	TOKEN_STRING_INITIALIZER(struct cmd_write_reg_bit_result,
>  				 regbit, "regbit");
>  cmdline_parse_token_num_t cmd_write_reg_bit_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id,
> +				 CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_write_reg_bit_reg_off =
> -	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off, UINT32);
> +	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off,
> +				 CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_write_reg_bit_bit_pos =
> -	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, bit_pos, UINT8);
> +	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, bit_pos,
> +				 CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_write_reg_bit_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, value, UINT8);
> +	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, value,
> +				 CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_write_reg_bit = {
>  	.f = cmd_write_reg_bit_parsed,
> @@ -8092,11 +8124,14 @@ cmdline_parse_token_string_t cmd_read_rxd_txd_rxd_txd =
>  	TOKEN_STRING_INITIALIZER(struct cmd_read_rxd_txd_result, rxd_txd,
>  				 "rxd#txd");
>  cmdline_parse_token_num_t cmd_read_rxd_txd_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id,
> +				 CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_read_rxd_txd_queue_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id,
> +				 CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_read_rxd_txd_desc_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, desc_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, desc_id,
> +				 CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_read_rxd_txd = {
>  	.f = cmd_read_rxd_txd_parsed,
> @@ -8174,7 +8209,7 @@ cmdline_parse_token_string_t cmd_mac_addr_what =
>  				"add#remove#set");
>  cmdline_parse_token_num_t cmd_mac_addr_portnum =
>  		TOKEN_NUM_INITIALIZER(struct cmd_mac_addr_result, port_num,
> -					UINT16);
> +					CMDLINE_UINT16);
>  cmdline_parse_token_etheraddr_t cmd_mac_addr_addr =
>  		TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
>  
> @@ -8220,7 +8255,8 @@ cmdline_parse_token_string_t cmd_eth_peer_set =
>  cmdline_parse_token_string_t cmd_eth_peer =
>  	TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, eth_peer, "eth-peer");
>  cmdline_parse_token_num_t cmd_eth_peer_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_eth_peer_addr =
>  	TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, peer_addr, NULL);
>  
> @@ -8269,13 +8305,13 @@ cmdline_parse_token_string_t cmd_setqmap_what =
>  				 what, "tx#rx");
>  cmdline_parse_token_num_t cmd_setqmap_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_setqmap_queueid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
> -			      queue_id, UINT16);
> +			      queue_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_setqmap_mapvalue =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
> -			      map_value, UINT8);
> +			      map_value, CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_set_qmap = {
>  	.f = cmd_set_qmap_parsed,
> @@ -8371,7 +8407,7 @@ cmdline_parse_token_string_t cmd_set_uc_hash_port =
>  				 port, "port");
>  cmdline_parse_token_num_t cmd_set_uc_hash_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_uc_hash_table,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_uc_hash_what =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
>  				 what, "uta");
> @@ -8432,7 +8468,7 @@ cmdline_parse_token_string_t cmd_set_uc_all_hash_port =
>  				 port, "port");
>  cmdline_parse_token_num_t cmd_set_uc_all_hash_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_uc_all_hash_table,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_uc_all_hash_what =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
>  				 what, "uta");
> @@ -8524,13 +8560,13 @@ cmdline_parse_token_string_t cmd_set_vf_macvlan_port =
>  				 port, "port");
>  cmdline_parse_token_num_t cmd_set_vf_macvlan_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_vf_macvlan_vf =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_macvlan_filter,
>  				 vf, "vf");
>  cmdline_parse_token_num_t cmd_set_vf_macvlan_vf_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter,
> -				vf_id, UINT8);
> +				vf_id, CMDLINE_UINT8);
>  cmdline_parse_token_etheraddr_t cmd_set_vf_macvlan_mac =
>  	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_macvlan_filter,
>  				address);
> @@ -8593,13 +8629,13 @@ cmdline_parse_token_string_t cmd_setvf_traffic_port =
>  				 port, "port");
>  cmdline_parse_token_num_t cmd_setvf_traffic_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_setvf_traffic_vf =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
>  				 vf, "vf");
>  cmdline_parse_token_num_t cmd_setvf_traffic_vfid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
> -			      vf_id, UINT8);
> +			      vf_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_setvf_traffic_what =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
>  				 what, "tx#rx");
> @@ -8681,13 +8717,13 @@ cmdline_parse_token_string_t cmd_set_vf_rxmode_port =
>  				 port, "port");
>  cmdline_parse_token_num_t cmd_set_vf_rxmode_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_vf_rxmode_vf =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
>  				 vf, "vf");
>  cmdline_parse_token_num_t cmd_set_vf_rxmode_vfid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
> -			      vf_id, UINT8);
> +			      vf_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_set_vf_rxmode_what =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
>  				 what, "rxmode");
> @@ -8764,13 +8800,13 @@ cmdline_parse_token_string_t cmd_vf_mac_addr_port =
>  				port,"port");
>  cmdline_parse_token_num_t cmd_vf_mac_addr_portnum =
>  	TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
> -				port_num, UINT16);
> +				port_num, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_vf_mac_addr_vf =
>  	TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
>  				vf,"vf");
>  cmdline_parse_token_num_t cmd_vf_mac_addr_vfnum =
>  	TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
> -				vf_num, UINT8);
> +				vf_num, CMDLINE_UINT8);
>  cmdline_parse_token_etheraddr_t cmd_vf_mac_addr_addr =
>  	TOKEN_ETHERADDR_INITIALIZER(struct cmd_vf_mac_addr_result,
>  				address);
> @@ -8855,19 +8891,19 @@ cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_what =
>  				 what, "add#rm");
>  cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vlanid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
> -			      vlan_id, UINT16);
> +			      vlan_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_port =
>  	TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
>  				 port, "port");
>  cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_vf =
>  	TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
>  				 vf, "vf");
>  cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vf_mask =
>  	TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
> -			      vf_mask, UINT64);
> +			      vf_mask, CMDLINE_UINT64);
>  
>  cmdline_parse_inst_t cmd_vf_rxvlan_filter = {
>  	.f = cmd_vf_rx_vlan_filter_parsed,
> @@ -8922,19 +8958,19 @@ cmdline_parse_token_string_t cmd_queue_rate_limit_port =
>  				port, "port");
>  cmdline_parse_token_num_t cmd_queue_rate_limit_portnum =
>  	TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
> -				port_num, UINT16);
> +				port_num, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_queue_rate_limit_queue =
>  	TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
>  				queue, "queue");
>  cmdline_parse_token_num_t cmd_queue_rate_limit_queuenum =
>  	TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
> -				queue_num, UINT8);
> +				queue_num, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_queue_rate_limit_rate =
>  	TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
>  				rate, "rate");
>  cmdline_parse_token_num_t cmd_queue_rate_limit_ratenum =
>  	TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
> -				rate_num, UINT16);
> +				rate_num, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_queue_rate_limit = {
>  	.f = cmd_queue_rate_limit_parsed,
> @@ -8992,25 +9028,25 @@ cmdline_parse_token_string_t cmd_vf_rate_limit_port =
>  				port, "port");
>  cmdline_parse_token_num_t cmd_vf_rate_limit_portnum =
>  	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
> -				port_num, UINT16);
> +				port_num, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_vf_rate_limit_vf =
>  	TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
>  				vf, "vf");
>  cmdline_parse_token_num_t cmd_vf_rate_limit_vfnum =
>  	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
> -				vf_num, UINT8);
> +				vf_num, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_vf_rate_limit_rate =
>  	TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
>  				rate, "rate");
>  cmdline_parse_token_num_t cmd_vf_rate_limit_ratenum =
>  	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
> -				rate_num, UINT16);
> +				rate_num, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_vf_rate_limit_q_msk =
>  	TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
>  				q_msk, "queue_mask");
>  cmdline_parse_token_num_t cmd_vf_rate_limit_q_msk_val =
>  	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
> -				q_msk_val, UINT64);
> +				q_msk_val, CMDLINE_UINT64);
>  
>  cmdline_parse_inst_t cmd_vf_rate_limit = {
>  	.f = cmd_vf_rate_limit_parsed,
> @@ -9132,7 +9168,7 @@ cmdline_parse_token_string_t cmd_tunnel_filter_what =
>  	what, "add#rm");
>  cmdline_parse_token_num_t cmd_tunnel_filter_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
> -	port_id, UINT16);
> +	port_id, CMDLINE_UINT16);
>  cmdline_parse_token_etheraddr_t cmd_tunnel_filter_outer_mac =
>  	TOKEN_ETHERADDR_INITIALIZER(struct cmd_tunnel_filter_result,
>  	outer_mac);
> @@ -9141,7 +9177,7 @@ cmdline_parse_token_etheraddr_t cmd_tunnel_filter_inner_mac =
>  	inner_mac);
>  cmdline_parse_token_num_t cmd_tunnel_filter_innner_vlan =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
> -	inner_vlan, UINT16);
> +	inner_vlan, CMDLINE_UINT16);
>  cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =
>  	TOKEN_IPADDR_INITIALIZER(struct cmd_tunnel_filter_result,
>  	ip_value);
> @@ -9155,10 +9191,10 @@ cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
>  		"imac#omac-imac-tenid");
>  cmdline_parse_token_num_t cmd_tunnel_filter_tenant_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
> -	tenant_id, UINT32);
> +	tenant_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_tunnel_filter_queue_num =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
> -	queue_num, UINT16);
> +	queue_num, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_tunnel_filter = {
>  	.f = cmd_tunnel_filter_parsed,
> @@ -9224,10 +9260,10 @@ cmdline_parse_token_string_t cmd_tunnel_udp_config_what =
>  				what, "add#rm");
>  cmdline_parse_token_num_t cmd_tunnel_udp_config_udp_port =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
> -				udp_port, UINT16);
> +				udp_port, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_tunnel_udp_config_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_tunnel_udp_config = {
>  	.f = cmd_tunnel_udp_config_parsed,
> @@ -9297,7 +9333,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_config =
>  				 "config");
>  cmdline_parse_token_num_t cmd_config_tunnel_udp_port_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, port_id,
> -			      UINT16);
> +			      CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_port =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port,
>  				 udp_tunnel_port,
> @@ -9310,7 +9346,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type =
>  				 "vxlan#geneve#vxlan-gpe");
>  cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_port,
> -			      UINT16);
> +			      CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
>  	.f = cmd_cfg_tunnel_udp_port_parsed,
> @@ -9363,13 +9399,13 @@ cmdline_parse_token_string_t cmd_global_config_cmd =
>  		"global_config");
>  cmdline_parse_token_num_t cmd_global_config_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_global_config_result, port_id,
> -			       UINT16);
> +			       CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_global_config_type =
>  	TOKEN_STRING_INITIALIZER(struct cmd_global_config_result,
>  		cfg_type, "gre-key-len");
>  cmdline_parse_token_num_t cmd_global_config_gre_key_len =
>  	TOKEN_NUM_INITIALIZER(struct cmd_global_config_result,
> -		len, UINT8);
> +		len, CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_global_config = {
>  	.f = cmd_global_config_parsed,
> @@ -9406,13 +9442,13 @@ cmdline_parse_token_string_t cmd_mirror_mask_port =
>  				port, "port");
>  cmdline_parse_token_num_t cmd_mirror_mask_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_mirror_mask_mirror =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
>  				mirror, "mirror-rule");
>  cmdline_parse_token_num_t cmd_mirror_mask_ruleid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
> -				rule_id, UINT8);
> +				rule_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_mirror_mask_what =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
>  				what, "pool-mirror-up#pool-mirror-down"
> @@ -9425,7 +9461,7 @@ cmdline_parse_token_string_t cmd_mirror_mask_dstpool =
>  				dstpool, "dst-pool");
>  cmdline_parse_token_num_t cmd_mirror_mask_poolid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
> -				dstpool_id, UINT8);
> +				dstpool_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_mirror_mask_on =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
>  				on, "on#off");
> @@ -9521,13 +9557,13 @@ cmdline_parse_token_string_t cmd_mirror_link_port =
>  				port, "port");
>  cmdline_parse_token_num_t cmd_mirror_link_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_mirror_link_mirror =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
>  				mirror, "mirror-rule");
>  cmdline_parse_token_num_t cmd_mirror_link_ruleid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
> -			    rule_id, UINT8);
> +			    rule_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_mirror_link_what =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
>  				what, "uplink-mirror#downlink-mirror");
> @@ -9536,7 +9572,7 @@ cmdline_parse_token_string_t cmd_mirror_link_dstpool =
>  				dstpool, "dst-pool");
>  cmdline_parse_token_num_t cmd_mirror_link_poolid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
> -				dstpool_id, UINT8);
> +				dstpool_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_mirror_link_on =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
>  				on, "on#off");
> @@ -9607,13 +9643,13 @@ cmdline_parse_token_string_t cmd_rm_mirror_rule_port =
>  				port, "port");
>  cmdline_parse_token_num_t cmd_rm_mirror_rule_portid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_rm_mirror_rule_mirror =
>  	TOKEN_STRING_INITIALIZER(struct cmd_rm_mirror_rule_result,
>  				mirror, "mirror-rule");
>  cmdline_parse_token_num_t cmd_rm_mirror_rule_ruleid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
> -				rule_id, UINT8);
> +				rule_id, CMDLINE_UINT8);
>  
>  static void
>  cmd_reset_mirror_rule_parsed(void *parsed_result,
> @@ -9859,7 +9895,7 @@ cmdline_parse_token_string_t cmd_syn_filter_filter =
>  	filter, "syn_filter");
>  cmdline_parse_token_num_t cmd_syn_filter_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_syn_filter_result,
> -	port_id, UINT16);
> +	port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_syn_filter_ops =
>  	TOKEN_STRING_INITIALIZER(struct cmd_syn_filter_result,
>  	ops, "add#del");
> @@ -9874,7 +9910,7 @@ cmdline_parse_token_string_t cmd_syn_filter_queue =
>  				queue, "queue");
>  cmdline_parse_token_num_t cmd_syn_filter_queue_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_syn_filter_result,
> -				queue_id, UINT16);
> +				queue_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_syn_filter = {
>  	.f = cmd_syn_filter_parsed,
> @@ -9951,7 +9987,7 @@ cmdline_parse_token_string_t cmd_queue_region_port =
>  	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result, port, "port");
>  cmdline_parse_token_num_t cmd_queue_region_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_queue_region_cmd =
>  	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
>  				 cmd, "queue-region");
> @@ -9960,19 +9996,19 @@ cmdline_parse_token_string_t cmd_queue_region_id =
>  				region, "region_id");
>  cmdline_parse_token_num_t cmd_queue_region_index =
>  	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
> -				region_id, UINT8);
> +				region_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_queue_region_queue_start_index =
>  	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
>  				queue_start_index, "queue_start_index");
>  cmdline_parse_token_num_t cmd_queue_region_queue_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
> -				queue_id, UINT8);
> +				queue_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_queue_region_queue_num =
>  	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
>  				queue_num, "queue_num");
>  cmdline_parse_token_num_t cmd_queue_region_queue_num_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
> -				queue_num_value, UINT8);
> +				queue_num_value, CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_queue_region = {
>  	.f = cmd_queue_region_parsed,
> @@ -10051,7 +10087,7 @@ cmdline_parse_token_string_t cmd_region_flowtype_port =
>  				port, "port");
>  cmdline_parse_token_num_t cmd_region_flowtype_port_index =
>  	TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_region_flowtype_cmd =
>  	TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
>  				cmd, "queue-region");
> @@ -10060,13 +10096,13 @@ cmdline_parse_token_string_t cmd_region_flowtype_index =
>  				region, "region_id");
>  cmdline_parse_token_num_t cmd_region_flowtype_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
> -				region_id, UINT8);
> +				region_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_region_flowtype_flow_index =
>  	TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
>  				flowtype, "flowtype");
>  cmdline_parse_token_num_t cmd_region_flowtype_flow_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
> -				flowtype_id, UINT8);
> +				flowtype_id, CMDLINE_UINT8);
>  cmdline_parse_inst_t cmd_region_flowtype = {
>  	.f = cmd_region_flowtype_parsed,
>  	.data = NULL,
> @@ -10142,7 +10178,7 @@ cmdline_parse_token_string_t cmd_user_priority_region_port =
>  				port, "port");
>  cmdline_parse_token_num_t cmd_user_priority_region_port_index =
>  	TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_user_priority_region_cmd =
>  	TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
>  				cmd, "queue-region");
> @@ -10151,13 +10187,13 @@ cmdline_parse_token_string_t cmd_user_priority_region_UP =
>  				user_priority, "UP");
>  cmdline_parse_token_num_t cmd_user_priority_region_UP_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
> -				user_priority_id, UINT8);
> +				user_priority_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_user_priority_region_region =
>  	TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
>  				region, "region_id");
>  cmdline_parse_token_num_t cmd_user_priority_region_region_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
> -				region_id, UINT8);
> +				region_id, CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_user_priority_region = {
>  	.f = cmd_user_priority_region_parsed,
> @@ -10235,7 +10271,7 @@ cmdline_parse_token_string_t cmd_flush_queue_region_port =
>  				port, "port");
>  cmdline_parse_token_num_t cmd_flush_queue_region_port_index =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flush_queue_region_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flush_queue_region_cmd =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
>  				cmd, "queue-region");
> @@ -10316,7 +10352,7 @@ cmdline_parse_token_string_t cmd_show_queue_region_info_port =
>  				port, "port");
>  cmdline_parse_token_num_t cmd_show_queue_region_info_port_index =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_queue_region_info,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_show_queue_region_info_cmd =
>  	TOKEN_STRING_INITIALIZER(struct cmd_show_queue_region_info,
>  				cmd, "queue-region");
> @@ -10417,7 +10453,7 @@ cmdline_parse_token_string_t cmd_2tuple_filter_filter =
>  				 filter, "2tuple_filter");
>  cmdline_parse_token_num_t cmd_2tuple_filter_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_2tuple_filter_ops =
>  	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
>  				 ops, "add#del");
> @@ -10426,37 +10462,37 @@ cmdline_parse_token_string_t cmd_2tuple_filter_dst_port =
>  				dst_port, "dst_port");
>  cmdline_parse_token_num_t cmd_2tuple_filter_dst_port_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
> -				dst_port_value, UINT16);
> +				dst_port_value, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_2tuple_filter_protocol =
>  	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
>  				protocol, "protocol");
>  cmdline_parse_token_num_t cmd_2tuple_filter_protocol_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
> -				protocol_value, UINT8);
> +				protocol_value, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_2tuple_filter_mask =
>  	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
>  				mask, "mask");
>  cmdline_parse_token_num_t cmd_2tuple_filter_mask_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
> -				mask_value, INT8);
> +				mask_value, CMDLINE_INT8);
>  cmdline_parse_token_string_t cmd_2tuple_filter_tcp_flags =
>  	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
>  				tcp_flags, "tcp_flags");
>  cmdline_parse_token_num_t cmd_2tuple_filter_tcp_flags_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
> -				tcp_flags_value, UINT8);
> +				tcp_flags_value, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_2tuple_filter_priority =
>  	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
>  				priority, "priority");
>  cmdline_parse_token_num_t cmd_2tuple_filter_priority_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
> -				priority_value, UINT8);
> +				priority_value, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_2tuple_filter_queue =
>  	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
>  				queue, "queue");
>  cmdline_parse_token_num_t cmd_2tuple_filter_queue_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
> -				queue_id, UINT16);
> +				queue_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_2tuple_filter = {
>  	.f = cmd_2tuple_filter_parsed,
> @@ -10596,7 +10632,7 @@ cmdline_parse_token_string_t cmd_5tuple_filter_filter =
>  				 filter, "5tuple_filter");
>  cmdline_parse_token_num_t cmd_5tuple_filter_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_5tuple_filter_ops =
>  	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
>  				 ops, "add#del");
> @@ -10617,43 +10653,43 @@ cmdline_parse_token_string_t cmd_5tuple_filter_dst_port =
>  				dst_port, "dst_port");
>  cmdline_parse_token_num_t cmd_5tuple_filter_dst_port_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
> -				dst_port_value, UINT16);
> +				dst_port_value, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_5tuple_filter_src_port =
>  	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
>  				src_port, "src_port");
>  cmdline_parse_token_num_t cmd_5tuple_filter_src_port_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
> -				src_port_value, UINT16);
> +				src_port_value, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_5tuple_filter_protocol =
>  	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
>  				protocol, "protocol");
>  cmdline_parse_token_num_t cmd_5tuple_filter_protocol_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
> -				protocol_value, UINT8);
> +				protocol_value, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_5tuple_filter_mask =
>  	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
>  				mask, "mask");
>  cmdline_parse_token_num_t cmd_5tuple_filter_mask_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
> -				mask_value, INT8);
> +				mask_value, CMDLINE_INT8);
>  cmdline_parse_token_string_t cmd_5tuple_filter_tcp_flags =
>  	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
>  				tcp_flags, "tcp_flags");
>  cmdline_parse_token_num_t cmd_5tuple_filter_tcp_flags_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
> -				tcp_flags_value, UINT8);
> +				tcp_flags_value, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_5tuple_filter_priority =
>  	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
>  				priority, "priority");
>  cmdline_parse_token_num_t cmd_5tuple_filter_priority_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
> -				priority_value, UINT8);
> +				priority_value, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_5tuple_filter_queue =
>  	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
>  				queue, "queue");
>  cmdline_parse_token_num_t cmd_5tuple_filter_queue_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
> -				queue_id, UINT16);
> +				queue_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_5tuple_filter = {
>  	.f = cmd_5tuple_filter_parsed,
> @@ -10819,7 +10855,7 @@ cmdline_parse_token_string_t cmd_flex_filter_filter =
>  				filter, "flex_filter");
>  cmdline_parse_token_num_t cmd_flex_filter_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
> -				port_id, UINT16);
> +				port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flex_filter_ops =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
>  				ops, "add#del");
> @@ -10828,7 +10864,7 @@ cmdline_parse_token_string_t cmd_flex_filter_len =
>  				len, "len");
>  cmdline_parse_token_num_t cmd_flex_filter_len_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
> -				len_value, UINT8);
> +				len_value, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_flex_filter_bytes =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
>  				bytes, "bytes");
> @@ -10846,13 +10882,13 @@ cmdline_parse_token_string_t cmd_flex_filter_priority =
>  				priority, "priority");
>  cmdline_parse_token_num_t cmd_flex_filter_priority_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
> -				priority_value, UINT8);
> +				priority_value, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_flex_filter_queue =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
>  				queue, "queue");
>  cmdline_parse_token_num_t cmd_flex_filter_queue_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
> -				queue_id, UINT16);
> +				queue_id, CMDLINE_UINT16);
>  cmdline_parse_inst_t cmd_flex_filter = {
>  	.f = cmd_flex_filter_parsed,
>  	.data = NULL,
> @@ -10898,7 +10934,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_filter =
>  				 filter, "ethertype_filter");
>  cmdline_parse_token_num_t cmd_ethertype_filter_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_ethertype_filter_ops =
>  	TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
>  				 ops, "add#del");
> @@ -10913,7 +10949,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_ethertype =
>  				 ethertype, "ethertype");
>  cmdline_parse_token_num_t cmd_ethertype_filter_ethertype_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
> -			      ethertype_value, UINT16);
> +			      ethertype_value, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_ethertype_filter_drop =
>  	TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
>  				 drop, "drop#fwd");
> @@ -10922,7 +10958,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_queue =
>  				 queue, "queue");
>  cmdline_parse_token_num_t cmd_ethertype_filter_queue_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
> -			      queue_id, UINT16);
> +			      queue_id, CMDLINE_UINT16);
>  
>  static void
>  cmd_ethertype_filter_parsed(void *parsed_result,
> @@ -11401,7 +11437,7 @@ cmdline_parse_token_string_t cmd_flow_director_filter =
>  				 flow_director_filter, "flow_director_filter");
>  cmdline_parse_token_num_t cmd_flow_director_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flow_director_ops =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
>  				 ops, "add#del#update");
> @@ -11416,7 +11452,7 @@ cmdline_parse_token_string_t cmd_flow_director_ether =
>  				 ether, "ether");
>  cmdline_parse_token_num_t cmd_flow_director_ether_type =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
> -			      ether_type, UINT16);
> +			      ether_type, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flow_director_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
>  				 src, "src");
> @@ -11425,7 +11461,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_ip_src =
>  				 ip_src);
>  cmdline_parse_token_num_t cmd_flow_director_port_src =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
> -			      port_src, UINT16);
> +			      port_src, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flow_director_dst =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
>  				 dst, "dst");
> @@ -11434,37 +11470,37 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_ip_dst =
>  				 ip_dst);
>  cmdline_parse_token_num_t cmd_flow_director_port_dst =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
> -			      port_dst, UINT16);
> +			      port_dst, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flow_director_verify_tag =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
>  				  verify_tag, "verify_tag");
>  cmdline_parse_token_num_t cmd_flow_director_verify_tag_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
> -			      verify_tag_value, UINT32);
> +			      verify_tag_value, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_flow_director_tos =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
>  				 tos, "tos");
>  cmdline_parse_token_num_t cmd_flow_director_tos_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
> -			      tos_value, UINT8);
> +			      tos_value, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_flow_director_proto =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
>  				 proto, "proto");
>  cmdline_parse_token_num_t cmd_flow_director_proto_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
> -			      proto_value, UINT8);
> +			      proto_value, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_flow_director_ttl =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
>  				 ttl, "ttl");
>  cmdline_parse_token_num_t cmd_flow_director_ttl_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
> -			      ttl_value, UINT8);
> +			      ttl_value, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_flow_director_vlan =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
>  				 vlan, "vlan");
>  cmdline_parse_token_num_t cmd_flow_director_vlan_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
> -			      vlan_value, UINT16);
> +			      vlan_value, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flow_director_flexbytes =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
>  				 flexbytes, "flexbytes");
> @@ -11482,13 +11518,13 @@ cmdline_parse_token_string_t cmd_flow_director_queue =
>  				 queue, "queue");
>  cmdline_parse_token_num_t cmd_flow_director_queue_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
> -			      queue_id, UINT16);
> +			      queue_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flow_director_fd_id =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
>  				 fd_id, "fd_id");
>  cmdline_parse_token_num_t cmd_flow_director_fd_id_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
> -			      fd_id_value, UINT32);
> +			      fd_id_value, CMDLINE_UINT32);
>  
>  cmdline_parse_token_string_t cmd_flow_director_mode =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
> @@ -11522,7 +11558,7 @@ cmdline_parse_token_string_t cmd_flow_director_tunnel_id =
>  				 tunnel_id, "tunnel-id");
>  cmdline_parse_token_num_t cmd_flow_director_tunnel_id_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
> -			      tunnel_id_value, UINT32);
> +			      tunnel_id_value, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_flow_director_packet =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
>  				 packet, "packet");
> @@ -11766,7 +11802,7 @@ cmdline_parse_token_string_t cmd_flush_flow_director_flush =
>  				 flush_flow_director, "flush_flow_director");
>  cmdline_parse_token_num_t cmd_flush_flow_director_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flush_flow_director_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  
>  static void
>  cmd_flush_flow_director_parsed(void *parsed_result,
> @@ -11884,13 +11920,13 @@ cmdline_parse_token_string_t cmd_flow_director_mask =
>  				 flow_director_mask, "flow_director_mask");
>  cmdline_parse_token_num_t cmd_flow_director_mask_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flow_director_mask_vlan =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
>  				 vlan, "vlan");
>  cmdline_parse_token_num_t cmd_flow_director_mask_vlan_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
> -			      vlan_mask, UINT16);
> +			      vlan_mask, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flow_director_mask_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
>  				 src_mask, "src_mask");
> @@ -11902,7 +11938,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_mask_ipv6_src =
>  				 ipv6_src);
>  cmdline_parse_token_num_t cmd_flow_director_mask_port_src =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
> -			      port_src, UINT16);
> +			      port_src, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flow_director_mask_dst =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
>  				 dst_mask, "dst_mask");
> @@ -11914,7 +11950,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_mask_ipv6_dst =
>  				 ipv6_dst);
>  cmdline_parse_token_num_t cmd_flow_director_mask_port_dst =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
> -			      port_dst, UINT16);
> +			      port_dst, CMDLINE_UINT16);
>  
>  cmdline_parse_token_string_t cmd_flow_director_mask_mode =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
> @@ -11933,19 +11969,19 @@ cmdline_parse_token_string_t cmd_flow_director_mask_mac =
>  				 mac, "mac");
>  cmdline_parse_token_num_t cmd_flow_director_mask_mac_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
> -			      mac_addr_byte_mask, UINT8);
> +			      mac_addr_byte_mask, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_flow_director_mask_tunnel_type =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
>  				 tunnel_type, "tunnel-type");
>  cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_type_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
> -			      tunnel_type_mask, UINT8);
> +			      tunnel_type_mask, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_flow_director_mask_tunnel_id =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
>  				 tunnel_id, "tunnel-id");
>  cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_id_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
> -			      tunnel_id_mask, UINT32);
> +			      tunnel_id_mask, CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_set_flow_director_ip_mask = {
>  	.f = cmd_flow_director_mask_parsed,
> @@ -12099,7 +12135,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexmask =
>  				 "flow_director_flex_mask");
>  cmdline_parse_token_num_t cmd_flow_director_flexmask_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flex_mask_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flow_director_flexmask_flow =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
>  				 flow, "flow");
> @@ -12217,7 +12253,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexpayload =
>  				 "flow_director_flex_payload");
>  cmdline_parse_token_num_t cmd_flow_director_flexpayload_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flexpayload_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_flow_director_flexpayload_payload_layer =
>  	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flexpayload_result,
>  				 payload_layer, "raw#l2#l3#l4");
> @@ -12285,7 +12321,7 @@ cmdline_parse_token_string_t cmd_get_sym_hash_ena_per_port_all =
>  		get_sym_hash_ena_per_port, "get_sym_hash_ena_per_port");
>  cmdline_parse_token_num_t cmd_get_sym_hash_ena_per_port_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_get_sym_hash_ena_per_port_result,
> -		port_id, UINT16);
> +		port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_get_sym_hash_ena_per_port = {
>  	.f = cmd_get_sym_hash_per_port_parsed,
> @@ -12341,7 +12377,7 @@ cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_all =
>  		set_sym_hash_ena_per_port, "set_sym_hash_ena_per_port");
>  cmdline_parse_token_num_t cmd_set_sym_hash_ena_per_port_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
> -		port_id, UINT16);
> +		port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_enable =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
>  		enable, "enable#disable");
> @@ -12466,7 +12502,7 @@ cmdline_parse_token_string_t cmd_get_hash_global_config_all =
>  		get_hash_global_config, "get_hash_global_config");
>  cmdline_parse_token_num_t cmd_get_hash_global_config_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_get_hash_global_config_result,
> -		port_id, UINT16);
> +		port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_get_hash_global_config = {
>  	.f = cmd_get_hash_global_config_parsed,
> @@ -12541,7 +12577,7 @@ cmdline_parse_token_string_t cmd_set_hash_global_config_all =
>  		set_hash_global_config, "set_hash_global_config");
>  cmdline_parse_token_num_t cmd_set_hash_global_config_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_hash_global_config_result,
> -		port_id, UINT16);
> +		port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_hash_global_config_hash_func =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_hash_global_config_result,
>  		hash_func, "toeplitz#simple_xor#symmetric_toeplitz#default");
> @@ -12657,7 +12693,7 @@ cmdline_parse_token_string_t cmd_set_hash_input_set_cmd =
>  		set_hash_input_set, "set_hash_input_set");
>  cmdline_parse_token_num_t cmd_set_hash_input_set_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_hash_input_set_result,
> -		port_id, UINT16);
> +		port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_hash_input_set_flow_type =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_hash_input_set_result,
>  		flow_type, NULL);
> @@ -12730,7 +12766,7 @@ cmdline_parse_token_string_t cmd_set_fdir_input_set_cmd =
>  	set_fdir_input_set, "set_fdir_input_set");
>  cmdline_parse_token_num_t cmd_set_fdir_input_set_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_fdir_input_set_result,
> -	port_id, UINT16);
> +	port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_fdir_input_set_flow_type =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result,
>  	flow_type,
> @@ -12803,7 +12839,8 @@ cmdline_parse_token_string_t cmd_mcast_addr_what =
>  	TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result, what,
>  				 "add#remove");
>  cmdline_parse_token_num_t cmd_mcast_addr_portnum =
> -	TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num,
> +				 CMDLINE_UINT16);
>  cmdline_parse_token_etheraddr_t cmd_mcast_addr_addr =
>  	TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
>  
> @@ -12852,7 +12889,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_all_str =
>  cmdline_parse_token_num_t cmd_config_l2_tunnel_eth_type_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_l2_tunnel_eth_type_result,
> -		 id, UINT16);
> +		 id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_l2_tunnel =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_l2_tunnel_eth_type_result,
> @@ -12868,7 +12905,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_eth_type =
>  cmdline_parse_token_num_t cmd_config_l2_tunnel_eth_type_eth_type_val =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_l2_tunnel_eth_type_result,
> -		 eth_type_val, UINT16);
> +		 eth_type_val, CMDLINE_UINT16);
>  
>  static enum rte_eth_tunnel_type
>  str2fdir_l2_tunnel_type(char *string)
> @@ -12986,7 +13023,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_all_str =
>  cmdline_parse_token_num_t cmd_config_l2_tunnel_en_dis_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_l2_tunnel_en_dis_result,
> -		 id, UINT16);
> +		 id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_l2_tunnel =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_l2_tunnel_en_dis_result,
> @@ -13164,7 +13201,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_port_tag_id =
>  cmdline_parse_token_num_t cmd_config_e_tag_port_tag_id_val =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_e_tag_result,
> -		 port_tag_id_val, UINT32);
> +		 port_tag_id_val, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_config_e_tag_e_tag_id =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_e_tag_result,
> @@ -13172,7 +13209,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_e_tag_id =
>  cmdline_parse_token_num_t cmd_config_e_tag_e_tag_id_val =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_e_tag_result,
> -		 e_tag_id_val, UINT16);
> +		 e_tag_id_val, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_e_tag_dst_pool =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_e_tag_result,
> @@ -13180,7 +13217,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_dst_pool =
>  cmdline_parse_token_num_t cmd_config_e_tag_dst_pool_val =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_e_tag_result,
> -		 dst_pool_val, UINT8);
> +		 dst_pool_val, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_config_e_tag_port =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_e_tag_result,
> @@ -13188,7 +13225,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_port =
>  cmdline_parse_token_num_t cmd_config_e_tag_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_e_tag_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_e_tag_vf =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_e_tag_result,
> @@ -13196,7 +13233,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_vf =
>  cmdline_parse_token_num_t cmd_config_e_tag_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_e_tag_result,
> -		 vf_id, UINT8);
> +		 vf_id, CMDLINE_UINT8);
>  
>  /* E-tag insertion configuration */
>  static void
> @@ -13515,11 +13552,11 @@ cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_antispoof =
>  cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_vlan_anti_spoof_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_vlan_anti_spoof_result,
> -		 vf_id, UINT32);
> +		 vf_id, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_on_off =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_vf_vlan_anti_spoof_result,
> @@ -13621,11 +13658,11 @@ cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_antispoof =
>  cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_mac_anti_spoof_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_mac_anti_spoof_result,
> -		 vf_id, UINT32);
> +		 vf_id, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_on_off =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_vf_mac_anti_spoof_result,
> @@ -13727,11 +13764,11 @@ cmdline_parse_token_string_t cmd_vf_vlan_stripq_stripq =
>  cmdline_parse_token_num_t cmd_vf_vlan_stripq_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_vlan_stripq_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_vf_vlan_stripq_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_vlan_stripq_result,
> -		 vf_id, UINT16);
> +		 vf_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_vf_vlan_stripq_on_off =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_vf_vlan_stripq_result,
> @@ -13833,15 +13870,15 @@ cmdline_parse_token_string_t cmd_vf_vlan_insert_insert =
>  cmdline_parse_token_num_t cmd_vf_vlan_insert_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_vlan_insert_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_vf_vlan_insert_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_vlan_insert_result,
> -		 vf_id, UINT16);
> +		 vf_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_vf_vlan_insert_vlan_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_vlan_insert_result,
> -		 vlan_id, UINT16);
> +		 vlan_id, CMDLINE_UINT16);
>  
>  static void
>  cmd_set_vf_vlan_insert_parsed(
> @@ -13931,7 +13968,7 @@ cmdline_parse_token_string_t cmd_tx_loopback_loopback =
>  cmdline_parse_token_num_t cmd_tx_loopback_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_tx_loopback_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_tx_loopback_on_off =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_tx_loopback_result,
> @@ -14031,7 +14068,7 @@ cmdline_parse_token_string_t cmd_all_queues_drop_en_drop =
>  cmdline_parse_token_num_t cmd_all_queues_drop_en_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_all_queues_drop_en_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_all_queues_drop_en_on_off =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_all_queues_drop_en_result,
> @@ -14123,11 +14160,11 @@ cmdline_parse_token_string_t cmd_vf_split_drop_en_drop =
>  cmdline_parse_token_num_t cmd_vf_split_drop_en_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_split_drop_en_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_vf_split_drop_en_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_split_drop_en_result,
> -		 vf_id, UINT16);
> +		 vf_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_vf_split_drop_en_on_off =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_vf_split_drop_en_result,
> @@ -14217,11 +14254,11 @@ cmdline_parse_token_string_t cmd_set_vf_mac_addr_addr =
>  cmdline_parse_token_num_t cmd_set_vf_mac_addr_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_set_vf_mac_addr_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_set_vf_mac_addr_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_set_vf_mac_addr_result,
> -		 vf_id, UINT16);
> +		 vf_id, CMDLINE_UINT16);
>  cmdline_parse_token_etheraddr_t cmd_set_vf_mac_addr_mac_addr =
>  	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_mac_addr_result,
>  		 mac_addr);
> @@ -14318,7 +14355,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_on_offload =
>  cmdline_parse_token_num_t cmd_macsec_offload_on_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_macsec_offload_on_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_macsec_offload_on_on =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_macsec_offload_on_result,
> @@ -14433,7 +14470,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_off_offload =
>  cmdline_parse_token_num_t cmd_macsec_offload_off_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_macsec_offload_off_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_macsec_offload_off_off =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_macsec_offload_off_result,
> @@ -14528,7 +14565,7 @@ cmdline_parse_token_string_t cmd_macsec_sc_tx_rx =
>  cmdline_parse_token_num_t cmd_macsec_sc_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_macsec_sc_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
>  	TOKEN_ETHERADDR_INITIALIZER
>  		(struct cmd_macsec_sc_result,
> @@ -14536,7 +14573,7 @@ cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
>  cmdline_parse_token_num_t cmd_macsec_sc_pi =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_macsec_sc_result,
> -		 pi, UINT16);
> +		 pi, CMDLINE_UINT16);
>  
>  static void
>  cmd_set_macsec_sc_parsed(
> @@ -14620,19 +14657,19 @@ cmdline_parse_token_string_t cmd_macsec_sa_tx_rx =
>  cmdline_parse_token_num_t cmd_macsec_sa_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_macsec_sa_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_macsec_sa_idx =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_macsec_sa_result,
> -		 idx, UINT8);
> +		 idx, CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_macsec_sa_an =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_macsec_sa_result,
> -		 an, UINT8);
> +		 an, CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_macsec_sa_pn =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_macsec_sa_result,
> -		 pn, UINT32);
> +		 pn, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_macsec_sa_key =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_macsec_sa_result,
> @@ -14740,11 +14777,11 @@ cmdline_parse_token_string_t cmd_vf_promisc_promisc =
>  cmdline_parse_token_num_t cmd_vf_promisc_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_promisc_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_vf_promisc_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_promisc_result,
> -		 vf_id, UINT32);
> +		 vf_id, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_vf_promisc_on_off =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_vf_promisc_result,
> @@ -14830,11 +14867,11 @@ cmdline_parse_token_string_t cmd_vf_allmulti_allmulti =
>  cmdline_parse_token_num_t cmd_vf_allmulti_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_allmulti_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_vf_allmulti_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_allmulti_result,
> -		 vf_id, UINT32);
> +		 vf_id, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_vf_allmulti_on_off =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_vf_allmulti_result,
> @@ -14920,11 +14957,11 @@ cmdline_parse_token_string_t cmd_set_vf_broadcast_broadcast =
>  cmdline_parse_token_num_t cmd_set_vf_broadcast_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_set_vf_broadcast_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_set_vf_broadcast_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_set_vf_broadcast_result,
> -		 vf_id, UINT16);
> +		 vf_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_vf_broadcast_on_off =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_set_vf_broadcast_result,
> @@ -15014,11 +15051,11 @@ cmdline_parse_token_string_t cmd_set_vf_vlan_tag_tag =
>  cmdline_parse_token_num_t cmd_set_vf_vlan_tag_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_set_vf_vlan_tag_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_set_vf_vlan_tag_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_set_vf_vlan_tag_result,
> -		 vf_id, UINT16);
> +		 vf_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_vf_vlan_tag_on_off =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_set_vf_vlan_tag_result,
> @@ -15124,19 +15161,19 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_max_bw =
>  cmdline_parse_token_num_t cmd_vf_tc_bw_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_tc_bw_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_vf_tc_bw_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_tc_bw_result,
> -		 vf_id, UINT16);
> +		 vf_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_vf_tc_bw_tc_no =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_tc_bw_result,
> -		 tc_no, UINT8);
> +		 tc_no, CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_vf_tc_bw_bw =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_tc_bw_result,
> -		 bw, UINT32);
> +		 bw, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_vf_tc_bw_result,
> @@ -15144,7 +15181,7 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list =
>  cmdline_parse_token_num_t cmd_vf_tc_bw_tc_map =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_vf_tc_bw_result,
> -		 tc_map, UINT8);
> +		 tc_map, CMDLINE_UINT8);
>  
>  /* VF max bandwidth setting */
>  static void
> @@ -15455,27 +15492,29 @@ cmdline_parse_token_string_t cmd_set_vxlan_vni =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
>  				 "vni");
>  cmdline_parse_token_num_t cmd_set_vxlan_vni_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, vni, UINT32);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, vni, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_set_vxlan_udp_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
>  				 "udp-src");
>  cmdline_parse_token_num_t cmd_set_vxlan_udp_src_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src,
> +				 CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_vxlan_udp_dst =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
>  				 "udp-dst");
>  cmdline_parse_token_num_t cmd_set_vxlan_udp_dst_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst,
> +				 CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_vxlan_ip_tos =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
>  				 "ip-tos");
>  cmdline_parse_token_num_t cmd_set_vxlan_ip_tos_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, UINT8);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_set_vxlan_ip_ttl =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
>  				 "ip-ttl");
>  cmdline_parse_token_num_t cmd_set_vxlan_ip_ttl_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, UINT8);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_set_vxlan_ip_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
>  				 "ip-src");
> @@ -15490,7 +15529,7 @@ cmdline_parse_token_string_t cmd_set_vxlan_vlan =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
>  				 "vlan-tci");
>  cmdline_parse_token_num_t cmd_set_vxlan_vlan_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_vxlan_eth_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
>  				 "eth-src");
> @@ -15675,7 +15714,7 @@ cmdline_parse_token_string_t cmd_set_nvgre_tni =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
>  				 "tni");
>  cmdline_parse_token_num_t cmd_set_nvgre_tni_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, UINT32);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_set_nvgre_ip_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
>  				 "ip-src");
> @@ -15690,7 +15729,7 @@ cmdline_parse_token_string_t cmd_set_nvgre_vlan =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
>  				 "vlan-tci");
>  cmdline_parse_token_num_t cmd_set_nvgre_vlan_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_nvgre_eth_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
>  				 "eth-src");
> @@ -15821,7 +15860,8 @@ cmdline_parse_token_string_t cmd_set_l2_encap_vlan =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
>  				 "vlan-tci");
>  cmdline_parse_token_num_t cmd_set_l2_encap_vlan_value =
> -	TOKEN_NUM_INITIALIZER(struct cmd_set_l2_encap_result, tci, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_set_l2_encap_result, tci,
> +				 CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_l2_encap_eth_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
>  				 "eth-src");
> @@ -15981,7 +16021,7 @@ cmdline_parse_token_string_t cmd_set_mplsogre_encap_label =
>  				 pos_token, "label");
>  cmdline_parse_token_num_t cmd_set_mplsogre_encap_label_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, label,
> -			      UINT32);
> +			      CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_set_mplsogre_encap_ip_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
>  				 pos_token, "ip-src");
> @@ -15997,7 +16037,7 @@ cmdline_parse_token_string_t cmd_set_mplsogre_encap_vlan =
>  				 pos_token, "vlan-tci");
>  cmdline_parse_token_num_t cmd_set_mplsogre_encap_vlan_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, tci,
> -			      UINT16);
> +			      CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_mplsogre_encap_eth_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
>  				 pos_token, "eth-src");
> @@ -16205,19 +16245,19 @@ cmdline_parse_token_string_t cmd_set_mplsoudp_encap_label =
>  				 pos_token, "label");
>  cmdline_parse_token_num_t cmd_set_mplsoudp_encap_label_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, label,
> -			      UINT32);
> +			      CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
>  				 pos_token, "udp-src");
>  cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_src_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_src,
> -			      UINT16);
> +			      CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_dst =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
>  				 pos_token, "udp-dst");
>  cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_dst_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_dst,
> -			      UINT16);
> +			      CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_mplsoudp_encap_ip_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
>  				 pos_token, "ip-src");
> @@ -16233,7 +16273,7 @@ cmdline_parse_token_string_t cmd_set_mplsoudp_encap_vlan =
>  				 pos_token, "vlan-tci");
>  cmdline_parse_token_num_t cmd_set_mplsoudp_encap_vlan_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, tci,
> -			      UINT16);
> +			      CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_mplsoudp_encap_eth_src =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
>  				 pos_token, "eth-src");
> @@ -16476,7 +16516,8 @@ cmdline_parse_token_string_t cmd_ddp_add_ddp =
>  cmdline_parse_token_string_t cmd_ddp_add_add =
>  	TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, add, "add");
>  cmdline_parse_token_num_t cmd_ddp_add_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_ddp_add_filepath =
>  	TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, filepath, NULL);
>  
> @@ -16556,7 +16597,8 @@ cmdline_parse_token_string_t cmd_ddp_del_ddp =
>  cmdline_parse_token_string_t cmd_ddp_del_del =
>  	TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, del, "del");
>  cmdline_parse_token_num_t cmd_ddp_del_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_ddp_del_filepath =
>  	TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, filepath, NULL);
>  
> @@ -16863,7 +16905,8 @@ cmdline_parse_token_string_t cmd_ddp_get_list_get =
>  cmdline_parse_token_string_t cmd_ddp_get_list_list =
>  	TOKEN_STRING_INITIALIZER(struct cmd_ddp_get_list_result, list, "list");
>  cmdline_parse_token_num_t cmd_ddp_get_list_port_id =
> -	TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id,
> +		CMDLINE_UINT16);
>  
>  static void
>  cmd_ddp_get_list_parsed(
> @@ -17014,13 +17057,13 @@ cmdline_parse_token_string_t cmd_cfg_input_set_cfg =
>  				 cfg, "config");
>  cmdline_parse_token_num_t cmd_cfg_input_set_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_cfg_input_set_pctype =
>  	TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
>  				 pctype, "pctype");
>  cmdline_parse_token_num_t cmd_cfg_input_set_pctype_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
> -			      pctype_id, UINT8);
> +			      pctype_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_cfg_input_set_inset_type =
>  	TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
>  				 inset_type,
> @@ -17033,7 +17076,7 @@ cmdline_parse_token_string_t cmd_cfg_input_set_field =
>  				 field, "field");
>  cmdline_parse_token_num_t cmd_cfg_input_set_field_idx =
>  	TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
> -			      field_idx, UINT8);
> +			      field_idx, CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_cfg_input_set = {
>  	.f = cmd_cfg_input_set_parsed,
> @@ -17115,13 +17158,13 @@ cmdline_parse_token_string_t cmd_clear_input_set_cfg =
>  				 cfg, "config");
>  cmdline_parse_token_num_t cmd_clear_input_set_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_clear_input_set_pctype =
>  	TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
>  				 pctype, "pctype");
>  cmdline_parse_token_num_t cmd_clear_input_set_pctype_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result,
> -			      pctype_id, UINT8);
> +			      pctype_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_clear_input_set_inset_type =
>  	TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
>  				 inset_type,
> @@ -17178,11 +17221,11 @@ cmdline_parse_token_string_t cmd_show_vf_stats_stats =
>  cmdline_parse_token_num_t cmd_show_vf_stats_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_show_vf_stats_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_show_vf_stats_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_show_vf_stats_result,
> -		 vf_id, UINT16);
> +		 vf_id, CMDLINE_UINT16);
>  
>  static void
>  cmd_show_vf_stats_parsed(
> @@ -17287,11 +17330,11 @@ cmdline_parse_token_string_t cmd_clear_vf_stats_stats =
>  cmdline_parse_token_num_t cmd_clear_vf_stats_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_clear_vf_stats_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_clear_vf_stats_vf_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_clear_vf_stats_result,
> -		 vf_id, UINT16);
> +		 vf_id, CMDLINE_UINT16);
>  
>  static void
>  cmd_clear_vf_stats_parsed(
> @@ -17371,7 +17414,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_reset_config =
>  cmdline_parse_token_num_t cmd_pctype_mapping_reset_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_pctype_mapping_reset_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_pctype_mapping_reset_pctype =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_pctype_mapping_reset_result,
> @@ -17453,7 +17496,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_get_port =
>  cmdline_parse_token_num_t cmd_pctype_mapping_get_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_pctype_mapping_get_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_pctype_mapping_get_pctype =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_pctype_mapping_get_result,
> @@ -17557,7 +17600,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_config =
>  cmdline_parse_token_num_t cmd_pctype_mapping_update_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_pctype_mapping_update_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_pctype_mapping_update_pctype =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_pctype_mapping_update_result,
> @@ -17577,7 +17620,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_pc_type =
>  cmdline_parse_token_num_t cmd_pctype_mapping_update_flow_type =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_pctype_mapping_update_result,
> -		 flow_type, UINT16);
> +		 flow_type, CMDLINE_UINT16);
>  
>  static void
>  cmd_pctype_mapping_update_parsed(
> @@ -17671,11 +17714,11 @@ cmdline_parse_token_string_t cmd_ptype_mapping_get_get =
>  cmdline_parse_token_num_t cmd_ptype_mapping_get_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_ptype_mapping_get_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_ptype_mapping_get_valid_only =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_ptype_mapping_get_result,
> -		 valid_only, UINT8);
> +		 valid_only, CMDLINE_UINT8);
>  
>  static void
>  cmd_ptype_mapping_get_parsed(
> @@ -17768,19 +17811,19 @@ cmdline_parse_token_string_t cmd_ptype_mapping_replace_replace =
>  cmdline_parse_token_num_t cmd_ptype_mapping_replace_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_ptype_mapping_replace_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_ptype_mapping_replace_target =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_ptype_mapping_replace_result,
> -		 target, UINT32);
> +		 target, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_ptype_mapping_replace_mask =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_ptype_mapping_replace_result,
> -		 mask, UINT8);
> +		 mask, CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_ptype_mapping_replace_pkt_type =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_ptype_mapping_replace_result,
> -		 pkt_type, UINT32);
> +		 pkt_type, CMDLINE_UINT32);
>  
>  static void
>  cmd_ptype_mapping_replace_parsed(
> @@ -17862,7 +17905,7 @@ cmdline_parse_token_string_t cmd_ptype_mapping_reset_reset =
>  cmdline_parse_token_num_t cmd_ptype_mapping_reset_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_ptype_mapping_reset_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  
>  static void
>  cmd_ptype_mapping_reset_parsed(
> @@ -17935,15 +17978,15 @@ cmdline_parse_token_string_t cmd_ptype_mapping_update_update =
>  cmdline_parse_token_num_t cmd_ptype_mapping_update_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_ptype_mapping_update_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_ptype_mapping_update_hw_ptype =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_ptype_mapping_update_result,
> -		 hw_ptype, UINT8);
> +		 hw_ptype, CMDLINE_UINT8);
>  cmdline_parse_token_num_t cmd_ptype_mapping_update_sw_ptype =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_ptype_mapping_update_result,
> -		 sw_ptype, UINT32);
> +		 sw_ptype, CMDLINE_UINT32);
>  
>  static void
>  cmd_ptype_mapping_update_parsed(
> @@ -18054,7 +18097,7 @@ cmdline_parse_token_string_t cmd_rx_offload_get_capa_port =
>  cmdline_parse_token_num_t cmd_rx_offload_get_capa_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_rx_offload_get_capa_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_rx_offload_get_capa_rx_offload =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_rx_offload_get_capa_result,
> @@ -18151,7 +18194,7 @@ cmdline_parse_token_string_t cmd_rx_offload_get_configuration_port =
>  cmdline_parse_token_num_t cmd_rx_offload_get_configuration_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_rx_offload_get_configuration_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_rx_offload_get_configuration_rx_offload =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_rx_offload_get_configuration_result,
> @@ -18233,7 +18276,7 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_config =
>  cmdline_parse_token_num_t cmd_config_per_port_rx_offload_result_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_per_port_rx_offload_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_rx_offload =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_per_port_rx_offload_result,
> @@ -18355,7 +18398,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_port =
>  cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_per_queue_rx_offload_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_per_queue_rx_offload_result,
> @@ -18363,7 +18406,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq =
>  cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_queue_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_per_queue_rx_offload_result,
> -		 queue_id, UINT16);
> +		 queue_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxoffload =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_per_queue_rx_offload_result,
> @@ -18464,7 +18507,7 @@ cmdline_parse_token_string_t cmd_tx_offload_get_capa_port =
>  cmdline_parse_token_num_t cmd_tx_offload_get_capa_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_tx_offload_get_capa_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_tx_offload_get_capa_tx_offload =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_tx_offload_get_capa_result,
> @@ -18561,7 +18604,7 @@ cmdline_parse_token_string_t cmd_tx_offload_get_configuration_port =
>  cmdline_parse_token_num_t cmd_tx_offload_get_configuration_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_tx_offload_get_configuration_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_tx_offload_get_configuration_tx_offload =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_tx_offload_get_configuration_result,
> @@ -18643,7 +18686,7 @@ cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_config =
>  cmdline_parse_token_num_t cmd_config_per_port_tx_offload_result_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_per_port_tx_offload_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_tx_offload =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_per_port_tx_offload_result,
> @@ -18772,7 +18815,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_port =
>  cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_per_queue_tx_offload_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_per_queue_tx_offload_result,
> @@ -18780,7 +18823,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq =
>  cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_queue_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_config_per_queue_tx_offload_result,
> -		 queue_id, UINT16);
> +		 queue_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txoffload =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_config_per_queue_tx_offload_result,
> @@ -18898,13 +18941,13 @@ cmdline_parse_token_string_t cmd_config_tx_metadata_specific_keyword =
>  			keyword, "config");
>  cmdline_parse_token_num_t cmd_config_tx_metadata_specific_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_tx_metadata_specific_item =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
>  			item, "tx_metadata");
>  cmdline_parse_token_num_t cmd_config_tx_metadata_specific_value =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
> -			value, UINT32);
> +			value, CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_config_tx_metadata_specific = {
>  	.f = cmd_config_tx_metadata_specific_parsed,
> @@ -18977,7 +19020,7 @@ cmdline_parse_token_string_t cmd_config_tx_dynf_specific_keyword =
>  			keyword, "config");
>  cmdline_parse_token_num_t cmd_config_tx_dynf_specific_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_config_tx_dynf_specific_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_config_tx_dynf_specific_item =
>  	TOKEN_STRING_INITIALIZER(struct cmd_config_tx_dynf_specific_result,
>  			item, "dynf");
> @@ -19036,7 +19079,7 @@ cmdline_parse_token_string_t cmd_show_tx_metadata_port =
>  			cmd_port, "port");
>  cmdline_parse_token_num_t cmd_show_tx_metadata_pid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_tx_metadata_result,
> -			cmd_pid, UINT16);
> +			cmd_pid, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_show_tx_metadata_keyword =
>  	TOKEN_STRING_INITIALIZER(struct cmd_show_tx_metadata_result,
>  			cmd_keyword, "tx_metadata");
> @@ -19076,7 +19119,7 @@ cmdline_parse_token_string_t cmd_show_port_supported_ptypes_port =
>  cmdline_parse_token_num_t cmd_show_port_supported_ptypes_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_show_port_supported_ptypes_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_show_port_supported_ptypes_ptypes =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_show_port_supported_ptypes_result,
> @@ -19224,19 +19267,19 @@ cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_port =
>  			cmd_port, "port");
>  cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_pid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
> -			cmd_pid, UINT16);
> +			cmd_pid, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_keyword =
>  	TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
>  			cmd_keyword, "rxq#txq");
>  cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_qid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
> -			cmd_qid, UINT16);
> +			cmd_qid, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_desc =
>  	TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
>  			cmd_desc, "desc");
>  cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_did =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
> -			cmd_did, UINT16);
> +			cmd_did, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_status =
>  	TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
>  			cmd_status, "status");
> @@ -19279,7 +19322,7 @@ cmdline_parse_token_string_t cmd_set_port_ptypes_port =
>  cmdline_parse_token_num_t cmd_set_port_ptypes_port_id =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_set_port_ptypes_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_set_port_ptypes_mask_str =
>  	TOKEN_STRING_INITIALIZER
>  		(struct cmd_set_port_ptypes_result,
> @@ -19287,7 +19330,7 @@ cmdline_parse_token_string_t cmd_set_port_ptypes_mask_str =
>  cmdline_parse_token_num_t cmd_set_port_ptypes_mask_u32 =
>  	TOKEN_NUM_INITIALIZER
>  		(struct cmd_set_port_ptypes_result,
> -		 mask, UINT32);
> +		 mask, CMDLINE_UINT32);
>  
>  static void
>  cmd_set_port_ptypes_parsed(
> @@ -19372,7 +19415,7 @@ cmdline_parse_token_string_t cmd_showport_macs_port =
>  			cmd_port, "port");
>  cmdline_parse_token_num_t cmd_showport_macs_pid =
>  	TOKEN_NUM_INITIALIZER(struct cmd_showport_macs_result,
> -			cmd_pid, UINT16);
> +			cmd_pid, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_showport_macs_keyword =
>  	TOKEN_STRING_INITIALIZER(struct cmd_showport_macs_result,
>  			cmd_keyword, "macs#mcast_macs");
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index 6263d307e..93b5878c4 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -7004,7 +7004,7 @@ cmdline_parse_token_string_t cmd_show_set_raw_cmd_what =
>  			cmd_what, "raw_encap#raw_decap");
>  cmdline_parse_token_num_t cmd_show_set_raw_cmd_index =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_set_raw_result,
> -			cmd_index, UINT16);
> +			cmd_index, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_show_set_raw_cmd_all =
>  	TOKEN_STRING_INITIALIZER(struct cmd_show_set_raw_result,
>  			cmd_all, "all");
> diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c
> index ee16244de..06db0ca2d 100644
> --- a/app/test-pmd/cmdline_mtr.c
> +++ b/app/test-pmd/cmdline_mtr.c
> @@ -253,7 +253,7 @@ cmdline_parse_token_string_t cmd_show_port_meter_cap_cap =
>  		struct cmd_show_port_meter_cap_result, cap, "cap");
>  cmdline_parse_token_num_t cmd_show_port_meter_cap_port_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_show_port_meter_cap_result, port_id, UINT16);
> +		struct cmd_show_port_meter_cap_result, port_id, CMDLINE_UINT16);
>  
>  static void cmd_show_port_meter_cap_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -359,23 +359,23 @@ cmdline_parse_token_string_t cmd_add_port_meter_profile_srtcm_srtcm_rfc2697 =
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_srtcm_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_profile_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_srtcm_result,
> -			profile_id, UINT32);
> +			profile_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_cir =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_srtcm_result,
> -			cir, UINT64);
> +			cir, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_cbs =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_srtcm_result,
> -			cbs, UINT64);
> +			cbs, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_ebs =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_srtcm_result,
> -			ebs, UINT64);
> +			ebs, CMDLINE_UINT64);
>  
>  static void cmd_add_port_meter_profile_srtcm_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -461,27 +461,27 @@ cmdline_parse_token_string_t cmd_add_port_meter_profile_trtcm_trtcm_rfc2698 =
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_trtcm_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_profile_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_trtcm_result,
> -			profile_id, UINT32);
> +			profile_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_cir =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_trtcm_result,
> -			cir, UINT64);
> +			cir, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_pir =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_trtcm_result,
> -			pir, UINT64);
> +			pir, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_cbs =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_trtcm_result,
> -			cbs, UINT64);
> +			cbs, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_pbs =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_trtcm_result,
> -			pbs, UINT64);
> +			pbs, CMDLINE_UINT64);
>  
>  static void cmd_add_port_meter_profile_trtcm_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -571,27 +571,27 @@ cmdline_parse_token_string_t
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_profile_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
> -			profile_id, UINT32);
> +			profile_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_cir =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
> -			cir, UINT64);
> +			cir, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_eir =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
> -			eir, UINT64);
> +			eir, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_cbs =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
> -			cbs, UINT64);
> +			cbs, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_ebs =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
> -			ebs, UINT64);
> +			ebs, CMDLINE_UINT64);
>  
>  static void cmd_add_port_meter_profile_trtcm_rfc4115_parsed(
>  	void *parsed_result,
> @@ -672,11 +672,11 @@ cmdline_parse_token_string_t cmd_del_port_meter_profile_profile =
>  cmdline_parse_token_num_t cmd_del_port_meter_profile_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_del_port_meter_profile_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_del_port_meter_profile_profile_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_del_port_meter_profile_result,
> -			profile_id, UINT32);
> +			profile_id, CMDLINE_UINT32);
>  
>  static void cmd_del_port_meter_profile_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -742,13 +742,14 @@ cmdline_parse_token_string_t cmd_create_port_meter_meter =
>  		struct cmd_create_port_meter_result, meter, "meter");
>  cmdline_parse_token_num_t cmd_create_port_meter_port_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_create_port_meter_result, port_id, UINT16);
> +		struct cmd_create_port_meter_result, port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_create_port_meter_mtr_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_create_port_meter_result, mtr_id, UINT32);
> +		struct cmd_create_port_meter_result, mtr_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_create_port_meter_profile_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_create_port_meter_result, profile_id, UINT32);
> +		struct cmd_create_port_meter_result, profile_id,
> +		CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_create_port_meter_meter_enable =
>  	TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result,
>  		meter_enable, "yes#no");
> @@ -763,10 +764,10 @@ cmdline_parse_token_string_t cmd_create_port_meter_r_action =
>  		r_action, "R#Y#G#D#r#y#g#d");
>  cmdline_parse_token_num_t cmd_create_port_meter_statistics_mask =
>  	TOKEN_NUM_INITIALIZER(struct cmd_create_port_meter_result,
> -		statistics_mask, UINT64);
> +		statistics_mask, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_create_port_meter_shared =
>  	TOKEN_NUM_INITIALIZER(struct cmd_create_port_meter_result,
> -		shared, UINT32);
> +		shared, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_create_port_meter_input_color =
>  	TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result,
>  		meter_input_color, TOKEN_STRING_MULTI);
> @@ -866,10 +867,10 @@ cmdline_parse_token_string_t cmd_enable_port_meter_meter =
>  		struct cmd_enable_port_meter_result, meter, "meter");
>  cmdline_parse_token_num_t cmd_enable_port_meter_port_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_enable_port_meter_result, port_id, UINT16);
> +		struct cmd_enable_port_meter_result, port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_enable_port_meter_mtr_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_enable_port_meter_result, mtr_id, UINT32);
> +		struct cmd_enable_port_meter_result, mtr_id, CMDLINE_UINT32);
>  
>  static void cmd_enable_port_meter_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -927,10 +928,10 @@ cmdline_parse_token_string_t cmd_disable_port_meter_meter =
>  		struct cmd_disable_port_meter_result, meter, "meter");
>  cmdline_parse_token_num_t cmd_disable_port_meter_port_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_disable_port_meter_result, port_id, UINT16);
> +		struct cmd_disable_port_meter_result, port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_disable_port_meter_mtr_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_disable_port_meter_result, mtr_id, UINT32);
> +		struct cmd_disable_port_meter_result, mtr_id, CMDLINE_UINT32);
>  
>  static void cmd_disable_port_meter_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -988,10 +989,10 @@ cmdline_parse_token_string_t cmd_del_port_meter_meter =
>  		struct cmd_del_port_meter_result, meter, "meter");
>  cmdline_parse_token_num_t cmd_del_port_meter_port_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_del_port_meter_result, port_id, UINT16);
> +		struct cmd_del_port_meter_result, port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_del_port_meter_mtr_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_del_port_meter_result, mtr_id, UINT32);
> +		struct cmd_del_port_meter_result, mtr_id, CMDLINE_UINT32);
>  
>  static void cmd_del_port_meter_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -1054,13 +1055,16 @@ cmdline_parse_token_string_t cmd_set_port_meter_profile_profile =
>  		struct cmd_set_port_meter_profile_result, profile, "profile");
>  cmdline_parse_token_num_t cmd_set_port_meter_profile_port_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_set_port_meter_profile_result, port_id, UINT16);
> +		struct cmd_set_port_meter_profile_result, port_id,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_set_port_meter_profile_mtr_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_set_port_meter_profile_result, mtr_id, UINT32);
> +		struct cmd_set_port_meter_profile_result, mtr_id,
> +		CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_set_port_meter_profile_profile_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_set_port_meter_profile_result, profile_id, UINT32);
> +		struct cmd_set_port_meter_profile_result, profile_id,
> +		CMDLINE_UINT32);
>  
>  static void cmd_set_port_meter_profile_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -1208,15 +1212,15 @@ cmdline_parse_token_string_t cmd_set_port_meter_policer_action_action =
>  cmdline_parse_token_num_t cmd_set_port_meter_policer_action_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_set_port_meter_policer_action_result, port_id,
> -		UINT16);
> +		CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_set_port_meter_policer_action_mtr_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_set_port_meter_policer_action_result, mtr_id,
> -		UINT32);
> +		CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_set_port_meter_policer_action_action_mask =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_set_port_meter_policer_action_result, action_mask,
> -		UINT32);
> +		CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_set_port_meter_policer_action_policer_action =
>  	TOKEN_STRING_INITIALIZER(
>  		struct cmd_set_port_meter_policer_action_result,
> @@ -1317,14 +1321,16 @@ cmdline_parse_token_string_t cmd_set_port_meter_stats_mask_mask =
>  		struct cmd_set_port_meter_stats_mask_result, mask, "mask");
>  cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_port_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_set_port_meter_stats_mask_result, port_id, UINT16);
> +		struct cmd_set_port_meter_stats_mask_result, port_id,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_mtr_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_set_port_meter_stats_mask_result, mtr_id, UINT32);
> +		struct cmd_set_port_meter_stats_mask_result, mtr_id,
> +		CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_stats_mask =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_set_port_meter_stats_mask_result, stats_mask,
> -		UINT64);
> +		CMDLINE_UINT64);
>  
>  static void cmd_set_port_meter_stats_mask_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -1389,10 +1395,12 @@ cmdline_parse_token_string_t cmd_show_port_meter_stats_stats =
>  		struct cmd_show_port_meter_stats_result, stats, "stats");
>  cmdline_parse_token_num_t cmd_show_port_meter_stats_port_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_show_port_meter_stats_result, port_id, UINT16);
> +		struct cmd_show_port_meter_stats_result, port_id,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_show_port_meter_stats_mtr_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_show_port_meter_stats_result, mtr_id, UINT32);
> +		struct cmd_show_port_meter_stats_result, mtr_id,
> +		CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_show_port_meter_stats_clear =
>  	TOKEN_STRING_INITIALIZER(
>  		struct cmd_show_port_meter_stats_result, clear, "yes#no");
> diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c
> index 6951beb58..cdc3ca48e 100644
> --- a/app/test-pmd/cmdline_tm.c
> +++ b/app/test-pmd/cmdline_tm.c
> @@ -217,7 +217,7 @@ cmdline_parse_token_string_t cmd_show_port_tm_cap_cap =
>  		cap, "cap");
>  cmdline_parse_token_num_t cmd_show_port_tm_cap_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_cap_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  
>  static void cmd_show_port_tm_cap_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -354,10 +354,10 @@ cmdline_parse_token_string_t cmd_show_port_tm_level_cap_cap =
>  		cap, "cap");
>  cmdline_parse_token_num_t cmd_show_port_tm_level_cap_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_show_port_tm_level_cap_level_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
> -		 level_id, UINT32);
> +		 level_id, CMDLINE_UINT32);
>  
>  
>  static void cmd_show_port_tm_level_cap_parsed(void *parsed_result,
> @@ -481,10 +481,10 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_cap_cap =
>  		cap, "cap");
>  cmdline_parse_token_num_t cmd_show_port_tm_node_cap_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_show_port_tm_node_cap_node_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
> -		 node_id, UINT32);
> +		 node_id, CMDLINE_UINT32);
>  
>  static void cmd_show_port_tm_node_cap_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -593,14 +593,15 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_stats_stats =
>  		struct cmd_show_port_tm_node_stats_result, stats, "stats");
>  cmdline_parse_token_num_t cmd_show_port_tm_node_stats_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_stats_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_show_port_tm_node_stats_node_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_show_port_tm_node_stats_result,
> -			node_id, UINT32);
> +			node_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_show_port_tm_node_stats_clear =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_show_port_tm_node_stats_result, clear, UINT32);
> +		struct cmd_show_port_tm_node_stats_result, clear,
> +			CMDLINE_UINT32);
>  
>  static void cmd_show_port_tm_node_stats_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -712,11 +713,11 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_type_type =
>  cmdline_parse_token_num_t cmd_show_port_tm_node_type_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_show_port_tm_node_type_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_show_port_tm_node_type_node_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_show_port_tm_node_type_result,
> -			node_id, UINT32);
> +			node_id, CMDLINE_UINT32);
>  
>  static void cmd_show_port_tm_node_type_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -804,31 +805,31 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_profile =
>  cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shaper_profile_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_shaper_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shaper_profile_result,
> -			shaper_id, UINT32);
> +			shaper_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_rate =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shaper_profile_result,
> -			cmit_tb_rate, UINT64);
> +			cmit_tb_rate, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_size =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shaper_profile_result,
> -			cmit_tb_size, UINT64);
> +			cmit_tb_size, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_rate =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shaper_profile_result,
> -			peak_tb_rate, UINT64);
> +			peak_tb_rate, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_size =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shaper_profile_result,
> -			peak_tb_size, UINT64);
> +			peak_tb_size, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_pktlen_adjust =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shaper_profile_result,
> -			pktlen_adjust, UINT32);
> +			pktlen_adjust, CMDLINE_UINT32);
>  
>  static void cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -920,11 +921,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_profile =
>  cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_del_port_tm_node_shaper_profile_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_shaper_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_del_port_tm_node_shaper_profile_result,
> -			shaper_id, UINT32);
> +			shaper_id, CMDLINE_UINT32);
>  
>  static void cmd_del_port_tm_node_shaper_profile_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -1001,15 +1002,15 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_shaper =
>  cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shared_shaper_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shared_shaper_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shared_shaper_result,
> -			shared_shaper_id, UINT32);
> +			shared_shaper_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shaper_profile_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shared_shaper_result,
> -			shaper_profile_id, UINT32);
> +			shaper_profile_id, CMDLINE_UINT32);
>  
>  static void cmd_add_port_tm_node_shared_shaper_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -1101,11 +1102,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_shaper =
>  cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_del_port_tm_node_shared_shaper_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_shared_shaper_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_del_port_tm_node_shared_shaper_result,
> -			shared_shaper_id, UINT32);
> +			shared_shaper_id, CMDLINE_UINT32);
>  
>  static void cmd_del_port_tm_node_shared_shaper_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -1194,11 +1195,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_profile =
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wred_profile_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			wred_profile_id, UINT32);
> +			wred_profile_id, CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g =
>  	TOKEN_STRING_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> @@ -1206,19 +1207,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g =
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_g =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			min_th_g, UINT64);
> +			min_th_g, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_g =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			max_th_g, UINT64);
> +			max_th_g, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_g =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			maxp_inv_g, UINT16);
> +			maxp_inv_g, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_g =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			wq_log2_g, UINT16);
> +			wq_log2_g, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y =
>  	TOKEN_STRING_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> @@ -1226,19 +1227,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y =
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_y =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			min_th_y, UINT64);
> +			min_th_y, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_y =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			max_th_y, UINT64);
> +			max_th_y, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_y =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			maxp_inv_y, UINT16);
> +			maxp_inv_y, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_y =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			wq_log2_y, UINT16);
> +			wq_log2_y, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r =
>  	TOKEN_STRING_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> @@ -1246,19 +1247,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r =
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_r =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			min_th_r, UINT64);
> +			min_th_r, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_r =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			max_th_r, UINT64);
> +			max_th_r, CMDLINE_UINT64);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_r =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			maxp_inv_r, UINT16);
> +			maxp_inv_r, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_r =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_wred_profile_result,
> -			wq_log2_r, UINT16);
> +			wq_log2_r, CMDLINE_UINT16);
>  
>  
>  static void cmd_add_port_tm_node_wred_profile_parsed(void *parsed_result,
> @@ -1374,11 +1375,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_profile =
>  cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_del_port_tm_node_wred_profile_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_wred_profile_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_del_port_tm_node_wred_profile_result,
> -			wred_profile_id, UINT32);
> +			wred_profile_id, CMDLINE_UINT32);
>  
>  static void cmd_del_port_tm_node_wred_profile_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -1456,15 +1457,15 @@ cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_profile =
>  cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_set_port_tm_node_shaper_profile_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_node_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_shaper_profile_result,
> -		node_id, UINT32);
> +		node_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t
>  	cmd_set_port_tm_node_shaper_shaper_profile_profile_id =
>  		TOKEN_NUM_INITIALIZER(
>  			struct cmd_set_port_tm_node_shaper_profile_result,
> -			shaper_profile_id, UINT32);
> +			shaper_profile_id, CMDLINE_UINT32);
>  
>  static void cmd_set_port_tm_node_shaper_profile_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -1550,31 +1551,31 @@ cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_node =
>  cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_nonleaf_node_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_node_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
> -		 node_id, UINT32);
> +		 node_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_parent_node_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
> -		 parent_node_id, INT32);
> +		 parent_node_id, CMDLINE_INT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_priority =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
> -		 priority, UINT32);
> +		 priority, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_weight =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
> -		 weight, UINT32);
> +		 weight, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_level_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
> -		 level_id, UINT32);
> +		 level_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_shaper_profile_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
> -		 shaper_profile_id, INT32);
> +		 shaper_profile_id, CMDLINE_INT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_n_sp_priorities =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
> -		 n_sp_priorities, UINT32);
> +		 n_sp_priorities, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_stats_mask =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
> -		 stats_mask, UINT64);
> +		 stats_mask, CMDLINE_UINT64);
>  cmdline_parse_token_string_t
>  	cmd_add_port_tm_nonleaf_node_multi_shared_shaper_id =
>  	TOKEN_STRING_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
> @@ -1708,34 +1709,34 @@ cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_node =
>  		struct cmd_add_port_tm_leaf_node_result, node, "node");
>  cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_node_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
> -		 node_id, UINT32);
> +		 node_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_parent_node_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
> -		 parent_node_id, INT32);
> +		 parent_node_id, CMDLINE_INT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_priority =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
> -		 priority, UINT32);
> +		 priority, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_weight =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
> -		 weight, UINT32);
> +		 weight, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_level_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
> -		 level_id, UINT32);
> +		 level_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_shaper_profile_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
> -		 shaper_profile_id, INT32);
> +		 shaper_profile_id, CMDLINE_INT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_cman_mode =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
> -		 cman_mode, UINT32);
> +		 cman_mode, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_wred_profile_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
> -		 wred_profile_id, UINT32);
> +		 wred_profile_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_stats_mask =
>  	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
> -		 stats_mask, UINT64);
> +		 stats_mask, CMDLINE_UINT64);
>  cmdline_parse_token_string_t
>  	cmd_add_port_tm_leaf_node_multi_shared_shaper_id =
>  	TOKEN_STRING_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
> @@ -1858,10 +1859,10 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_node =
>  		struct cmd_del_port_tm_node_result, node, "node");
>  cmdline_parse_token_num_t cmd_del_port_tm_node_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_del_port_tm_node_result,
> -		 port_id, UINT16);
> +		 port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_del_port_tm_node_node_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_del_port_tm_node_result,
> -		node_id, UINT32);
> +		node_id, CMDLINE_UINT32);
>  
>  static void cmd_del_port_tm_node_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -1936,19 +1937,21 @@ cmdline_parse_token_string_t cmd_set_port_tm_node_parent_parent =
>  		struct cmd_set_port_tm_node_parent_result, parent, "parent");
>  cmdline_parse_token_num_t cmd_set_port_tm_node_parent_port_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_set_port_tm_node_parent_result, port_id, UINT16);
> +		struct cmd_set_port_tm_node_parent_result, port_id,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_set_port_tm_node_parent_node_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_set_port_tm_node_parent_result, node_id, UINT32);
> +		struct cmd_set_port_tm_node_parent_result, node_id,
> +		CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_set_port_tm_node_parent_parent_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
> -		parent_id, UINT32);
> +		parent_id, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_set_port_tm_node_parent_priority =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
> -		priority, UINT32);
> +		priority, CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_set_port_tm_node_parent_weight =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
> -		weight, UINT32);
> +		weight, CMDLINE_UINT32);
>  
>  static void cmd_set_port_tm_node_parent_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -2024,10 +2027,12 @@ cmdline_parse_token_string_t cmd_suspend_port_tm_node_node =
>  		struct cmd_suspend_port_tm_node_result, node, "node");
>  cmdline_parse_token_num_t cmd_suspend_port_tm_node_port_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_suspend_port_tm_node_result, port_id, UINT16);
> +		struct cmd_suspend_port_tm_node_result, port_id,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_suspend_port_tm_node_node_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_suspend_port_tm_node_result, node_id, UINT32);
> +		struct cmd_suspend_port_tm_node_result, node_id,
> +		CMDLINE_UINT32);
>  
>  static void cmd_suspend_port_tm_node_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -2089,10 +2094,10 @@ cmdline_parse_token_string_t cmd_resume_port_tm_node_node =
>  		struct cmd_resume_port_tm_node_result, node, "node");
>  cmdline_parse_token_num_t cmd_resume_port_tm_node_port_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_resume_port_tm_node_result, port_id, UINT16);
> +		struct cmd_resume_port_tm_node_result, port_id, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_resume_port_tm_node_node_id =
>  	TOKEN_NUM_INITIALIZER(
> -		struct cmd_resume_port_tm_node_result, node_id, UINT32);
> +		struct cmd_resume_port_tm_node_result, node_id, CMDLINE_UINT32);
>  
>  static void cmd_resume_port_tm_node_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -2156,7 +2161,7 @@ cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_commit =
>  cmdline_parse_token_num_t cmd_port_tm_hierarchy_commit_port_id =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_port_tm_hierarchy_commit_result,
> -			port_id, UINT16);
> +			port_id, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_clean_on_fail =
>  	TOKEN_STRING_INITIALIZER(struct cmd_port_tm_hierarchy_commit_result,
>  		 clean_on_fail, "yes#no");
> @@ -2236,17 +2241,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_ip_ecn =
>  				 ip_ecn, "ip_ecn");
>  cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_green =
>  	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
> -			      green, UINT16);
> +			      green, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_yellow =
>  	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
> -			      yellow, UINT16);
> +			      yellow, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_red =
>  	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
> -				red, UINT16);
> +				red, CMDLINE_UINT16);
>  
>  static void cmd_port_tm_mark_ip_ecn_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -2323,17 +2328,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_ip_dscp =
>  				 ip_dscp, "ip_dscp");
>  cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_green =
>  	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
> -				green, UINT16);
> +				green, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_yellow =
>  	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
> -				yellow, UINT16);
> +				yellow, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_red =
>  	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
> -				red, UINT16);
> +				red, CMDLINE_UINT16);
>  
>  static void cmd_port_tm_mark_ip_dscp_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> @@ -2410,17 +2415,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_vlan_dei =
>  				 vlan_dei, "vlan_dei");
>  cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_port_id =
>  	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
> -			      port_id, UINT16);
> +			      port_id, CMDLINE_UINT16);
>  
>  cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_green =
>  	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
> -				green, UINT16);
> +				green, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_yellow =
>  	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
> -				yellow, UINT16);
> +				yellow, CMDLINE_UINT16);
>  cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_red =
>  	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
> -				red, UINT16);
> +				red, CMDLINE_UINT16);
>  
>  static void cmd_port_tm_mark_vlan_dei_parsed(void *parsed_result,
>  	__rte_unused struct cmdline *cl,
> diff --git a/app/test/test_cmdline_num.c b/app/test/test_cmdline_num.c
> index a6ad95507..a2f79ae85 100644
> --- a/app/test/test_cmdline_num.c
> +++ b/app/test/test_cmdline_num.c
> @@ -220,31 +220,31 @@ static int
>  can_parse_unsigned(uint64_t expected_result, enum cmdline_numtype type)
>  {
>  	switch (type) {
> -	case UINT8:
> +	case CMDLINE_UINT8:
>  		if (expected_result > UINT8_MAX)
>  			return 0;
>  		break;
> -	case UINT16:
> +	case CMDLINE_UINT16:
>  		if (expected_result > UINT16_MAX)
>  			return 0;
>  		break;
> -	case UINT32:
> +	case CMDLINE_UINT32:
>  		if (expected_result > UINT32_MAX)
>  			return 0;
>  		break;
> -	case INT8:
> +	case CMDLINE_INT8:
>  		if (expected_result > INT8_MAX)
>  			return 0;
>  		break;
> -	case INT16:
> +	case CMDLINE_INT16:
>  		if (expected_result > INT16_MAX)
>  			return 0;
>  		break;
> -	case INT32:
> +	case CMDLINE_INT32:
>  		if (expected_result > INT32_MAX)
>  			return 0;
>  		break;
> -	case INT64:
> +	case CMDLINE_INT64:
>  		if (expected_result > INT64_MAX)
>  			return 0;
>  		break;
> @@ -258,31 +258,31 @@ static int
>  can_parse_signed(int64_t expected_result, enum cmdline_numtype type)
>  {
>  	switch (type) {
> -	case UINT8:
> +	case CMDLINE_UINT8:
>  		if (expected_result > UINT8_MAX || expected_result < 0)
>  			return 0;
>  		break;
> -	case UINT16:
> +	case CMDLINE_UINT16:
>  		if (expected_result > UINT16_MAX || expected_result < 0)
>  			return 0;
>  		break;
> -	case UINT32:
> +	case CMDLINE_UINT32:
>  		if (expected_result > UINT32_MAX || expected_result < 0)
>  			return 0;
>  		break;
> -	case UINT64:
> +	case CMDLINE_UINT64:
>  		if (expected_result < 0)
>  			return 0;
>  		break;
> -	case INT8:
> +	case CMDLINE_INT8:
>  		if (expected_result > INT8_MAX || expected_result < INT8_MIN)
>  			return 0;
>  		break;
> -	case INT16:
> +	case CMDLINE_INT16:
>  		if (expected_result > INT16_MAX || expected_result < INT16_MIN)
>  			return 0;
>  		break;
> -	case INT32:
> +	case CMDLINE_INT32:
>  		if (expected_result > INT32_MAX || expected_result < INT32_MIN)
>  			return 0;
>  		break;
> @@ -302,7 +302,7 @@ test_parse_num_invalid_param(void)
>  	int ret = 0;
>  
>  	/* set up a token */
> -	token.num_data.type = UINT32;
> +	token.num_data.type = CMDLINE_UINT32;
>  
>  	/* copy string to buffer */
>  	strlcpy(buf, num_valid_positive_strs[0].str, sizeof(buf));
> @@ -375,7 +375,7 @@ test_parse_num_invalid_data(void)
>  	cmdline_parse_token_num_t token;
>  
>  	/* cycle through all possible parsed types */
> -	for (type = UINT8; type <= INT64; type++) {
> +	for (type = CMDLINE_UINT8; type <= CMDLINE_INT64; type++) {
>  		token.num_data.type = type;
>  
>  		/* test full strings */
> @@ -414,7 +414,7 @@ test_parse_num_valid(void)
>  	/** valid strings **/
>  
>  	/* cycle through all possible parsed types */
> -	for (type = UINT8; type <= INT64; type++) {
> +	for (type = CMDLINE_UINT8; type <= CMDLINE_INT64; type++) {
>  		token.num_data.type = type;
>  
>  		/* test positive strings */
> @@ -468,13 +468,13 @@ test_parse_num_valid(void)
>  			if (ret > 0) {
>  				/* detect negative */
>  				switch (type) {
> -				case INT8:
> +				case CMDLINE_INT8:
>  					result = (int8_t) result;
>  					break;
> -				case INT16:
> +				case CMDLINE_INT16:
>  					result = (int16_t) result;
>  					break;
> -				case INT32:
> +				case CMDLINE_INT32:
>  					result = (int32_t) result;
>  					break;
>  				default:
> @@ -492,7 +492,7 @@ test_parse_num_valid(void)
>  	/** garbage strings **/
>  
>  	/* cycle through all possible parsed types */
> -	for (type = UINT8; type <= INT64; type++) {
> +	for (type = CMDLINE_UINT8; type <= CMDLINE_INT64; type++) {
>  		token.num_data.type = type;
>  
>  		/* test positive garbage strings */
> @@ -546,15 +546,15 @@ test_parse_num_valid(void)
>  			if (ret > 0) {
>  				/* detect negative */
>  				switch (type) {
> -				case INT8:
> +				case CMDLINE_INT8:
>  					if (result & (INT8_MAX + 1))
>  						result |= 0xFFFFFFFFFFFFFF00ULL;
>  					break;
> -				case INT16:
> +				case CMDLINE_INT16:
>  					if (result & (INT16_MAX + 1))
>  						result |= 0xFFFFFFFFFFFF0000ULL;
>  					break;
> -				case INT32:
> +				case CMDLINE_INT32:
>  					if (result & (INT32_MAX + 1ULL))
>  						result |= 0xFFFFFFFF00000000ULL;
>  					break;
> diff --git a/examples/ethtool/ethtool-app/ethapp.c b/examples/ethtool/ethtool-app/ethapp.c
> index b6b967118..272e86966 100644
> --- a/examples/ethtool/ethtool-app/ethapp.c
> +++ b/examples/ethtool/ethtool-app/ethapp.c
> @@ -70,7 +70,7 @@ cmdline_parse_token_string_t pcmd_rxmode_token_cmd =
>  cmdline_parse_token_string_t pcmd_portstats_token_cmd =
>  	TOKEN_STRING_INITIALIZER(struct pcmd_int_params, cmd, "portstats");
>  cmdline_parse_token_num_t pcmd_int_token_port =
> -	TOKEN_NUM_INITIALIZER(struct pcmd_int_params, port, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct pcmd_int_params, port, CMDLINE_UINT16);
>  
>  /* Commands taking port id and string */
>  cmdline_parse_token_string_t pcmd_eeprom_token_cmd =
> @@ -84,7 +84,7 @@ cmdline_parse_token_string_t pcmd_regs_token_cmd =
>  	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, cmd, "regs");
>  
>  cmdline_parse_token_num_t pcmd_intstr_token_port =
> -	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, CMDLINE_UINT16);
>  cmdline_parse_token_string_t pcmd_intstr_token_opt =
>  	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, opt, NULL);
>  
> @@ -92,7 +92,7 @@ cmdline_parse_token_string_t pcmd_intstr_token_opt =
>  cmdline_parse_token_string_t pcmd_macaddr_token_cmd =
>  	TOKEN_STRING_INITIALIZER(struct pcmd_intmac_params, cmd, "macaddr");
>  cmdline_parse_token_num_t pcmd_intmac_token_port =
> -	TOKEN_NUM_INITIALIZER(struct pcmd_intmac_params, port, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct pcmd_intmac_params, port, CMDLINE_UINT16);
>  cmdline_parse_token_etheraddr_t pcmd_intmac_token_mac =
>  	TOKEN_ETHERADDR_INITIALIZER(struct pcmd_intmac_params, mac);
>  
> @@ -106,18 +106,19 @@ cmdline_parse_token_string_t pcmd_ringparam_token_cmd =
>  	TOKEN_STRING_INITIALIZER(struct pcmd_intintint_params, cmd,
>  		"ringparam");
>  cmdline_parse_token_num_t pcmd_intintint_token_port =
> -	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, port, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, port,
> +		CMDLINE_UINT16);
>  cmdline_parse_token_num_t pcmd_intintint_token_tx =
> -	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, tx, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, tx, CMDLINE_UINT16);
>  cmdline_parse_token_num_t pcmd_intintint_token_rx =
> -	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, rx, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, rx, CMDLINE_UINT16);
>  
>  
>  /* Pause commands */
>  cmdline_parse_token_string_t pcmd_pause_token_cmd =
>  	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, cmd, "pause");
>  cmdline_parse_token_num_t pcmd_pause_token_port =
> -	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, CMDLINE_UINT16);
>  cmdline_parse_token_string_t pcmd_pause_token_opt =
>  	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params,
>  		opt, "all#tx#rx#none");
> @@ -126,11 +127,11 @@ cmdline_parse_token_string_t pcmd_pause_token_opt =
>  cmdline_parse_token_string_t pcmd_vlan_token_cmd =
>  	TOKEN_STRING_INITIALIZER(struct pcmd_vlan_params, cmd, "vlan");
>  cmdline_parse_token_num_t pcmd_vlan_token_port =
> -	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, port, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, port, CMDLINE_UINT16);
>  cmdline_parse_token_string_t pcmd_vlan_token_mode =
>  	TOKEN_STRING_INITIALIZER(struct pcmd_vlan_params, mode, "add#del");
>  cmdline_parse_token_num_t pcmd_vlan_token_vid =
> -	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, vid, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, vid, CMDLINE_UINT16);
>  
>  
>  static void
> diff --git a/examples/ipsec-secgw/parser.c b/examples/ipsec-secgw/parser.c
> index 8f6666032..4d8fcf32b 100644
> --- a/examples/ipsec-secgw/parser.c
> +++ b/examples/ipsec-secgw/parser.c
> @@ -560,7 +560,7 @@ cmdline_parse_token_string_t cfg_add_neigh_start =
>  cmdline_parse_token_string_t cfg_add_neigh_pstr =
>  	TOKEN_STRING_INITIALIZER(struct cfg_neigh_add_item, pstr, "port");
>  cmdline_parse_token_num_t cfg_add_neigh_port =
> -	TOKEN_NUM_INITIALIZER(struct cfg_neigh_add_item, port, UINT16);
> +	TOKEN_NUM_INITIALIZER(struct cfg_neigh_add_item, port, CMDLINE_UINT16);
>  cmdline_parse_token_string_t cfg_add_neigh_mac =
>  	TOKEN_STRING_INITIALIZER(struct cfg_neigh_add_item, mac, NULL);
>  
> diff --git a/examples/qos_sched/cmdline.c b/examples/qos_sched/cmdline.c
> index ba68e0d02..7bb8058f8 100644
> --- a/examples/qos_sched/cmdline.c
> +++ b/examples/qos_sched/cmdline.c
> @@ -113,7 +113,7 @@ cmdline_parse_token_string_t cmd_setqavg_param_string =
>                                  "period#n");
>  cmdline_parse_token_num_t cmd_setqavg_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_setqavg_result, number,
> -                                UINT32);
> +				CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_setqavg = {
>          .f = cmd_setqavg_parsed,
> @@ -188,10 +188,10 @@ cmdline_parse_token_string_t cmd_subportstats_subport_string =
>                                  "subport");
>  cmdline_parse_token_num_t cmd_subportstats_subport_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_subportstats_result, subport_number,
> -                                UINT32);
> +				CMDLINE_UINT32);
>  cmdline_parse_token_num_t cmd_subportstats_port_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_subportstats_result, port_number,
> -			       UINT16);
> +				CMDLINE_UINT16);
>  
>  cmdline_parse_inst_t cmd_subportstats = {
>          .f = cmd_subportstats_parsed,
> @@ -236,19 +236,19 @@ cmdline_parse_token_string_t cmd_pipestats_port_string =
>                                  "port");
>  cmdline_parse_token_num_t cmd_pipestats_port_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, port_number,
> -			       UINT16);
> +				CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_pipestats_subport_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_pipestats_result, subport_string,
>                                  "subport");
>  cmdline_parse_token_num_t cmd_pipestats_subport_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, subport_number,
> -                                UINT32);
> +				CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_pipestats_pipe_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_pipestats_result, pipe_string,
>                                  "pipe");
>  cmdline_parse_token_num_t cmd_pipestats_pipe_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, pipe_number,
> -                                UINT32);
> +				CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_pipestats = {
>          .f = cmd_pipestats_parsed,
> @@ -299,31 +299,31 @@ cmdline_parse_token_string_t cmd_avg_q_port_string =
>                                  "port");
>  cmdline_parse_token_num_t cmd_avg_q_port_number =
>  	TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, port_number,
> -			       UINT16);
> +				CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_avg_q_subport_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, subport_string,
>                                  "subport");
>  cmdline_parse_token_num_t cmd_avg_q_subport_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, subport_number,
> -                                UINT32);
> +				CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_avg_q_pipe_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, pipe_string,
>                                  "pipe");
>  cmdline_parse_token_num_t cmd_avg_q_pipe_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, pipe_number,
> -                                UINT32);
> +				CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_avg_q_tc_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, tc_string,
>                                  "tc");
>  cmdline_parse_token_num_t cmd_avg_q_tc_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, tc_number,
> -                                UINT8);
> +				CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_avg_q_q_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, q_string,
>                                  "q");
>  cmdline_parse_token_num_t cmd_avg_q_q_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, q_number,
> -                                UINT8);
> +				CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_avg_q = {
>          .f = cmd_avg_q_parsed,
> @@ -376,25 +376,25 @@ cmdline_parse_token_string_t cmd_avg_tcpipe_port_string =
>                                  "port");
>  cmdline_parse_token_num_t cmd_avg_tcpipe_port_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, port_number,
> -			       UINT16);
> +				CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_avg_tcpipe_subport_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, subport_string,
>                                  "subport");
>  cmdline_parse_token_num_t cmd_avg_tcpipe_subport_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, subport_number,
> -                                UINT32);
> +				CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_avg_tcpipe_pipe_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, pipe_string,
>                                  "pipe");
>  cmdline_parse_token_num_t cmd_avg_tcpipe_pipe_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, pipe_number,
> -                                UINT32);
> +				CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_avg_tcpipe_tc_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, tc_string,
>                                  "tc");
>  cmdline_parse_token_num_t cmd_avg_tcpipe_tc_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, tc_number,
> -                                UINT8);
> +				CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_avg_tcpipe = {
>          .f = cmd_avg_tcpipe_parsed,
> @@ -443,19 +443,19 @@ cmdline_parse_token_string_t cmd_avg_pipe_port_string =
>                                  "port");
>  cmdline_parse_token_num_t cmd_avg_pipe_port_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, port_number,
> -			       UINT16);
> +				CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_avg_pipe_subport_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_avg_pipe_result, subport_string,
>                                  "subport");
>  cmdline_parse_token_num_t cmd_avg_pipe_subport_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, subport_number,
> -                                UINT32);
> +				CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_avg_pipe_pipe_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_avg_pipe_result, pipe_string,
>                                  "pipe");
>  cmdline_parse_token_num_t cmd_avg_pipe_pipe_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, pipe_number,
> -                                UINT32);
> +				CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_avg_pipe = {
>          .f = cmd_avg_pipe_parsed,
> @@ -502,19 +502,19 @@ cmdline_parse_token_string_t cmd_avg_tcsubport_port_string =
>                                  "port");
>  cmdline_parse_token_num_t cmd_avg_tcsubport_port_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, port_number,
> -			       UINT16);
> +				CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_avg_tcsubport_subport_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_avg_tcsubport_result, subport_string,
>                                  "subport");
>  cmdline_parse_token_num_t cmd_avg_tcsubport_subport_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, subport_number,
> -                                UINT32);
> +				CMDLINE_UINT32);
>  cmdline_parse_token_string_t cmd_avg_tcsubport_tc_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_avg_tcsubport_result, tc_string,
>                                  "tc");
>  cmdline_parse_token_num_t cmd_avg_tcsubport_tc_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, tc_number,
> -                                UINT8);
> +				CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_avg_tcsubport = {
>          .f = cmd_avg_tcsubport_parsed,
> @@ -559,13 +559,13 @@ cmdline_parse_token_string_t cmd_avg_subport_port_string =
>                                  "port");
>  cmdline_parse_token_num_t cmd_avg_subport_port_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_subport_result, port_number,
> -			       UINT16);
> +				CMDLINE_UINT16);
>  cmdline_parse_token_string_t cmd_avg_subport_subport_string =
>          TOKEN_STRING_INITIALIZER(struct cmd_avg_subport_result, subport_string,
>                                  "subport");
>  cmdline_parse_token_num_t cmd_avg_subport_subport_number =
>          TOKEN_NUM_INITIALIZER(struct cmd_avg_subport_result, subport_number,
> -                                UINT32);
> +				CMDLINE_UINT32);
>  
>  cmdline_parse_inst_t cmd_avg_subport = {
>          .f = cmd_avg_subport_parsed,
> diff --git a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
> index 96c1a1ff6..d15e0fc1f 100644
> --- a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
> +++ b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
> @@ -446,7 +446,7 @@ cmdline_parse_token_string_t cmd_set_cpu_freq =
>  			set_cpu_freq, "set_cpu_freq");
>  cmdline_parse_token_num_t cmd_set_cpu_freq_core_num =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_cpu_freq_result,
> -			lcore_id, UINT8);
> +			lcore_id, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result,
>  			cmd, "up#down#min#max#enable_turbo#disable_turbo");
> diff --git a/examples/vm_power_manager/vm_power_cli.c b/examples/vm_power_manager/vm_power_cli.c
> index 7edeaccda..0128f047f 100644
> --- a/examples/vm_power_manager/vm_power_cli.c
> +++ b/examples/vm_power_manager/vm_power_cli.c
> @@ -155,10 +155,10 @@ cmdline_parse_token_string_t cmd_set_pcpu_vm_name =
>  				vm_name, NULL);
>  cmdline_parse_token_num_t set_pcpu_vcpu =
>  		TOKEN_NUM_INITIALIZER(struct cmd_set_pcpu_result,
> -				vcpu, UINT8);
> +				vcpu, CMDLINE_UINT8);
>  cmdline_parse_token_num_t set_pcpu_core =
>  		TOKEN_NUM_INITIALIZER(struct cmd_set_pcpu_result,
> -				core, UINT64);
> +				core, CMDLINE_UINT64);
>  
>  
>  cmdline_parse_inst_t cmd_set_pcpu_set = {
> @@ -455,7 +455,7 @@ cmdline_parse_token_string_t cmd_show_cpu_freq =
>  
>  cmdline_parse_token_num_t cmd_show_cpu_freq_core_num =
>  	TOKEN_NUM_INITIALIZER(struct cmd_show_cpu_freq_result,
> -			core_num, UINT8);
> +			core_num, CMDLINE_UINT8);
>  
>  cmdline_parse_inst_t cmd_show_cpu_freq_set = {
>  	.f = cmd_show_cpu_freq_parsed,
> @@ -504,7 +504,7 @@ cmdline_parse_token_string_t cmd_set_cpu_freq =
>  			set_cpu_freq, "set_cpu_freq");
>  cmdline_parse_token_num_t cmd_set_cpu_freq_core_num =
>  	TOKEN_NUM_INITIALIZER(struct cmd_set_cpu_freq_result,
> -			core_num, UINT8);
> +			core_num, CMDLINE_UINT8);
>  cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd =
>  	TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result,
>  			cmd, "up#down#min#max#enable_turbo#disable_turbo");
> diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/librte_cmdline/cmdline_parse_num.c
> index 478f181b4..e96cddc9f 100644
> --- a/lib/librte_cmdline/cmdline_parse_num.c
> +++ b/lib/librte_cmdline/cmdline_parse_num.c
> @@ -57,9 +57,8 @@ static inline int
>  add_to_res(unsigned int c, uint64_t *res, unsigned int base)
>  {
>  	/* overflow */
> -	if ( (UINT64_MAX - c) / base < *res ) {
> +	if ((UINT64_MAX - c) / base < *res)
>  		return -1;
> -	}
>  
>  	*res = (uint64_t) (*res * base + c);
>  	return 0;
> @@ -69,23 +68,23 @@ static int
>  check_res_size(struct cmdline_token_num_data *nd, unsigned ressize)
>  {
>  	switch (nd->type) {
> -	case INT8:
> -	case UINT8:
> +	case CMDLINE_INT8:
> +	case CMDLINE_UINT8:
>  		if (ressize < sizeof(int8_t))
>  			return -1;
>  		break;
> -	case INT16:
> -	case UINT16:
> +	case CMDLINE_INT16:
> +	case CMDLINE_UINT16:
>  		if (ressize < sizeof(int16_t))
>  			return -1;
>  		break;
> -	case INT32:
> -	case UINT32:
> +	case CMDLINE_INT32:
> +	case CMDLINE_UINT32:
>  		if (ressize < sizeof(int32_t))
>  			return -1;
>  		break;
> -	case INT64:
> -	case UINT64:
> +	case CMDLINE_INT64:
> +	case CMDLINE_UINT64:
>  		if (ressize < sizeof(int64_t))
>  			return -1;
>  		break;
> @@ -123,7 +122,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res,
>  			return -1;
>  	}
>  
> -	while ( st != ERROR && c && ! cmdline_isendoftoken(c) ) {
> +	while (st != ERROR && c && !cmdline_isendoftoken(c)) {
>  		debug_printf("%c %x -> ", c, c);
>  		switch (st) {
>  		case START:
> @@ -259,61 +258,53 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res,
>  	case HEX_OK:
>  	case OCTAL_OK:
>  	case BIN_OK:
> -		if ( nd.type == INT8 && res1 <= INT8_MAX ) {
> +		if (nd.type == CMDLINE_INT8 && res1 <= INT8_MAX) {
>  			if (res) *(int8_t *)res = (int8_t) res1;
>  			return buf-srcbuf;
> -		}
> -		else if ( nd.type == INT16 && res1 <= INT16_MAX ) {
> +		} else if (nd.type == CMDLINE_INT16 && res1 <= INT16_MAX) {
>  			if (res) *(int16_t *)res = (int16_t) res1;
>  			return buf-srcbuf;
> -		}
> -		else if ( nd.type == INT32 && res1 <= INT32_MAX ) {
> +		} else if (nd.type == CMDLINE_INT32 && res1 <= INT32_MAX) {
>  			if (res) *(int32_t *)res = (int32_t) res1;
>  			return buf-srcbuf;
> -		}
> -		else if ( nd.type == INT64 && res1 <= INT64_MAX ) {
> +		} else if (nd.type == CMDLINE_INT64 && res1 <= INT64_MAX) {
>  			if (res) *(int64_t *)res = (int64_t) res1;
>  			return buf-srcbuf;
> -		}
> -		else if ( nd.type == UINT8 && res1 <= UINT8_MAX ) {
> +		} else if (nd.type == CMDLINE_UINT8 && res1 <= UINT8_MAX) {
>  			if (res) *(uint8_t *)res = (uint8_t) res1;
>  			return buf-srcbuf;
> -		}
> -		else if (nd.type == UINT16  && res1 <= UINT16_MAX ) {
> +		} else if (nd.type == CMDLINE_UINT16  && res1 <= UINT16_MAX) {
>  			if (res) *(uint16_t *)res = (uint16_t) res1;
>  			return buf-srcbuf;
> -		}
> -		else if ( nd.type == UINT32 && res1 <= UINT32_MAX ) {
> +		} else if (nd.type == CMDLINE_UINT32 && res1 <= UINT32_MAX) {
>  			if (res) *(uint32_t *)res = (uint32_t) res1;
>  			return buf-srcbuf;
> -		}
> -		else if ( nd.type == UINT64 ) {
> +		} else if (nd.type == CMDLINE_UINT64) {
>  			if (res) *(uint64_t *)res = res1;
>  			return buf-srcbuf;
> -		}
> -		else {
> +		} else {
>  			return -1;
>  		}
>  		break;
>  
>  	case DEC_NEG_OK:
> -		if ( nd.type == INT8 && res1 <= INT8_MAX + 1 ) {
> +		if (nd.type == CMDLINE_INT8 &&
> +				res1 <= INT8_MAX + 1) {
>  			if (res) *(int8_t *)res = (int8_t) (-res1);
>  			return buf-srcbuf;
> -		}
> -		else if ( nd.type == INT16 && res1 <= (uint16_t)INT16_MAX + 1 ) {
> +		} else if (nd.type == CMDLINE_INT16 &&
> +				res1 <= (uint16_t)INT16_MAX + 1) {
>  			if (res) *(int16_t *)res = (int16_t) (-res1);
>  			return buf-srcbuf;
> -		}
> -		else if ( nd.type == INT32 && res1 <= (uint32_t)INT32_MAX + 1 ) {
> +		} else if (nd.type == CMDLINE_INT32 &&
> +				res1 <= (uint32_t)INT32_MAX + 1) {
>  			if (res) *(int32_t *)res = (int32_t) (-res1);
>  			return buf-srcbuf;
> -		}
> -		else if ( nd.type == INT64 && res1 <= (uint64_t)INT64_MAX + 1 ) {
> +		} else if (nd.type == CMDLINE_INT64 &&
> +				res1 <= (uint64_t)INT64_MAX + 1) {
>  			if (res) *(int64_t *)res = (int64_t) (-res1);
>  			return buf-srcbuf;
> -		}
> -		else {
> +		} else {
>  			return -1;
>  		}
>  		break;
> diff --git a/lib/librte_cmdline/cmdline_parse_num.h b/lib/librte_cmdline/cmdline_parse_num.h
> index 58b28cad7..28b04520f 100644
> --- a/lib/librte_cmdline/cmdline_parse_num.h
> +++ b/lib/librte_cmdline/cmdline_parse_num.h
> @@ -14,14 +14,14 @@ extern "C" {
>  #endif
>  
>  enum cmdline_numtype {
> -	UINT8 = 0,
> -	UINT16,
> -	UINT32,
> -	UINT64,
> -	INT8,
> -	INT16,
> -	INT32,
> -	INT64
> +	CMDLINE_UINT8 = 0,
> +	CMDLINE_UINT16,
> +	CMDLINE_UINT32,
> +	CMDLINE_UINT64,
> +	CMDLINE_INT8,
> +	CMDLINE_INT16,
> +	CMDLINE_INT32,
> +	CMDLINE_INT64
>  };
>  
>  struct cmdline_token_num_data {
> -- 
> 2.25.4

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [dpdk-dev] [PATCH] cmdline: avoid name clash with Windows system types
  2020-08-21 18:48 [dpdk-dev] [PATCH] cmdline: avoid name clash with Windows system types Dmitry Kozlyuk
  2020-08-21 20:58 ` Jie Zhou
@ 2020-08-22  0:43 ` Ranjit Menon
  2020-09-02 18:38 ` [dpdk-dev] [PATCH v2] " Dmitry Kozlyuk
  2 siblings, 0 replies; 13+ messages in thread
From: Ranjit Menon @ 2020-08-22  0:43 UTC (permalink / raw)
  To: Dmitry Kozlyuk, dev
  Cc: Jie Zhou, Olivier Matz, Wenzhuo Lu, Beilei Xing,
	Bernard Iremonger, Ori Kam, Marko Kovacevic, Bruce Richardson,
	Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori,
	Pavan Nikhilesh, Cristian Dumitrescu, Jasvinder Singh,
	David Hunt


On 8/21/2020 11:48 AM, Dmitry Kozlyuk wrote:
> cmdline_numtype member names clash with Windows system identifiers.
> Add CMDLINE_ prefix to cmdline constants to avoid this and possible
> future conflicts.
>
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
> ---
>
> This patch made some lines overlong. When breaking them, indentation
> style is kept consistent with nearby code; it's weird in some places.
>
>   app/test-cmdline/commands.c                   |   2 +-
>   app/test-pmd/bpf_cmd.c                        |  10 +-
>   app/test-pmd/cmdline.c                        | 715 ++++++++++--------
>   app/test-pmd/cmdline_flow.c                   |   2 +-
>   app/test-pmd/cmdline_mtr.c                    |  92 ++-
>   app/test-pmd/cmdline_tm.c                     | 177 ++---
>   app/test/test_cmdline_num.c                   |  48 +-
>   examples/ethtool/ethtool-app/ethapp.c         |  19 +-
>   examples/ipsec-secgw/parser.c                 |   2 +-
>   examples/qos_sched/cmdline.c                  |  46 +-
>   .../guest_cli/vm_power_cli_guest.c            |   2 +-
>   examples/vm_power_manager/vm_power_cli.c      |   8 +-
>   lib/librte_cmdline/cmdline_parse_num.c        |  65 +-
>   lib/librte_cmdline/cmdline_parse_num.h        |  16 +-
>   14 files changed, 627 insertions(+), 577 deletions(-)
>
> <Snip>

Thanks for doing this, Dmitry!

Acked-by: Ranjit Menon <ranjit.menon@intel.com>


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [dpdk-dev] [PATCH v2] cmdline: avoid name clash with Windows system types
  2020-08-21 18:48 [dpdk-dev] [PATCH] cmdline: avoid name clash with Windows system types Dmitry Kozlyuk
  2020-08-21 20:58 ` Jie Zhou
  2020-08-22  0:43 ` Ranjit Menon
@ 2020-09-02 18:38 ` Dmitry Kozlyuk
  2020-09-03  9:20   ` Bruce Richardson
  2020-10-30  1:01   ` [dpdk-dev] [PATCH v3] " Dmitry Kozlyuk
  2 siblings, 2 replies; 13+ messages in thread
From: Dmitry Kozlyuk @ 2020-09-02 18:38 UTC (permalink / raw)
  To: dev
  Cc: Jie Zhou, Dmitry Kozlyuk, Ranjit Menon, Olivier Matz, Wenzhuo Lu,
	Beilei Xing, Bernard Iremonger, Ori Kam, Marko Kovacevic,
	Bruce Richardson, Radu Nicolau, Akhil Goyal, Tomasz Kantecki,
	Sunil Kumar Kori, Pavan Nikhilesh, Cristian Dumitrescu,
	Jasvinder Singh, Maxime Coquelin, Chenbo Xia, Zhihong Wang,
	David Hunt

cmdline_numtype member names clash with Windows system identifiers.
Add CMDLINE_ prefix to cmdline constants to avoid this and possible
future conflicts.

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
---

v2: fix compilation issue found by CI.

This patch made some lines overlong. When breaking them, indentation
style is kept consistent with nearby code; it's weird in some places.

 app/test-cmdline/commands.c                   |   2 +-
 app/test-pmd/bpf_cmd.c                        |  10 +-
 app/test-pmd/cmdline.c                        | 715 ++++++++++--------
 app/test-pmd/cmdline_flow.c                   |   2 +-
 app/test-pmd/cmdline_mtr.c                    |  92 ++-
 app/test-pmd/cmdline_tm.c                     | 177 ++---
 app/test/test_cmdline_num.c                   |  48 +-
 examples/ethtool/ethtool-app/ethapp.c         |  19 +-
 examples/ipsec-secgw/parser.c                 |   2 +-
 examples/qos_sched/cmdline.c                  |  46 +-
 examples/vdpa/main.c                          |   2 +-
 .../guest_cli/vm_power_cli_guest.c            |   2 +-
 examples/vm_power_manager/vm_power_cli.c      |   8 +-
 lib/librte_cmdline/cmdline_parse_num.c        |  65 +-
 lib/librte_cmdline/cmdline_parse_num.h        |  16 +-
 15 files changed, 628 insertions(+), 578 deletions(-)

diff --git a/app/test-cmdline/commands.c b/app/test-cmdline/commands.c
index d67c0ca6a..b6e13ca46 100644
--- a/app/test-cmdline/commands.c
+++ b/app/test-cmdline/commands.c
@@ -193,7 +193,7 @@ cmd_num_parsed(void *parsed_result,
 }
 
 cmdline_parse_token_num_t cmd_num_tok =
-	TOKEN_NUM_INITIALIZER(struct cmd_num_result, num, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_num_result, num, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_num = {
 	.f = cmd_num_parsed,  /* function to call */
diff --git a/app/test-pmd/bpf_cmd.c b/app/test-pmd/bpf_cmd.c
index 0f984ccf4..51b37a4d0 100644
--- a/app/test-pmd/bpf_cmd.c
+++ b/app/test-pmd/bpf_cmd.c
@@ -124,9 +124,9 @@ cmdline_parse_token_string_t cmd_load_bpf_dir =
 	TOKEN_STRING_INITIALIZER(struct cmd_bpf_ld_result,
 			dir, "rx#tx");
 cmdline_parse_token_num_t cmd_load_bpf_port =
-	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, port, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, port, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_load_bpf_queue =
-	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, queue, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, queue, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_load_bpf_flags =
 	TOKEN_STRING_INITIALIZER(struct cmd_bpf_ld_result,
 			flags, NULL);
@@ -180,9 +180,11 @@ cmdline_parse_token_string_t cmd_unload_bpf_dir =
 	TOKEN_STRING_INITIALIZER(struct cmd_bpf_unld_result,
 			dir, "rx#tx");
 cmdline_parse_token_num_t cmd_unload_bpf_port =
-	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, port, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result,
+			port, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_unload_bpf_queue =
-	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, queue, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result,
+			queue, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_operate_bpf_unld_parse = {
 	.f = cmd_operate_bpf_unld_parsed,
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 0a6ed85f3..455b0dd98 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1378,7 +1378,7 @@ cmdline_parse_token_string_t cmd_operate_specific_port_port =
 						name, "start#stop#close#reset");
 cmdline_parse_token_num_t cmd_operate_specific_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_operate_specific_port_result,
-							value, UINT8);
+							value, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_operate_specific_port = {
 	.f = cmd_operate_specific_port_parsed,
@@ -1516,7 +1516,7 @@ cmdline_parse_token_string_t cmd_operate_detach_port_keyword =
 			keyword, "detach");
 cmdline_parse_token_num_t cmd_operate_detach_port_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_operate_detach_port_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_operate_detach_port = {
 	.f = cmd_operate_detach_port_parsed,
@@ -1740,7 +1740,8 @@ cmdline_parse_token_string_t cmd_config_speed_specific_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, keyword,
 								"config");
 cmdline_parse_token_num_t cmd_config_speed_specific_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_speed_specific, id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_speed_specific, id,
+							CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_speed_specific_item1 =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, item1,
 								"speed");
@@ -1812,7 +1813,8 @@ cmdline_parse_token_string_t cmd_config_loopback_all_item =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_loopback_all, item,
 							"loopback");
 cmdline_parse_token_num_t cmd_config_loopback_all_mode =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_all, mode, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_all, mode,
+							CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_config_loopback_all = {
 	.f = cmd_config_loopback_all_parsed,
@@ -1866,13 +1868,13 @@ cmdline_parse_token_string_t cmd_config_loopback_specific_keyword =
 								"config");
 cmdline_parse_token_num_t cmd_config_loopback_specific_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_specific, port_id,
-								UINT16);
+								CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_loopback_specific_item =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_loopback_specific, item,
 								"loopback");
 cmdline_parse_token_num_t cmd_config_loopback_specific_mode =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_specific, mode,
-			      UINT32);
+			      CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_config_loopback_specific = {
 	.f = cmd_config_loopback_specific_parsed,
@@ -1957,7 +1959,7 @@ cmdline_parse_token_string_t cmd_config_rx_tx_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rx_tx, name,
 						"rxq#txq#rxd#txd");
 cmdline_parse_token_num_t cmd_config_rx_tx_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rx_tx, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rx_tx, value, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_config_rx_tx = {
 	.f = cmd_config_rx_tx_parsed,
@@ -2039,7 +2041,7 @@ cmdline_parse_token_string_t cmd_config_max_pkt_len_name =
 								"max-pkt-len");
 cmdline_parse_token_num_t cmd_config_max_pkt_len_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_max_pkt_len_result, value,
-								UINT32);
+								CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_config_max_pkt_len = {
 	.f = cmd_config_max_pkt_len_parsed,
@@ -2111,7 +2113,7 @@ cmdline_parse_token_string_t cmd_config_max_lro_pkt_size_name =
 				 name, "max-lro-pkt-size");
 cmdline_parse_token_num_t cmd_config_max_lro_pkt_size_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_max_lro_pkt_size_result,
-			      value, UINT32);
+			      value, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_config_max_lro_pkt_size = {
 	.f = cmd_config_max_lro_pkt_size_parsed,
@@ -2160,9 +2162,11 @@ cmdline_parse_token_string_t cmd_config_mtu_mtu =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_mtu_result, keyword,
 				 "mtu");
 cmdline_parse_token_num_t cmd_config_mtu_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_config_mtu_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value,
+				 CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_config_mtu = {
 	.f = cmd_config_mtu_parsed,
@@ -2493,7 +2497,8 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_config =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, config,
 				 "config");
 cmdline_parse_token_num_t cmd_config_rss_hash_key_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_hash_key =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key,
 				 rss_hash_key, "rss-hash-key");
@@ -2597,19 +2602,19 @@ cmdline_parse_token_string_t cmd_config_rxtx_ring_size_config =
 				 config, "config");
 cmdline_parse_token_num_t cmd_config_rxtx_ring_size_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
-				 portid, UINT16);
+				 portid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rxtxq =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
 				 rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_rxtx_ring_size_qid =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
-			      qid, UINT16);
+			      qid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rsize =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
 				 rsize, "ring_size");
 cmdline_parse_token_num_t cmd_config_rxtx_ring_size_size =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
-			      size, UINT16);
+			      size, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_config_rxtx_ring_size = {
 	.f = cmd_config_rxtx_ring_size_parsed,
@@ -2698,11 +2703,13 @@ cmd_config_rxtx_queue_parsed(void *parsed_result,
 cmdline_parse_token_string_t cmd_config_rxtx_queue_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, port, "port");
 cmdline_parse_token_num_t cmd_config_rxtx_queue_portid =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid,
+						CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_queue_rxtxq =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_rxtx_queue_qid =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid,
+						CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_queue_opname =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, opname,
 						"start#stop");
@@ -2778,13 +2785,13 @@ cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_port =
 						port, "port");
 cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
-						port_id, UINT16);
+						port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_rxtxq =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
 						rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_qid =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
-						qid, UINT16);
+						qid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_opname =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
 						opname, "deferred_start");
@@ -2820,11 +2827,12 @@ struct cmd_setup_rxtx_queue {
 cmdline_parse_token_string_t cmd_setup_rxtx_queue_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, port, "port");
 cmdline_parse_token_num_t cmd_setup_rxtx_queue_portid =
-	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, portid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, portid,
+		CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setup_rxtx_queue_rxtxq =
 	TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_setup_rxtx_queue_qid =
-	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, qid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, qid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setup_rxtx_queue_setup =
 	TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, setup, "setup");
 
@@ -3033,7 +3041,8 @@ cmdline_parse_token_string_t cmd_config_rss_reta_port =
 cmdline_parse_token_string_t cmd_config_rss_reta_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, keyword, "config");
 cmdline_parse_token_num_t cmd_config_rss_reta_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_rss_reta_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, name, "rss");
 cmdline_parse_token_string_t cmd_config_rss_reta_list_name =
@@ -3144,13 +3153,14 @@ cmdline_parse_token_string_t cmd_showport_reta_show =
 cmdline_parse_token_string_t cmd_showport_reta_port =
 	TOKEN_STRING_INITIALIZER(struct  cmd_showport_reta, port, "port");
 cmdline_parse_token_num_t cmd_showport_reta_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id,
+					CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_showport_reta_rss =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, rss, "rss");
 cmdline_parse_token_string_t cmd_showport_reta_reta =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, reta, "reta");
 cmdline_parse_token_num_t cmd_showport_reta_size =
-	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_showport_reta_list_of_items =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_reta,
 					list_of_items, NULL);
@@ -3195,7 +3205,8 @@ cmdline_parse_token_string_t cmd_showport_rss_hash_show =
 cmdline_parse_token_string_t cmd_showport_rss_hash_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, port, "port");
 cmdline_parse_token_num_t cmd_showport_rss_hash_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_showport_rss_hash_rss_hash =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, rss_hash,
 				 "rss-hash");
@@ -3299,7 +3310,7 @@ cmdline_parse_token_string_t cmd_config_dcb_port =
 cmdline_parse_token_string_t cmd_config_dcb_config =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, config, "config");
 cmdline_parse_token_num_t cmd_config_dcb_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_dcb_dcb =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, dcb, "dcb");
 cmdline_parse_token_string_t cmd_config_dcb_vt =
@@ -3307,7 +3318,7 @@ cmdline_parse_token_string_t cmd_config_dcb_vt =
 cmdline_parse_token_string_t cmd_config_dcb_vt_en =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, vt_en, "on#off");
 cmdline_parse_token_num_t cmd_config_dcb_num_tcs =
-        TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, num_tcs, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, num_tcs, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_config_dcb_pfc=
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, pfc, "pfc");
 cmdline_parse_token_string_t cmd_config_dcb_pfc_en =
@@ -3406,7 +3417,7 @@ cmdline_parse_token_string_t cmd_config_burst_all =
 cmdline_parse_token_string_t cmd_config_burst_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_burst, name, "burst");
 cmdline_parse_token_num_t cmd_config_burst_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_burst, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_burst, value, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_config_burst = {
 	.f = cmd_config_burst_parsed,
@@ -3475,7 +3486,7 @@ cmdline_parse_token_string_t cmd_config_thresh_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_thresh, name,
 				"txpt#txht#txwt#rxpt#rxht#rxwt");
 cmdline_parse_token_num_t cmd_config_thresh_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_thresh, value, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_thresh, value, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_config_thresh = {
 	.f = cmd_config_thresh_parsed,
@@ -3539,7 +3550,8 @@ cmdline_parse_token_string_t cmd_config_threshold_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_threshold, name,
 						"txfreet#txrst#rxfreet");
 cmdline_parse_token_num_t cmd_config_threshold_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_threshold, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_threshold, value,
+						CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_config_threshold = {
 	.f = cmd_config_threshold_parsed,
@@ -3745,7 +3757,8 @@ cmdline_parse_token_string_t cmd_setmask_mask =
 	TOKEN_STRING_INITIALIZER(struct cmd_setmask_result, mask,
 				 "coremask#portmask");
 cmdline_parse_token_num_t cmd_setmask_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_setmask_result, hexavalue, UINT64);
+	TOKEN_NUM_INITIALIZER(struct cmd_setmask_result, hexavalue,
+				 CMDLINE_UINT64);
 
 cmdline_parse_inst_t cmd_set_fwd_mask = {
 	.f = cmd_set_mask_parsed,
@@ -3791,7 +3804,7 @@ cmdline_parse_token_string_t cmd_set_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_result, what,
 				 "nbport#nbcore#burst#verbose");
 cmdline_parse_token_num_t cmd_set_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_result, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_result, value, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_set_numbers = {
 	.f = cmd_set_parsed,
@@ -3839,7 +3852,7 @@ cmdline_parse_token_string_t cmd_set_log_log =
 cmdline_parse_token_string_t cmd_set_log_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_log_result, type, NULL);
 cmdline_parse_token_num_t cmd_set_log_level =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_set_log = {
 	.f = cmd_set_log_parsed,
@@ -4019,7 +4032,7 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_all_all =
 				 all, "all");
 cmdline_parse_token_num_t cmd_rx_vlan_filter_all_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_all_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_rx_vlan_filter_all = {
 	.f = cmd_rx_vlan_filter_all_parsed,
@@ -4183,10 +4196,10 @@ cmdline_parse_token_string_t cmd_vlan_tpid_what =
 				 what, "tpid");
 cmdline_parse_token_num_t cmd_vlan_tpid_tpid =
 	TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
-			      tp_id, UINT16);
+			      tp_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vlan_tpid_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_vlan_tpid = {
 	.f = cmd_vlan_tpid_parsed,
@@ -4233,10 +4246,10 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_what =
 				 what, "add#rm");
 cmdline_parse_token_num_t cmd_rx_vlan_filter_vlanid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result,
-			      vlan_id, UINT16);
+			      vlan_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_rx_vlan_filter_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_rx_vlan_filter = {
 	.f = cmd_rx_vlan_filter_parsed,
@@ -4286,10 +4299,10 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_set =
 				 set, "set");
 cmdline_parse_token_num_t cmd_tx_vlan_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_vlanid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
-			      vlan_id, UINT16);
+			      vlan_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_set = {
 	.f = cmd_tx_vlan_set_parsed,
@@ -4340,13 +4353,13 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_qinq_set =
 		set, "set");
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-		vlan_id, UINT16);
+		vlan_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid_outer =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-		vlan_id_outer, UINT16);
+		vlan_id_outer, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_set_qinq = {
 	.f = cmd_tx_vlan_set_qinq_parsed,
@@ -4398,10 +4411,10 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_pvid =
 				 pvid, "pvid");
 cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
-			     port_id, UINT16);
+			     port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_vlan_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
-			      vlan_id, UINT16);
+			      vlan_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
 				 mode, "on#off");
@@ -4453,7 +4466,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_reset_reset =
 				 reset, "reset");
 cmdline_parse_token_num_t cmd_tx_vlan_reset_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_reset_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_reset = {
 	.f = cmd_tx_vlan_reset_parsed,
@@ -4659,7 +4672,7 @@ cmdline_parse_token_string_t cmd_csum_hwsw =
 				hwsw, "hw#sw");
 cmdline_parse_token_num_t cmd_csum_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_csum_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_csum_set = {
 	.f = cmd_csum_parsed,
@@ -4730,7 +4743,7 @@ cmdline_parse_token_string_t cmd_csum_tunnel_onoff =
 				onoff, "on#off");
 cmdline_parse_token_num_t cmd_csum_tunnel_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_csum_tunnel_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_csum_tunnel = {
 	.f = cmd_csum_tunnel_parsed,
@@ -4818,10 +4831,10 @@ cmdline_parse_token_string_t cmd_tso_set_mode =
 				mode, "set");
 cmdline_parse_token_num_t cmd_tso_set_tso_segsz =
 	TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
-				tso_segsz, UINT16);
+				tso_segsz, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tso_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tso_set = {
 	.f = cmd_tso_set_parsed,
@@ -4967,10 +4980,10 @@ cmdline_parse_token_string_t cmd_tunnel_tso_set_mode =
 				mode, "set");
 cmdline_parse_token_num_t cmd_tunnel_tso_set_tso_segsz =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
-				tso_segsz, UINT16);
+				tso_segsz, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tunnel_tso_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_tso_set = {
 	.f = cmd_tunnel_tso_set_parsed,
@@ -5034,7 +5047,7 @@ cmdline_parse_token_string_t cmd_gro_enable_port =
 			cmd_keyword, "port");
 cmdline_parse_token_num_t cmd_gro_enable_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_gro_enable_result,
-			cmd_pid, UINT16);
+			cmd_pid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_gro_enable_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_gro_enable_result,
 			cmd_keyword, "gro");
@@ -5084,7 +5097,7 @@ cmdline_parse_token_string_t cmd_gro_show_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_gro_show_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_gro_show_result,
-			cmd_pid, UINT16);
+			cmd_pid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_gro_show_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_gro_show_result,
 			cmd_keyword, "gro");
@@ -5134,7 +5147,7 @@ cmdline_parse_token_string_t cmd_gro_flush_flush =
 			cmd_flush, "flush");
 cmdline_parse_token_num_t cmd_gro_flush_cycles =
 	TOKEN_NUM_INITIALIZER(struct cmd_gro_flush_result,
-			cmd_cycles, UINT8);
+			cmd_cycles, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_gro_flush = {
 	.f = cmd_gro_flush_parsed,
@@ -5184,7 +5197,7 @@ cmdline_parse_token_string_t cmd_gso_enable_mode =
 			cmd_mode, "on#off");
 cmdline_parse_token_num_t cmd_gso_enable_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_gso_enable_result,
-			cmd_pid, UINT16);
+			cmd_pid, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_gso_enable = {
 	.f = cmd_gso_enable_parsed,
@@ -5243,7 +5256,7 @@ cmdline_parse_token_string_t cmd_gso_size_segsz =
 				cmd_segsz, "segsz");
 cmdline_parse_token_num_t cmd_gso_size_size =
 	TOKEN_NUM_INITIALIZER(struct cmd_gso_size_result,
-				cmd_size, UINT16);
+				cmd_size, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_gso_size = {
 	.f = cmd_gso_size_parsed,
@@ -5301,7 +5314,7 @@ cmdline_parse_token_string_t cmd_gso_show_keyword =
 				cmd_keyword, "gso");
 cmdline_parse_token_num_t cmd_gso_show_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_gso_show_result,
-				cmd_pid, UINT16);
+				cmd_pid, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_gso_show = {
 	.f = cmd_gso_show_parsed,
@@ -5444,7 +5457,7 @@ cmdline_parse_token_string_t cmd_setbypass_mode_value =
 			value, "normal#bypass#isolate");
 cmdline_parse_token_num_t cmd_setbypass_mode_port =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_mode_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bypass_mode = {
 	.f = cmd_set_bypass_mode_parsed,
@@ -5550,7 +5563,7 @@ cmdline_parse_token_string_t cmd_setbypass_event_mode_value =
 			mode_value, "normal#bypass#isolate");
 cmdline_parse_token_num_t cmd_setbypass_event_port =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_event_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bypass_event = {
 	.f = cmd_set_bypass_event_parsed,
@@ -5716,7 +5729,7 @@ cmdline_parse_token_string_t cmd_showbypass_config_config =
 			config, "config");
 cmdline_parse_token_num_t cmd_showbypass_config_port =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_bypass_config_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_show_bypass_config = {
 	.f = cmd_show_bypass_config_parsed,
@@ -5765,10 +5778,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result,
 		mode, "mode");
 cmdline_parse_token_num_t cmd_setbonding_mode_value =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
-		value, UINT8);
+		value, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_setbonding_mode_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bonding_mode = {
 		.f = cmd_set_bonding_mode_parsed,
@@ -5842,7 +5855,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
 		dedicated_queues, "dedicated_queues");
 cmdline_parse_token_num_t cmd_setbonding_lacp_dedicated_queues_port_id =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setbonding_lacp_dedicated_queues_mode =
 TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
 		mode, "enable#disable");
@@ -5910,7 +5923,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
 		balance_xmit_policy, "balance_xmit_policy");
 cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy =
 TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
 		policy, "l2#l23#l34");
@@ -6058,7 +6071,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result,
 		config, "config");
 cmdline_parse_token_num_t cmd_showbonding_config_port =
 TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_show_bonding_config = {
 		.f = cmd_show_bonding_config_parsed,
@@ -6111,10 +6124,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result,
 		primary, "primary");
 cmdline_parse_token_num_t cmd_setbonding_primary_slave =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
-		slave_id, UINT16);
+		slave_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_setbonding_primary_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bonding_primary = {
 		.f = cmd_set_bonding_primary_parsed,
@@ -6169,10 +6182,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result,
 		slave, "slave");
 cmdline_parse_token_num_t cmd_addbonding_slave_slaveid =
 TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
-		slave_id, UINT16);
+		slave_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_addbonding_slave_port =
 TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_add_bonding_slave = {
 		.f = cmd_add_bonding_slave_parsed,
@@ -6227,10 +6240,10 @@ cmdline_parse_token_string_t cmd_removebonding_slave_slave =
 				slave, "slave");
 cmdline_parse_token_num_t cmd_removebonding_slave_slaveid =
 		TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
-				slave_id, UINT16);
+				slave_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_removebonding_slave_port =
 		TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_remove_bonding_slave = {
 		.f = cmd_remove_bonding_slave_parsed,
@@ -6309,10 +6322,10 @@ cmdline_parse_token_string_t cmd_createbonded_device_device =
 				device, "device");
 cmdline_parse_token_num_t cmd_createbonded_device_mode =
 		TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result,
-				mode, UINT8);
+				mode, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_createbonded_device_socket =
 		TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result,
-				socket, UINT8);
+				socket, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_create_bonded_device = {
 		.f = cmd_create_bonded_device_parsed,
@@ -6365,7 +6378,7 @@ cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac =
 				"mac_addr");
 cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result,
-				port_num, UINT16);
+				port_num, CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr =
 		TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address);
 
@@ -6418,10 +6431,10 @@ cmdline_parse_token_string_t cmd_set_bond_mon_period_mon_period =
 				mon_period,	"mon_period");
 cmdline_parse_token_num_t cmd_set_bond_mon_period_portnum =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
-				port_num, UINT16);
+				port_num, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_bond_mon_period_period_ms =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
-				period_ms, UINT32);
+				period_ms, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_set_bond_mon_period = {
 		.f = cmd_set_bond_mon_period_parsed,
@@ -6480,7 +6493,7 @@ cmdline_parse_token_string_t cmd_set_bonding_agg_mode_agg_mode =
 
 cmdline_parse_token_num_t cmd_set_bonding_agg_mode_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_agg_mode_policy_result,
-				port_num, UINT16);
+				port_num, CMDLINE_UINT16);
 
 cmdline_parse_token_string_t cmd_set_bonding_agg_mode_policy_string =
 	TOKEN_STRING_INITIALIZER(
@@ -6668,11 +6681,13 @@ cmdline_parse_token_string_t cmd_set_burst_tx_retry_tx =
 cmdline_parse_token_string_t cmd_set_burst_tx_retry_delay =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, delay, "delay");
 cmdline_parse_token_num_t cmd_set_burst_tx_retry_time =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time,
+				 CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_set_burst_tx_retry_retry =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry, "retry");
 cmdline_parse_token_num_t cmd_set_burst_tx_retry_retry_num =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num,
+				 CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_set_burst_tx_retry = {
 	.f = cmd_set_burst_tx_retry_parsed,
@@ -6730,7 +6745,7 @@ cmdline_parse_token_string_t cmd_setpromisc_portall =
 				 "all");
 cmdline_parse_token_num_t cmd_setpromisc_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_promisc_mode_result, port_num,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setpromisc_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, mode,
 				 "on#off");
@@ -6804,7 +6819,7 @@ cmdline_parse_token_string_t cmd_setallmulti_portall =
 				 "all");
 cmdline_parse_token_num_t cmd_setallmulti_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_allmulti_mode_result, port_num,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setallmulti_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_allmulti_mode_result, mode,
 				 "on#off");
@@ -6882,25 +6897,25 @@ cmdline_parse_token_string_t cmd_lfc_set_high_water_str =
 				hw_str, "high_water");
 cmdline_parse_token_num_t cmd_lfc_set_high_water =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				high_water, UINT32);
+				high_water, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_lfc_set_low_water_str =
 	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
 				lw_str, "low_water");
 cmdline_parse_token_num_t cmd_lfc_set_low_water =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				low_water, UINT32);
+				low_water, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_lfc_set_pause_time_str =
 	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
 				pt_str, "pause_time");
 cmdline_parse_token_num_t cmd_lfc_set_pause_time =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				pause_time, UINT16);
+				pause_time, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_lfc_set_send_xon_str =
 	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
 				xon_str, "send_xon");
 cmdline_parse_token_num_t cmd_lfc_set_send_xon =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				send_xon, UINT16);
+				send_xon, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_lfc_set_mac_ctrl_frame_fwd_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
 				mac_ctrl_frame_fwd, "mac_ctrl_frame_fwd");
@@ -6915,7 +6930,7 @@ cmdline_parse_token_string_t cmd_lfc_set_autoneg =
 				autoneg, "on#off");
 cmdline_parse_token_num_t cmd_lfc_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 /* forward declaration */
 static void
@@ -7211,19 +7226,19 @@ cmdline_parse_token_string_t cmd_pfc_set_tx_mode =
 				tx_pfc_mode, "on#off");
 cmdline_parse_token_num_t cmd_pfc_set_high_water =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				high_water, UINT32);
+				high_water, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_pfc_set_low_water =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				low_water, UINT32);
+				low_water, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_pfc_set_pause_time =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				pause_time, UINT16);
+				pause_time, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_pfc_set_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				priority, UINT8);
+				priority, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_pfc_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_priority_flow_control_set = {
 	.f = cmd_priority_flow_ctrl_set_parsed,
@@ -7361,7 +7376,7 @@ cmdline_parse_token_string_t cmd_start_tx_first_n_tx_first =
 			tx_first, "tx_first");
 cmdline_parse_token_num_t cmd_start_tx_first_n_tx_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_start_tx_first_n_result,
-			tx_num, UINT32);
+			tx_num, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_start_tx_first_n = {
 	.f = cmd_start_tx_first_n_parsed,
@@ -7392,7 +7407,8 @@ cmdline_parse_token_string_t cmd_set_link_up_link_up =
 cmdline_parse_token_string_t cmd_set_link_up_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_link_up_result, port, "port");
 cmdline_parse_token_num_t cmd_set_link_up_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id,
+				CMDLINE_UINT16);
 
 static void cmd_set_link_up_parsed(__rte_unused void *parsed_result,
 			     __rte_unused struct cmdline *cl,
@@ -7431,7 +7447,8 @@ cmdline_parse_token_string_t cmd_set_link_down_link_down =
 cmdline_parse_token_string_t cmd_set_link_down_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_link_down_result, port, "port");
 cmdline_parse_token_num_t cmd_set_link_down_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id,
+				CMDLINE_UINT16);
 
 static void cmd_set_link_down_parsed(
 				__rte_unused void *parsed_result,
@@ -7620,7 +7637,8 @@ cmdline_parse_token_string_t cmd_showport_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_result, what,
 				 "info#summary#stats#xstats#fdir#stat_qmap#dcb_tc#cap");
 cmdline_parse_token_num_t cmd_showport_portnum =
-	TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum,
+				 CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_showport = {
 	.f = cmd_showport_parsed,
@@ -7711,9 +7729,11 @@ cmdline_parse_token_string_t cmd_showqueue_type =
 cmdline_parse_token_string_t cmd_showqueue_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_showqueue_result, what, "info");
 cmdline_parse_token_num_t cmd_showqueue_portnum =
-	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_showqueue_queuenum =
-	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum,
+		CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_showqueue = {
 	.f = cmd_showqueue_parsed,
@@ -7794,9 +7814,11 @@ cmdline_parse_token_string_t cmd_read_reg_read =
 cmdline_parse_token_string_t cmd_read_reg_reg =
 	TOKEN_STRING_INITIALIZER(struct cmd_read_reg_result, reg, "reg");
 cmdline_parse_token_num_t cmd_read_reg_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_read_reg_reg_off =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off,
+		CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_read_reg = {
 	.f = cmd_read_reg_parsed,
@@ -7839,16 +7861,16 @@ cmdline_parse_token_string_t cmd_read_reg_bit_field_regfield =
 				 regfield, "regfield");
 cmdline_parse_token_num_t cmd_read_reg_bit_field_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, port_id,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_reg_off =
 	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, reg_off,
-			      UINT32);
+			      CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_bit1_pos =
 	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, bit1_pos,
-			      UINT8);
+			      CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_bit2_pos =
 	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, bit2_pos,
-			      UINT8);
+			      CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_read_reg_bit_field = {
 	.f = cmd_read_reg_bit_field_parsed,
@@ -7890,11 +7912,14 @@ cmdline_parse_token_string_t cmd_read_reg_bit_regbit =
 	TOKEN_STRING_INITIALIZER(struct cmd_read_reg_bit_result,
 				 regbit, "regbit");
 cmdline_parse_token_num_t cmd_read_reg_bit_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_read_reg_bit_reg_off =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off,
+				 CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_read_reg_bit_bit_pos =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, bit_pos, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, bit_pos,
+				 CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_read_reg_bit = {
 	.f = cmd_read_reg_bit_parsed,
@@ -7933,11 +7958,14 @@ cmdline_parse_token_string_t cmd_write_reg_write =
 cmdline_parse_token_string_t cmd_write_reg_reg =
 	TOKEN_STRING_INITIALIZER(struct cmd_write_reg_result, reg, "reg");
 cmdline_parse_token_num_t cmd_write_reg_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_write_reg_reg_off =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off,
+		CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_write_reg_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, value, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, value,
+		CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_write_reg = {
 	.f = cmd_write_reg_parsed,
@@ -7982,19 +8010,19 @@ cmdline_parse_token_string_t cmd_write_reg_bit_field_regfield =
 				 regfield, "regfield");
 cmdline_parse_token_num_t cmd_write_reg_bit_field_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, port_id,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_reg_off =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, reg_off,
-			      UINT32);
+			      CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_bit1_pos =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, bit1_pos,
-			      UINT8);
+			      CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_bit2_pos =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, bit2_pos,
-			      UINT8);
+			      CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, value,
-			      UINT32);
+			      CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_write_reg_bit_field = {
 	.f = cmd_write_reg_bit_field_parsed,
@@ -8040,13 +8068,17 @@ cmdline_parse_token_string_t cmd_write_reg_bit_regbit =
 	TOKEN_STRING_INITIALIZER(struct cmd_write_reg_bit_result,
 				 regbit, "regbit");
 cmdline_parse_token_num_t cmd_write_reg_bit_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_write_reg_bit_reg_off =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off,
+				 CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_write_reg_bit_bit_pos =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, bit_pos, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, bit_pos,
+				 CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_write_reg_bit_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, value, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, value,
+				 CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_write_reg_bit = {
 	.f = cmd_write_reg_bit_parsed,
@@ -8092,11 +8124,14 @@ cmdline_parse_token_string_t cmd_read_rxd_txd_rxd_txd =
 	TOKEN_STRING_INITIALIZER(struct cmd_read_rxd_txd_result, rxd_txd,
 				 "rxd#txd");
 cmdline_parse_token_num_t cmd_read_rxd_txd_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_read_rxd_txd_queue_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id,
+				 CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_read_rxd_txd_desc_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, desc_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, desc_id,
+				 CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_read_rxd_txd = {
 	.f = cmd_read_rxd_txd_parsed,
@@ -8174,7 +8209,7 @@ cmdline_parse_token_string_t cmd_mac_addr_what =
 				"add#remove#set");
 cmdline_parse_token_num_t cmd_mac_addr_portnum =
 		TOKEN_NUM_INITIALIZER(struct cmd_mac_addr_result, port_num,
-					UINT16);
+					CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_mac_addr_addr =
 		TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
 
@@ -8220,7 +8255,8 @@ cmdline_parse_token_string_t cmd_eth_peer_set =
 cmdline_parse_token_string_t cmd_eth_peer =
 	TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, eth_peer, "eth-peer");
 cmdline_parse_token_num_t cmd_eth_peer_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_eth_peer_addr =
 	TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, peer_addr, NULL);
 
@@ -8269,13 +8305,13 @@ cmdline_parse_token_string_t cmd_setqmap_what =
 				 what, "tx#rx");
 cmdline_parse_token_num_t cmd_setqmap_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_setqmap_queueid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-			      queue_id, UINT16);
+			      queue_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_setqmap_mapvalue =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-			      map_value, UINT8);
+			      map_value, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_set_qmap = {
 	.f = cmd_set_qmap_parsed,
@@ -8371,7 +8407,7 @@ cmdline_parse_token_string_t cmd_set_uc_hash_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_set_uc_hash_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_uc_hash_table,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_uc_hash_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
 				 what, "uta");
@@ -8432,7 +8468,7 @@ cmdline_parse_token_string_t cmd_set_uc_all_hash_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_set_uc_all_hash_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_uc_all_hash_table,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_uc_all_hash_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
 				 what, "uta");
@@ -8524,13 +8560,13 @@ cmdline_parse_token_string_t cmd_set_vf_macvlan_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_set_vf_macvlan_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_macvlan_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_macvlan_filter,
 				 vf, "vf");
 cmdline_parse_token_num_t cmd_set_vf_macvlan_vf_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter,
-				vf_id, UINT8);
+				vf_id, CMDLINE_UINT8);
 cmdline_parse_token_etheraddr_t cmd_set_vf_macvlan_mac =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_macvlan_filter,
 				address);
@@ -8593,13 +8629,13 @@ cmdline_parse_token_string_t cmd_setvf_traffic_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_setvf_traffic_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_setvf_traffic_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
 				 vf, "vf");
 cmdline_parse_token_num_t cmd_setvf_traffic_vfid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
-			      vf_id, UINT8);
+			      vf_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_setvf_traffic_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
 				 what, "tx#rx");
@@ -8681,13 +8717,13 @@ cmdline_parse_token_string_t cmd_set_vf_rxmode_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_set_vf_rxmode_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_rxmode_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
 				 vf, "vf");
 cmdline_parse_token_num_t cmd_set_vf_rxmode_vfid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
-			      vf_id, UINT8);
+			      vf_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_set_vf_rxmode_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
 				 what, "rxmode");
@@ -8764,13 +8800,13 @@ cmdline_parse_token_string_t cmd_vf_mac_addr_port =
 				port,"port");
 cmdline_parse_token_num_t cmd_vf_mac_addr_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
-				port_num, UINT16);
+				port_num, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_mac_addr_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
 				vf,"vf");
 cmdline_parse_token_num_t cmd_vf_mac_addr_vfnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
-				vf_num, UINT8);
+				vf_num, CMDLINE_UINT8);
 cmdline_parse_token_etheraddr_t cmd_vf_mac_addr_addr =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_vf_mac_addr_result,
 				address);
@@ -8855,19 +8891,19 @@ cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_what =
 				 what, "add#rm");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vlanid =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-			      vlan_id, UINT16);
+			      vlan_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
 				 port, "port");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
 				 vf, "vf");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vf_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-			      vf_mask, UINT64);
+			      vf_mask, CMDLINE_UINT64);
 
 cmdline_parse_inst_t cmd_vf_rxvlan_filter = {
 	.f = cmd_vf_rx_vlan_filter_parsed,
@@ -8922,19 +8958,19 @@ cmdline_parse_token_string_t cmd_queue_rate_limit_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_queue_rate_limit_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-				port_num, UINT16);
+				port_num, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_queue_rate_limit_queue =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
 				queue, "queue");
 cmdline_parse_token_num_t cmd_queue_rate_limit_queuenum =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-				queue_num, UINT8);
+				queue_num, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_queue_rate_limit_rate =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
 				rate, "rate");
 cmdline_parse_token_num_t cmd_queue_rate_limit_ratenum =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-				rate_num, UINT16);
+				rate_num, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_queue_rate_limit = {
 	.f = cmd_queue_rate_limit_parsed,
@@ -8992,25 +9028,25 @@ cmdline_parse_token_string_t cmd_vf_rate_limit_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_vf_rate_limit_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-				port_num, UINT16);
+				port_num, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rate_limit_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
 				vf, "vf");
 cmdline_parse_token_num_t cmd_vf_rate_limit_vfnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-				vf_num, UINT8);
+				vf_num, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_vf_rate_limit_rate =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
 				rate, "rate");
 cmdline_parse_token_num_t cmd_vf_rate_limit_ratenum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-				rate_num, UINT16);
+				rate_num, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rate_limit_q_msk =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
 				q_msk, "queue_mask");
 cmdline_parse_token_num_t cmd_vf_rate_limit_q_msk_val =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-				q_msk_val, UINT64);
+				q_msk_val, CMDLINE_UINT64);
 
 cmdline_parse_inst_t cmd_vf_rate_limit = {
 	.f = cmd_vf_rate_limit_parsed,
@@ -9132,7 +9168,7 @@ cmdline_parse_token_string_t cmd_tunnel_filter_what =
 	what, "add#rm");
 cmdline_parse_token_num_t cmd_tunnel_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-	port_id, UINT16);
+	port_id, CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_tunnel_filter_outer_mac =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_tunnel_filter_result,
 	outer_mac);
@@ -9141,7 +9177,7 @@ cmdline_parse_token_etheraddr_t cmd_tunnel_filter_inner_mac =
 	inner_mac);
 cmdline_parse_token_num_t cmd_tunnel_filter_innner_vlan =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-	inner_vlan, UINT16);
+	inner_vlan, CMDLINE_UINT16);
 cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =
 	TOKEN_IPADDR_INITIALIZER(struct cmd_tunnel_filter_result,
 	ip_value);
@@ -9155,10 +9191,10 @@ cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
 		"imac#omac-imac-tenid");
 cmdline_parse_token_num_t cmd_tunnel_filter_tenant_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-	tenant_id, UINT32);
+	tenant_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_tunnel_filter_queue_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-	queue_num, UINT16);
+	queue_num, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_filter = {
 	.f = cmd_tunnel_filter_parsed,
@@ -9224,10 +9260,10 @@ cmdline_parse_token_string_t cmd_tunnel_udp_config_what =
 				what, "add#rm");
 cmdline_parse_token_num_t cmd_tunnel_udp_config_udp_port =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
-				udp_port, UINT16);
+				udp_port, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_tunnel_udp_config_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_udp_config = {
 	.f = cmd_tunnel_udp_config_parsed,
@@ -9297,7 +9333,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_config =
 				 "config");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, port_id,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port,
 				 udp_tunnel_port,
@@ -9310,7 +9346,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type =
 				 "vxlan#geneve#vxlan-gpe");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_port,
-			      UINT16);
+			      CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
 	.f = cmd_cfg_tunnel_udp_port_parsed,
@@ -9363,13 +9399,13 @@ cmdline_parse_token_string_t cmd_global_config_cmd =
 		"global_config");
 cmdline_parse_token_num_t cmd_global_config_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_global_config_result, port_id,
-			       UINT16);
+			       CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_global_config_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_global_config_result,
 		cfg_type, "gre-key-len");
 cmdline_parse_token_num_t cmd_global_config_gre_key_len =
 	TOKEN_NUM_INITIALIZER(struct cmd_global_config_result,
-		len, UINT8);
+		len, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_global_config = {
 	.f = cmd_global_config_parsed,
@@ -9406,13 +9442,13 @@ cmdline_parse_token_string_t cmd_mirror_mask_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_mirror_mask_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_mirror_mask_mirror =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
 				mirror, "mirror-rule");
 cmdline_parse_token_num_t cmd_mirror_mask_ruleid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-				rule_id, UINT8);
+				rule_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_mask_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
 				what, "pool-mirror-up#pool-mirror-down"
@@ -9425,7 +9461,7 @@ cmdline_parse_token_string_t cmd_mirror_mask_dstpool =
 				dstpool, "dst-pool");
 cmdline_parse_token_num_t cmd_mirror_mask_poolid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-				dstpool_id, UINT8);
+				dstpool_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_mask_on =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
 				on, "on#off");
@@ -9521,13 +9557,13 @@ cmdline_parse_token_string_t cmd_mirror_link_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_mirror_link_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_mirror_link_mirror =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
 				mirror, "mirror-rule");
 cmdline_parse_token_num_t cmd_mirror_link_ruleid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-			    rule_id, UINT8);
+			    rule_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_link_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
 				what, "uplink-mirror#downlink-mirror");
@@ -9536,7 +9572,7 @@ cmdline_parse_token_string_t cmd_mirror_link_dstpool =
 				dstpool, "dst-pool");
 cmdline_parse_token_num_t cmd_mirror_link_poolid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-				dstpool_id, UINT8);
+				dstpool_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_link_on =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
 				on, "on#off");
@@ -9607,13 +9643,13 @@ cmdline_parse_token_string_t cmd_rm_mirror_rule_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_rm_mirror_rule_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_rm_mirror_rule_mirror =
 	TOKEN_STRING_INITIALIZER(struct cmd_rm_mirror_rule_result,
 				mirror, "mirror-rule");
 cmdline_parse_token_num_t cmd_rm_mirror_rule_ruleid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
-				rule_id, UINT8);
+				rule_id, CMDLINE_UINT8);
 
 static void
 cmd_reset_mirror_rule_parsed(void *parsed_result,
@@ -9859,7 +9895,7 @@ cmdline_parse_token_string_t cmd_syn_filter_filter =
 	filter, "syn_filter");
 cmdline_parse_token_num_t cmd_syn_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_syn_filter_result,
-	port_id, UINT16);
+	port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_syn_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_syn_filter_result,
 	ops, "add#del");
@@ -9874,7 +9910,7 @@ cmdline_parse_token_string_t cmd_syn_filter_queue =
 				queue, "queue");
 cmdline_parse_token_num_t cmd_syn_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_syn_filter_result,
-				queue_id, UINT16);
+				queue_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_syn_filter = {
 	.f = cmd_syn_filter_parsed,
@@ -9951,7 +9987,7 @@ cmdline_parse_token_string_t cmd_queue_region_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result, port, "port");
 cmdline_parse_token_num_t cmd_queue_region_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_queue_region_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
 				 cmd, "queue-region");
@@ -9960,19 +9996,19 @@ cmdline_parse_token_string_t cmd_queue_region_id =
 				region, "region_id");
 cmdline_parse_token_num_t cmd_queue_region_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-				region_id, UINT8);
+				region_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_queue_region_queue_start_index =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
 				queue_start_index, "queue_start_index");
 cmdline_parse_token_num_t cmd_queue_region_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-				queue_id, UINT8);
+				queue_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_queue_region_queue_num =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
 				queue_num, "queue_num");
 cmdline_parse_token_num_t cmd_queue_region_queue_num_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-				queue_num_value, UINT8);
+				queue_num_value, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_queue_region = {
 	.f = cmd_queue_region_parsed,
@@ -10051,7 +10087,7 @@ cmdline_parse_token_string_t cmd_region_flowtype_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_region_flowtype_port_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_region_flowtype_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
 				cmd, "queue-region");
@@ -10060,13 +10096,13 @@ cmdline_parse_token_string_t cmd_region_flowtype_index =
 				region, "region_id");
 cmdline_parse_token_num_t cmd_region_flowtype_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
-				region_id, UINT8);
+				region_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_region_flowtype_flow_index =
 	TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
 				flowtype, "flowtype");
 cmdline_parse_token_num_t cmd_region_flowtype_flow_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
-				flowtype_id, UINT8);
+				flowtype_id, CMDLINE_UINT8);
 cmdline_parse_inst_t cmd_region_flowtype = {
 	.f = cmd_region_flowtype_parsed,
 	.data = NULL,
@@ -10142,7 +10178,7 @@ cmdline_parse_token_string_t cmd_user_priority_region_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_user_priority_region_port_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_user_priority_region_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
 				cmd, "queue-region");
@@ -10151,13 +10187,13 @@ cmdline_parse_token_string_t cmd_user_priority_region_UP =
 				user_priority, "UP");
 cmdline_parse_token_num_t cmd_user_priority_region_UP_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
-				user_priority_id, UINT8);
+				user_priority_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_user_priority_region_region =
 	TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
 				region, "region_id");
 cmdline_parse_token_num_t cmd_user_priority_region_region_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
-				region_id, UINT8);
+				region_id, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_user_priority_region = {
 	.f = cmd_user_priority_region_parsed,
@@ -10235,7 +10271,7 @@ cmdline_parse_token_string_t cmd_flush_queue_region_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_flush_queue_region_port_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_flush_queue_region_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flush_queue_region_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
 				cmd, "queue-region");
@@ -10316,7 +10352,7 @@ cmdline_parse_token_string_t cmd_show_queue_region_info_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_show_queue_region_info_port_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_queue_region_info,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_queue_region_info_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_queue_region_info,
 				cmd, "queue-region");
@@ -10417,7 +10453,7 @@ cmdline_parse_token_string_t cmd_2tuple_filter_filter =
 				 filter, "2tuple_filter");
 cmdline_parse_token_num_t cmd_2tuple_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_2tuple_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				 ops, "add#del");
@@ -10426,37 +10462,37 @@ cmdline_parse_token_string_t cmd_2tuple_filter_dst_port =
 				dst_port, "dst_port");
 cmdline_parse_token_num_t cmd_2tuple_filter_dst_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				dst_port_value, UINT16);
+				dst_port_value, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_2tuple_filter_protocol =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				protocol, "protocol");
 cmdline_parse_token_num_t cmd_2tuple_filter_protocol_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				protocol_value, UINT8);
+				protocol_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_2tuple_filter_mask =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				mask, "mask");
 cmdline_parse_token_num_t cmd_2tuple_filter_mask_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				mask_value, INT8);
+				mask_value, CMDLINE_INT8);
 cmdline_parse_token_string_t cmd_2tuple_filter_tcp_flags =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				tcp_flags, "tcp_flags");
 cmdline_parse_token_num_t cmd_2tuple_filter_tcp_flags_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				tcp_flags_value, UINT8);
+				tcp_flags_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_2tuple_filter_priority =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				priority, "priority");
 cmdline_parse_token_num_t cmd_2tuple_filter_priority_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				priority_value, UINT8);
+				priority_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_2tuple_filter_queue =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				queue, "queue");
 cmdline_parse_token_num_t cmd_2tuple_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				queue_id, UINT16);
+				queue_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_2tuple_filter = {
 	.f = cmd_2tuple_filter_parsed,
@@ -10596,7 +10632,7 @@ cmdline_parse_token_string_t cmd_5tuple_filter_filter =
 				 filter, "5tuple_filter");
 cmdline_parse_token_num_t cmd_5tuple_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_5tuple_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				 ops, "add#del");
@@ -10617,43 +10653,43 @@ cmdline_parse_token_string_t cmd_5tuple_filter_dst_port =
 				dst_port, "dst_port");
 cmdline_parse_token_num_t cmd_5tuple_filter_dst_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				dst_port_value, UINT16);
+				dst_port_value, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_5tuple_filter_src_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				src_port, "src_port");
 cmdline_parse_token_num_t cmd_5tuple_filter_src_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				src_port_value, UINT16);
+				src_port_value, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_5tuple_filter_protocol =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				protocol, "protocol");
 cmdline_parse_token_num_t cmd_5tuple_filter_protocol_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				protocol_value, UINT8);
+				protocol_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_5tuple_filter_mask =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				mask, "mask");
 cmdline_parse_token_num_t cmd_5tuple_filter_mask_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				mask_value, INT8);
+				mask_value, CMDLINE_INT8);
 cmdline_parse_token_string_t cmd_5tuple_filter_tcp_flags =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				tcp_flags, "tcp_flags");
 cmdline_parse_token_num_t cmd_5tuple_filter_tcp_flags_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				tcp_flags_value, UINT8);
+				tcp_flags_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_5tuple_filter_priority =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				priority, "priority");
 cmdline_parse_token_num_t cmd_5tuple_filter_priority_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				priority_value, UINT8);
+				priority_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_5tuple_filter_queue =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				queue, "queue");
 cmdline_parse_token_num_t cmd_5tuple_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				queue_id, UINT16);
+				queue_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_5tuple_filter = {
 	.f = cmd_5tuple_filter_parsed,
@@ -10819,7 +10855,7 @@ cmdline_parse_token_string_t cmd_flex_filter_filter =
 				filter, "flex_filter");
 cmdline_parse_token_num_t cmd_flex_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-				port_id, UINT16);
+				port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flex_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
 				ops, "add#del");
@@ -10828,7 +10864,7 @@ cmdline_parse_token_string_t cmd_flex_filter_len =
 				len, "len");
 cmdline_parse_token_num_t cmd_flex_filter_len_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-				len_value, UINT8);
+				len_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flex_filter_bytes =
 	TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
 				bytes, "bytes");
@@ -10846,13 +10882,13 @@ cmdline_parse_token_string_t cmd_flex_filter_priority =
 				priority, "priority");
 cmdline_parse_token_num_t cmd_flex_filter_priority_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-				priority_value, UINT8);
+				priority_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flex_filter_queue =
 	TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
 				queue, "queue");
 cmdline_parse_token_num_t cmd_flex_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-				queue_id, UINT16);
+				queue_id, CMDLINE_UINT16);
 cmdline_parse_inst_t cmd_flex_filter = {
 	.f = cmd_flex_filter_parsed,
 	.data = NULL,
@@ -10898,7 +10934,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_filter =
 				 filter, "ethertype_filter");
 cmdline_parse_token_num_t cmd_ethertype_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_ethertype_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
 				 ops, "add#del");
@@ -10913,7 +10949,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_ethertype =
 				 ethertype, "ethertype");
 cmdline_parse_token_num_t cmd_ethertype_filter_ethertype_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-			      ethertype_value, UINT16);
+			      ethertype_value, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_ethertype_filter_drop =
 	TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
 				 drop, "drop#fwd");
@@ -10922,7 +10958,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_queue =
 				 queue, "queue");
 cmdline_parse_token_num_t cmd_ethertype_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-			      queue_id, UINT16);
+			      queue_id, CMDLINE_UINT16);
 
 static void
 cmd_ethertype_filter_parsed(void *parsed_result,
@@ -11401,7 +11437,7 @@ cmdline_parse_token_string_t cmd_flow_director_filter =
 				 flow_director_filter, "flow_director_filter");
 cmdline_parse_token_num_t cmd_flow_director_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 ops, "add#del#update");
@@ -11416,7 +11452,7 @@ cmdline_parse_token_string_t cmd_flow_director_ether =
 				 ether, "ether");
 cmdline_parse_token_num_t cmd_flow_director_ether_type =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      ether_type, UINT16);
+			      ether_type, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 src, "src");
@@ -11425,7 +11461,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_ip_src =
 				 ip_src);
 cmdline_parse_token_num_t cmd_flow_director_port_src =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      port_src, UINT16);
+			      port_src, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_dst =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 dst, "dst");
@@ -11434,37 +11470,37 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_ip_dst =
 				 ip_dst);
 cmdline_parse_token_num_t cmd_flow_director_port_dst =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      port_dst, UINT16);
+			      port_dst, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_verify_tag =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				  verify_tag, "verify_tag");
 cmdline_parse_token_num_t cmd_flow_director_verify_tag_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      verify_tag_value, UINT32);
+			      verify_tag_value, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_flow_director_tos =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 tos, "tos");
 cmdline_parse_token_num_t cmd_flow_director_tos_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      tos_value, UINT8);
+			      tos_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_proto =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 proto, "proto");
 cmdline_parse_token_num_t cmd_flow_director_proto_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      proto_value, UINT8);
+			      proto_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_ttl =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 ttl, "ttl");
 cmdline_parse_token_num_t cmd_flow_director_ttl_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      ttl_value, UINT8);
+			      ttl_value, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 vlan, "vlan");
 cmdline_parse_token_num_t cmd_flow_director_vlan_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      vlan_value, UINT16);
+			      vlan_value, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexbytes =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 flexbytes, "flexbytes");
@@ -11482,13 +11518,13 @@ cmdline_parse_token_string_t cmd_flow_director_queue =
 				 queue, "queue");
 cmdline_parse_token_num_t cmd_flow_director_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      queue_id, UINT16);
+			      queue_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_fd_id =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 fd_id, "fd_id");
 cmdline_parse_token_num_t cmd_flow_director_fd_id_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      fd_id_value, UINT32);
+			      fd_id_value, CMDLINE_UINT32);
 
 cmdline_parse_token_string_t cmd_flow_director_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
@@ -11522,7 +11558,7 @@ cmdline_parse_token_string_t cmd_flow_director_tunnel_id =
 				 tunnel_id, "tunnel-id");
 cmdline_parse_token_num_t cmd_flow_director_tunnel_id_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      tunnel_id_value, UINT32);
+			      tunnel_id_value, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_flow_director_packet =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 packet, "packet");
@@ -11766,7 +11802,7 @@ cmdline_parse_token_string_t cmd_flush_flow_director_flush =
 				 flush_flow_director, "flush_flow_director");
 cmdline_parse_token_num_t cmd_flush_flow_director_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flush_flow_director_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 static void
 cmd_flush_flow_director_parsed(void *parsed_result,
@@ -11884,13 +11920,13 @@ cmdline_parse_token_string_t cmd_flow_director_mask =
 				 flow_director_mask, "flow_director_mask");
 cmdline_parse_token_num_t cmd_flow_director_mask_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 vlan, "vlan");
 cmdline_parse_token_num_t cmd_flow_director_mask_vlan_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      vlan_mask, UINT16);
+			      vlan_mask, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 src_mask, "src_mask");
@@ -11902,7 +11938,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_mask_ipv6_src =
 				 ipv6_src);
 cmdline_parse_token_num_t cmd_flow_director_mask_port_src =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      port_src, UINT16);
+			      port_src, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_dst =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 dst_mask, "dst_mask");
@@ -11914,7 +11950,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_mask_ipv6_dst =
 				 ipv6_dst);
 cmdline_parse_token_num_t cmd_flow_director_mask_port_dst =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      port_dst, UINT16);
+			      port_dst, CMDLINE_UINT16);
 
 cmdline_parse_token_string_t cmd_flow_director_mask_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
@@ -11933,19 +11969,19 @@ cmdline_parse_token_string_t cmd_flow_director_mask_mac =
 				 mac, "mac");
 cmdline_parse_token_num_t cmd_flow_director_mask_mac_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      mac_addr_byte_mask, UINT8);
+			      mac_addr_byte_mask, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_mask_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 tunnel_type, "tunnel-type");
 cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_type_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      tunnel_type_mask, UINT8);
+			      tunnel_type_mask, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_mask_tunnel_id =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 tunnel_id, "tunnel-id");
 cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_id_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      tunnel_id_mask, UINT32);
+			      tunnel_id_mask, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_set_flow_director_ip_mask = {
 	.f = cmd_flow_director_mask_parsed,
@@ -12099,7 +12135,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexmask =
 				 "flow_director_flex_mask");
 cmdline_parse_token_num_t cmd_flow_director_flexmask_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flex_mask_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexmask_flow =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
 				 flow, "flow");
@@ -12217,7 +12253,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexpayload =
 				 "flow_director_flex_payload");
 cmdline_parse_token_num_t cmd_flow_director_flexpayload_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flexpayload_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexpayload_payload_layer =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flexpayload_result,
 				 payload_layer, "raw#l2#l3#l4");
@@ -12285,7 +12321,7 @@ cmdline_parse_token_string_t cmd_get_sym_hash_ena_per_port_all =
 		get_sym_hash_ena_per_port, "get_sym_hash_ena_per_port");
 cmdline_parse_token_num_t cmd_get_sym_hash_ena_per_port_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_get_sym_hash_ena_per_port_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_get_sym_hash_ena_per_port = {
 	.f = cmd_get_sym_hash_per_port_parsed,
@@ -12341,7 +12377,7 @@ cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_all =
 		set_sym_hash_ena_per_port, "set_sym_hash_ena_per_port");
 cmdline_parse_token_num_t cmd_set_sym_hash_ena_per_port_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_enable =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
 		enable, "enable#disable");
@@ -12466,7 +12502,7 @@ cmdline_parse_token_string_t cmd_get_hash_global_config_all =
 		get_hash_global_config, "get_hash_global_config");
 cmdline_parse_token_num_t cmd_get_hash_global_config_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_get_hash_global_config_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_get_hash_global_config = {
 	.f = cmd_get_hash_global_config_parsed,
@@ -12541,7 +12577,7 @@ cmdline_parse_token_string_t cmd_set_hash_global_config_all =
 		set_hash_global_config, "set_hash_global_config");
 cmdline_parse_token_num_t cmd_set_hash_global_config_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_hash_global_config_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_hash_global_config_hash_func =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_hash_global_config_result,
 		hash_func, "toeplitz#simple_xor#symmetric_toeplitz#default");
@@ -12657,7 +12693,7 @@ cmdline_parse_token_string_t cmd_set_hash_input_set_cmd =
 		set_hash_input_set, "set_hash_input_set");
 cmdline_parse_token_num_t cmd_set_hash_input_set_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_hash_input_set_result,
-		port_id, UINT16);
+		port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_hash_input_set_flow_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_hash_input_set_result,
 		flow_type, NULL);
@@ -12730,7 +12766,7 @@ cmdline_parse_token_string_t cmd_set_fdir_input_set_cmd =
 	set_fdir_input_set, "set_fdir_input_set");
 cmdline_parse_token_num_t cmd_set_fdir_input_set_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_fdir_input_set_result,
-	port_id, UINT16);
+	port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_fdir_input_set_flow_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result,
 	flow_type,
@@ -12803,7 +12839,8 @@ cmdline_parse_token_string_t cmd_mcast_addr_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result, what,
 				 "add#remove");
 cmdline_parse_token_num_t cmd_mcast_addr_portnum =
-	TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num,
+				 CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_mcast_addr_addr =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
 
@@ -12852,7 +12889,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_all_str =
 cmdline_parse_token_num_t cmd_config_l2_tunnel_eth_type_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_l2_tunnel_eth_type_result,
-		 id, UINT16);
+		 id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_l2_tunnel =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_l2_tunnel_eth_type_result,
@@ -12868,7 +12905,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_eth_type =
 cmdline_parse_token_num_t cmd_config_l2_tunnel_eth_type_eth_type_val =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_l2_tunnel_eth_type_result,
-		 eth_type_val, UINT16);
+		 eth_type_val, CMDLINE_UINT16);
 
 static enum rte_eth_tunnel_type
 str2fdir_l2_tunnel_type(char *string)
@@ -12986,7 +13023,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_all_str =
 cmdline_parse_token_num_t cmd_config_l2_tunnel_en_dis_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_l2_tunnel_en_dis_result,
-		 id, UINT16);
+		 id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_l2_tunnel =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_l2_tunnel_en_dis_result,
@@ -13164,7 +13201,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_port_tag_id =
 cmdline_parse_token_num_t cmd_config_e_tag_port_tag_id_val =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 port_tag_id_val, UINT32);
+		 port_tag_id_val, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_config_e_tag_e_tag_id =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_e_tag_result,
@@ -13172,7 +13209,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_e_tag_id =
 cmdline_parse_token_num_t cmd_config_e_tag_e_tag_id_val =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 e_tag_id_val, UINT16);
+		 e_tag_id_val, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_e_tag_dst_pool =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_e_tag_result,
@@ -13180,7 +13217,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_dst_pool =
 cmdline_parse_token_num_t cmd_config_e_tag_dst_pool_val =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 dst_pool_val, UINT8);
+		 dst_pool_val, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_config_e_tag_port =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_e_tag_result,
@@ -13188,7 +13225,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_port =
 cmdline_parse_token_num_t cmd_config_e_tag_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_e_tag_vf =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_e_tag_result,
@@ -13196,7 +13233,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_vf =
 cmdline_parse_token_num_t cmd_config_e_tag_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 vf_id, UINT8);
+		 vf_id, CMDLINE_UINT8);
 
 /* E-tag insertion configuration */
 static void
@@ -13515,11 +13552,11 @@ cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_antispoof =
 cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_anti_spoof_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_anti_spoof_result,
-		 vf_id, UINT32);
+		 vf_id, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_vlan_anti_spoof_result,
@@ -13621,11 +13658,11 @@ cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_antispoof =
 cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_mac_anti_spoof_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_mac_anti_spoof_result,
-		 vf_id, UINT32);
+		 vf_id, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_mac_anti_spoof_result,
@@ -13727,11 +13764,11 @@ cmdline_parse_token_string_t cmd_vf_vlan_stripq_stripq =
 cmdline_parse_token_num_t cmd_vf_vlan_stripq_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_stripq_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_stripq_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_stripq_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_vlan_stripq_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_vlan_stripq_result,
@@ -13833,15 +13870,15 @@ cmdline_parse_token_string_t cmd_vf_vlan_insert_insert =
 cmdline_parse_token_num_t cmd_vf_vlan_insert_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_insert_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_insert_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_insert_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_insert_vlan_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_insert_result,
-		 vlan_id, UINT16);
+		 vlan_id, CMDLINE_UINT16);
 
 static void
 cmd_set_vf_vlan_insert_parsed(
@@ -13931,7 +13968,7 @@ cmdline_parse_token_string_t cmd_tx_loopback_loopback =
 cmdline_parse_token_num_t cmd_tx_loopback_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_tx_loopback_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_tx_loopback_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_tx_loopback_result,
@@ -14031,7 +14068,7 @@ cmdline_parse_token_string_t cmd_all_queues_drop_en_drop =
 cmdline_parse_token_num_t cmd_all_queues_drop_en_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_all_queues_drop_en_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_all_queues_drop_en_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_all_queues_drop_en_result,
@@ -14123,11 +14160,11 @@ cmdline_parse_token_string_t cmd_vf_split_drop_en_drop =
 cmdline_parse_token_num_t cmd_vf_split_drop_en_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_split_drop_en_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_split_drop_en_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_split_drop_en_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_vf_split_drop_en_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_split_drop_en_result,
@@ -14217,11 +14254,11 @@ cmdline_parse_token_string_t cmd_set_vf_mac_addr_addr =
 cmdline_parse_token_num_t cmd_set_vf_mac_addr_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_mac_addr_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_vf_mac_addr_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_mac_addr_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_set_vf_mac_addr_mac_addr =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_mac_addr_result,
 		 mac_addr);
@@ -14318,7 +14355,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_on_offload =
 cmdline_parse_token_num_t cmd_macsec_offload_on_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_offload_on_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_macsec_offload_on_on =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_macsec_offload_on_result,
@@ -14433,7 +14470,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_off_offload =
 cmdline_parse_token_num_t cmd_macsec_offload_off_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_offload_off_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_macsec_offload_off_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_macsec_offload_off_result,
@@ -14528,7 +14565,7 @@ cmdline_parse_token_string_t cmd_macsec_sc_tx_rx =
 cmdline_parse_token_num_t cmd_macsec_sc_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sc_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
 	TOKEN_ETHERADDR_INITIALIZER
 		(struct cmd_macsec_sc_result,
@@ -14536,7 +14573,7 @@ cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
 cmdline_parse_token_num_t cmd_macsec_sc_pi =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sc_result,
-		 pi, UINT16);
+		 pi, CMDLINE_UINT16);
 
 static void
 cmd_set_macsec_sc_parsed(
@@ -14620,19 +14657,19 @@ cmdline_parse_token_string_t cmd_macsec_sa_tx_rx =
 cmdline_parse_token_num_t cmd_macsec_sa_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sa_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_macsec_sa_idx =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sa_result,
-		 idx, UINT8);
+		 idx, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_macsec_sa_an =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sa_result,
-		 an, UINT8);
+		 an, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_macsec_sa_pn =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sa_result,
-		 pn, UINT32);
+		 pn, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_macsec_sa_key =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_macsec_sa_result,
@@ -14740,11 +14777,11 @@ cmdline_parse_token_string_t cmd_vf_promisc_promisc =
 cmdline_parse_token_num_t cmd_vf_promisc_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_promisc_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_promisc_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_promisc_result,
-		 vf_id, UINT32);
+		 vf_id, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_vf_promisc_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_promisc_result,
@@ -14830,11 +14867,11 @@ cmdline_parse_token_string_t cmd_vf_allmulti_allmulti =
 cmdline_parse_token_num_t cmd_vf_allmulti_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_allmulti_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_allmulti_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_allmulti_result,
-		 vf_id, UINT32);
+		 vf_id, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_vf_allmulti_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_allmulti_result,
@@ -14920,11 +14957,11 @@ cmdline_parse_token_string_t cmd_set_vf_broadcast_broadcast =
 cmdline_parse_token_num_t cmd_set_vf_broadcast_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_broadcast_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_vf_broadcast_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_broadcast_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_broadcast_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_set_vf_broadcast_result,
@@ -15014,11 +15051,11 @@ cmdline_parse_token_string_t cmd_set_vf_vlan_tag_tag =
 cmdline_parse_token_num_t cmd_set_vf_vlan_tag_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_vlan_tag_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_vf_vlan_tag_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_vlan_tag_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_vlan_tag_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_set_vf_vlan_tag_result,
@@ -15124,19 +15161,19 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_max_bw =
 cmdline_parse_token_num_t cmd_vf_tc_bw_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_tc_bw_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_vf_tc_bw_tc_no =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 tc_no, UINT8);
+		 tc_no, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_vf_tc_bw_bw =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 bw, UINT32);
+		 bw, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
@@ -15144,7 +15181,7 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list =
 cmdline_parse_token_num_t cmd_vf_tc_bw_tc_map =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 tc_map, UINT8);
+		 tc_map, CMDLINE_UINT8);
 
 /* VF max bandwidth setting */
 static void
@@ -15455,27 +15492,29 @@ cmdline_parse_token_string_t cmd_set_vxlan_vni =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "vni");
 cmdline_parse_token_num_t cmd_set_vxlan_vni_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, vni, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, vni, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_set_vxlan_udp_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "udp-src");
 cmdline_parse_token_num_t cmd_set_vxlan_udp_src_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src,
+				 CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vxlan_udp_dst =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "udp-dst");
 cmdline_parse_token_num_t cmd_set_vxlan_udp_dst_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst,
+				 CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vxlan_ip_tos =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "ip-tos");
 cmdline_parse_token_num_t cmd_set_vxlan_ip_tos_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_set_vxlan_ip_ttl =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "ip-ttl");
 cmdline_parse_token_num_t cmd_set_vxlan_ip_ttl_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_set_vxlan_ip_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "ip-src");
@@ -15490,7 +15529,7 @@ cmdline_parse_token_string_t cmd_set_vxlan_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "vlan-tci");
 cmdline_parse_token_num_t cmd_set_vxlan_vlan_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_vxlan_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "eth-src");
@@ -15675,7 +15714,7 @@ cmdline_parse_token_string_t cmd_set_nvgre_tni =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
 				 "tni");
 cmdline_parse_token_num_t cmd_set_nvgre_tni_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_set_nvgre_ip_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
 				 "ip-src");
@@ -15690,7 +15729,7 @@ cmdline_parse_token_string_t cmd_set_nvgre_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
 				 "vlan-tci");
 cmdline_parse_token_num_t cmd_set_nvgre_vlan_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_nvgre_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
 				 "eth-src");
@@ -15821,7 +15860,8 @@ cmdline_parse_token_string_t cmd_set_l2_encap_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
 				 "vlan-tci");
 cmdline_parse_token_num_t cmd_set_l2_encap_vlan_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_l2_encap_result, tci, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_l2_encap_result, tci,
+				 CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_l2_encap_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
 				 "eth-src");
@@ -15981,7 +16021,7 @@ cmdline_parse_token_string_t cmd_set_mplsogre_encap_label =
 				 pos_token, "label");
 cmdline_parse_token_num_t cmd_set_mplsogre_encap_label_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, label,
-			      UINT32);
+			      CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_set_mplsogre_encap_ip_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
 				 pos_token, "ip-src");
@@ -15997,7 +16037,7 @@ cmdline_parse_token_string_t cmd_set_mplsogre_encap_vlan =
 				 pos_token, "vlan-tci");
 cmdline_parse_token_num_t cmd_set_mplsogre_encap_vlan_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, tci,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsogre_encap_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
 				 pos_token, "eth-src");
@@ -16205,19 +16245,19 @@ cmdline_parse_token_string_t cmd_set_mplsoudp_encap_label =
 				 pos_token, "label");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_label_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, label,
-			      UINT32);
+			      CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
 				 pos_token, "udp-src");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_src_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_src,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_dst =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
 				 pos_token, "udp-dst");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_dst_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_dst,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_ip_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
 				 pos_token, "ip-src");
@@ -16233,7 +16273,7 @@ cmdline_parse_token_string_t cmd_set_mplsoudp_encap_vlan =
 				 pos_token, "vlan-tci");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_vlan_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, tci,
-			      UINT16);
+			      CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
 				 pos_token, "eth-src");
@@ -16476,7 +16516,8 @@ cmdline_parse_token_string_t cmd_ddp_add_ddp =
 cmdline_parse_token_string_t cmd_ddp_add_add =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, add, "add");
 cmdline_parse_token_num_t cmd_ddp_add_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_ddp_add_filepath =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, filepath, NULL);
 
@@ -16556,7 +16597,8 @@ cmdline_parse_token_string_t cmd_ddp_del_ddp =
 cmdline_parse_token_string_t cmd_ddp_del_del =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, del, "del");
 cmdline_parse_token_num_t cmd_ddp_del_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_ddp_del_filepath =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, filepath, NULL);
 
@@ -16863,7 +16905,8 @@ cmdline_parse_token_string_t cmd_ddp_get_list_get =
 cmdline_parse_token_string_t cmd_ddp_get_list_list =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_get_list_result, list, "list");
 cmdline_parse_token_num_t cmd_ddp_get_list_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id,
+		CMDLINE_UINT16);
 
 static void
 cmd_ddp_get_list_parsed(
@@ -17014,13 +17057,13 @@ cmdline_parse_token_string_t cmd_cfg_input_set_cfg =
 				 cfg, "config");
 cmdline_parse_token_num_t cmd_cfg_input_set_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_cfg_input_set_pctype =
 	TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
 				 pctype, "pctype");
 cmdline_parse_token_num_t cmd_cfg_input_set_pctype_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
-			      pctype_id, UINT8);
+			      pctype_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_cfg_input_set_inset_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
 				 inset_type,
@@ -17033,7 +17076,7 @@ cmdline_parse_token_string_t cmd_cfg_input_set_field =
 				 field, "field");
 cmdline_parse_token_num_t cmd_cfg_input_set_field_idx =
 	TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
-			      field_idx, UINT8);
+			      field_idx, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_cfg_input_set = {
 	.f = cmd_cfg_input_set_parsed,
@@ -17115,13 +17158,13 @@ cmdline_parse_token_string_t cmd_clear_input_set_cfg =
 				 cfg, "config");
 cmdline_parse_token_num_t cmd_clear_input_set_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_clear_input_set_pctype =
 	TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
 				 pctype, "pctype");
 cmdline_parse_token_num_t cmd_clear_input_set_pctype_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result,
-			      pctype_id, UINT8);
+			      pctype_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_clear_input_set_inset_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
 				 inset_type,
@@ -17178,11 +17221,11 @@ cmdline_parse_token_string_t cmd_show_vf_stats_stats =
 cmdline_parse_token_num_t cmd_show_vf_stats_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_show_vf_stats_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_show_vf_stats_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_show_vf_stats_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 
 static void
 cmd_show_vf_stats_parsed(
@@ -17287,11 +17330,11 @@ cmdline_parse_token_string_t cmd_clear_vf_stats_stats =
 cmdline_parse_token_num_t cmd_clear_vf_stats_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_clear_vf_stats_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_clear_vf_stats_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_clear_vf_stats_result,
-		 vf_id, UINT16);
+		 vf_id, CMDLINE_UINT16);
 
 static void
 cmd_clear_vf_stats_parsed(
@@ -17371,7 +17414,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_reset_config =
 cmdline_parse_token_num_t cmd_pctype_mapping_reset_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_pctype_mapping_reset_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_reset_pctype =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_pctype_mapping_reset_result,
@@ -17453,7 +17496,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_get_port =
 cmdline_parse_token_num_t cmd_pctype_mapping_get_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_pctype_mapping_get_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_get_pctype =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_pctype_mapping_get_result,
@@ -17557,7 +17600,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_config =
 cmdline_parse_token_num_t cmd_pctype_mapping_update_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_pctype_mapping_update_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_update_pctype =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_pctype_mapping_update_result,
@@ -17577,7 +17620,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_pc_type =
 cmdline_parse_token_num_t cmd_pctype_mapping_update_flow_type =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_pctype_mapping_update_result,
-		 flow_type, UINT16);
+		 flow_type, CMDLINE_UINT16);
 
 static void
 cmd_pctype_mapping_update_parsed(
@@ -17671,11 +17714,11 @@ cmdline_parse_token_string_t cmd_ptype_mapping_get_get =
 cmdline_parse_token_num_t cmd_ptype_mapping_get_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_get_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_get_valid_only =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_get_result,
-		 valid_only, UINT8);
+		 valid_only, CMDLINE_UINT8);
 
 static void
 cmd_ptype_mapping_get_parsed(
@@ -17768,19 +17811,19 @@ cmdline_parse_token_string_t cmd_ptype_mapping_replace_replace =
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_replace_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_target =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_replace_result,
-		 target, UINT32);
+		 target, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_mask =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_replace_result,
-		 mask, UINT8);
+		 mask, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_pkt_type =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_replace_result,
-		 pkt_type, UINT32);
+		 pkt_type, CMDLINE_UINT32);
 
 static void
 cmd_ptype_mapping_replace_parsed(
@@ -17862,7 +17905,7 @@ cmdline_parse_token_string_t cmd_ptype_mapping_reset_reset =
 cmdline_parse_token_num_t cmd_ptype_mapping_reset_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_reset_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 
 static void
 cmd_ptype_mapping_reset_parsed(
@@ -17935,15 +17978,15 @@ cmdline_parse_token_string_t cmd_ptype_mapping_update_update =
 cmdline_parse_token_num_t cmd_ptype_mapping_update_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_update_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_update_hw_ptype =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_update_result,
-		 hw_ptype, UINT8);
+		 hw_ptype, CMDLINE_UINT8);
 cmdline_parse_token_num_t cmd_ptype_mapping_update_sw_ptype =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_update_result,
-		 sw_ptype, UINT32);
+		 sw_ptype, CMDLINE_UINT32);
 
 static void
 cmd_ptype_mapping_update_parsed(
@@ -18054,7 +18097,7 @@ cmdline_parse_token_string_t cmd_rx_offload_get_capa_port =
 cmdline_parse_token_num_t cmd_rx_offload_get_capa_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_rx_offload_get_capa_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_rx_offload_get_capa_rx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_rx_offload_get_capa_result,
@@ -18151,7 +18194,7 @@ cmdline_parse_token_string_t cmd_rx_offload_get_configuration_port =
 cmdline_parse_token_num_t cmd_rx_offload_get_configuration_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_rx_offload_get_configuration_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_rx_offload_get_configuration_rx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_rx_offload_get_configuration_result,
@@ -18233,7 +18276,7 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_config =
 cmdline_parse_token_num_t cmd_config_per_port_rx_offload_result_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_port_rx_offload_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_rx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_port_rx_offload_result,
@@ -18355,7 +18398,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_port =
 cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
@@ -18363,7 +18406,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq =
 cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_queue_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
-		 queue_id, UINT16);
+		 queue_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxoffload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
@@ -18464,7 +18507,7 @@ cmdline_parse_token_string_t cmd_tx_offload_get_capa_port =
 cmdline_parse_token_num_t cmd_tx_offload_get_capa_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_tx_offload_get_capa_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_tx_offload_get_capa_tx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_tx_offload_get_capa_result,
@@ -18561,7 +18604,7 @@ cmdline_parse_token_string_t cmd_tx_offload_get_configuration_port =
 cmdline_parse_token_num_t cmd_tx_offload_get_configuration_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_tx_offload_get_configuration_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_tx_offload_get_configuration_tx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_tx_offload_get_configuration_result,
@@ -18643,7 +18686,7 @@ cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_config =
 cmdline_parse_token_num_t cmd_config_per_port_tx_offload_result_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_port_tx_offload_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_tx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_port_tx_offload_result,
@@ -18772,7 +18815,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_port =
 cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_queue_tx_offload_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_tx_offload_result,
@@ -18780,7 +18823,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq =
 cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_queue_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_queue_tx_offload_result,
-		 queue_id, UINT16);
+		 queue_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txoffload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_tx_offload_result,
@@ -18898,13 +18941,13 @@ cmdline_parse_token_string_t cmd_config_tx_metadata_specific_keyword =
 			keyword, "config");
 cmdline_parse_token_num_t cmd_config_tx_metadata_specific_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_tx_metadata_specific_item =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
 			item, "tx_metadata");
 cmdline_parse_token_num_t cmd_config_tx_metadata_specific_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
-			value, UINT32);
+			value, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_config_tx_metadata_specific = {
 	.f = cmd_config_tx_metadata_specific_parsed,
@@ -18977,7 +19020,7 @@ cmdline_parse_token_string_t cmd_config_tx_dynf_specific_keyword =
 			keyword, "config");
 cmdline_parse_token_num_t cmd_config_tx_dynf_specific_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tx_dynf_specific_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_config_tx_dynf_specific_item =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tx_dynf_specific_result,
 			item, "dynf");
@@ -19036,7 +19079,7 @@ cmdline_parse_token_string_t cmd_show_tx_metadata_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_show_tx_metadata_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_tx_metadata_result,
-			cmd_pid, UINT16);
+			cmd_pid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_tx_metadata_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_tx_metadata_result,
 			cmd_keyword, "tx_metadata");
@@ -19076,7 +19119,7 @@ cmdline_parse_token_string_t cmd_show_port_supported_ptypes_port =
 cmdline_parse_token_num_t cmd_show_port_supported_ptypes_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_show_port_supported_ptypes_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_port_supported_ptypes_ptypes =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_show_port_supported_ptypes_result,
@@ -19224,19 +19267,19 @@ cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
-			cmd_pid, UINT16);
+			cmd_pid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
 			cmd_keyword, "rxq#txq");
 cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_qid =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
-			cmd_qid, UINT16);
+			cmd_qid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_desc =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
 			cmd_desc, "desc");
 cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_did =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
-			cmd_did, UINT16);
+			cmd_did, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_status =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
 			cmd_status, "status");
@@ -19279,7 +19322,7 @@ cmdline_parse_token_string_t cmd_set_port_ptypes_port =
 cmdline_parse_token_num_t cmd_set_port_ptypes_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_port_ptypes_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_set_port_ptypes_mask_str =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_set_port_ptypes_result,
@@ -19287,7 +19330,7 @@ cmdline_parse_token_string_t cmd_set_port_ptypes_mask_str =
 cmdline_parse_token_num_t cmd_set_port_ptypes_mask_u32 =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_port_ptypes_result,
-		 mask, UINT32);
+		 mask, CMDLINE_UINT32);
 
 static void
 cmd_set_port_ptypes_parsed(
@@ -19372,7 +19415,7 @@ cmdline_parse_token_string_t cmd_showport_macs_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_showport_macs_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_showport_macs_result,
-			cmd_pid, UINT16);
+			cmd_pid, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_showport_macs_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_macs_result,
 			cmd_keyword, "macs#mcast_macs");
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 6263d307e..93b5878c4 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -7004,7 +7004,7 @@ cmdline_parse_token_string_t cmd_show_set_raw_cmd_what =
 			cmd_what, "raw_encap#raw_decap");
 cmdline_parse_token_num_t cmd_show_set_raw_cmd_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_set_raw_result,
-			cmd_index, UINT16);
+			cmd_index, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_show_set_raw_cmd_all =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_set_raw_result,
 			cmd_all, "all");
diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c
index ee16244de..06db0ca2d 100644
--- a/app/test-pmd/cmdline_mtr.c
+++ b/app/test-pmd/cmdline_mtr.c
@@ -253,7 +253,7 @@ cmdline_parse_token_string_t cmd_show_port_meter_cap_cap =
 		struct cmd_show_port_meter_cap_result, cap, "cap");
 cmdline_parse_token_num_t cmd_show_port_meter_cap_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_show_port_meter_cap_result, port_id, UINT16);
+		struct cmd_show_port_meter_cap_result, port_id, CMDLINE_UINT16);
 
 static void cmd_show_port_meter_cap_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -359,23 +359,23 @@ cmdline_parse_token_string_t cmd_add_port_meter_profile_srtcm_srtcm_rfc2697 =
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			profile_id, UINT32);
+			profile_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_cir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			cir, UINT64);
+			cir, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_cbs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			cbs, UINT64);
+			cbs, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_ebs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			ebs, UINT64);
+			ebs, CMDLINE_UINT64);
 
 static void cmd_add_port_meter_profile_srtcm_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -461,27 +461,27 @@ cmdline_parse_token_string_t cmd_add_port_meter_profile_trtcm_trtcm_rfc2698 =
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			profile_id, UINT32);
+			profile_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_cir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			cir, UINT64);
+			cir, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_pir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			pir, UINT64);
+			pir, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_cbs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			cbs, UINT64);
+			cbs, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_pbs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			pbs, UINT64);
+			pbs, CMDLINE_UINT64);
 
 static void cmd_add_port_meter_profile_trtcm_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -571,27 +571,27 @@ cmdline_parse_token_string_t
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			profile_id, UINT32);
+			profile_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_cir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			cir, UINT64);
+			cir, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_eir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			eir, UINT64);
+			eir, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_cbs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			cbs, UINT64);
+			cbs, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_ebs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			ebs, UINT64);
+			ebs, CMDLINE_UINT64);
 
 static void cmd_add_port_meter_profile_trtcm_rfc4115_parsed(
 	void *parsed_result,
@@ -672,11 +672,11 @@ cmdline_parse_token_string_t cmd_del_port_meter_profile_profile =
 cmdline_parse_token_num_t cmd_del_port_meter_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_meter_profile_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_meter_profile_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_meter_profile_result,
-			profile_id, UINT32);
+			profile_id, CMDLINE_UINT32);
 
 static void cmd_del_port_meter_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -742,13 +742,14 @@ cmdline_parse_token_string_t cmd_create_port_meter_meter =
 		struct cmd_create_port_meter_result, meter, "meter");
 cmdline_parse_token_num_t cmd_create_port_meter_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_create_port_meter_result, port_id, UINT16);
+		struct cmd_create_port_meter_result, port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_create_port_meter_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_create_port_meter_result, mtr_id, UINT32);
+		struct cmd_create_port_meter_result, mtr_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_create_port_meter_profile_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_create_port_meter_result, profile_id, UINT32);
+		struct cmd_create_port_meter_result, profile_id,
+		CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_create_port_meter_meter_enable =
 	TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result,
 		meter_enable, "yes#no");
@@ -763,10 +764,10 @@ cmdline_parse_token_string_t cmd_create_port_meter_r_action =
 		r_action, "R#Y#G#D#r#y#g#d");
 cmdline_parse_token_num_t cmd_create_port_meter_statistics_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_create_port_meter_result,
-		statistics_mask, UINT64);
+		statistics_mask, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_create_port_meter_shared =
 	TOKEN_NUM_INITIALIZER(struct cmd_create_port_meter_result,
-		shared, UINT32);
+		shared, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_create_port_meter_input_color =
 	TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result,
 		meter_input_color, TOKEN_STRING_MULTI);
@@ -866,10 +867,10 @@ cmdline_parse_token_string_t cmd_enable_port_meter_meter =
 		struct cmd_enable_port_meter_result, meter, "meter");
 cmdline_parse_token_num_t cmd_enable_port_meter_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_enable_port_meter_result, port_id, UINT16);
+		struct cmd_enable_port_meter_result, port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_enable_port_meter_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_enable_port_meter_result, mtr_id, UINT32);
+		struct cmd_enable_port_meter_result, mtr_id, CMDLINE_UINT32);
 
 static void cmd_enable_port_meter_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -927,10 +928,10 @@ cmdline_parse_token_string_t cmd_disable_port_meter_meter =
 		struct cmd_disable_port_meter_result, meter, "meter");
 cmdline_parse_token_num_t cmd_disable_port_meter_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_disable_port_meter_result, port_id, UINT16);
+		struct cmd_disable_port_meter_result, port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_disable_port_meter_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_disable_port_meter_result, mtr_id, UINT32);
+		struct cmd_disable_port_meter_result, mtr_id, CMDLINE_UINT32);
 
 static void cmd_disable_port_meter_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -988,10 +989,10 @@ cmdline_parse_token_string_t cmd_del_port_meter_meter =
 		struct cmd_del_port_meter_result, meter, "meter");
 cmdline_parse_token_num_t cmd_del_port_meter_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_del_port_meter_result, port_id, UINT16);
+		struct cmd_del_port_meter_result, port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_meter_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_del_port_meter_result, mtr_id, UINT32);
+		struct cmd_del_port_meter_result, mtr_id, CMDLINE_UINT32);
 
 static void cmd_del_port_meter_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1054,13 +1055,16 @@ cmdline_parse_token_string_t cmd_set_port_meter_profile_profile =
 		struct cmd_set_port_meter_profile_result, profile, "profile");
 cmdline_parse_token_num_t cmd_set_port_meter_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_profile_result, port_id, UINT16);
+		struct cmd_set_port_meter_profile_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_meter_profile_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_profile_result, mtr_id, UINT32);
+		struct cmd_set_port_meter_profile_result, mtr_id,
+		CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_meter_profile_profile_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_profile_result, profile_id, UINT32);
+		struct cmd_set_port_meter_profile_result, profile_id,
+		CMDLINE_UINT32);
 
 static void cmd_set_port_meter_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1208,15 +1212,15 @@ cmdline_parse_token_string_t cmd_set_port_meter_policer_action_action =
 cmdline_parse_token_num_t cmd_set_port_meter_policer_action_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_meter_policer_action_result, port_id,
-		UINT16);
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_meter_policer_action_mtr_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_meter_policer_action_result, mtr_id,
-		UINT32);
+		CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_meter_policer_action_action_mask =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_meter_policer_action_result, action_mask,
-		UINT32);
+		CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_set_port_meter_policer_action_policer_action =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_set_port_meter_policer_action_result,
@@ -1317,14 +1321,16 @@ cmdline_parse_token_string_t cmd_set_port_meter_stats_mask_mask =
 		struct cmd_set_port_meter_stats_mask_result, mask, "mask");
 cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_stats_mask_result, port_id, UINT16);
+		struct cmd_set_port_meter_stats_mask_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_stats_mask_result, mtr_id, UINT32);
+		struct cmd_set_port_meter_stats_mask_result, mtr_id,
+		CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_stats_mask =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_meter_stats_mask_result, stats_mask,
-		UINT64);
+		CMDLINE_UINT64);
 
 static void cmd_set_port_meter_stats_mask_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1389,10 +1395,12 @@ cmdline_parse_token_string_t cmd_show_port_meter_stats_stats =
 		struct cmd_show_port_meter_stats_result, stats, "stats");
 cmdline_parse_token_num_t cmd_show_port_meter_stats_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_show_port_meter_stats_result, port_id, UINT16);
+		struct cmd_show_port_meter_stats_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_meter_stats_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_show_port_meter_stats_result, mtr_id, UINT32);
+		struct cmd_show_port_meter_stats_result, mtr_id,
+		CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_show_port_meter_stats_clear =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_show_port_meter_stats_result, clear, "yes#no");
diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c
index 6951beb58..cdc3ca48e 100644
--- a/app/test-pmd/cmdline_tm.c
+++ b/app/test-pmd/cmdline_tm.c
@@ -217,7 +217,7 @@ cmdline_parse_token_string_t cmd_show_port_tm_cap_cap =
 		cap, "cap");
 cmdline_parse_token_num_t cmd_show_port_tm_cap_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_cap_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 
 static void cmd_show_port_tm_cap_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -354,10 +354,10 @@ cmdline_parse_token_string_t cmd_show_port_tm_level_cap_cap =
 		cap, "cap");
 cmdline_parse_token_num_t cmd_show_port_tm_level_cap_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_tm_level_cap_level_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
-		 level_id, UINT32);
+		 level_id, CMDLINE_UINT32);
 
 
 static void cmd_show_port_tm_level_cap_parsed(void *parsed_result,
@@ -481,10 +481,10 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_cap_cap =
 		cap, "cap");
 cmdline_parse_token_num_t cmd_show_port_tm_node_cap_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_tm_node_cap_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
-		 node_id, UINT32);
+		 node_id, CMDLINE_UINT32);
 
 static void cmd_show_port_tm_node_cap_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -593,14 +593,15 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_stats_stats =
 		struct cmd_show_port_tm_node_stats_result, stats, "stats");
 cmdline_parse_token_num_t cmd_show_port_tm_node_stats_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_stats_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_tm_node_stats_node_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_show_port_tm_node_stats_result,
-			node_id, UINT32);
+			node_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_show_port_tm_node_stats_clear =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_show_port_tm_node_stats_result, clear, UINT32);
+		struct cmd_show_port_tm_node_stats_result, clear,
+			CMDLINE_UINT32);
 
 static void cmd_show_port_tm_node_stats_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -712,11 +713,11 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_type_type =
 cmdline_parse_token_num_t cmd_show_port_tm_node_type_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_show_port_tm_node_type_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_tm_node_type_node_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_show_port_tm_node_type_result,
-			node_id, UINT32);
+			node_id, CMDLINE_UINT32);
 
 static void cmd_show_port_tm_node_type_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -804,31 +805,31 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_profile =
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_shaper_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			shaper_id, UINT32);
+			shaper_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_rate =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			cmit_tb_rate, UINT64);
+			cmit_tb_rate, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_size =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			cmit_tb_size, UINT64);
+			cmit_tb_size, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_rate =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			peak_tb_rate, UINT64);
+			peak_tb_rate, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_size =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			peak_tb_size, UINT64);
+			peak_tb_size, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_pktlen_adjust =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			pktlen_adjust, UINT32);
+			pktlen_adjust, CMDLINE_UINT32);
 
 static void cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -920,11 +921,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_profile =
 cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_shaper_profile_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_shaper_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_shaper_profile_result,
-			shaper_id, UINT32);
+			shaper_id, CMDLINE_UINT32);
 
 static void cmd_del_port_tm_node_shaper_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1001,15 +1002,15 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_shaper =
 cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shared_shaper_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shared_shaper_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shared_shaper_result,
-			shared_shaper_id, UINT32);
+			shared_shaper_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shaper_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shared_shaper_result,
-			shaper_profile_id, UINT32);
+			shaper_profile_id, CMDLINE_UINT32);
 
 static void cmd_add_port_tm_node_shared_shaper_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1101,11 +1102,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_shaper =
 cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_shared_shaper_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_shared_shaper_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_shared_shaper_result,
-			shared_shaper_id, UINT32);
+			shared_shaper_id, CMDLINE_UINT32);
 
 static void cmd_del_port_tm_node_shared_shaper_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1194,11 +1195,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_profile =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wred_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			wred_profile_id, UINT32);
+			wred_profile_id, CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
@@ -1206,19 +1207,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			min_th_g, UINT64);
+			min_th_g, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			max_th_g, UINT64);
+			max_th_g, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			maxp_inv_g, UINT16);
+			maxp_inv_g, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			wq_log2_g, UINT16);
+			wq_log2_g, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
@@ -1226,19 +1227,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			min_th_y, UINT64);
+			min_th_y, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			max_th_y, UINT64);
+			max_th_y, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			maxp_inv_y, UINT16);
+			maxp_inv_y, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			wq_log2_y, UINT16);
+			wq_log2_y, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
@@ -1246,19 +1247,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			min_th_r, UINT64);
+			min_th_r, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			max_th_r, UINT64);
+			max_th_r, CMDLINE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			maxp_inv_r, UINT16);
+			maxp_inv_r, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			wq_log2_r, UINT16);
+			wq_log2_r, CMDLINE_UINT16);
 
 
 static void cmd_add_port_tm_node_wred_profile_parsed(void *parsed_result,
@@ -1374,11 +1375,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_profile =
 cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_wred_profile_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_wred_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_wred_profile_result,
-			wred_profile_id, UINT32);
+			wred_profile_id, CMDLINE_UINT32);
 
 static void cmd_del_port_tm_node_wred_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1456,15 +1457,15 @@ cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_profile =
 cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_tm_node_shaper_profile_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_shaper_profile_result,
-		node_id, UINT32);
+		node_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t
 	cmd_set_port_tm_node_shaper_shaper_profile_profile_id =
 		TOKEN_NUM_INITIALIZER(
 			struct cmd_set_port_tm_node_shaper_profile_result,
-			shaper_profile_id, UINT32);
+			shaper_profile_id, CMDLINE_UINT32);
 
 static void cmd_set_port_tm_node_shaper_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1550,31 +1551,31 @@ cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_node =
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_nonleaf_node_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 node_id, UINT32);
+		 node_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_parent_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 parent_node_id, INT32);
+		 parent_node_id, CMDLINE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 priority, UINT32);
+		 priority, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_weight =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 weight, UINT32);
+		 weight, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_level_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 level_id, UINT32);
+		 level_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_shaper_profile_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 shaper_profile_id, INT32);
+		 shaper_profile_id, CMDLINE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_n_sp_priorities =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 n_sp_priorities, UINT32);
+		 n_sp_priorities, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_stats_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 stats_mask, UINT64);
+		 stats_mask, CMDLINE_UINT64);
 cmdline_parse_token_string_t
 	cmd_add_port_tm_nonleaf_node_multi_shared_shaper_id =
 	TOKEN_STRING_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
@@ -1708,34 +1709,34 @@ cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_node =
 		struct cmd_add_port_tm_leaf_node_result, node, "node");
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 node_id, UINT32);
+		 node_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_parent_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 parent_node_id, INT32);
+		 parent_node_id, CMDLINE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 priority, UINT32);
+		 priority, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_weight =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 weight, UINT32);
+		 weight, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_level_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 level_id, UINT32);
+		 level_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_shaper_profile_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 shaper_profile_id, INT32);
+		 shaper_profile_id, CMDLINE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_cman_mode =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 cman_mode, UINT32);
+		 cman_mode, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_wred_profile_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 wred_profile_id, UINT32);
+		 wred_profile_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_stats_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 stats_mask, UINT64);
+		 stats_mask, CMDLINE_UINT64);
 cmdline_parse_token_string_t
 	cmd_add_port_tm_leaf_node_multi_shared_shaper_id =
 	TOKEN_STRING_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
@@ -1858,10 +1859,10 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_node =
 		struct cmd_del_port_tm_node_result, node, "node");
 cmdline_parse_token_num_t cmd_del_port_tm_node_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_del_port_tm_node_result,
-		 port_id, UINT16);
+		 port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_tm_node_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_del_port_tm_node_result,
-		node_id, UINT32);
+		node_id, CMDLINE_UINT32);
 
 static void cmd_del_port_tm_node_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1936,19 +1937,21 @@ cmdline_parse_token_string_t cmd_set_port_tm_node_parent_parent =
 		struct cmd_set_port_tm_node_parent_result, parent, "parent");
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_tm_node_parent_result, port_id, UINT16);
+		struct cmd_set_port_tm_node_parent_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_node_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_tm_node_parent_result, node_id, UINT32);
+		struct cmd_set_port_tm_node_parent_result, node_id,
+		CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_parent_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
-		parent_id, UINT32);
+		parent_id, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
-		priority, UINT32);
+		priority, CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_weight =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
-		weight, UINT32);
+		weight, CMDLINE_UINT32);
 
 static void cmd_set_port_tm_node_parent_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2024,10 +2027,12 @@ cmdline_parse_token_string_t cmd_suspend_port_tm_node_node =
 		struct cmd_suspend_port_tm_node_result, node, "node");
 cmdline_parse_token_num_t cmd_suspend_port_tm_node_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_suspend_port_tm_node_result, port_id, UINT16);
+		struct cmd_suspend_port_tm_node_result, port_id,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_suspend_port_tm_node_node_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_suspend_port_tm_node_result, node_id, UINT32);
+		struct cmd_suspend_port_tm_node_result, node_id,
+		CMDLINE_UINT32);
 
 static void cmd_suspend_port_tm_node_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2089,10 +2094,10 @@ cmdline_parse_token_string_t cmd_resume_port_tm_node_node =
 		struct cmd_resume_port_tm_node_result, node, "node");
 cmdline_parse_token_num_t cmd_resume_port_tm_node_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_resume_port_tm_node_result, port_id, UINT16);
+		struct cmd_resume_port_tm_node_result, port_id, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_resume_port_tm_node_node_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_resume_port_tm_node_result, node_id, UINT32);
+		struct cmd_resume_port_tm_node_result, node_id, CMDLINE_UINT32);
 
 static void cmd_resume_port_tm_node_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2156,7 +2161,7 @@ cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_commit =
 cmdline_parse_token_num_t cmd_port_tm_hierarchy_commit_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_port_tm_hierarchy_commit_result,
-			port_id, UINT16);
+			port_id, CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_clean_on_fail =
 	TOKEN_STRING_INITIALIZER(struct cmd_port_tm_hierarchy_commit_result,
 		 clean_on_fail, "yes#no");
@@ -2236,17 +2241,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_ip_ecn =
 				 ip_ecn, "ip_ecn");
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_green =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-			      green, UINT16);
+			      green, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_yellow =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-			      yellow, UINT16);
+			      yellow, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_red =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-				red, UINT16);
+				red, CMDLINE_UINT16);
 
 static void cmd_port_tm_mark_ip_ecn_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2323,17 +2328,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_ip_dscp =
 				 ip_dscp, "ip_dscp");
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_green =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-				green, UINT16);
+				green, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_yellow =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-				yellow, UINT16);
+				yellow, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_red =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-				red, UINT16);
+				red, CMDLINE_UINT16);
 
 static void cmd_port_tm_mark_ip_dscp_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2410,17 +2415,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_vlan_dei =
 				 vlan_dei, "vlan_dei");
 cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-			      port_id, UINT16);
+			      port_id, CMDLINE_UINT16);
 
 cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_green =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-				green, UINT16);
+				green, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_yellow =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-				yellow, UINT16);
+				yellow, CMDLINE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_red =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-				red, UINT16);
+				red, CMDLINE_UINT16);
 
 static void cmd_port_tm_mark_vlan_dei_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
diff --git a/app/test/test_cmdline_num.c b/app/test/test_cmdline_num.c
index a6ad95507..a2f79ae85 100644
--- a/app/test/test_cmdline_num.c
+++ b/app/test/test_cmdline_num.c
@@ -220,31 +220,31 @@ static int
 can_parse_unsigned(uint64_t expected_result, enum cmdline_numtype type)
 {
 	switch (type) {
-	case UINT8:
+	case CMDLINE_UINT8:
 		if (expected_result > UINT8_MAX)
 			return 0;
 		break;
-	case UINT16:
+	case CMDLINE_UINT16:
 		if (expected_result > UINT16_MAX)
 			return 0;
 		break;
-	case UINT32:
+	case CMDLINE_UINT32:
 		if (expected_result > UINT32_MAX)
 			return 0;
 		break;
-	case INT8:
+	case CMDLINE_INT8:
 		if (expected_result > INT8_MAX)
 			return 0;
 		break;
-	case INT16:
+	case CMDLINE_INT16:
 		if (expected_result > INT16_MAX)
 			return 0;
 		break;
-	case INT32:
+	case CMDLINE_INT32:
 		if (expected_result > INT32_MAX)
 			return 0;
 		break;
-	case INT64:
+	case CMDLINE_INT64:
 		if (expected_result > INT64_MAX)
 			return 0;
 		break;
@@ -258,31 +258,31 @@ static int
 can_parse_signed(int64_t expected_result, enum cmdline_numtype type)
 {
 	switch (type) {
-	case UINT8:
+	case CMDLINE_UINT8:
 		if (expected_result > UINT8_MAX || expected_result < 0)
 			return 0;
 		break;
-	case UINT16:
+	case CMDLINE_UINT16:
 		if (expected_result > UINT16_MAX || expected_result < 0)
 			return 0;
 		break;
-	case UINT32:
+	case CMDLINE_UINT32:
 		if (expected_result > UINT32_MAX || expected_result < 0)
 			return 0;
 		break;
-	case UINT64:
+	case CMDLINE_UINT64:
 		if (expected_result < 0)
 			return 0;
 		break;
-	case INT8:
+	case CMDLINE_INT8:
 		if (expected_result > INT8_MAX || expected_result < INT8_MIN)
 			return 0;
 		break;
-	case INT16:
+	case CMDLINE_INT16:
 		if (expected_result > INT16_MAX || expected_result < INT16_MIN)
 			return 0;
 		break;
-	case INT32:
+	case CMDLINE_INT32:
 		if (expected_result > INT32_MAX || expected_result < INT32_MIN)
 			return 0;
 		break;
@@ -302,7 +302,7 @@ test_parse_num_invalid_param(void)
 	int ret = 0;
 
 	/* set up a token */
-	token.num_data.type = UINT32;
+	token.num_data.type = CMDLINE_UINT32;
 
 	/* copy string to buffer */
 	strlcpy(buf, num_valid_positive_strs[0].str, sizeof(buf));
@@ -375,7 +375,7 @@ test_parse_num_invalid_data(void)
 	cmdline_parse_token_num_t token;
 
 	/* cycle through all possible parsed types */
-	for (type = UINT8; type <= INT64; type++) {
+	for (type = CMDLINE_UINT8; type <= CMDLINE_INT64; type++) {
 		token.num_data.type = type;
 
 		/* test full strings */
@@ -414,7 +414,7 @@ test_parse_num_valid(void)
 	/** valid strings **/
 
 	/* cycle through all possible parsed types */
-	for (type = UINT8; type <= INT64; type++) {
+	for (type = CMDLINE_UINT8; type <= CMDLINE_INT64; type++) {
 		token.num_data.type = type;
 
 		/* test positive strings */
@@ -468,13 +468,13 @@ test_parse_num_valid(void)
 			if (ret > 0) {
 				/* detect negative */
 				switch (type) {
-				case INT8:
+				case CMDLINE_INT8:
 					result = (int8_t) result;
 					break;
-				case INT16:
+				case CMDLINE_INT16:
 					result = (int16_t) result;
 					break;
-				case INT32:
+				case CMDLINE_INT32:
 					result = (int32_t) result;
 					break;
 				default:
@@ -492,7 +492,7 @@ test_parse_num_valid(void)
 	/** garbage strings **/
 
 	/* cycle through all possible parsed types */
-	for (type = UINT8; type <= INT64; type++) {
+	for (type = CMDLINE_UINT8; type <= CMDLINE_INT64; type++) {
 		token.num_data.type = type;
 
 		/* test positive garbage strings */
@@ -546,15 +546,15 @@ test_parse_num_valid(void)
 			if (ret > 0) {
 				/* detect negative */
 				switch (type) {
-				case INT8:
+				case CMDLINE_INT8:
 					if (result & (INT8_MAX + 1))
 						result |= 0xFFFFFFFFFFFFFF00ULL;
 					break;
-				case INT16:
+				case CMDLINE_INT16:
 					if (result & (INT16_MAX + 1))
 						result |= 0xFFFFFFFFFFFF0000ULL;
 					break;
-				case INT32:
+				case CMDLINE_INT32:
 					if (result & (INT32_MAX + 1ULL))
 						result |= 0xFFFFFFFF00000000ULL;
 					break;
diff --git a/examples/ethtool/ethtool-app/ethapp.c b/examples/ethtool/ethtool-app/ethapp.c
index b6b967118..272e86966 100644
--- a/examples/ethtool/ethtool-app/ethapp.c
+++ b/examples/ethtool/ethtool-app/ethapp.c
@@ -70,7 +70,7 @@ cmdline_parse_token_string_t pcmd_rxmode_token_cmd =
 cmdline_parse_token_string_t pcmd_portstats_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_int_params, cmd, "portstats");
 cmdline_parse_token_num_t pcmd_int_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_int_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_int_params, port, CMDLINE_UINT16);
 
 /* Commands taking port id and string */
 cmdline_parse_token_string_t pcmd_eeprom_token_cmd =
@@ -84,7 +84,7 @@ cmdline_parse_token_string_t pcmd_regs_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, cmd, "regs");
 
 cmdline_parse_token_num_t pcmd_intstr_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, CMDLINE_UINT16);
 cmdline_parse_token_string_t pcmd_intstr_token_opt =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, opt, NULL);
 
@@ -92,7 +92,7 @@ cmdline_parse_token_string_t pcmd_intstr_token_opt =
 cmdline_parse_token_string_t pcmd_macaddr_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intmac_params, cmd, "macaddr");
 cmdline_parse_token_num_t pcmd_intmac_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intmac_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intmac_params, port, CMDLINE_UINT16);
 cmdline_parse_token_etheraddr_t pcmd_intmac_token_mac =
 	TOKEN_ETHERADDR_INITIALIZER(struct pcmd_intmac_params, mac);
 
@@ -106,18 +106,19 @@ cmdline_parse_token_string_t pcmd_ringparam_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intintint_params, cmd,
 		"ringparam");
 cmdline_parse_token_num_t pcmd_intintint_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, port,
+		CMDLINE_UINT16);
 cmdline_parse_token_num_t pcmd_intintint_token_tx =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, tx, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, tx, CMDLINE_UINT16);
 cmdline_parse_token_num_t pcmd_intintint_token_rx =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, rx, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, rx, CMDLINE_UINT16);
 
 
 /* Pause commands */
 cmdline_parse_token_string_t pcmd_pause_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, cmd, "pause");
 cmdline_parse_token_num_t pcmd_pause_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, CMDLINE_UINT16);
 cmdline_parse_token_string_t pcmd_pause_token_opt =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params,
 		opt, "all#tx#rx#none");
@@ -126,11 +127,11 @@ cmdline_parse_token_string_t pcmd_pause_token_opt =
 cmdline_parse_token_string_t pcmd_vlan_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_vlan_params, cmd, "vlan");
 cmdline_parse_token_num_t pcmd_vlan_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, port, CMDLINE_UINT16);
 cmdline_parse_token_string_t pcmd_vlan_token_mode =
 	TOKEN_STRING_INITIALIZER(struct pcmd_vlan_params, mode, "add#del");
 cmdline_parse_token_num_t pcmd_vlan_token_vid =
-	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, vid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, vid, CMDLINE_UINT16);
 
 
 static void
diff --git a/examples/ipsec-secgw/parser.c b/examples/ipsec-secgw/parser.c
index 8f6666032..4d8fcf32b 100644
--- a/examples/ipsec-secgw/parser.c
+++ b/examples/ipsec-secgw/parser.c
@@ -560,7 +560,7 @@ cmdline_parse_token_string_t cfg_add_neigh_start =
 cmdline_parse_token_string_t cfg_add_neigh_pstr =
 	TOKEN_STRING_INITIALIZER(struct cfg_neigh_add_item, pstr, "port");
 cmdline_parse_token_num_t cfg_add_neigh_port =
-	TOKEN_NUM_INITIALIZER(struct cfg_neigh_add_item, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cfg_neigh_add_item, port, CMDLINE_UINT16);
 cmdline_parse_token_string_t cfg_add_neigh_mac =
 	TOKEN_STRING_INITIALIZER(struct cfg_neigh_add_item, mac, NULL);
 
diff --git a/examples/qos_sched/cmdline.c b/examples/qos_sched/cmdline.c
index ba68e0d02..7bb8058f8 100644
--- a/examples/qos_sched/cmdline.c
+++ b/examples/qos_sched/cmdline.c
@@ -113,7 +113,7 @@ cmdline_parse_token_string_t cmd_setqavg_param_string =
                                 "period#n");
 cmdline_parse_token_num_t cmd_setqavg_number =
         TOKEN_NUM_INITIALIZER(struct cmd_setqavg_result, number,
-                                UINT32);
+				CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_setqavg = {
         .f = cmd_setqavg_parsed,
@@ -188,10 +188,10 @@ cmdline_parse_token_string_t cmd_subportstats_subport_string =
                                 "subport");
 cmdline_parse_token_num_t cmd_subportstats_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_subportstats_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_num_t cmd_subportstats_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_subportstats_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 
 cmdline_parse_inst_t cmd_subportstats = {
         .f = cmd_subportstats_parsed,
@@ -236,19 +236,19 @@ cmdline_parse_token_string_t cmd_pipestats_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_pipestats_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_pipestats_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_pipestats_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_pipestats_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_pipestats_pipe_string =
         TOKEN_STRING_INITIALIZER(struct cmd_pipestats_result, pipe_string,
                                 "pipe");
 cmdline_parse_token_num_t cmd_pipestats_pipe_number =
         TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, pipe_number,
-                                UINT32);
+				CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_pipestats = {
         .f = cmd_pipestats_parsed,
@@ -299,31 +299,31 @@ cmdline_parse_token_string_t cmd_avg_q_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_q_port_number =
 	TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_avg_q_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_q_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_avg_q_pipe_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, pipe_string,
                                 "pipe");
 cmdline_parse_token_num_t cmd_avg_q_pipe_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, pipe_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_avg_q_tc_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, tc_string,
                                 "tc");
 cmdline_parse_token_num_t cmd_avg_q_tc_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, tc_number,
-                                UINT8);
+				CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_avg_q_q_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, q_string,
                                 "q");
 cmdline_parse_token_num_t cmd_avg_q_q_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, q_number,
-                                UINT8);
+				CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_avg_q = {
         .f = cmd_avg_q_parsed,
@@ -376,25 +376,25 @@ cmdline_parse_token_string_t cmd_avg_tcpipe_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_tcpipe_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_avg_tcpipe_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_tcpipe_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_avg_tcpipe_pipe_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, pipe_string,
                                 "pipe");
 cmdline_parse_token_num_t cmd_avg_tcpipe_pipe_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, pipe_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_avg_tcpipe_tc_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, tc_string,
                                 "tc");
 cmdline_parse_token_num_t cmd_avg_tcpipe_tc_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, tc_number,
-                                UINT8);
+				CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_avg_tcpipe = {
         .f = cmd_avg_tcpipe_parsed,
@@ -443,19 +443,19 @@ cmdline_parse_token_string_t cmd_avg_pipe_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_pipe_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_avg_pipe_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_pipe_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_pipe_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_avg_pipe_pipe_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_pipe_result, pipe_string,
                                 "pipe");
 cmdline_parse_token_num_t cmd_avg_pipe_pipe_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, pipe_number,
-                                UINT32);
+				CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_avg_pipe = {
         .f = cmd_avg_pipe_parsed,
@@ -502,19 +502,19 @@ cmdline_parse_token_string_t cmd_avg_tcsubport_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_tcsubport_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_avg_tcsubport_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcsubport_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_tcsubport_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 cmdline_parse_token_string_t cmd_avg_tcsubport_tc_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcsubport_result, tc_string,
                                 "tc");
 cmdline_parse_token_num_t cmd_avg_tcsubport_tc_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, tc_number,
-                                UINT8);
+				CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_avg_tcsubport = {
         .f = cmd_avg_tcsubport_parsed,
@@ -559,13 +559,13 @@ cmdline_parse_token_string_t cmd_avg_subport_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_subport_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_subport_result, port_number,
-			       UINT16);
+				CMDLINE_UINT16);
 cmdline_parse_token_string_t cmd_avg_subport_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_subport_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_subport_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_subport_result, subport_number,
-                                UINT32);
+				CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_avg_subport = {
         .f = cmd_avg_subport_parsed,
diff --git a/examples/vdpa/main.c b/examples/vdpa/main.c
index 2345f9866..3fcd40bce 100644
--- a/examples/vdpa/main.c
+++ b/examples/vdpa/main.c
@@ -471,7 +471,7 @@ cmdline_parse_token_string_t cmd_device_stats_ =
 cmdline_parse_token_string_t cmd_device_bdf =
 	TOKEN_STRING_INITIALIZER(struct cmd_stats_result, bdf, NULL);
 cmdline_parse_token_num_t cmd_queue_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_stats_result, qid, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_stats_result, qid, CMDLINE_UINT32);
 
 cmdline_parse_inst_t cmd_device_stats = {
 	.f = cmd_device_stats_parsed,
diff --git a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
index 96c1a1ff6..d15e0fc1f 100644
--- a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
+++ b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
@@ -446,7 +446,7 @@ cmdline_parse_token_string_t cmd_set_cpu_freq =
 			set_cpu_freq, "set_cpu_freq");
 cmdline_parse_token_num_t cmd_set_cpu_freq_core_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_cpu_freq_result,
-			lcore_id, UINT8);
+			lcore_id, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result,
 			cmd, "up#down#min#max#enable_turbo#disable_turbo");
diff --git a/examples/vm_power_manager/vm_power_cli.c b/examples/vm_power_manager/vm_power_cli.c
index 7edeaccda..0128f047f 100644
--- a/examples/vm_power_manager/vm_power_cli.c
+++ b/examples/vm_power_manager/vm_power_cli.c
@@ -155,10 +155,10 @@ cmdline_parse_token_string_t cmd_set_pcpu_vm_name =
 				vm_name, NULL);
 cmdline_parse_token_num_t set_pcpu_vcpu =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_pcpu_result,
-				vcpu, UINT8);
+				vcpu, CMDLINE_UINT8);
 cmdline_parse_token_num_t set_pcpu_core =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_pcpu_result,
-				core, UINT64);
+				core, CMDLINE_UINT64);
 
 
 cmdline_parse_inst_t cmd_set_pcpu_set = {
@@ -455,7 +455,7 @@ cmdline_parse_token_string_t cmd_show_cpu_freq =
 
 cmdline_parse_token_num_t cmd_show_cpu_freq_core_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_cpu_freq_result,
-			core_num, UINT8);
+			core_num, CMDLINE_UINT8);
 
 cmdline_parse_inst_t cmd_show_cpu_freq_set = {
 	.f = cmd_show_cpu_freq_parsed,
@@ -504,7 +504,7 @@ cmdline_parse_token_string_t cmd_set_cpu_freq =
 			set_cpu_freq, "set_cpu_freq");
 cmdline_parse_token_num_t cmd_set_cpu_freq_core_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_cpu_freq_result,
-			core_num, UINT8);
+			core_num, CMDLINE_UINT8);
 cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result,
 			cmd, "up#down#min#max#enable_turbo#disable_turbo");
diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/librte_cmdline/cmdline_parse_num.c
index 478f181b4..e96cddc9f 100644
--- a/lib/librte_cmdline/cmdline_parse_num.c
+++ b/lib/librte_cmdline/cmdline_parse_num.c
@@ -57,9 +57,8 @@ static inline int
 add_to_res(unsigned int c, uint64_t *res, unsigned int base)
 {
 	/* overflow */
-	if ( (UINT64_MAX - c) / base < *res ) {
+	if ((UINT64_MAX - c) / base < *res)
 		return -1;
-	}
 
 	*res = (uint64_t) (*res * base + c);
 	return 0;
@@ -69,23 +68,23 @@ static int
 check_res_size(struct cmdline_token_num_data *nd, unsigned ressize)
 {
 	switch (nd->type) {
-	case INT8:
-	case UINT8:
+	case CMDLINE_INT8:
+	case CMDLINE_UINT8:
 		if (ressize < sizeof(int8_t))
 			return -1;
 		break;
-	case INT16:
-	case UINT16:
+	case CMDLINE_INT16:
+	case CMDLINE_UINT16:
 		if (ressize < sizeof(int16_t))
 			return -1;
 		break;
-	case INT32:
-	case UINT32:
+	case CMDLINE_INT32:
+	case CMDLINE_UINT32:
 		if (ressize < sizeof(int32_t))
 			return -1;
 		break;
-	case INT64:
-	case UINT64:
+	case CMDLINE_INT64:
+	case CMDLINE_UINT64:
 		if (ressize < sizeof(int64_t))
 			return -1;
 		break;
@@ -123,7 +122,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res,
 			return -1;
 	}
 
-	while ( st != ERROR && c && ! cmdline_isendoftoken(c) ) {
+	while (st != ERROR && c && !cmdline_isendoftoken(c)) {
 		debug_printf("%c %x -> ", c, c);
 		switch (st) {
 		case START:
@@ -259,61 +258,53 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res,
 	case HEX_OK:
 	case OCTAL_OK:
 	case BIN_OK:
-		if ( nd.type == INT8 && res1 <= INT8_MAX ) {
+		if (nd.type == CMDLINE_INT8 && res1 <= INT8_MAX) {
 			if (res) *(int8_t *)res = (int8_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT16 && res1 <= INT16_MAX ) {
+		} else if (nd.type == CMDLINE_INT16 && res1 <= INT16_MAX) {
 			if (res) *(int16_t *)res = (int16_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT32 && res1 <= INT32_MAX ) {
+		} else if (nd.type == CMDLINE_INT32 && res1 <= INT32_MAX) {
 			if (res) *(int32_t *)res = (int32_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT64 && res1 <= INT64_MAX ) {
+		} else if (nd.type == CMDLINE_INT64 && res1 <= INT64_MAX) {
 			if (res) *(int64_t *)res = (int64_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == UINT8 && res1 <= UINT8_MAX ) {
+		} else if (nd.type == CMDLINE_UINT8 && res1 <= UINT8_MAX) {
 			if (res) *(uint8_t *)res = (uint8_t) res1;
 			return buf-srcbuf;
-		}
-		else if (nd.type == UINT16  && res1 <= UINT16_MAX ) {
+		} else if (nd.type == CMDLINE_UINT16  && res1 <= UINT16_MAX) {
 			if (res) *(uint16_t *)res = (uint16_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == UINT32 && res1 <= UINT32_MAX ) {
+		} else if (nd.type == CMDLINE_UINT32 && res1 <= UINT32_MAX) {
 			if (res) *(uint32_t *)res = (uint32_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == UINT64 ) {
+		} else if (nd.type == CMDLINE_UINT64) {
 			if (res) *(uint64_t *)res = res1;
 			return buf-srcbuf;
-		}
-		else {
+		} else {
 			return -1;
 		}
 		break;
 
 	case DEC_NEG_OK:
-		if ( nd.type == INT8 && res1 <= INT8_MAX + 1 ) {
+		if (nd.type == CMDLINE_INT8 &&
+				res1 <= INT8_MAX + 1) {
 			if (res) *(int8_t *)res = (int8_t) (-res1);
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT16 && res1 <= (uint16_t)INT16_MAX + 1 ) {
+		} else if (nd.type == CMDLINE_INT16 &&
+				res1 <= (uint16_t)INT16_MAX + 1) {
 			if (res) *(int16_t *)res = (int16_t) (-res1);
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT32 && res1 <= (uint32_t)INT32_MAX + 1 ) {
+		} else if (nd.type == CMDLINE_INT32 &&
+				res1 <= (uint32_t)INT32_MAX + 1) {
 			if (res) *(int32_t *)res = (int32_t) (-res1);
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT64 && res1 <= (uint64_t)INT64_MAX + 1 ) {
+		} else if (nd.type == CMDLINE_INT64 &&
+				res1 <= (uint64_t)INT64_MAX + 1) {
 			if (res) *(int64_t *)res = (int64_t) (-res1);
 			return buf-srcbuf;
-		}
-		else {
+		} else {
 			return -1;
 		}
 		break;
diff --git a/lib/librte_cmdline/cmdline_parse_num.h b/lib/librte_cmdline/cmdline_parse_num.h
index 58b28cad7..28b04520f 100644
--- a/lib/librte_cmdline/cmdline_parse_num.h
+++ b/lib/librte_cmdline/cmdline_parse_num.h
@@ -14,14 +14,14 @@ extern "C" {
 #endif
 
 enum cmdline_numtype {
-	UINT8 = 0,
-	UINT16,
-	UINT32,
-	UINT64,
-	INT8,
-	INT16,
-	INT32,
-	INT64
+	CMDLINE_UINT8 = 0,
+	CMDLINE_UINT16,
+	CMDLINE_UINT32,
+	CMDLINE_UINT64,
+	CMDLINE_INT8,
+	CMDLINE_INT16,
+	CMDLINE_INT32,
+	CMDLINE_INT64
 };
 
 struct cmdline_token_num_data {
-- 
2.25.4


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [dpdk-dev] [PATCH v2] cmdline: avoid name clash with Windows system types
  2020-09-02 18:38 ` [dpdk-dev] [PATCH v2] " Dmitry Kozlyuk
@ 2020-09-03  9:20   ` Bruce Richardson
  2020-09-03  9:30     ` Dmitry Kozlyuk
  2020-10-30  1:01   ` [dpdk-dev] [PATCH v3] " Dmitry Kozlyuk
  1 sibling, 1 reply; 13+ messages in thread
From: Bruce Richardson @ 2020-09-03  9:20 UTC (permalink / raw)
  To: Dmitry Kozlyuk
  Cc: dev, Jie Zhou, Ranjit Menon, Olivier Matz, Wenzhuo Lu,
	Beilei Xing, Bernard Iremonger, Ori Kam, Marko Kovacevic,
	Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori,
	Pavan Nikhilesh, Cristian Dumitrescu, Jasvinder Singh,
	Maxime Coquelin, Chenbo Xia, Zhihong Wang, David Hunt

On Wed, Sep 02, 2020 at 09:38:05PM +0300, Dmitry Kozlyuk wrote:
> cmdline_numtype member names clash with Windows system identifiers.
> Add CMDLINE_ prefix to cmdline constants to avoid this and possible
> future conflicts.
> 
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
> ---

Is CMDLINE the best prefix to use here. The DPDK standard is obviously RTE_
as a prefix. This is one I suggested previously (over a year ago, actually):

http://patches.dpdk.org/patch/52644/

/Bruce

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [dpdk-dev] [PATCH v2] cmdline: avoid name clash with Windows system types
  2020-09-03  9:20   ` Bruce Richardson
@ 2020-09-03  9:30     ` Dmitry Kozlyuk
  2020-09-03  9:40       ` Bruce Richardson
  0 siblings, 1 reply; 13+ messages in thread
From: Dmitry Kozlyuk @ 2020-09-03  9:30 UTC (permalink / raw)
  To: Bruce Richardson
  Cc: dev, Jie Zhou, Ranjit Menon, Olivier Matz, Wenzhuo Lu,
	Beilei Xing, Bernard Iremonger, Ori Kam, Marko Kovacevic,
	Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori,
	Pavan Nikhilesh, Cristian Dumitrescu, Jasvinder Singh,
	Maxime Coquelin, Chenbo Xia, Zhihong Wang, David Hunt

On Thu, 3 Sep 2020 10:20:52 +0100, Bruce Richardson wrote:
> On Wed, Sep 02, 2020 at 09:38:05PM +0300, Dmitry Kozlyuk wrote:
> > cmdline_numtype member names clash with Windows system identifiers.
> > Add CMDLINE_ prefix to cmdline constants to avoid this and possible
> > future conflicts.
> > 
> > Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> > Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
> > ---  
> 
> Is CMDLINE the best prefix to use here. The DPDK standard is obviously RTE_
> as a prefix. This is one I suggested previously (over a year ago, actually):
> 
> http://patches.dpdk.org/patch/52644/

RTE_ is the standard indeed. I went with CMDLINE_, because this is the prefix
librte_cmdline uses for its main routines. Will change in v3 if no objections
arise.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [dpdk-dev] [PATCH v2] cmdline: avoid name clash with Windows system types
  2020-09-03  9:30     ` Dmitry Kozlyuk
@ 2020-09-03  9:40       ` Bruce Richardson
  2020-09-17 14:15         ` Olivier Matz
  0 siblings, 1 reply; 13+ messages in thread
From: Bruce Richardson @ 2020-09-03  9:40 UTC (permalink / raw)
  To: Dmitry Kozlyuk
  Cc: dev, Jie Zhou, Ranjit Menon, Olivier Matz, Wenzhuo Lu,
	Beilei Xing, Bernard Iremonger, Ori Kam, Marko Kovacevic,
	Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori,
	Pavan Nikhilesh, Cristian Dumitrescu, Jasvinder Singh,
	Maxime Coquelin, Chenbo Xia, Zhihong Wang, David Hunt

On Thu, Sep 03, 2020 at 12:30:56PM +0300, Dmitry Kozlyuk wrote:
> On Thu, 3 Sep 2020 10:20:52 +0100, Bruce Richardson wrote:
> > On Wed, Sep 02, 2020 at 09:38:05PM +0300, Dmitry Kozlyuk wrote:
> > > cmdline_numtype member names clash with Windows system identifiers.
> > > Add CMDLINE_ prefix to cmdline constants to avoid this and possible
> > > future conflicts.
> > > 
> > > Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> > > Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
> > > ---  
> > 
> > Is CMDLINE the best prefix to use here. The DPDK standard is obviously RTE_
> > as a prefix. This is one I suggested previously (over a year ago, actually):
> > 
> > http://patches.dpdk.org/patch/52644/
> 
> RTE_ is the standard indeed. I went with CMDLINE_, because this is the prefix
> librte_cmdline uses for its main routines. Will change in v3 if no objections
> arise.

Yes, I suggest waiting for other inputs.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [dpdk-dev] [PATCH v2] cmdline: avoid name clash with Windows system types
  2020-09-03  9:40       ` Bruce Richardson
@ 2020-09-17 14:15         ` Olivier Matz
  0 siblings, 0 replies; 13+ messages in thread
From: Olivier Matz @ 2020-09-17 14:15 UTC (permalink / raw)
  To: Bruce Richardson
  Cc: Dmitry Kozlyuk, dev, Jie Zhou, Ranjit Menon, Wenzhuo Lu,
	Beilei Xing, Bernard Iremonger, Ori Kam, Marko Kovacevic,
	Radu Nicolau, Akhil Goyal, Tomasz Kantecki, Sunil Kumar Kori,
	Pavan Nikhilesh, Cristian Dumitrescu, Jasvinder Singh,
	Maxime Coquelin, Chenbo Xia, Zhihong Wang, David Hunt

Hi,

On Thu, Sep 03, 2020 at 10:40:31AM +0100, Bruce Richardson wrote:
> On Thu, Sep 03, 2020 at 12:30:56PM +0300, Dmitry Kozlyuk wrote:
> > On Thu, 3 Sep 2020 10:20:52 +0100, Bruce Richardson wrote:
> > > On Wed, Sep 02, 2020 at 09:38:05PM +0300, Dmitry Kozlyuk wrote:
> > > > cmdline_numtype member names clash with Windows system identifiers.
> > > > Add CMDLINE_ prefix to cmdline constants to avoid this and possible
> > > > future conflicts.
> > > > 
> > > > Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> > > > Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
> > > > ---  
> > > 
> > > Is CMDLINE the best prefix to use here. The DPDK standard is obviously RTE_
> > > as a prefix. This is one I suggested previously (over a year ago, actually):
> > > 
> > > http://patches.dpdk.org/patch/52644/
> > 
> > RTE_ is the standard indeed. I went with CMDLINE_, because this is the prefix
> > librte_cmdline uses for its main routines. Will change in v3 if no objections
> > arise.
> 
> Yes, I suggest waiting for other inputs.

+1 for RTE_ prefix

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [dpdk-dev] [PATCH v3] cmdline: avoid name clash with Windows system types
  2020-09-02 18:38 ` [dpdk-dev] [PATCH v2] " Dmitry Kozlyuk
  2020-09-03  9:20   ` Bruce Richardson
@ 2020-10-30  1:01   ` Dmitry Kozlyuk
  2020-10-30 21:20     ` Ranjit Menon
                       ` (2 more replies)
  1 sibling, 3 replies; 13+ messages in thread
From: Dmitry Kozlyuk @ 2020-10-30  1:01 UTC (permalink / raw)
  To: dev
  Cc: Jie Zhou, Dmitry Kozlyuk, Ranjit Menon, Olivier Matz, Wenzhuo Lu,
	Beilei Xing, Bernard Iremonger, Ori Kam, Radu Nicolau,
	Akhil Goyal, Cristian Dumitrescu, Jasvinder Singh,
	Maxime Coquelin, Chenbo Xia, David Hunt

cmdline_numtype member names clash with Windows system identifiers.
Add RTE_ prefix to cmdline constants to avoid this and possible
future conflicts.

Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---

v3: change prefix from CMDLINE_ to RTE_ (Bruce Richardson)

 app/test-cmdline/commands.c                   |   2 +-
 app/test-pmd/bpf_cmd.c                        |   8 +-
 app/test-pmd/cmdline.c                        | 705 +++++++++---------
 app/test-pmd/cmdline_flow.c                   |   2 +-
 app/test-pmd/cmdline_mtr.c                    |  89 +--
 app/test-pmd/cmdline_tm.c                     | 196 ++---
 app/test/test_cmdline_num.c                   |  48 +-
 examples/ethtool/ethtool-app/ethapp.c         |  19 +-
 examples/ipsec-secgw/parser.c                 |   2 +-
 examples/qos_sched/cmdline.c                  |  46 +-
 examples/vdpa/main.c                          |   2 +-
 .../guest_cli/vm_power_cli_guest.c            |   2 +-
 examples/vm_power_manager/vm_power_cli.c      |   8 +-
 lib/librte_cmdline/cmdline_parse_num.c        |  65 +-
 lib/librte_cmdline/cmdline_parse_num.h        |  16 +-
 15 files changed, 618 insertions(+), 592 deletions(-)

diff --git a/app/test-cmdline/commands.c b/app/test-cmdline/commands.c
index ff7ac973e..d732976f0 100644
--- a/app/test-cmdline/commands.c
+++ b/app/test-cmdline/commands.c
@@ -193,7 +193,7 @@ cmd_num_parsed(void *parsed_result,
 }
 
 cmdline_parse_token_num_t cmd_num_tok =
-	TOKEN_NUM_INITIALIZER(struct cmd_num_result, num, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_num_result, num, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_num = {
 	.f = cmd_num_parsed,  /* function to call */
diff --git a/app/test-pmd/bpf_cmd.c b/app/test-pmd/bpf_cmd.c
index 0a1a1788e..066619e11 100644
--- a/app/test-pmd/bpf_cmd.c
+++ b/app/test-pmd/bpf_cmd.c
@@ -124,9 +124,9 @@ cmdline_parse_token_string_t cmd_load_bpf_dir =
 	TOKEN_STRING_INITIALIZER(struct cmd_bpf_ld_result,
 			dir, "rx#tx");
 cmdline_parse_token_num_t cmd_load_bpf_port =
-	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, port, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, port, RTE_UINT8);
 cmdline_parse_token_num_t cmd_load_bpf_queue =
-	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, queue, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, queue, RTE_UINT16);
 cmdline_parse_token_string_t cmd_load_bpf_flags =
 	TOKEN_STRING_INITIALIZER(struct cmd_bpf_ld_result,
 			flags, NULL);
@@ -180,9 +180,9 @@ cmdline_parse_token_string_t cmd_unload_bpf_dir =
 	TOKEN_STRING_INITIALIZER(struct cmd_bpf_unld_result,
 			dir, "rx#tx");
 cmdline_parse_token_num_t cmd_unload_bpf_port =
-	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, port, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, port, RTE_UINT8);
 cmdline_parse_token_num_t cmd_unload_bpf_queue =
-	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, queue, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, queue, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_operate_bpf_unld_parse = {
 	.f = cmd_operate_bpf_unld_parsed,
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index d59c2b2c4..2f98b8d67 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1433,7 +1433,7 @@ cmdline_parse_token_string_t cmd_operate_specific_port_port =
 						name, "start#stop#close#reset");
 cmdline_parse_token_num_t cmd_operate_specific_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_operate_specific_port_result,
-							value, UINT8);
+							value, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_operate_specific_port = {
 	.f = cmd_operate_specific_port_parsed,
@@ -1571,7 +1571,7 @@ cmdline_parse_token_string_t cmd_operate_detach_port_keyword =
 			keyword, "detach");
 cmdline_parse_token_num_t cmd_operate_detach_port_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_operate_detach_port_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_operate_detach_port = {
 	.f = cmd_operate_detach_port_parsed,
@@ -1795,7 +1795,7 @@ cmdline_parse_token_string_t cmd_config_speed_specific_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, keyword,
 								"config");
 cmdline_parse_token_num_t cmd_config_speed_specific_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_speed_specific, id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_speed_specific, id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_speed_specific_item1 =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, item1,
 								"speed");
@@ -1867,7 +1867,7 @@ cmdline_parse_token_string_t cmd_config_loopback_all_item =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_loopback_all, item,
 							"loopback");
 cmdline_parse_token_num_t cmd_config_loopback_all_mode =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_all, mode, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_all, mode, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_config_loopback_all = {
 	.f = cmd_config_loopback_all_parsed,
@@ -1921,13 +1921,13 @@ cmdline_parse_token_string_t cmd_config_loopback_specific_keyword =
 								"config");
 cmdline_parse_token_num_t cmd_config_loopback_specific_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_specific, port_id,
-								UINT16);
+								RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_loopback_specific_item =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_loopback_specific, item,
 								"loopback");
 cmdline_parse_token_num_t cmd_config_loopback_specific_mode =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_specific, mode,
-			      UINT32);
+			      RTE_UINT32);
 
 cmdline_parse_inst_t cmd_config_loopback_specific = {
 	.f = cmd_config_loopback_specific_parsed,
@@ -2012,7 +2012,7 @@ cmdline_parse_token_string_t cmd_config_rx_tx_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rx_tx, name,
 						"rxq#txq#rxd#txd");
 cmdline_parse_token_num_t cmd_config_rx_tx_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rx_tx, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rx_tx, value, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_config_rx_tx = {
 	.f = cmd_config_rx_tx_parsed,
@@ -2094,7 +2094,7 @@ cmdline_parse_token_string_t cmd_config_max_pkt_len_name =
 								"max-pkt-len");
 cmdline_parse_token_num_t cmd_config_max_pkt_len_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_max_pkt_len_result, value,
-								UINT32);
+								RTE_UINT32);
 
 cmdline_parse_inst_t cmd_config_max_pkt_len = {
 	.f = cmd_config_max_pkt_len_parsed,
@@ -2166,7 +2166,7 @@ cmdline_parse_token_string_t cmd_config_max_lro_pkt_size_name =
 				 name, "max-lro-pkt-size");
 cmdline_parse_token_num_t cmd_config_max_lro_pkt_size_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_max_lro_pkt_size_result,
-			      value, UINT32);
+			      value, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_config_max_lro_pkt_size = {
 	.f = cmd_config_max_lro_pkt_size_parsed,
@@ -2215,9 +2215,11 @@ cmdline_parse_token_string_t cmd_config_mtu_mtu =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_mtu_result, keyword,
 				 "mtu");
 cmdline_parse_token_num_t cmd_config_mtu_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id,
+				 RTE_UINT16);
 cmdline_parse_token_num_t cmd_config_mtu_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value,
+				 RTE_UINT16);
 
 cmdline_parse_inst_t cmd_config_mtu = {
 	.f = cmd_config_mtu_parsed,
@@ -2558,7 +2560,8 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_config =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, config,
 				 "config");
 cmdline_parse_token_num_t cmd_config_rss_hash_key_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id,
+				 RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_hash_key =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key,
 				 rss_hash_key, "rss-hash-key");
@@ -2662,19 +2665,19 @@ cmdline_parse_token_string_t cmd_config_rxtx_ring_size_config =
 				 config, "config");
 cmdline_parse_token_num_t cmd_config_rxtx_ring_size_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
-				 portid, UINT16);
+				 portid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rxtxq =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
 				 rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_rxtx_ring_size_qid =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
-			      qid, UINT16);
+			      qid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rsize =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size,
 				 rsize, "ring_size");
 cmdline_parse_token_num_t cmd_config_rxtx_ring_size_size =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size,
-			      size, UINT16);
+			      size, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_config_rxtx_ring_size = {
 	.f = cmd_config_rxtx_ring_size_parsed,
@@ -2763,11 +2766,11 @@ cmd_config_rxtx_queue_parsed(void *parsed_result,
 cmdline_parse_token_string_t cmd_config_rxtx_queue_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, port, "port");
 cmdline_parse_token_num_t cmd_config_rxtx_queue_portid =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, portid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_queue_rxtxq =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_rxtx_queue_qid =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_rxtx_queue_opname =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, opname,
 						"start#stop");
@@ -2843,13 +2846,13 @@ cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_port =
 						port, "port");
 cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
-						port_id, UINT16);
+						port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_rxtxq =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
 						rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_qid =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
-						qid, UINT16);
+						qid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_opname =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue,
 						opname, "deferred_start");
@@ -2885,11 +2888,11 @@ struct cmd_setup_rxtx_queue {
 cmdline_parse_token_string_t cmd_setup_rxtx_queue_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, port, "port");
 cmdline_parse_token_num_t cmd_setup_rxtx_queue_portid =
-	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, portid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, portid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_setup_rxtx_queue_rxtxq =
 	TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, rxtxq, "rxq#txq");
 cmdline_parse_token_num_t cmd_setup_rxtx_queue_qid =
-	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, qid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, qid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_setup_rxtx_queue_setup =
 	TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, setup, "setup");
 
@@ -3098,7 +3101,7 @@ cmdline_parse_token_string_t cmd_config_rss_reta_port =
 cmdline_parse_token_string_t cmd_config_rss_reta_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, keyword, "config");
 cmdline_parse_token_num_t cmd_config_rss_reta_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_rss_reta, port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_rss_reta_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, name, "rss");
 cmdline_parse_token_string_t cmd_config_rss_reta_list_name =
@@ -3209,13 +3212,13 @@ cmdline_parse_token_string_t cmd_showport_reta_show =
 cmdline_parse_token_string_t cmd_showport_reta_port =
 	TOKEN_STRING_INITIALIZER(struct  cmd_showport_reta, port, "port");
 cmdline_parse_token_num_t cmd_showport_reta_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_showport_reta_rss =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, rss, "rss");
 cmdline_parse_token_string_t cmd_showport_reta_reta =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, reta, "reta");
 cmdline_parse_token_num_t cmd_showport_reta_size =
-	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, RTE_UINT16);
 cmdline_parse_token_string_t cmd_showport_reta_list_of_items =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_reta,
 					list_of_items, NULL);
@@ -3260,7 +3263,8 @@ cmdline_parse_token_string_t cmd_showport_rss_hash_show =
 cmdline_parse_token_string_t cmd_showport_rss_hash_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, port, "port");
 cmdline_parse_token_num_t cmd_showport_rss_hash_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id,
+				 RTE_UINT16);
 cmdline_parse_token_string_t cmd_showport_rss_hash_rss_hash =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, rss_hash,
 				 "rss-hash");
@@ -3364,7 +3368,7 @@ cmdline_parse_token_string_t cmd_config_dcb_port =
 cmdline_parse_token_string_t cmd_config_dcb_config =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, config, "config");
 cmdline_parse_token_num_t cmd_config_dcb_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_dcb_dcb =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, dcb, "dcb");
 cmdline_parse_token_string_t cmd_config_dcb_vt =
@@ -3372,7 +3376,7 @@ cmdline_parse_token_string_t cmd_config_dcb_vt =
 cmdline_parse_token_string_t cmd_config_dcb_vt_en =
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, vt_en, "on#off");
 cmdline_parse_token_num_t cmd_config_dcb_num_tcs =
-        TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, num_tcs, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, num_tcs, RTE_UINT8);
 cmdline_parse_token_string_t cmd_config_dcb_pfc=
         TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, pfc, "pfc");
 cmdline_parse_token_string_t cmd_config_dcb_pfc_en =
@@ -3471,7 +3475,7 @@ cmdline_parse_token_string_t cmd_config_burst_all =
 cmdline_parse_token_string_t cmd_config_burst_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_burst, name, "burst");
 cmdline_parse_token_num_t cmd_config_burst_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_burst, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_burst, value, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_config_burst = {
 	.f = cmd_config_burst_parsed,
@@ -3540,7 +3544,7 @@ cmdline_parse_token_string_t cmd_config_thresh_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_thresh, name,
 				"txpt#txht#txwt#rxpt#rxht#rxwt");
 cmdline_parse_token_num_t cmd_config_thresh_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_thresh, value, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_thresh, value, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_config_thresh = {
 	.f = cmd_config_thresh_parsed,
@@ -3604,7 +3608,7 @@ cmdline_parse_token_string_t cmd_config_threshold_name =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_threshold, name,
 						"txfreet#txrst#rxfreet");
 cmdline_parse_token_num_t cmd_config_threshold_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_config_threshold, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_config_threshold, value, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_config_threshold = {
 	.f = cmd_config_threshold_parsed,
@@ -3810,7 +3814,7 @@ cmdline_parse_token_string_t cmd_setmask_mask =
 	TOKEN_STRING_INITIALIZER(struct cmd_setmask_result, mask,
 				 "coremask#portmask");
 cmdline_parse_token_num_t cmd_setmask_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_setmask_result, hexavalue, UINT64);
+	TOKEN_NUM_INITIALIZER(struct cmd_setmask_result, hexavalue, RTE_UINT64);
 
 cmdline_parse_inst_t cmd_set_fwd_mask = {
 	.f = cmd_set_mask_parsed,
@@ -3856,7 +3860,7 @@ cmdline_parse_token_string_t cmd_set_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_result, what,
 				 "nbport#nbcore#burst#verbose");
 cmdline_parse_token_num_t cmd_set_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_result, value, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_result, value, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_set_numbers = {
 	.f = cmd_set_parsed,
@@ -3904,7 +3908,7 @@ cmdline_parse_token_string_t cmd_set_log_log =
 cmdline_parse_token_string_t cmd_set_log_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_log_result, type, NULL);
 cmdline_parse_token_num_t cmd_set_log_level =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_set_log = {
 	.f = cmd_set_log_parsed,
@@ -4176,7 +4180,7 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_all_all =
 				 all, "all");
 cmdline_parse_token_num_t cmd_rx_vlan_filter_all_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_all_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_rx_vlan_filter_all = {
 	.f = cmd_rx_vlan_filter_all_parsed,
@@ -4340,10 +4344,10 @@ cmdline_parse_token_string_t cmd_vlan_tpid_what =
 				 what, "tpid");
 cmdline_parse_token_num_t cmd_vlan_tpid_tpid =
 	TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
-			      tp_id, UINT16);
+			      tp_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vlan_tpid_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_vlan_tpid = {
 	.f = cmd_vlan_tpid_parsed,
@@ -4390,10 +4394,10 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_what =
 				 what, "add#rm");
 cmdline_parse_token_num_t cmd_rx_vlan_filter_vlanid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result,
-			      vlan_id, UINT16);
+			      vlan_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_rx_vlan_filter_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_rx_vlan_filter = {
 	.f = cmd_rx_vlan_filter_parsed,
@@ -4446,10 +4450,10 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_set =
 				 set, "set");
 cmdline_parse_token_num_t cmd_tx_vlan_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_vlanid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result,
-			      vlan_id, UINT16);
+			      vlan_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_set = {
 	.f = cmd_tx_vlan_set_parsed,
@@ -4503,13 +4507,13 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_qinq_set =
 		set, "set");
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-		port_id, UINT16);
+		port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-		vlan_id, UINT16);
+		vlan_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid_outer =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result,
-		vlan_id_outer, UINT16);
+		vlan_id_outer, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_set_qinq = {
 	.f = cmd_tx_vlan_set_qinq_parsed,
@@ -4561,10 +4565,10 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_pvid =
 				 pvid, "pvid");
 cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
-			     port_id, UINT16);
+			     port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_vlan_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
-			      vlan_id, UINT16);
+			      vlan_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_tx_vlan_set_pvid_result,
 				 mode, "on#off");
@@ -4619,7 +4623,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_reset_reset =
 				 reset, "reset");
 cmdline_parse_token_num_t cmd_tx_vlan_reset_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_reset_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tx_vlan_reset = {
 	.f = cmd_tx_vlan_reset_parsed,
@@ -4825,7 +4829,7 @@ cmdline_parse_token_string_t cmd_csum_hwsw =
 				hwsw, "hw#sw");
 cmdline_parse_token_num_t cmd_csum_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_csum_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_csum_set = {
 	.f = cmd_csum_parsed,
@@ -4896,7 +4900,7 @@ cmdline_parse_token_string_t cmd_csum_tunnel_onoff =
 				onoff, "on#off");
 cmdline_parse_token_num_t cmd_csum_tunnel_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_csum_tunnel_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_csum_tunnel = {
 	.f = cmd_csum_tunnel_parsed,
@@ -4984,10 +4988,10 @@ cmdline_parse_token_string_t cmd_tso_set_mode =
 				mode, "set");
 cmdline_parse_token_num_t cmd_tso_set_tso_segsz =
 	TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
-				tso_segsz, UINT16);
+				tso_segsz, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tso_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tso_set = {
 	.f = cmd_tso_set_parsed,
@@ -5133,10 +5137,10 @@ cmdline_parse_token_string_t cmd_tunnel_tso_set_mode =
 				mode, "set");
 cmdline_parse_token_num_t cmd_tunnel_tso_set_tso_segsz =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
-				tso_segsz, UINT16);
+				tso_segsz, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tunnel_tso_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_tso_set = {
 	.f = cmd_tunnel_tso_set_parsed,
@@ -5200,7 +5204,7 @@ cmdline_parse_token_string_t cmd_gro_enable_port =
 			cmd_keyword, "port");
 cmdline_parse_token_num_t cmd_gro_enable_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_gro_enable_result,
-			cmd_pid, UINT16);
+			cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_gro_enable_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_gro_enable_result,
 			cmd_keyword, "gro");
@@ -5250,7 +5254,7 @@ cmdline_parse_token_string_t cmd_gro_show_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_gro_show_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_gro_show_result,
-			cmd_pid, UINT16);
+			cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_gro_show_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_gro_show_result,
 			cmd_keyword, "gro");
@@ -5300,7 +5304,7 @@ cmdline_parse_token_string_t cmd_gro_flush_flush =
 			cmd_flush, "flush");
 cmdline_parse_token_num_t cmd_gro_flush_cycles =
 	TOKEN_NUM_INITIALIZER(struct cmd_gro_flush_result,
-			cmd_cycles, UINT8);
+			cmd_cycles, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_gro_flush = {
 	.f = cmd_gro_flush_parsed,
@@ -5350,7 +5354,7 @@ cmdline_parse_token_string_t cmd_gso_enable_mode =
 			cmd_mode, "on#off");
 cmdline_parse_token_num_t cmd_gso_enable_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_gso_enable_result,
-			cmd_pid, UINT16);
+			cmd_pid, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_gso_enable = {
 	.f = cmd_gso_enable_parsed,
@@ -5409,7 +5413,7 @@ cmdline_parse_token_string_t cmd_gso_size_segsz =
 				cmd_segsz, "segsz");
 cmdline_parse_token_num_t cmd_gso_size_size =
 	TOKEN_NUM_INITIALIZER(struct cmd_gso_size_result,
-				cmd_size, UINT16);
+				cmd_size, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_gso_size = {
 	.f = cmd_gso_size_parsed,
@@ -5467,7 +5471,7 @@ cmdline_parse_token_string_t cmd_gso_show_keyword =
 				cmd_keyword, "gso");
 cmdline_parse_token_num_t cmd_gso_show_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_gso_show_result,
-				cmd_pid, UINT16);
+				cmd_pid, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_gso_show = {
 	.f = cmd_gso_show_parsed,
@@ -5610,7 +5614,7 @@ cmdline_parse_token_string_t cmd_setbypass_mode_value =
 			value, "normal#bypass#isolate");
 cmdline_parse_token_num_t cmd_setbypass_mode_port =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_mode_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bypass_mode = {
 	.f = cmd_set_bypass_mode_parsed,
@@ -5716,7 +5720,7 @@ cmdline_parse_token_string_t cmd_setbypass_event_mode_value =
 			mode_value, "normal#bypass#isolate");
 cmdline_parse_token_num_t cmd_setbypass_event_port =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_event_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bypass_event = {
 	.f = cmd_set_bypass_event_parsed,
@@ -5882,7 +5886,7 @@ cmdline_parse_token_string_t cmd_showbypass_config_config =
 			config, "config");
 cmdline_parse_token_num_t cmd_showbypass_config_port =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_bypass_config_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_show_bypass_config = {
 	.f = cmd_show_bypass_config_parsed,
@@ -5931,10 +5935,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result,
 		mode, "mode");
 cmdline_parse_token_num_t cmd_setbonding_mode_value =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
-		value, UINT8);
+		value, RTE_UINT8);
 cmdline_parse_token_num_t cmd_setbonding_mode_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result,
-		port_id, UINT16);
+		port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bonding_mode = {
 		.f = cmd_set_bonding_mode_parsed,
@@ -6008,7 +6012,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
 		dedicated_queues, "dedicated_queues");
 cmdline_parse_token_num_t cmd_setbonding_lacp_dedicated_queues_port_id =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
-		port_id, UINT16);
+		port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_setbonding_lacp_dedicated_queues_mode =
 TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result,
 		mode, "enable#disable");
@@ -6076,7 +6080,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
 		balance_xmit_policy, "balance_xmit_policy");
 cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
-		port_id, UINT16);
+		port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy =
 TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result,
 		policy, "l2#l23#l34");
@@ -6224,7 +6228,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result,
 		config, "config");
 cmdline_parse_token_num_t cmd_showbonding_config_port =
 TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result,
-		port_id, UINT16);
+		port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_show_bonding_config = {
 		.f = cmd_show_bonding_config_parsed,
@@ -6277,10 +6281,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result,
 		primary, "primary");
 cmdline_parse_token_num_t cmd_setbonding_primary_slave =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
-		slave_id, UINT16);
+		slave_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_setbonding_primary_port =
 TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result,
-		port_id, UINT16);
+		port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_set_bonding_primary = {
 		.f = cmd_set_bonding_primary_parsed,
@@ -6335,10 +6339,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result,
 		slave, "slave");
 cmdline_parse_token_num_t cmd_addbonding_slave_slaveid =
 TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
-		slave_id, UINT16);
+		slave_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_addbonding_slave_port =
 TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result,
-		port_id, UINT16);
+		port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_add_bonding_slave = {
 		.f = cmd_add_bonding_slave_parsed,
@@ -6393,10 +6397,10 @@ cmdline_parse_token_string_t cmd_removebonding_slave_slave =
 				slave, "slave");
 cmdline_parse_token_num_t cmd_removebonding_slave_slaveid =
 		TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
-				slave_id, UINT16);
+				slave_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_removebonding_slave_port =
 		TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_remove_bonding_slave = {
 		.f = cmd_remove_bonding_slave_parsed,
@@ -6475,10 +6479,10 @@ cmdline_parse_token_string_t cmd_createbonded_device_device =
 				device, "device");
 cmdline_parse_token_num_t cmd_createbonded_device_mode =
 		TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result,
-				mode, UINT8);
+				mode, RTE_UINT8);
 cmdline_parse_token_num_t cmd_createbonded_device_socket =
 		TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result,
-				socket, UINT8);
+				socket, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_create_bonded_device = {
 		.f = cmd_create_bonded_device_parsed,
@@ -6531,7 +6535,7 @@ cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac =
 				"mac_addr");
 cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result,
-				port_num, UINT16);
+				port_num, RTE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr =
 		TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address);
 
@@ -6584,10 +6588,10 @@ cmdline_parse_token_string_t cmd_set_bond_mon_period_mon_period =
 				mon_period,	"mon_period");
 cmdline_parse_token_num_t cmd_set_bond_mon_period_portnum =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
-				port_num, UINT16);
+				port_num, RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_bond_mon_period_period_ms =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result,
-				period_ms, UINT32);
+				period_ms, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_set_bond_mon_period = {
 		.f = cmd_set_bond_mon_period_parsed,
@@ -6646,7 +6650,7 @@ cmdline_parse_token_string_t cmd_set_bonding_agg_mode_agg_mode =
 
 cmdline_parse_token_num_t cmd_set_bonding_agg_mode_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_agg_mode_policy_result,
-				port_num, UINT16);
+				port_num, RTE_UINT16);
 
 cmdline_parse_token_string_t cmd_set_bonding_agg_mode_policy_string =
 	TOKEN_STRING_INITIALIZER(
@@ -6834,11 +6838,13 @@ cmdline_parse_token_string_t cmd_set_burst_tx_retry_tx =
 cmdline_parse_token_string_t cmd_set_burst_tx_retry_delay =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, delay, "delay");
 cmdline_parse_token_num_t cmd_set_burst_tx_retry_time =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time,
+				 RTE_UINT32);
 cmdline_parse_token_string_t cmd_set_burst_tx_retry_retry =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry, "retry");
 cmdline_parse_token_num_t cmd_set_burst_tx_retry_retry_num =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num,
+				 RTE_UINT32);
 
 cmdline_parse_inst_t cmd_set_burst_tx_retry = {
 	.f = cmd_set_burst_tx_retry_parsed,
@@ -6896,7 +6902,7 @@ cmdline_parse_token_string_t cmd_setpromisc_portall =
 				 "all");
 cmdline_parse_token_num_t cmd_setpromisc_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_promisc_mode_result, port_num,
-			      UINT16);
+			      RTE_UINT16);
 cmdline_parse_token_string_t cmd_setpromisc_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, mode,
 				 "on#off");
@@ -6970,7 +6976,7 @@ cmdline_parse_token_string_t cmd_setallmulti_portall =
 				 "all");
 cmdline_parse_token_num_t cmd_setallmulti_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_allmulti_mode_result, port_num,
-			      UINT16);
+			      RTE_UINT16);
 cmdline_parse_token_string_t cmd_setallmulti_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_allmulti_mode_result, mode,
 				 "on#off");
@@ -7048,25 +7054,25 @@ cmdline_parse_token_string_t cmd_lfc_set_high_water_str =
 				hw_str, "high_water");
 cmdline_parse_token_num_t cmd_lfc_set_high_water =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				high_water, UINT32);
+				high_water, RTE_UINT32);
 cmdline_parse_token_string_t cmd_lfc_set_low_water_str =
 	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
 				lw_str, "low_water");
 cmdline_parse_token_num_t cmd_lfc_set_low_water =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				low_water, UINT32);
+				low_water, RTE_UINT32);
 cmdline_parse_token_string_t cmd_lfc_set_pause_time_str =
 	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
 				pt_str, "pause_time");
 cmdline_parse_token_num_t cmd_lfc_set_pause_time =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				pause_time, UINT16);
+				pause_time, RTE_UINT16);
 cmdline_parse_token_string_t cmd_lfc_set_send_xon_str =
 	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
 				xon_str, "send_xon");
 cmdline_parse_token_num_t cmd_lfc_set_send_xon =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				send_xon, UINT16);
+				send_xon, RTE_UINT16);
 cmdline_parse_token_string_t cmd_lfc_set_mac_ctrl_frame_fwd_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
 				mac_ctrl_frame_fwd, "mac_ctrl_frame_fwd");
@@ -7081,7 +7087,7 @@ cmdline_parse_token_string_t cmd_lfc_set_autoneg =
 				autoneg, "on#off");
 cmdline_parse_token_num_t cmd_lfc_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 
 /* forward declaration */
 static void
@@ -7377,19 +7383,19 @@ cmdline_parse_token_string_t cmd_pfc_set_tx_mode =
 				tx_pfc_mode, "on#off");
 cmdline_parse_token_num_t cmd_pfc_set_high_water =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				high_water, UINT32);
+				high_water, RTE_UINT32);
 cmdline_parse_token_num_t cmd_pfc_set_low_water =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				low_water, UINT32);
+				low_water, RTE_UINT32);
 cmdline_parse_token_num_t cmd_pfc_set_pause_time =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				pause_time, UINT16);
+				pause_time, RTE_UINT16);
 cmdline_parse_token_num_t cmd_pfc_set_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				priority, UINT8);
+				priority, RTE_UINT8);
 cmdline_parse_token_num_t cmd_pfc_set_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_priority_flow_control_set = {
 	.f = cmd_priority_flow_ctrl_set_parsed,
@@ -7527,7 +7533,7 @@ cmdline_parse_token_string_t cmd_start_tx_first_n_tx_first =
 			tx_first, "tx_first");
 cmdline_parse_token_num_t cmd_start_tx_first_n_tx_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_start_tx_first_n_result,
-			tx_num, UINT32);
+			tx_num, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_start_tx_first_n = {
 	.f = cmd_start_tx_first_n_parsed,
@@ -7558,7 +7564,8 @@ cmdline_parse_token_string_t cmd_set_link_up_link_up =
 cmdline_parse_token_string_t cmd_set_link_up_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_link_up_result, port, "port");
 cmdline_parse_token_num_t cmd_set_link_up_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id,
+				RTE_UINT16);
 
 static void cmd_set_link_up_parsed(__rte_unused void *parsed_result,
 			     __rte_unused struct cmdline *cl,
@@ -7597,7 +7604,8 @@ cmdline_parse_token_string_t cmd_set_link_down_link_down =
 cmdline_parse_token_string_t cmd_set_link_down_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_link_down_result, port, "port");
 cmdline_parse_token_num_t cmd_set_link_down_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id,
+				RTE_UINT16);
 
 static void cmd_set_link_down_parsed(
 				__rte_unused void *parsed_result,
@@ -7790,7 +7798,7 @@ cmdline_parse_token_string_t cmd_showport_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_result, what,
 				 "info#summary#stats#xstats#fdir#stat_qmap#dcb_tc#cap");
 cmdline_parse_token_num_t cmd_showport_portnum =
-	TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showport_result, portnum, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_showport = {
 	.f = cmd_showport_parsed,
@@ -7880,7 +7888,8 @@ cmdline_parse_token_string_t cmd_showeeprom_show =
 cmdline_parse_token_string_t cmd_showeeprom_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_showeeprom_result, port, "port");
 cmdline_parse_token_num_t cmd_showeeprom_portnum =
-	TOKEN_NUM_INITIALIZER(struct cmd_showeeprom_result, portnum, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showeeprom_result, portnum,
+			RTE_UINT16);
 cmdline_parse_token_string_t cmd_showeeprom_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_showeeprom_result, type, "module_eeprom#eeprom");
 
@@ -7926,9 +7935,11 @@ cmdline_parse_token_string_t cmd_showqueue_type =
 cmdline_parse_token_string_t cmd_showqueue_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_showqueue_result, what, "info");
 cmdline_parse_token_num_t cmd_showqueue_portnum =
-	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum,
+		RTE_UINT16);
 cmdline_parse_token_num_t cmd_showqueue_queuenum =
-	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum,
+		RTE_UINT16);
 
 cmdline_parse_inst_t cmd_showqueue = {
 	.f = cmd_showqueue_parsed,
@@ -8009,9 +8020,9 @@ cmdline_parse_token_string_t cmd_read_reg_read =
 cmdline_parse_token_string_t cmd_read_reg_reg =
 	TOKEN_STRING_INITIALIZER(struct cmd_read_reg_result, reg, "reg");
 cmdline_parse_token_num_t cmd_read_reg_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_read_reg_reg_off =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_read_reg = {
 	.f = cmd_read_reg_parsed,
@@ -8054,16 +8065,16 @@ cmdline_parse_token_string_t cmd_read_reg_bit_field_regfield =
 				 regfield, "regfield");
 cmdline_parse_token_num_t cmd_read_reg_bit_field_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, port_id,
-			      UINT16);
+			      RTE_UINT16);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_reg_off =
 	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, reg_off,
-			      UINT32);
+			      RTE_UINT32);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_bit1_pos =
 	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, bit1_pos,
-			      UINT8);
+			      RTE_UINT8);
 cmdline_parse_token_num_t cmd_read_reg_bit_field_bit2_pos =
 	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, bit2_pos,
-			      UINT8);
+			      RTE_UINT8);
 
 cmdline_parse_inst_t cmd_read_reg_bit_field = {
 	.f = cmd_read_reg_bit_field_parsed,
@@ -8105,11 +8116,14 @@ cmdline_parse_token_string_t cmd_read_reg_bit_regbit =
 	TOKEN_STRING_INITIALIZER(struct cmd_read_reg_bit_result,
 				 regbit, "regbit");
 cmdline_parse_token_num_t cmd_read_reg_bit_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id,
+				 RTE_UINT16);
 cmdline_parse_token_num_t cmd_read_reg_bit_reg_off =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off,
+				 RTE_UINT32);
 cmdline_parse_token_num_t cmd_read_reg_bit_bit_pos =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, bit_pos, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, bit_pos,
+				 RTE_UINT8);
 
 cmdline_parse_inst_t cmd_read_reg_bit = {
 	.f = cmd_read_reg_bit_parsed,
@@ -8148,11 +8162,11 @@ cmdline_parse_token_string_t cmd_write_reg_write =
 cmdline_parse_token_string_t cmd_write_reg_reg =
 	TOKEN_STRING_INITIALIZER(struct cmd_write_reg_result, reg, "reg");
 cmdline_parse_token_num_t cmd_write_reg_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_write_reg_reg_off =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off, RTE_UINT32);
 cmdline_parse_token_num_t cmd_write_reg_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, value, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, value, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_write_reg = {
 	.f = cmd_write_reg_parsed,
@@ -8197,19 +8211,19 @@ cmdline_parse_token_string_t cmd_write_reg_bit_field_regfield =
 				 regfield, "regfield");
 cmdline_parse_token_num_t cmd_write_reg_bit_field_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, port_id,
-			      UINT16);
+			      RTE_UINT16);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_reg_off =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, reg_off,
-			      UINT32);
+			      RTE_UINT32);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_bit1_pos =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, bit1_pos,
-			      UINT8);
+			      RTE_UINT8);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_bit2_pos =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, bit2_pos,
-			      UINT8);
+			      RTE_UINT8);
 cmdline_parse_token_num_t cmd_write_reg_bit_field_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, value,
-			      UINT32);
+			      RTE_UINT32);
 
 cmdline_parse_inst_t cmd_write_reg_bit_field = {
 	.f = cmd_write_reg_bit_field_parsed,
@@ -8255,13 +8269,17 @@ cmdline_parse_token_string_t cmd_write_reg_bit_regbit =
 	TOKEN_STRING_INITIALIZER(struct cmd_write_reg_bit_result,
 				 regbit, "regbit");
 cmdline_parse_token_num_t cmd_write_reg_bit_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id,
+				 RTE_UINT16);
 cmdline_parse_token_num_t cmd_write_reg_bit_reg_off =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off,
+				 RTE_UINT32);
 cmdline_parse_token_num_t cmd_write_reg_bit_bit_pos =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, bit_pos, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, bit_pos,
+				 RTE_UINT8);
 cmdline_parse_token_num_t cmd_write_reg_bit_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, value, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, value,
+				 RTE_UINT8);
 
 cmdline_parse_inst_t cmd_write_reg_bit = {
 	.f = cmd_write_reg_bit_parsed,
@@ -8307,11 +8325,14 @@ cmdline_parse_token_string_t cmd_read_rxd_txd_rxd_txd =
 	TOKEN_STRING_INITIALIZER(struct cmd_read_rxd_txd_result, rxd_txd,
 				 "rxd#txd");
 cmdline_parse_token_num_t cmd_read_rxd_txd_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id,
+				 RTE_UINT16);
 cmdline_parse_token_num_t cmd_read_rxd_txd_queue_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id,
+				 RTE_UINT16);
 cmdline_parse_token_num_t cmd_read_rxd_txd_desc_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, desc_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, desc_id,
+				 RTE_UINT16);
 
 cmdline_parse_inst_t cmd_read_rxd_txd = {
 	.f = cmd_read_rxd_txd_parsed,
@@ -8389,7 +8410,7 @@ cmdline_parse_token_string_t cmd_mac_addr_what =
 				"add#remove#set");
 cmdline_parse_token_num_t cmd_mac_addr_portnum =
 		TOKEN_NUM_INITIALIZER(struct cmd_mac_addr_result, port_num,
-					UINT16);
+					RTE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_mac_addr_addr =
 		TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
 
@@ -8435,7 +8456,8 @@ cmdline_parse_token_string_t cmd_eth_peer_set =
 cmdline_parse_token_string_t cmd_eth_peer =
 	TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, eth_peer, "eth-peer");
 cmdline_parse_token_num_t cmd_eth_peer_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id,
+		RTE_UINT16);
 cmdline_parse_token_string_t cmd_eth_peer_addr =
 	TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, peer_addr, NULL);
 
@@ -8484,13 +8506,13 @@ cmdline_parse_token_string_t cmd_setqmap_what =
 				 what, "tx#rx");
 cmdline_parse_token_num_t cmd_setqmap_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_setqmap_queueid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-			      queue_id, UINT16);
+			      queue_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_setqmap_mapvalue =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result,
-			      map_value, UINT8);
+			      map_value, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_set_qmap = {
 	.f = cmd_set_qmap_parsed,
@@ -8670,7 +8692,7 @@ cmdline_parse_token_string_t cmd_set_uc_hash_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_set_uc_hash_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_uc_hash_table,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_uc_hash_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table,
 				 what, "uta");
@@ -8731,7 +8753,7 @@ cmdline_parse_token_string_t cmd_set_uc_all_hash_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_set_uc_all_hash_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_uc_all_hash_table,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_uc_all_hash_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table,
 				 what, "uta");
@@ -8823,13 +8845,13 @@ cmdline_parse_token_string_t cmd_set_vf_macvlan_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_set_vf_macvlan_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_macvlan_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_macvlan_filter,
 				 vf, "vf");
 cmdline_parse_token_num_t cmd_set_vf_macvlan_vf_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter,
-				vf_id, UINT8);
+				vf_id, RTE_UINT8);
 cmdline_parse_token_etheraddr_t cmd_set_vf_macvlan_mac =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_macvlan_filter,
 				address);
@@ -8892,13 +8914,13 @@ cmdline_parse_token_string_t cmd_setvf_traffic_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_setvf_traffic_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_setvf_traffic_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
 				 vf, "vf");
 cmdline_parse_token_num_t cmd_setvf_traffic_vfid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic,
-			      vf_id, UINT8);
+			      vf_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_setvf_traffic_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic,
 				 what, "tx#rx");
@@ -8980,13 +9002,13 @@ cmdline_parse_token_string_t cmd_set_vf_rxmode_port =
 				 port, "port");
 cmdline_parse_token_num_t cmd_set_vf_rxmode_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_rxmode_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
 				 vf, "vf");
 cmdline_parse_token_num_t cmd_set_vf_rxmode_vfid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode,
-			      vf_id, UINT8);
+			      vf_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_set_vf_rxmode_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode,
 				 what, "rxmode");
@@ -9063,13 +9085,13 @@ cmdline_parse_token_string_t cmd_vf_mac_addr_port =
 				port,"port");
 cmdline_parse_token_num_t cmd_vf_mac_addr_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
-				port_num, UINT16);
+				port_num, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_mac_addr_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result,
 				vf,"vf");
 cmdline_parse_token_num_t cmd_vf_mac_addr_vfnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result,
-				vf_num, UINT8);
+				vf_num, RTE_UINT8);
 cmdline_parse_token_etheraddr_t cmd_vf_mac_addr_addr =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_vf_mac_addr_result,
 				address);
@@ -9154,19 +9176,19 @@ cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_what =
 				 what, "add#rm");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vlanid =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-			      vlan_id, UINT16);
+			      vlan_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
 				 port, "port");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter,
 				 vf, "vf");
 cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vf_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter,
-			      vf_mask, UINT64);
+			      vf_mask, RTE_UINT64);
 
 cmdline_parse_inst_t cmd_vf_rxvlan_filter = {
 	.f = cmd_vf_rx_vlan_filter_parsed,
@@ -9221,19 +9243,19 @@ cmdline_parse_token_string_t cmd_queue_rate_limit_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_queue_rate_limit_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-				port_num, UINT16);
+				port_num, RTE_UINT16);
 cmdline_parse_token_string_t cmd_queue_rate_limit_queue =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
 				queue, "queue");
 cmdline_parse_token_num_t cmd_queue_rate_limit_queuenum =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-				queue_num, UINT8);
+				queue_num, RTE_UINT8);
 cmdline_parse_token_string_t cmd_queue_rate_limit_rate =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result,
 				rate, "rate");
 cmdline_parse_token_num_t cmd_queue_rate_limit_ratenum =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result,
-				rate_num, UINT16);
+				rate_num, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_queue_rate_limit = {
 	.f = cmd_queue_rate_limit_parsed,
@@ -9291,25 +9313,25 @@ cmdline_parse_token_string_t cmd_vf_rate_limit_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_vf_rate_limit_portnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-				port_num, UINT16);
+				port_num, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rate_limit_vf =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
 				vf, "vf");
 cmdline_parse_token_num_t cmd_vf_rate_limit_vfnum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-				vf_num, UINT8);
+				vf_num, RTE_UINT8);
 cmdline_parse_token_string_t cmd_vf_rate_limit_rate =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
 				rate, "rate");
 cmdline_parse_token_num_t cmd_vf_rate_limit_ratenum =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-				rate_num, UINT16);
+				rate_num, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_rate_limit_q_msk =
 	TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result,
 				q_msk, "queue_mask");
 cmdline_parse_token_num_t cmd_vf_rate_limit_q_msk_val =
 	TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result,
-				q_msk_val, UINT64);
+				q_msk_val, RTE_UINT64);
 
 cmdline_parse_inst_t cmd_vf_rate_limit = {
 	.f = cmd_vf_rate_limit_parsed,
@@ -9431,7 +9453,7 @@ cmdline_parse_token_string_t cmd_tunnel_filter_what =
 	what, "add#rm");
 cmdline_parse_token_num_t cmd_tunnel_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-	port_id, UINT16);
+	port_id, RTE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_tunnel_filter_outer_mac =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_tunnel_filter_result,
 	outer_mac);
@@ -9440,7 +9462,7 @@ cmdline_parse_token_etheraddr_t cmd_tunnel_filter_inner_mac =
 	inner_mac);
 cmdline_parse_token_num_t cmd_tunnel_filter_innner_vlan =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-	inner_vlan, UINT16);
+	inner_vlan, RTE_UINT16);
 cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value =
 	TOKEN_IPADDR_INITIALIZER(struct cmd_tunnel_filter_result,
 	ip_value);
@@ -9454,10 +9476,10 @@ cmdline_parse_token_string_t cmd_tunnel_filter_filter_type =
 		"imac#omac-imac-tenid");
 cmdline_parse_token_num_t cmd_tunnel_filter_tenant_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-	tenant_id, UINT32);
+	tenant_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_tunnel_filter_queue_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result,
-	queue_num, UINT16);
+	queue_num, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_filter = {
 	.f = cmd_tunnel_filter_parsed,
@@ -9523,10 +9545,10 @@ cmdline_parse_token_string_t cmd_tunnel_udp_config_what =
 				what, "add#rm");
 cmdline_parse_token_num_t cmd_tunnel_udp_config_udp_port =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
-				udp_port, UINT16);
+				udp_port, RTE_UINT16);
 cmdline_parse_token_num_t cmd_tunnel_udp_config_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_tunnel_udp_config = {
 	.f = cmd_tunnel_udp_config_parsed,
@@ -9596,7 +9618,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_config =
 				 "config");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, port_id,
-			      UINT16);
+			      RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port,
 				 udp_tunnel_port,
@@ -9609,7 +9631,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type =
 				 "vxlan#geneve#vxlan-gpe");
 cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_port,
-			      UINT16);
+			      RTE_UINT16);
 
 cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = {
 	.f = cmd_cfg_tunnel_udp_port_parsed,
@@ -9662,13 +9684,13 @@ cmdline_parse_token_string_t cmd_global_config_cmd =
 		"global_config");
 cmdline_parse_token_num_t cmd_global_config_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_global_config_result, port_id,
-			       UINT16);
+			       RTE_UINT16);
 cmdline_parse_token_string_t cmd_global_config_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_global_config_result,
 		cfg_type, "gre-key-len");
 cmdline_parse_token_num_t cmd_global_config_gre_key_len =
 	TOKEN_NUM_INITIALIZER(struct cmd_global_config_result,
-		len, UINT8);
+		len, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_global_config = {
 	.f = cmd_global_config_parsed,
@@ -9705,13 +9727,13 @@ cmdline_parse_token_string_t cmd_mirror_mask_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_mirror_mask_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_mirror_mask_mirror =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
 				mirror, "mirror-rule");
 cmdline_parse_token_num_t cmd_mirror_mask_ruleid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-				rule_id, UINT8);
+				rule_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_mask_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
 				what, "pool-mirror-up#pool-mirror-down"
@@ -9724,7 +9746,7 @@ cmdline_parse_token_string_t cmd_mirror_mask_dstpool =
 				dstpool, "dst-pool");
 cmdline_parse_token_num_t cmd_mirror_mask_poolid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result,
-				dstpool_id, UINT8);
+				dstpool_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_mask_on =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result,
 				on, "on#off");
@@ -9820,13 +9842,13 @@ cmdline_parse_token_string_t cmd_mirror_link_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_mirror_link_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_mirror_link_mirror =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
 				mirror, "mirror-rule");
 cmdline_parse_token_num_t cmd_mirror_link_ruleid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-			    rule_id, UINT8);
+			    rule_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_link_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
 				what, "uplink-mirror#downlink-mirror");
@@ -9835,7 +9857,7 @@ cmdline_parse_token_string_t cmd_mirror_link_dstpool =
 				dstpool, "dst-pool");
 cmdline_parse_token_num_t cmd_mirror_link_poolid =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result,
-				dstpool_id, UINT8);
+				dstpool_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_mirror_link_on =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result,
 				on, "on#off");
@@ -9906,13 +9928,13 @@ cmdline_parse_token_string_t cmd_rm_mirror_rule_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_rm_mirror_rule_portid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_rm_mirror_rule_mirror =
 	TOKEN_STRING_INITIALIZER(struct cmd_rm_mirror_rule_result,
 				mirror, "mirror-rule");
 cmdline_parse_token_num_t cmd_rm_mirror_rule_ruleid =
 	TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result,
-				rule_id, UINT8);
+				rule_id, RTE_UINT8);
 
 static void
 cmd_reset_mirror_rule_parsed(void *parsed_result,
@@ -10158,7 +10180,7 @@ cmdline_parse_token_string_t cmd_syn_filter_filter =
 	filter, "syn_filter");
 cmdline_parse_token_num_t cmd_syn_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_syn_filter_result,
-	port_id, UINT16);
+	port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_syn_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_syn_filter_result,
 	ops, "add#del");
@@ -10173,7 +10195,7 @@ cmdline_parse_token_string_t cmd_syn_filter_queue =
 				queue, "queue");
 cmdline_parse_token_num_t cmd_syn_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_syn_filter_result,
-				queue_id, UINT16);
+				queue_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_syn_filter = {
 	.f = cmd_syn_filter_parsed,
@@ -10250,7 +10272,7 @@ cmdline_parse_token_string_t cmd_queue_region_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result, port, "port");
 cmdline_parse_token_num_t cmd_queue_region_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_queue_region_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
 				 cmd, "queue-region");
@@ -10259,19 +10281,19 @@ cmdline_parse_token_string_t cmd_queue_region_id =
 				region, "region_id");
 cmdline_parse_token_num_t cmd_queue_region_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-				region_id, UINT8);
+				region_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_queue_region_queue_start_index =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
 				queue_start_index, "queue_start_index");
 cmdline_parse_token_num_t cmd_queue_region_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-				queue_id, UINT8);
+				queue_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_queue_region_queue_num =
 	TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result,
 				queue_num, "queue_num");
 cmdline_parse_token_num_t cmd_queue_region_queue_num_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result,
-				queue_num_value, UINT8);
+				queue_num_value, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_queue_region = {
 	.f = cmd_queue_region_parsed,
@@ -10350,7 +10372,7 @@ cmdline_parse_token_string_t cmd_region_flowtype_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_region_flowtype_port_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_region_flowtype_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
 				cmd, "queue-region");
@@ -10359,13 +10381,13 @@ cmdline_parse_token_string_t cmd_region_flowtype_index =
 				region, "region_id");
 cmdline_parse_token_num_t cmd_region_flowtype_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
-				region_id, UINT8);
+				region_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_region_flowtype_flow_index =
 	TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result,
 				flowtype, "flowtype");
 cmdline_parse_token_num_t cmd_region_flowtype_flow_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result,
-				flowtype_id, UINT8);
+				flowtype_id, RTE_UINT8);
 cmdline_parse_inst_t cmd_region_flowtype = {
 	.f = cmd_region_flowtype_parsed,
 	.data = NULL,
@@ -10441,7 +10463,7 @@ cmdline_parse_token_string_t cmd_user_priority_region_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_user_priority_region_port_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_user_priority_region_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
 				cmd, "queue-region");
@@ -10450,13 +10472,13 @@ cmdline_parse_token_string_t cmd_user_priority_region_UP =
 				user_priority, "UP");
 cmdline_parse_token_num_t cmd_user_priority_region_UP_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
-				user_priority_id, UINT8);
+				user_priority_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_user_priority_region_region =
 	TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result,
 				region, "region_id");
 cmdline_parse_token_num_t cmd_user_priority_region_region_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result,
-				region_id, UINT8);
+				region_id, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_user_priority_region = {
 	.f = cmd_user_priority_region_parsed,
@@ -10534,7 +10556,7 @@ cmdline_parse_token_string_t cmd_flush_queue_region_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_flush_queue_region_port_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_flush_queue_region_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flush_queue_region_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result,
 				cmd, "queue-region");
@@ -10615,7 +10637,7 @@ cmdline_parse_token_string_t cmd_show_queue_region_info_port =
 				port, "port");
 cmdline_parse_token_num_t cmd_show_queue_region_info_port_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_queue_region_info,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_queue_region_info_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_queue_region_info,
 				cmd, "queue-region");
@@ -10716,7 +10738,7 @@ cmdline_parse_token_string_t cmd_2tuple_filter_filter =
 				 filter, "2tuple_filter");
 cmdline_parse_token_num_t cmd_2tuple_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_2tuple_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				 ops, "add#del");
@@ -10725,37 +10747,37 @@ cmdline_parse_token_string_t cmd_2tuple_filter_dst_port =
 				dst_port, "dst_port");
 cmdline_parse_token_num_t cmd_2tuple_filter_dst_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				dst_port_value, UINT16);
+				dst_port_value, RTE_UINT16);
 cmdline_parse_token_string_t cmd_2tuple_filter_protocol =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				protocol, "protocol");
 cmdline_parse_token_num_t cmd_2tuple_filter_protocol_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				protocol_value, UINT8);
+				protocol_value, RTE_UINT8);
 cmdline_parse_token_string_t cmd_2tuple_filter_mask =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				mask, "mask");
 cmdline_parse_token_num_t cmd_2tuple_filter_mask_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				mask_value, INT8);
+				mask_value, RTE_INT8);
 cmdline_parse_token_string_t cmd_2tuple_filter_tcp_flags =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				tcp_flags, "tcp_flags");
 cmdline_parse_token_num_t cmd_2tuple_filter_tcp_flags_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				tcp_flags_value, UINT8);
+				tcp_flags_value, RTE_UINT8);
 cmdline_parse_token_string_t cmd_2tuple_filter_priority =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				priority, "priority");
 cmdline_parse_token_num_t cmd_2tuple_filter_priority_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				priority_value, UINT8);
+				priority_value, RTE_UINT8);
 cmdline_parse_token_string_t cmd_2tuple_filter_queue =
 	TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
 				queue, "queue");
 cmdline_parse_token_num_t cmd_2tuple_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-				queue_id, UINT16);
+				queue_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_2tuple_filter = {
 	.f = cmd_2tuple_filter_parsed,
@@ -10895,7 +10917,7 @@ cmdline_parse_token_string_t cmd_5tuple_filter_filter =
 				 filter, "5tuple_filter");
 cmdline_parse_token_num_t cmd_5tuple_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_5tuple_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				 ops, "add#del");
@@ -10916,43 +10938,43 @@ cmdline_parse_token_string_t cmd_5tuple_filter_dst_port =
 				dst_port, "dst_port");
 cmdline_parse_token_num_t cmd_5tuple_filter_dst_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				dst_port_value, UINT16);
+				dst_port_value, RTE_UINT16);
 cmdline_parse_token_string_t cmd_5tuple_filter_src_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				src_port, "src_port");
 cmdline_parse_token_num_t cmd_5tuple_filter_src_port_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				src_port_value, UINT16);
+				src_port_value, RTE_UINT16);
 cmdline_parse_token_string_t cmd_5tuple_filter_protocol =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				protocol, "protocol");
 cmdline_parse_token_num_t cmd_5tuple_filter_protocol_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				protocol_value, UINT8);
+				protocol_value, RTE_UINT8);
 cmdline_parse_token_string_t cmd_5tuple_filter_mask =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				mask, "mask");
 cmdline_parse_token_num_t cmd_5tuple_filter_mask_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				mask_value, INT8);
+				mask_value, RTE_INT8);
 cmdline_parse_token_string_t cmd_5tuple_filter_tcp_flags =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				tcp_flags, "tcp_flags");
 cmdline_parse_token_num_t cmd_5tuple_filter_tcp_flags_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				tcp_flags_value, UINT8);
+				tcp_flags_value, RTE_UINT8);
 cmdline_parse_token_string_t cmd_5tuple_filter_priority =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				priority, "priority");
 cmdline_parse_token_num_t cmd_5tuple_filter_priority_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				priority_value, UINT8);
+				priority_value, RTE_UINT8);
 cmdline_parse_token_string_t cmd_5tuple_filter_queue =
 	TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
 				queue, "queue");
 cmdline_parse_token_num_t cmd_5tuple_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-				queue_id, UINT16);
+				queue_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_5tuple_filter = {
 	.f = cmd_5tuple_filter_parsed,
@@ -11118,7 +11140,7 @@ cmdline_parse_token_string_t cmd_flex_filter_filter =
 				filter, "flex_filter");
 cmdline_parse_token_num_t cmd_flex_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-				port_id, UINT16);
+				port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flex_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
 				ops, "add#del");
@@ -11127,7 +11149,7 @@ cmdline_parse_token_string_t cmd_flex_filter_len =
 				len, "len");
 cmdline_parse_token_num_t cmd_flex_filter_len_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-				len_value, UINT8);
+				len_value, RTE_UINT8);
 cmdline_parse_token_string_t cmd_flex_filter_bytes =
 	TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
 				bytes, "bytes");
@@ -11145,13 +11167,13 @@ cmdline_parse_token_string_t cmd_flex_filter_priority =
 				priority, "priority");
 cmdline_parse_token_num_t cmd_flex_filter_priority_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-				priority_value, UINT8);
+				priority_value, RTE_UINT8);
 cmdline_parse_token_string_t cmd_flex_filter_queue =
 	TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result,
 				queue, "queue");
 cmdline_parse_token_num_t cmd_flex_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result,
-				queue_id, UINT16);
+				queue_id, RTE_UINT16);
 cmdline_parse_inst_t cmd_flex_filter = {
 	.f = cmd_flex_filter_parsed,
 	.data = NULL,
@@ -11197,7 +11219,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_filter =
 				 filter, "ethertype_filter");
 cmdline_parse_token_num_t cmd_ethertype_filter_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_ethertype_filter_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
 				 ops, "add#del");
@@ -11212,7 +11234,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_ethertype =
 				 ethertype, "ethertype");
 cmdline_parse_token_num_t cmd_ethertype_filter_ethertype_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-			      ethertype_value, UINT16);
+			      ethertype_value, RTE_UINT16);
 cmdline_parse_token_string_t cmd_ethertype_filter_drop =
 	TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result,
 				 drop, "drop#fwd");
@@ -11221,7 +11243,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_queue =
 				 queue, "queue");
 cmdline_parse_token_num_t cmd_ethertype_filter_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result,
-			      queue_id, UINT16);
+			      queue_id, RTE_UINT16);
 
 static void
 cmd_ethertype_filter_parsed(void *parsed_result,
@@ -11700,7 +11722,7 @@ cmdline_parse_token_string_t cmd_flow_director_filter =
 				 flow_director_filter, "flow_director_filter");
 cmdline_parse_token_num_t cmd_flow_director_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_ops =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 ops, "add#del#update");
@@ -11715,7 +11737,7 @@ cmdline_parse_token_string_t cmd_flow_director_ether =
 				 ether, "ether");
 cmdline_parse_token_num_t cmd_flow_director_ether_type =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      ether_type, UINT16);
+			      ether_type, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 src, "src");
@@ -11724,7 +11746,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_ip_src =
 				 ip_src);
 cmdline_parse_token_num_t cmd_flow_director_port_src =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      port_src, UINT16);
+			      port_src, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_dst =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 dst, "dst");
@@ -11733,37 +11755,37 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_ip_dst =
 				 ip_dst);
 cmdline_parse_token_num_t cmd_flow_director_port_dst =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      port_dst, UINT16);
+			      port_dst, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_verify_tag =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				  verify_tag, "verify_tag");
 cmdline_parse_token_num_t cmd_flow_director_verify_tag_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      verify_tag_value, UINT32);
+			      verify_tag_value, RTE_UINT32);
 cmdline_parse_token_string_t cmd_flow_director_tos =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 tos, "tos");
 cmdline_parse_token_num_t cmd_flow_director_tos_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      tos_value, UINT8);
+			      tos_value, RTE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_proto =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 proto, "proto");
 cmdline_parse_token_num_t cmd_flow_director_proto_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      proto_value, UINT8);
+			      proto_value, RTE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_ttl =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 ttl, "ttl");
 cmdline_parse_token_num_t cmd_flow_director_ttl_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      ttl_value, UINT8);
+			      ttl_value, RTE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 vlan, "vlan");
 cmdline_parse_token_num_t cmd_flow_director_vlan_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      vlan_value, UINT16);
+			      vlan_value, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexbytes =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 flexbytes, "flexbytes");
@@ -11781,13 +11803,13 @@ cmdline_parse_token_string_t cmd_flow_director_queue =
 				 queue, "queue");
 cmdline_parse_token_num_t cmd_flow_director_queue_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      queue_id, UINT16);
+			      queue_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_fd_id =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 fd_id, "fd_id");
 cmdline_parse_token_num_t cmd_flow_director_fd_id_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      fd_id_value, UINT32);
+			      fd_id_value, RTE_UINT32);
 
 cmdline_parse_token_string_t cmd_flow_director_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
@@ -11821,7 +11843,7 @@ cmdline_parse_token_string_t cmd_flow_director_tunnel_id =
 				 tunnel_id, "tunnel-id");
 cmdline_parse_token_num_t cmd_flow_director_tunnel_id_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result,
-			      tunnel_id_value, UINT32);
+			      tunnel_id_value, RTE_UINT32);
 cmdline_parse_token_string_t cmd_flow_director_packet =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result,
 				 packet, "packet");
@@ -12065,7 +12087,7 @@ cmdline_parse_token_string_t cmd_flush_flow_director_flush =
 				 flush_flow_director, "flush_flow_director");
 cmdline_parse_token_num_t cmd_flush_flow_director_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flush_flow_director_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 
 static void
 cmd_flush_flow_director_parsed(void *parsed_result,
@@ -12183,13 +12205,13 @@ cmdline_parse_token_string_t cmd_flow_director_mask =
 				 flow_director_mask, "flow_director_mask");
 cmdline_parse_token_num_t cmd_flow_director_mask_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 vlan, "vlan");
 cmdline_parse_token_num_t cmd_flow_director_mask_vlan_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      vlan_mask, UINT16);
+			      vlan_mask, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 src_mask, "src_mask");
@@ -12201,7 +12223,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_mask_ipv6_src =
 				 ipv6_src);
 cmdline_parse_token_num_t cmd_flow_director_mask_port_src =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      port_src, UINT16);
+			      port_src, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_mask_dst =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 dst_mask, "dst_mask");
@@ -12213,7 +12235,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_mask_ipv6_dst =
 				 ipv6_dst);
 cmdline_parse_token_num_t cmd_flow_director_mask_port_dst =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      port_dst, UINT16);
+			      port_dst, RTE_UINT16);
 
 cmdline_parse_token_string_t cmd_flow_director_mask_mode =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
@@ -12232,19 +12254,19 @@ cmdline_parse_token_string_t cmd_flow_director_mask_mac =
 				 mac, "mac");
 cmdline_parse_token_num_t cmd_flow_director_mask_mac_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      mac_addr_byte_mask, UINT8);
+			      mac_addr_byte_mask, RTE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_mask_tunnel_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 tunnel_type, "tunnel-type");
 cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_type_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      tunnel_type_mask, UINT8);
+			      tunnel_type_mask, RTE_UINT8);
 cmdline_parse_token_string_t cmd_flow_director_mask_tunnel_id =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result,
 				 tunnel_id, "tunnel-id");
 cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_id_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result,
-			      tunnel_id_mask, UINT32);
+			      tunnel_id_mask, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_set_flow_director_ip_mask = {
 	.f = cmd_flow_director_mask_parsed,
@@ -12398,7 +12420,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexmask =
 				 "flow_director_flex_mask");
 cmdline_parse_token_num_t cmd_flow_director_flexmask_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flex_mask_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexmask_flow =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result,
 				 flow, "flow");
@@ -12516,7 +12538,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexpayload =
 				 "flow_director_flex_payload");
 cmdline_parse_token_num_t cmd_flow_director_flexpayload_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flexpayload_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_flow_director_flexpayload_payload_layer =
 	TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flexpayload_result,
 				 payload_layer, "raw#l2#l3#l4");
@@ -12584,7 +12606,7 @@ cmdline_parse_token_string_t cmd_get_sym_hash_ena_per_port_all =
 		get_sym_hash_ena_per_port, "get_sym_hash_ena_per_port");
 cmdline_parse_token_num_t cmd_get_sym_hash_ena_per_port_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_get_sym_hash_ena_per_port_result,
-		port_id, UINT16);
+		port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_get_sym_hash_ena_per_port = {
 	.f = cmd_get_sym_hash_per_port_parsed,
@@ -12640,7 +12662,7 @@ cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_all =
 		set_sym_hash_ena_per_port, "set_sym_hash_ena_per_port");
 cmdline_parse_token_num_t cmd_set_sym_hash_ena_per_port_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
-		port_id, UINT16);
+		port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_enable =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result,
 		enable, "enable#disable");
@@ -12765,7 +12787,7 @@ cmdline_parse_token_string_t cmd_get_hash_global_config_all =
 		get_hash_global_config, "get_hash_global_config");
 cmdline_parse_token_num_t cmd_get_hash_global_config_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_get_hash_global_config_result,
-		port_id, UINT16);
+		port_id, RTE_UINT16);
 
 cmdline_parse_inst_t cmd_get_hash_global_config = {
 	.f = cmd_get_hash_global_config_parsed,
@@ -12840,7 +12862,7 @@ cmdline_parse_token_string_t cmd_set_hash_global_config_all =
 		set_hash_global_config, "set_hash_global_config");
 cmdline_parse_token_num_t cmd_set_hash_global_config_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_hash_global_config_result,
-		port_id, UINT16);
+		port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_hash_global_config_hash_func =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_hash_global_config_result,
 		hash_func, "toeplitz#simple_xor#symmetric_toeplitz#default");
@@ -12956,7 +12978,7 @@ cmdline_parse_token_string_t cmd_set_hash_input_set_cmd =
 		set_hash_input_set, "set_hash_input_set");
 cmdline_parse_token_num_t cmd_set_hash_input_set_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_hash_input_set_result,
-		port_id, UINT16);
+		port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_hash_input_set_flow_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_hash_input_set_result,
 		flow_type, NULL);
@@ -13029,7 +13051,7 @@ cmdline_parse_token_string_t cmd_set_fdir_input_set_cmd =
 	set_fdir_input_set, "set_fdir_input_set");
 cmdline_parse_token_num_t cmd_set_fdir_input_set_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_fdir_input_set_result,
-	port_id, UINT16);
+	port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_fdir_input_set_flow_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result,
 	flow_type,
@@ -13102,7 +13124,8 @@ cmdline_parse_token_string_t cmd_mcast_addr_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result, what,
 				 "add#remove");
 cmdline_parse_token_num_t cmd_mcast_addr_portnum =
-	TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num,
+				 RTE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_mcast_addr_addr =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address);
 
@@ -13151,7 +13174,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_all_str =
 cmdline_parse_token_num_t cmd_config_l2_tunnel_eth_type_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_l2_tunnel_eth_type_result,
-		 id, UINT16);
+		 id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_l2_tunnel =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_l2_tunnel_eth_type_result,
@@ -13167,7 +13190,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_eth_type =
 cmdline_parse_token_num_t cmd_config_l2_tunnel_eth_type_eth_type_val =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_l2_tunnel_eth_type_result,
-		 eth_type_val, UINT16);
+		 eth_type_val, RTE_UINT16);
 
 static enum rte_eth_tunnel_type
 str2fdir_l2_tunnel_type(char *string)
@@ -13285,7 +13308,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_all_str =
 cmdline_parse_token_num_t cmd_config_l2_tunnel_en_dis_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_l2_tunnel_en_dis_result,
-		 id, UINT16);
+		 id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_l2_tunnel =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_l2_tunnel_en_dis_result,
@@ -13463,7 +13486,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_port_tag_id =
 cmdline_parse_token_num_t cmd_config_e_tag_port_tag_id_val =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 port_tag_id_val, UINT32);
+		 port_tag_id_val, RTE_UINT32);
 cmdline_parse_token_string_t cmd_config_e_tag_e_tag_id =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_e_tag_result,
@@ -13471,7 +13494,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_e_tag_id =
 cmdline_parse_token_num_t cmd_config_e_tag_e_tag_id_val =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 e_tag_id_val, UINT16);
+		 e_tag_id_val, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_e_tag_dst_pool =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_e_tag_result,
@@ -13479,7 +13502,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_dst_pool =
 cmdline_parse_token_num_t cmd_config_e_tag_dst_pool_val =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 dst_pool_val, UINT8);
+		 dst_pool_val, RTE_UINT8);
 cmdline_parse_token_string_t cmd_config_e_tag_port =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_e_tag_result,
@@ -13487,7 +13510,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_port =
 cmdline_parse_token_num_t cmd_config_e_tag_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_e_tag_vf =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_e_tag_result,
@@ -13495,7 +13518,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_vf =
 cmdline_parse_token_num_t cmd_config_e_tag_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_e_tag_result,
-		 vf_id, UINT8);
+		 vf_id, RTE_UINT8);
 
 /* E-tag insertion configuration */
 static void
@@ -13814,11 +13837,11 @@ cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_antispoof =
 cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_anti_spoof_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_anti_spoof_result,
-		 vf_id, UINT32);
+		 vf_id, RTE_UINT32);
 cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_vlan_anti_spoof_result,
@@ -13920,11 +13943,11 @@ cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_antispoof =
 cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_mac_anti_spoof_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_mac_anti_spoof_result,
-		 vf_id, UINT32);
+		 vf_id, RTE_UINT32);
 cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_mac_anti_spoof_result,
@@ -14026,11 +14049,11 @@ cmdline_parse_token_string_t cmd_vf_vlan_stripq_stripq =
 cmdline_parse_token_num_t cmd_vf_vlan_stripq_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_stripq_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_stripq_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_stripq_result,
-		 vf_id, UINT16);
+		 vf_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_vlan_stripq_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_vlan_stripq_result,
@@ -14132,15 +14155,15 @@ cmdline_parse_token_string_t cmd_vf_vlan_insert_insert =
 cmdline_parse_token_num_t cmd_vf_vlan_insert_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_insert_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_insert_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_insert_result,
-		 vf_id, UINT16);
+		 vf_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_vlan_insert_vlan_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_vlan_insert_result,
-		 vlan_id, UINT16);
+		 vlan_id, RTE_UINT16);
 
 static void
 cmd_set_vf_vlan_insert_parsed(
@@ -14230,7 +14253,7 @@ cmdline_parse_token_string_t cmd_tx_loopback_loopback =
 cmdline_parse_token_num_t cmd_tx_loopback_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_tx_loopback_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_tx_loopback_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_tx_loopback_result,
@@ -14330,7 +14353,7 @@ cmdline_parse_token_string_t cmd_all_queues_drop_en_drop =
 cmdline_parse_token_num_t cmd_all_queues_drop_en_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_all_queues_drop_en_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_all_queues_drop_en_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_all_queues_drop_en_result,
@@ -14422,11 +14445,11 @@ cmdline_parse_token_string_t cmd_vf_split_drop_en_drop =
 cmdline_parse_token_num_t cmd_vf_split_drop_en_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_split_drop_en_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_split_drop_en_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_split_drop_en_result,
-		 vf_id, UINT16);
+		 vf_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_vf_split_drop_en_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_split_drop_en_result,
@@ -14516,11 +14539,11 @@ cmdline_parse_token_string_t cmd_set_vf_mac_addr_addr =
 cmdline_parse_token_num_t cmd_set_vf_mac_addr_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_mac_addr_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_vf_mac_addr_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_mac_addr_result,
-		 vf_id, UINT16);
+		 vf_id, RTE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_set_vf_mac_addr_mac_addr =
 	TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_mac_addr_result,
 		 mac_addr);
@@ -14617,7 +14640,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_on_offload =
 cmdline_parse_token_num_t cmd_macsec_offload_on_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_offload_on_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_macsec_offload_on_on =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_macsec_offload_on_result,
@@ -14732,7 +14755,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_off_offload =
 cmdline_parse_token_num_t cmd_macsec_offload_off_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_offload_off_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_macsec_offload_off_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_macsec_offload_off_result,
@@ -14827,7 +14850,7 @@ cmdline_parse_token_string_t cmd_macsec_sc_tx_rx =
 cmdline_parse_token_num_t cmd_macsec_sc_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sc_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
 	TOKEN_ETHERADDR_INITIALIZER
 		(struct cmd_macsec_sc_result,
@@ -14835,7 +14858,7 @@ cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac =
 cmdline_parse_token_num_t cmd_macsec_sc_pi =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sc_result,
-		 pi, UINT16);
+		 pi, RTE_UINT16);
 
 static void
 cmd_set_macsec_sc_parsed(
@@ -14919,19 +14942,19 @@ cmdline_parse_token_string_t cmd_macsec_sa_tx_rx =
 cmdline_parse_token_num_t cmd_macsec_sa_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sa_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_macsec_sa_idx =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sa_result,
-		 idx, UINT8);
+		 idx, RTE_UINT8);
 cmdline_parse_token_num_t cmd_macsec_sa_an =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sa_result,
-		 an, UINT8);
+		 an, RTE_UINT8);
 cmdline_parse_token_num_t cmd_macsec_sa_pn =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_macsec_sa_result,
-		 pn, UINT32);
+		 pn, RTE_UINT32);
 cmdline_parse_token_string_t cmd_macsec_sa_key =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_macsec_sa_result,
@@ -15039,11 +15062,11 @@ cmdline_parse_token_string_t cmd_vf_promisc_promisc =
 cmdline_parse_token_num_t cmd_vf_promisc_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_promisc_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_promisc_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_promisc_result,
-		 vf_id, UINT32);
+		 vf_id, RTE_UINT32);
 cmdline_parse_token_string_t cmd_vf_promisc_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_promisc_result,
@@ -15129,11 +15152,11 @@ cmdline_parse_token_string_t cmd_vf_allmulti_allmulti =
 cmdline_parse_token_num_t cmd_vf_allmulti_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_allmulti_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_allmulti_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_allmulti_result,
-		 vf_id, UINT32);
+		 vf_id, RTE_UINT32);
 cmdline_parse_token_string_t cmd_vf_allmulti_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_allmulti_result,
@@ -15219,11 +15242,11 @@ cmdline_parse_token_string_t cmd_set_vf_broadcast_broadcast =
 cmdline_parse_token_num_t cmd_set_vf_broadcast_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_broadcast_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_vf_broadcast_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_broadcast_result,
-		 vf_id, UINT16);
+		 vf_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_broadcast_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_set_vf_broadcast_result,
@@ -15313,11 +15336,11 @@ cmdline_parse_token_string_t cmd_set_vf_vlan_tag_tag =
 cmdline_parse_token_num_t cmd_set_vf_vlan_tag_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_vlan_tag_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_vf_vlan_tag_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_vf_vlan_tag_result,
-		 vf_id, UINT16);
+		 vf_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vf_vlan_tag_on_off =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_set_vf_vlan_tag_result,
@@ -15423,19 +15446,19 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_max_bw =
 cmdline_parse_token_num_t cmd_vf_tc_bw_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_tc_bw_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 vf_id, UINT16);
+		 vf_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_vf_tc_bw_tc_no =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 tc_no, UINT8);
+		 tc_no, RTE_UINT8);
 cmdline_parse_token_num_t cmd_vf_tc_bw_bw =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 bw, UINT32);
+		 bw, RTE_UINT32);
 cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
@@ -15443,7 +15466,7 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list =
 cmdline_parse_token_num_t cmd_vf_tc_bw_tc_map =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_vf_tc_bw_result,
-		 tc_map, UINT8);
+		 tc_map, RTE_UINT8);
 
 /* VF max bandwidth setting */
 static void
@@ -15754,27 +15777,27 @@ cmdline_parse_token_string_t cmd_set_vxlan_vni =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "vni");
 cmdline_parse_token_num_t cmd_set_vxlan_vni_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, vni, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, vni, RTE_UINT32);
 cmdline_parse_token_string_t cmd_set_vxlan_udp_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "udp-src");
 cmdline_parse_token_num_t cmd_set_vxlan_udp_src_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vxlan_udp_dst =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "udp-dst");
 cmdline_parse_token_num_t cmd_set_vxlan_udp_dst_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vxlan_ip_tos =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "ip-tos");
 cmdline_parse_token_num_t cmd_set_vxlan_ip_tos_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, RTE_UINT8);
 cmdline_parse_token_string_t cmd_set_vxlan_ip_ttl =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "ip-ttl");
 cmdline_parse_token_num_t cmd_set_vxlan_ip_ttl_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, UINT8);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, RTE_UINT8);
 cmdline_parse_token_string_t cmd_set_vxlan_ip_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "ip-src");
@@ -15789,7 +15812,7 @@ cmdline_parse_token_string_t cmd_set_vxlan_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "vlan-tci");
 cmdline_parse_token_num_t cmd_set_vxlan_vlan_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_vxlan_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token,
 				 "eth-src");
@@ -15974,7 +15997,7 @@ cmdline_parse_token_string_t cmd_set_nvgre_tni =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
 				 "tni");
 cmdline_parse_token_num_t cmd_set_nvgre_tni_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, RTE_UINT32);
 cmdline_parse_token_string_t cmd_set_nvgre_ip_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
 				 "ip-src");
@@ -15989,7 +16012,7 @@ cmdline_parse_token_string_t cmd_set_nvgre_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
 				 "vlan-tci");
 cmdline_parse_token_num_t cmd_set_nvgre_vlan_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_nvgre_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token,
 				 "eth-src");
@@ -16120,7 +16143,7 @@ cmdline_parse_token_string_t cmd_set_l2_encap_vlan =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
 				 "vlan-tci");
 cmdline_parse_token_num_t cmd_set_l2_encap_vlan_value =
-	TOKEN_NUM_INITIALIZER(struct cmd_set_l2_encap_result, tci, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_set_l2_encap_result, tci, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_l2_encap_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token,
 				 "eth-src");
@@ -16280,7 +16303,7 @@ cmdline_parse_token_string_t cmd_set_mplsogre_encap_label =
 				 pos_token, "label");
 cmdline_parse_token_num_t cmd_set_mplsogre_encap_label_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, label,
-			      UINT32);
+			      RTE_UINT32);
 cmdline_parse_token_string_t cmd_set_mplsogre_encap_ip_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
 				 pos_token, "ip-src");
@@ -16296,7 +16319,7 @@ cmdline_parse_token_string_t cmd_set_mplsogre_encap_vlan =
 				 pos_token, "vlan-tci");
 cmdline_parse_token_num_t cmd_set_mplsogre_encap_vlan_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, tci,
-			      UINT16);
+			      RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsogre_encap_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result,
 				 pos_token, "eth-src");
@@ -16504,19 +16527,19 @@ cmdline_parse_token_string_t cmd_set_mplsoudp_encap_label =
 				 pos_token, "label");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_label_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, label,
-			      UINT32);
+			      RTE_UINT32);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
 				 pos_token, "udp-src");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_src_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_src,
-			      UINT16);
+			      RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_dst =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
 				 pos_token, "udp-dst");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_dst_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_dst,
-			      UINT16);
+			      RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_ip_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
 				 pos_token, "ip-src");
@@ -16532,7 +16555,7 @@ cmdline_parse_token_string_t cmd_set_mplsoudp_encap_vlan =
 				 pos_token, "vlan-tci");
 cmdline_parse_token_num_t cmd_set_mplsoudp_encap_vlan_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, tci,
-			      UINT16);
+			      RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_mplsoudp_encap_eth_src =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result,
 				 pos_token, "eth-src");
@@ -16775,7 +16798,8 @@ cmdline_parse_token_string_t cmd_ddp_add_ddp =
 cmdline_parse_token_string_t cmd_ddp_add_add =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, add, "add");
 cmdline_parse_token_num_t cmd_ddp_add_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id,
+		RTE_UINT16);
 cmdline_parse_token_string_t cmd_ddp_add_filepath =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, filepath, NULL);
 
@@ -16855,7 +16879,7 @@ cmdline_parse_token_string_t cmd_ddp_del_ddp =
 cmdline_parse_token_string_t cmd_ddp_del_del =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, del, "del");
 cmdline_parse_token_num_t cmd_ddp_del_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_ddp_del_result, port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_ddp_del_filepath =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, filepath, NULL);
 
@@ -17162,7 +17186,8 @@ cmdline_parse_token_string_t cmd_ddp_get_list_get =
 cmdline_parse_token_string_t cmd_ddp_get_list_list =
 	TOKEN_STRING_INITIALIZER(struct cmd_ddp_get_list_result, list, "list");
 cmdline_parse_token_num_t cmd_ddp_get_list_port_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id,
+		RTE_UINT16);
 
 static void
 cmd_ddp_get_list_parsed(
@@ -17313,13 +17338,13 @@ cmdline_parse_token_string_t cmd_cfg_input_set_cfg =
 				 cfg, "config");
 cmdline_parse_token_num_t cmd_cfg_input_set_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_cfg_input_set_pctype =
 	TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
 				 pctype, "pctype");
 cmdline_parse_token_num_t cmd_cfg_input_set_pctype_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
-			      pctype_id, UINT8);
+			      pctype_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_cfg_input_set_inset_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result,
 				 inset_type,
@@ -17332,7 +17357,7 @@ cmdline_parse_token_string_t cmd_cfg_input_set_field =
 				 field, "field");
 cmdline_parse_token_num_t cmd_cfg_input_set_field_idx =
 	TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result,
-			      field_idx, UINT8);
+			      field_idx, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_cfg_input_set = {
 	.f = cmd_cfg_input_set_parsed,
@@ -17414,13 +17439,13 @@ cmdline_parse_token_string_t cmd_clear_input_set_cfg =
 				 cfg, "config");
 cmdline_parse_token_num_t cmd_clear_input_set_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_clear_input_set_pctype =
 	TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
 				 pctype, "pctype");
 cmdline_parse_token_num_t cmd_clear_input_set_pctype_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result,
-			      pctype_id, UINT8);
+			      pctype_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_clear_input_set_inset_type =
 	TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result,
 				 inset_type,
@@ -17477,11 +17502,11 @@ cmdline_parse_token_string_t cmd_show_vf_stats_stats =
 cmdline_parse_token_num_t cmd_show_vf_stats_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_show_vf_stats_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_show_vf_stats_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_show_vf_stats_result,
-		 vf_id, UINT16);
+		 vf_id, RTE_UINT16);
 
 static void
 cmd_show_vf_stats_parsed(
@@ -17586,11 +17611,11 @@ cmdline_parse_token_string_t cmd_clear_vf_stats_stats =
 cmdline_parse_token_num_t cmd_clear_vf_stats_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_clear_vf_stats_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_clear_vf_stats_vf_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_clear_vf_stats_result,
-		 vf_id, UINT16);
+		 vf_id, RTE_UINT16);
 
 static void
 cmd_clear_vf_stats_parsed(
@@ -17670,7 +17695,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_reset_config =
 cmdline_parse_token_num_t cmd_pctype_mapping_reset_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_pctype_mapping_reset_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_reset_pctype =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_pctype_mapping_reset_result,
@@ -17752,7 +17777,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_get_port =
 cmdline_parse_token_num_t cmd_pctype_mapping_get_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_pctype_mapping_get_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_get_pctype =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_pctype_mapping_get_result,
@@ -17856,7 +17881,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_config =
 cmdline_parse_token_num_t cmd_pctype_mapping_update_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_pctype_mapping_update_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_pctype_mapping_update_pctype =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_pctype_mapping_update_result,
@@ -17876,7 +17901,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_pc_type =
 cmdline_parse_token_num_t cmd_pctype_mapping_update_flow_type =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_pctype_mapping_update_result,
-		 flow_type, UINT16);
+		 flow_type, RTE_UINT16);
 
 static void
 cmd_pctype_mapping_update_parsed(
@@ -17970,11 +17995,11 @@ cmdline_parse_token_string_t cmd_ptype_mapping_get_get =
 cmdline_parse_token_num_t cmd_ptype_mapping_get_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_get_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_get_valid_only =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_get_result,
-		 valid_only, UINT8);
+		 valid_only, RTE_UINT8);
 
 static void
 cmd_ptype_mapping_get_parsed(
@@ -18067,19 +18092,19 @@ cmdline_parse_token_string_t cmd_ptype_mapping_replace_replace =
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_replace_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_target =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_replace_result,
-		 target, UINT32);
+		 target, RTE_UINT32);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_mask =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_replace_result,
-		 mask, UINT8);
+		 mask, RTE_UINT8);
 cmdline_parse_token_num_t cmd_ptype_mapping_replace_pkt_type =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_replace_result,
-		 pkt_type, UINT32);
+		 pkt_type, RTE_UINT32);
 
 static void
 cmd_ptype_mapping_replace_parsed(
@@ -18161,7 +18186,7 @@ cmdline_parse_token_string_t cmd_ptype_mapping_reset_reset =
 cmdline_parse_token_num_t cmd_ptype_mapping_reset_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_reset_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 
 static void
 cmd_ptype_mapping_reset_parsed(
@@ -18234,15 +18259,15 @@ cmdline_parse_token_string_t cmd_ptype_mapping_update_update =
 cmdline_parse_token_num_t cmd_ptype_mapping_update_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_update_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_ptype_mapping_update_hw_ptype =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_update_result,
-		 hw_ptype, UINT8);
+		 hw_ptype, RTE_UINT8);
 cmdline_parse_token_num_t cmd_ptype_mapping_update_sw_ptype =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_ptype_mapping_update_result,
-		 sw_ptype, UINT32);
+		 sw_ptype, RTE_UINT32);
 
 static void
 cmd_ptype_mapping_update_parsed(
@@ -18353,7 +18378,7 @@ cmdline_parse_token_string_t cmd_rx_offload_get_capa_port =
 cmdline_parse_token_num_t cmd_rx_offload_get_capa_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_rx_offload_get_capa_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_rx_offload_get_capa_rx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_rx_offload_get_capa_result,
@@ -18450,7 +18475,7 @@ cmdline_parse_token_string_t cmd_rx_offload_get_configuration_port =
 cmdline_parse_token_num_t cmd_rx_offload_get_configuration_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_rx_offload_get_configuration_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_rx_offload_get_configuration_rx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_rx_offload_get_configuration_result,
@@ -18532,7 +18557,7 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_config =
 cmdline_parse_token_num_t cmd_config_per_port_rx_offload_result_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_port_rx_offload_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_rx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_port_rx_offload_result,
@@ -18655,7 +18680,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_port =
 cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
@@ -18663,7 +18688,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq =
 cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_queue_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
-		 queue_id, UINT16);
+		 queue_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxoffload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_rx_offload_result,
@@ -18764,7 +18789,7 @@ cmdline_parse_token_string_t cmd_tx_offload_get_capa_port =
 cmdline_parse_token_num_t cmd_tx_offload_get_capa_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_tx_offload_get_capa_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_tx_offload_get_capa_tx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_tx_offload_get_capa_result,
@@ -18861,7 +18886,7 @@ cmdline_parse_token_string_t cmd_tx_offload_get_configuration_port =
 cmdline_parse_token_num_t cmd_tx_offload_get_configuration_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_tx_offload_get_configuration_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_tx_offload_get_configuration_tx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_tx_offload_get_configuration_result,
@@ -18943,7 +18968,7 @@ cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_config =
 cmdline_parse_token_num_t cmd_config_per_port_tx_offload_result_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_port_tx_offload_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_tx_offload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_port_tx_offload_result,
@@ -19072,7 +19097,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_port =
 cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_queue_tx_offload_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_tx_offload_result,
@@ -19080,7 +19105,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq =
 cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_queue_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_config_per_queue_tx_offload_result,
-		 queue_id, UINT16);
+		 queue_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txoffload =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_config_per_queue_tx_offload_result,
@@ -19198,13 +19223,13 @@ cmdline_parse_token_string_t cmd_config_tx_metadata_specific_keyword =
 			keyword, "config");
 cmdline_parse_token_num_t cmd_config_tx_metadata_specific_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_tx_metadata_specific_item =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
 			item, "tx_metadata");
 cmdline_parse_token_num_t cmd_config_tx_metadata_specific_value =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result,
-			value, UINT32);
+			value, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_config_tx_metadata_specific = {
 	.f = cmd_config_tx_metadata_specific_parsed,
@@ -19277,7 +19302,7 @@ cmdline_parse_token_string_t cmd_config_tx_dynf_specific_keyword =
 			keyword, "config");
 cmdline_parse_token_num_t cmd_config_tx_dynf_specific_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_config_tx_dynf_specific_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_config_tx_dynf_specific_item =
 	TOKEN_STRING_INITIALIZER(struct cmd_config_tx_dynf_specific_result,
 			item, "dynf");
@@ -19336,7 +19361,7 @@ cmdline_parse_token_string_t cmd_show_tx_metadata_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_show_tx_metadata_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_tx_metadata_result,
-			cmd_pid, UINT16);
+			cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_tx_metadata_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_tx_metadata_result,
 			cmd_keyword, "tx_metadata");
@@ -19401,7 +19426,7 @@ cmdline_parse_token_string_t cmd_show_fec_capability_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_show_fec_capability_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_fec_capability_result,
-			cmd_pid, UINT16);
+			cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_fec_capability_fec =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_fec_capability_result,
 			cmd_fec, "fec");
@@ -19483,7 +19508,7 @@ cmdline_parse_token_string_t cmd_show_fec_mode_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_show_fec_mode_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_fec_metadata_result,
-			cmd_pid, UINT16);
+			cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_fec_mode_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_fec_metadata_result,
 			cmd_keyword, "fec_mode");
@@ -19522,7 +19547,7 @@ cmdline_parse_token_string_t cmd_set_port_fec_mode_port =
 cmdline_parse_token_num_t cmd_set_port_fec_mode_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_port_fec_mode,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_port_fec_mode_str =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_set_port_fec_mode,
@@ -19596,7 +19621,7 @@ cmdline_parse_token_string_t cmd_show_port_supported_ptypes_port =
 cmdline_parse_token_num_t cmd_show_port_supported_ptypes_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_show_port_supported_ptypes_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_port_supported_ptypes_ptypes =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_show_port_supported_ptypes_result,
@@ -19744,19 +19769,19 @@ cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
-			cmd_pid, UINT16);
+			cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
 			cmd_keyword, "rxq#txq");
 cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_qid =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
-			cmd_qid, UINT16);
+			cmd_qid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_desc =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
 			cmd_desc, "desc");
 cmdline_parse_token_num_t cmd_show_rx_tx_desc_status_did =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
-			cmd_did, UINT16);
+			cmd_did, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_rx_tx_desc_status_status =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_rx_tx_desc_status_result,
 			cmd_status, "status");
@@ -19799,7 +19824,7 @@ cmdline_parse_token_string_t cmd_set_port_ptypes_port =
 cmdline_parse_token_num_t cmd_set_port_ptypes_port_id =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_port_ptypes_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_set_port_ptypes_mask_str =
 	TOKEN_STRING_INITIALIZER
 		(struct cmd_set_port_ptypes_result,
@@ -19807,7 +19832,7 @@ cmdline_parse_token_string_t cmd_set_port_ptypes_mask_str =
 cmdline_parse_token_num_t cmd_set_port_ptypes_mask_u32 =
 	TOKEN_NUM_INITIALIZER
 		(struct cmd_set_port_ptypes_result,
-		 mask, UINT32);
+		 mask, RTE_UINT32);
 
 static void
 cmd_set_port_ptypes_parsed(
@@ -19892,7 +19917,7 @@ cmdline_parse_token_string_t cmd_showport_macs_port =
 			cmd_port, "port");
 cmdline_parse_token_num_t cmd_showport_macs_pid =
 	TOKEN_NUM_INITIALIZER(struct cmd_showport_macs_result,
-			cmd_pid, UINT16);
+			cmd_pid, RTE_UINT16);
 cmdline_parse_token_string_t cmd_showport_macs_keyword =
 	TOKEN_STRING_INITIALIZER(struct cmd_showport_macs_result,
 			cmd_keyword, "macs#mcast_macs");
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index cd35d5b9c..8b01602c4 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -7831,7 +7831,7 @@ cmdline_parse_token_string_t cmd_show_set_raw_cmd_what =
 			cmd_what, "raw_encap#raw_decap");
 cmdline_parse_token_num_t cmd_show_set_raw_cmd_index =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_set_raw_result,
-			cmd_index, UINT16);
+			cmd_index, RTE_UINT16);
 cmdline_parse_token_string_t cmd_show_set_raw_cmd_all =
 	TOKEN_STRING_INITIALIZER(struct cmd_show_set_raw_result,
 			cmd_all, "all");
diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c
index ee16244de..399ee56e0 100644
--- a/app/test-pmd/cmdline_mtr.c
+++ b/app/test-pmd/cmdline_mtr.c
@@ -253,7 +253,7 @@ cmdline_parse_token_string_t cmd_show_port_meter_cap_cap =
 		struct cmd_show_port_meter_cap_result, cap, "cap");
 cmdline_parse_token_num_t cmd_show_port_meter_cap_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_show_port_meter_cap_result, port_id, UINT16);
+		struct cmd_show_port_meter_cap_result, port_id, RTE_UINT16);
 
 static void cmd_show_port_meter_cap_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -359,23 +359,23 @@ cmdline_parse_token_string_t cmd_add_port_meter_profile_srtcm_srtcm_rfc2697 =
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			profile_id, UINT32);
+			profile_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_cir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			cir, UINT64);
+			cir, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_cbs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			cbs, UINT64);
+			cbs, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_ebs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_srtcm_result,
-			ebs, UINT64);
+			ebs, RTE_UINT64);
 
 static void cmd_add_port_meter_profile_srtcm_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -461,27 +461,27 @@ cmdline_parse_token_string_t cmd_add_port_meter_profile_trtcm_trtcm_rfc2698 =
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			profile_id, UINT32);
+			profile_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_cir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			cir, UINT64);
+			cir, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_pir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			pir, UINT64);
+			pir, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_cbs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			cbs, UINT64);
+			cbs, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_pbs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_result,
-			pbs, UINT64);
+			pbs, RTE_UINT64);
 
 static void cmd_add_port_meter_profile_trtcm_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -571,27 +571,27 @@ cmdline_parse_token_string_t
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			profile_id, UINT32);
+			profile_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_cir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			cir, UINT64);
+			cir, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_eir =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			eir, UINT64);
+			eir, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_cbs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			cbs, UINT64);
+			cbs, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_ebs =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_meter_profile_trtcm_rfc4115_result,
-			ebs, UINT64);
+			ebs, RTE_UINT64);
 
 static void cmd_add_port_meter_profile_trtcm_rfc4115_parsed(
 	void *parsed_result,
@@ -672,11 +672,11 @@ cmdline_parse_token_string_t cmd_del_port_meter_profile_profile =
 cmdline_parse_token_num_t cmd_del_port_meter_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_meter_profile_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_meter_profile_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_meter_profile_result,
-			profile_id, UINT32);
+			profile_id, RTE_UINT32);
 
 static void cmd_del_port_meter_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -742,13 +742,13 @@ cmdline_parse_token_string_t cmd_create_port_meter_meter =
 		struct cmd_create_port_meter_result, meter, "meter");
 cmdline_parse_token_num_t cmd_create_port_meter_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_create_port_meter_result, port_id, UINT16);
+		struct cmd_create_port_meter_result, port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_create_port_meter_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_create_port_meter_result, mtr_id, UINT32);
+		struct cmd_create_port_meter_result, mtr_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_create_port_meter_profile_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_create_port_meter_result, profile_id, UINT32);
+		struct cmd_create_port_meter_result, profile_id, RTE_UINT32);
 cmdline_parse_token_string_t cmd_create_port_meter_meter_enable =
 	TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result,
 		meter_enable, "yes#no");
@@ -763,10 +763,10 @@ cmdline_parse_token_string_t cmd_create_port_meter_r_action =
 		r_action, "R#Y#G#D#r#y#g#d");
 cmdline_parse_token_num_t cmd_create_port_meter_statistics_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_create_port_meter_result,
-		statistics_mask, UINT64);
+		statistics_mask, RTE_UINT64);
 cmdline_parse_token_num_t cmd_create_port_meter_shared =
 	TOKEN_NUM_INITIALIZER(struct cmd_create_port_meter_result,
-		shared, UINT32);
+		shared, RTE_UINT32);
 cmdline_parse_token_string_t cmd_create_port_meter_input_color =
 	TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result,
 		meter_input_color, TOKEN_STRING_MULTI);
@@ -866,10 +866,10 @@ cmdline_parse_token_string_t cmd_enable_port_meter_meter =
 		struct cmd_enable_port_meter_result, meter, "meter");
 cmdline_parse_token_num_t cmd_enable_port_meter_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_enable_port_meter_result, port_id, UINT16);
+		struct cmd_enable_port_meter_result, port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_enable_port_meter_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_enable_port_meter_result, mtr_id, UINT32);
+		struct cmd_enable_port_meter_result, mtr_id, RTE_UINT32);
 
 static void cmd_enable_port_meter_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -927,10 +927,10 @@ cmdline_parse_token_string_t cmd_disable_port_meter_meter =
 		struct cmd_disable_port_meter_result, meter, "meter");
 cmdline_parse_token_num_t cmd_disable_port_meter_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_disable_port_meter_result, port_id, UINT16);
+		struct cmd_disable_port_meter_result, port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_disable_port_meter_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_disable_port_meter_result, mtr_id, UINT32);
+		struct cmd_disable_port_meter_result, mtr_id, RTE_UINT32);
 
 static void cmd_disable_port_meter_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -988,10 +988,10 @@ cmdline_parse_token_string_t cmd_del_port_meter_meter =
 		struct cmd_del_port_meter_result, meter, "meter");
 cmdline_parse_token_num_t cmd_del_port_meter_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_del_port_meter_result, port_id, UINT16);
+		struct cmd_del_port_meter_result, port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_meter_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_del_port_meter_result, mtr_id, UINT32);
+		struct cmd_del_port_meter_result, mtr_id, RTE_UINT32);
 
 static void cmd_del_port_meter_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1054,13 +1054,16 @@ cmdline_parse_token_string_t cmd_set_port_meter_profile_profile =
 		struct cmd_set_port_meter_profile_result, profile, "profile");
 cmdline_parse_token_num_t cmd_set_port_meter_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_profile_result, port_id, UINT16);
+		struct cmd_set_port_meter_profile_result, port_id,
+		RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_meter_profile_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_profile_result, mtr_id, UINT32);
+		struct cmd_set_port_meter_profile_result, mtr_id,
+		RTE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_meter_profile_profile_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_profile_result, profile_id, UINT32);
+		struct cmd_set_port_meter_profile_result, profile_id,
+		RTE_UINT32);
 
 static void cmd_set_port_meter_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1208,15 +1211,15 @@ cmdline_parse_token_string_t cmd_set_port_meter_policer_action_action =
 cmdline_parse_token_num_t cmd_set_port_meter_policer_action_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_meter_policer_action_result, port_id,
-		UINT16);
+		RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_meter_policer_action_mtr_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_meter_policer_action_result, mtr_id,
-		UINT32);
+		RTE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_meter_policer_action_action_mask =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_meter_policer_action_result, action_mask,
-		UINT32);
+		RTE_UINT32);
 cmdline_parse_token_string_t cmd_set_port_meter_policer_action_policer_action =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_set_port_meter_policer_action_result,
@@ -1317,14 +1320,16 @@ cmdline_parse_token_string_t cmd_set_port_meter_stats_mask_mask =
 		struct cmd_set_port_meter_stats_mask_result, mask, "mask");
 cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_stats_mask_result, port_id, UINT16);
+		struct cmd_set_port_meter_stats_mask_result, port_id,
+		RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_meter_stats_mask_result, mtr_id, UINT32);
+		struct cmd_set_port_meter_stats_mask_result, mtr_id,
+		RTE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_stats_mask =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_meter_stats_mask_result, stats_mask,
-		UINT64);
+		RTE_UINT64);
 
 static void cmd_set_port_meter_stats_mask_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1389,10 +1394,10 @@ cmdline_parse_token_string_t cmd_show_port_meter_stats_stats =
 		struct cmd_show_port_meter_stats_result, stats, "stats");
 cmdline_parse_token_num_t cmd_show_port_meter_stats_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_show_port_meter_stats_result, port_id, UINT16);
+		struct cmd_show_port_meter_stats_result, port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_meter_stats_mtr_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_show_port_meter_stats_result, mtr_id, UINT32);
+		struct cmd_show_port_meter_stats_result, mtr_id, RTE_UINT32);
 cmdline_parse_token_string_t cmd_show_port_meter_stats_clear =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_show_port_meter_stats_result, clear, "yes#no");
diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c
index af9988049..997822657 100644
--- a/app/test-pmd/cmdline_tm.c
+++ b/app/test-pmd/cmdline_tm.c
@@ -219,7 +219,7 @@ cmdline_parse_token_string_t cmd_show_port_tm_cap_cap =
 		cap, "cap");
 cmdline_parse_token_num_t cmd_show_port_tm_cap_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_cap_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 
 static void cmd_show_port_tm_cap_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -368,10 +368,10 @@ cmdline_parse_token_string_t cmd_show_port_tm_level_cap_cap =
 		cap, "cap");
 cmdline_parse_token_num_t cmd_show_port_tm_level_cap_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_tm_level_cap_level_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
-		 level_id, UINT32);
+		 level_id, RTE_UINT32);
 
 
 static void cmd_show_port_tm_level_cap_parsed(void *parsed_result,
@@ -518,10 +518,10 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_cap_cap =
 		cap, "cap");
 cmdline_parse_token_num_t cmd_show_port_tm_node_cap_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_tm_node_cap_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
-		 node_id, UINT32);
+		 node_id, RTE_UINT32);
 
 static void cmd_show_port_tm_node_cap_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -642,14 +642,14 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_stats_stats =
 		struct cmd_show_port_tm_node_stats_result, stats, "stats");
 cmdline_parse_token_num_t cmd_show_port_tm_node_stats_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_stats_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_tm_node_stats_node_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_show_port_tm_node_stats_result,
-			node_id, UINT32);
+			node_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_show_port_tm_node_stats_clear =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_show_port_tm_node_stats_result, clear, UINT32);
+		struct cmd_show_port_tm_node_stats_result, clear, RTE_UINT32);
 
 static void cmd_show_port_tm_node_stats_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -761,11 +761,11 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_type_type =
 cmdline_parse_token_num_t cmd_show_port_tm_node_type_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_show_port_tm_node_type_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_show_port_tm_node_type_node_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_show_port_tm_node_type_result,
-			node_id, UINT32);
+			node_id, RTE_UINT32);
 
 static void cmd_show_port_tm_node_type_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -854,35 +854,35 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_profile =
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_shaper_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			shaper_id, UINT32);
+			shaper_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_rate =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			cmit_tb_rate, UINT64);
+			cmit_tb_rate, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_size =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			cmit_tb_size, UINT64);
+			cmit_tb_size, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_rate =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			peak_tb_rate, UINT64);
+			peak_tb_rate, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_size =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			peak_tb_size, UINT64);
+			peak_tb_size, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_pktlen_adjust =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			pktlen_adjust, UINT32);
+			pktlen_adjust, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_packet_mode =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			pkt_mode, UINT32);
+			pkt_mode, RTE_UINT32);
 
 static void cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -976,11 +976,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_profile =
 cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_shaper_profile_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_shaper_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_shaper_profile_result,
-			shaper_id, UINT32);
+			shaper_id, RTE_UINT32);
 
 static void cmd_del_port_tm_node_shaper_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1057,15 +1057,15 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_shaper =
 cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shared_shaper_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shared_shaper_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shared_shaper_result,
-			shared_shaper_id, UINT32);
+			shared_shaper_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shaper_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shared_shaper_result,
-			shaper_profile_id, UINT32);
+			shaper_profile_id, RTE_UINT32);
 
 static void cmd_add_port_tm_node_shared_shaper_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1157,11 +1157,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_shaper =
 cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_shared_shaper_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_shared_shaper_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_shared_shaper_result,
-			shared_shaper_id, UINT32);
+			shared_shaper_id, RTE_UINT32);
 
 static void cmd_del_port_tm_node_shared_shaper_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1250,11 +1250,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_profile =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wred_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			wred_profile_id, UINT32);
+			wred_profile_id, RTE_UINT32);
 cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
@@ -1262,19 +1262,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			min_th_g, UINT64);
+			min_th_g, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			max_th_g, UINT64);
+			max_th_g, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			maxp_inv_g, UINT16);
+			maxp_inv_g, RTE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			wq_log2_g, UINT16);
+			wq_log2_g, RTE_UINT16);
 cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
@@ -1282,19 +1282,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			min_th_y, UINT64);
+			min_th_y, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			max_th_y, UINT64);
+			max_th_y, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			maxp_inv_y, UINT16);
+			maxp_inv_y, RTE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			wq_log2_y, UINT16);
+			wq_log2_y, RTE_UINT16);
 cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r =
 	TOKEN_STRING_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
@@ -1302,19 +1302,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			min_th_r, UINT64);
+			min_th_r, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			max_th_r, UINT64);
+			max_th_r, RTE_UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			maxp_inv_r, UINT16);
+			maxp_inv_r, RTE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
-			wq_log2_r, UINT16);
+			wq_log2_r, RTE_UINT16);
 
 
 static void cmd_add_port_tm_node_wred_profile_parsed(void *parsed_result,
@@ -1430,11 +1430,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_profile =
 cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_wred_profile_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_wred_profile_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_del_port_tm_node_wred_profile_result,
-			wred_profile_id, UINT32);
+			wred_profile_id, RTE_UINT32);
 
 static void cmd_del_port_tm_node_wred_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1512,15 +1512,15 @@ cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_profile =
 cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_set_port_tm_node_shaper_profile_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_shaper_profile_result,
-		node_id, UINT32);
+		node_id, RTE_UINT32);
 cmdline_parse_token_num_t
 	cmd_set_port_tm_node_shaper_shaper_profile_profile_id =
 		TOKEN_NUM_INITIALIZER(
 			struct cmd_set_port_tm_node_shaper_profile_result,
-			shaper_profile_id, UINT32);
+			shaper_profile_id, RTE_UINT32);
 
 static void cmd_set_port_tm_node_shaper_profile_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -1606,31 +1606,31 @@ cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_node =
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_nonleaf_node_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 node_id, UINT32);
+		 node_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_parent_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 parent_node_id, INT32);
+		 parent_node_id, RTE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 priority, UINT32);
+		 priority, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_weight =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 weight, UINT32);
+		 weight, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_level_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 level_id, UINT32);
+		 level_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_shaper_profile_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 shaper_profile_id, INT32);
+		 shaper_profile_id, RTE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_n_sp_priorities =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 n_sp_priorities, UINT32);
+		 n_sp_priorities, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_stats_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-		 stats_mask, UINT64);
+		 stats_mask, RTE_UINT64);
 cmdline_parse_token_string_t
 	cmd_add_port_tm_nonleaf_node_multi_shared_shaper_id =
 	TOKEN_STRING_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
@@ -1767,31 +1767,31 @@ cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_pktmode =
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_nonleaf_node_pmode_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-		 node_id, UINT32);
+		 node_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_parent_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-		 parent_node_id, INT32);
+		 parent_node_id, RTE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-		 priority, UINT32);
+		 priority, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_weight =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-		 weight, UINT32);
+		 weight, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_level_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-		 level_id, UINT32);
+		 level_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_shaper_profile_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-		 shaper_profile_id, INT32);
+		 shaper_profile_id, RTE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_n_sp_priorities =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-		 n_sp_priorities, UINT32);
+		 n_sp_priorities, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_stats_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-		 stats_mask, UINT64);
+		 stats_mask, RTE_UINT64);
 cmdline_parse_token_string_t
 	cmd_add_port_tm_nonleaf_node_pmode_multi_shrd_shpr_id =
 	TOKEN_STRING_INITIALIZER(
@@ -1930,34 +1930,34 @@ cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_node =
 		struct cmd_add_port_tm_leaf_node_result, node, "node");
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 node_id, UINT32);
+		 node_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_parent_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 parent_node_id, INT32);
+		 parent_node_id, RTE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 priority, UINT32);
+		 priority, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_weight =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 weight, UINT32);
+		 weight, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_level_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 level_id, UINT32);
+		 level_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_shaper_profile_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 shaper_profile_id, INT32);
+		 shaper_profile_id, RTE_INT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_cman_mode =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 cman_mode, UINT32);
+		 cman_mode, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_wred_profile_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 wred_profile_id, UINT32);
+		 wred_profile_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_stats_mask =
 	TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-		 stats_mask, UINT64);
+		 stats_mask, RTE_UINT64);
 cmdline_parse_token_string_t
 	cmd_add_port_tm_leaf_node_multi_shared_shaper_id =
 	TOKEN_STRING_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
@@ -2080,10 +2080,10 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_node =
 		struct cmd_del_port_tm_node_result, node, "node");
 cmdline_parse_token_num_t cmd_del_port_tm_node_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_del_port_tm_node_result,
-		 port_id, UINT16);
+		 port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_del_port_tm_node_node_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_del_port_tm_node_result,
-		node_id, UINT32);
+		node_id, RTE_UINT32);
 
 static void cmd_del_port_tm_node_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2158,19 +2158,21 @@ cmdline_parse_token_string_t cmd_set_port_tm_node_parent_parent =
 		struct cmd_set_port_tm_node_parent_result, parent, "parent");
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_tm_node_parent_result, port_id, UINT16);
+		struct cmd_set_port_tm_node_parent_result, port_id,
+		RTE_UINT16);
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_node_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_set_port_tm_node_parent_result, node_id, UINT32);
+		struct cmd_set_port_tm_node_parent_result, node_id,
+		RTE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_parent_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
-		parent_id, UINT32);
+		parent_id, RTE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_priority =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
-		priority, UINT32);
+		priority, RTE_UINT32);
 cmdline_parse_token_num_t cmd_set_port_tm_node_parent_weight =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
-		weight, UINT32);
+		weight, RTE_UINT32);
 
 static void cmd_set_port_tm_node_parent_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2246,10 +2248,12 @@ cmdline_parse_token_string_t cmd_suspend_port_tm_node_node =
 		struct cmd_suspend_port_tm_node_result, node, "node");
 cmdline_parse_token_num_t cmd_suspend_port_tm_node_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_suspend_port_tm_node_result, port_id, UINT16);
+		struct cmd_suspend_port_tm_node_result, port_id,
+		RTE_UINT16);
 cmdline_parse_token_num_t cmd_suspend_port_tm_node_node_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_suspend_port_tm_node_result, node_id, UINT32);
+		struct cmd_suspend_port_tm_node_result, node_id,
+		RTE_UINT32);
 
 static void cmd_suspend_port_tm_node_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2311,10 +2315,10 @@ cmdline_parse_token_string_t cmd_resume_port_tm_node_node =
 		struct cmd_resume_port_tm_node_result, node, "node");
 cmdline_parse_token_num_t cmd_resume_port_tm_node_port_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_resume_port_tm_node_result, port_id, UINT16);
+		struct cmd_resume_port_tm_node_result, port_id, RTE_UINT16);
 cmdline_parse_token_num_t cmd_resume_port_tm_node_node_id =
 	TOKEN_NUM_INITIALIZER(
-		struct cmd_resume_port_tm_node_result, node_id, UINT32);
+		struct cmd_resume_port_tm_node_result, node_id, RTE_UINT32);
 
 static void cmd_resume_port_tm_node_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2378,7 +2382,7 @@ cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_commit =
 cmdline_parse_token_num_t cmd_port_tm_hierarchy_commit_port_id =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_port_tm_hierarchy_commit_result,
-			port_id, UINT16);
+			port_id, RTE_UINT16);
 cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_clean_on_fail =
 	TOKEN_STRING_INITIALIZER(struct cmd_port_tm_hierarchy_commit_result,
 		 clean_on_fail, "yes#no");
@@ -2458,17 +2462,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_ip_ecn =
 				 ip_ecn, "ip_ecn");
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_green =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-			      green, UINT16);
+			      green, RTE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_yellow =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-			      yellow, UINT16);
+			      yellow, RTE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_red =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-				red, UINT16);
+				red, RTE_UINT16);
 
 static void cmd_port_tm_mark_ip_ecn_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2545,17 +2549,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_ip_dscp =
 				 ip_dscp, "ip_dscp");
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_green =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-				green, UINT16);
+				green, RTE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_yellow =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-				yellow, UINT16);
+				yellow, RTE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_red =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-				red, UINT16);
+				red, RTE_UINT16);
 
 static void cmd_port_tm_mark_ip_dscp_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
@@ -2632,17 +2636,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_vlan_dei =
 				 vlan_dei, "vlan_dei");
 cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_port_id =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-			      port_id, UINT16);
+			      port_id, RTE_UINT16);
 
 cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_green =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-				green, UINT16);
+				green, RTE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_yellow =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-				yellow, UINT16);
+				yellow, RTE_UINT16);
 cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_red =
 	TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-				red, UINT16);
+				red, RTE_UINT16);
 
 static void cmd_port_tm_mark_vlan_dei_parsed(void *parsed_result,
 	__rte_unused struct cmdline *cl,
diff --git a/app/test/test_cmdline_num.c b/app/test/test_cmdline_num.c
index a6ad95507..ec479cdb3 100644
--- a/app/test/test_cmdline_num.c
+++ b/app/test/test_cmdline_num.c
@@ -220,31 +220,31 @@ static int
 can_parse_unsigned(uint64_t expected_result, enum cmdline_numtype type)
 {
 	switch (type) {
-	case UINT8:
+	case RTE_UINT8:
 		if (expected_result > UINT8_MAX)
 			return 0;
 		break;
-	case UINT16:
+	case RTE_UINT16:
 		if (expected_result > UINT16_MAX)
 			return 0;
 		break;
-	case UINT32:
+	case RTE_UINT32:
 		if (expected_result > UINT32_MAX)
 			return 0;
 		break;
-	case INT8:
+	case RTE_INT8:
 		if (expected_result > INT8_MAX)
 			return 0;
 		break;
-	case INT16:
+	case RTE_INT16:
 		if (expected_result > INT16_MAX)
 			return 0;
 		break;
-	case INT32:
+	case RTE_INT32:
 		if (expected_result > INT32_MAX)
 			return 0;
 		break;
-	case INT64:
+	case RTE_INT64:
 		if (expected_result > INT64_MAX)
 			return 0;
 		break;
@@ -258,31 +258,31 @@ static int
 can_parse_signed(int64_t expected_result, enum cmdline_numtype type)
 {
 	switch (type) {
-	case UINT8:
+	case RTE_UINT8:
 		if (expected_result > UINT8_MAX || expected_result < 0)
 			return 0;
 		break;
-	case UINT16:
+	case RTE_UINT16:
 		if (expected_result > UINT16_MAX || expected_result < 0)
 			return 0;
 		break;
-	case UINT32:
+	case RTE_UINT32:
 		if (expected_result > UINT32_MAX || expected_result < 0)
 			return 0;
 		break;
-	case UINT64:
+	case RTE_UINT64:
 		if (expected_result < 0)
 			return 0;
 		break;
-	case INT8:
+	case RTE_INT8:
 		if (expected_result > INT8_MAX || expected_result < INT8_MIN)
 			return 0;
 		break;
-	case INT16:
+	case RTE_INT16:
 		if (expected_result > INT16_MAX || expected_result < INT16_MIN)
 			return 0;
 		break;
-	case INT32:
+	case RTE_INT32:
 		if (expected_result > INT32_MAX || expected_result < INT32_MIN)
 			return 0;
 		break;
@@ -302,7 +302,7 @@ test_parse_num_invalid_param(void)
 	int ret = 0;
 
 	/* set up a token */
-	token.num_data.type = UINT32;
+	token.num_data.type = RTE_UINT32;
 
 	/* copy string to buffer */
 	strlcpy(buf, num_valid_positive_strs[0].str, sizeof(buf));
@@ -375,7 +375,7 @@ test_parse_num_invalid_data(void)
 	cmdline_parse_token_num_t token;
 
 	/* cycle through all possible parsed types */
-	for (type = UINT8; type <= INT64; type++) {
+	for (type = RTE_UINT8; type <= RTE_INT64; type++) {
 		token.num_data.type = type;
 
 		/* test full strings */
@@ -414,7 +414,7 @@ test_parse_num_valid(void)
 	/** valid strings **/
 
 	/* cycle through all possible parsed types */
-	for (type = UINT8; type <= INT64; type++) {
+	for (type = RTE_UINT8; type <= RTE_INT64; type++) {
 		token.num_data.type = type;
 
 		/* test positive strings */
@@ -468,13 +468,13 @@ test_parse_num_valid(void)
 			if (ret > 0) {
 				/* detect negative */
 				switch (type) {
-				case INT8:
+				case RTE_INT8:
 					result = (int8_t) result;
 					break;
-				case INT16:
+				case RTE_INT16:
 					result = (int16_t) result;
 					break;
-				case INT32:
+				case RTE_INT32:
 					result = (int32_t) result;
 					break;
 				default:
@@ -492,7 +492,7 @@ test_parse_num_valid(void)
 	/** garbage strings **/
 
 	/* cycle through all possible parsed types */
-	for (type = UINT8; type <= INT64; type++) {
+	for (type = RTE_UINT8; type <= RTE_INT64; type++) {
 		token.num_data.type = type;
 
 		/* test positive garbage strings */
@@ -546,15 +546,15 @@ test_parse_num_valid(void)
 			if (ret > 0) {
 				/* detect negative */
 				switch (type) {
-				case INT8:
+				case RTE_INT8:
 					if (result & (INT8_MAX + 1))
 						result |= 0xFFFFFFFFFFFFFF00ULL;
 					break;
-				case INT16:
+				case RTE_INT16:
 					if (result & (INT16_MAX + 1))
 						result |= 0xFFFFFFFFFFFF0000ULL;
 					break;
-				case INT32:
+				case RTE_INT32:
 					if (result & (INT32_MAX + 1ULL))
 						result |= 0xFFFFFFFF00000000ULL;
 					break;
diff --git a/examples/ethtool/ethtool-app/ethapp.c b/examples/ethtool/ethtool-app/ethapp.c
index b6b967118..e6c93e13a 100644
--- a/examples/ethtool/ethtool-app/ethapp.c
+++ b/examples/ethtool/ethtool-app/ethapp.c
@@ -70,7 +70,7 @@ cmdline_parse_token_string_t pcmd_rxmode_token_cmd =
 cmdline_parse_token_string_t pcmd_portstats_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_int_params, cmd, "portstats");
 cmdline_parse_token_num_t pcmd_int_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_int_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_int_params, port, RTE_UINT16);
 
 /* Commands taking port id and string */
 cmdline_parse_token_string_t pcmd_eeprom_token_cmd =
@@ -84,7 +84,7 @@ cmdline_parse_token_string_t pcmd_regs_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, cmd, "regs");
 
 cmdline_parse_token_num_t pcmd_intstr_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, RTE_UINT16);
 cmdline_parse_token_string_t pcmd_intstr_token_opt =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, opt, NULL);
 
@@ -92,7 +92,7 @@ cmdline_parse_token_string_t pcmd_intstr_token_opt =
 cmdline_parse_token_string_t pcmd_macaddr_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intmac_params, cmd, "macaddr");
 cmdline_parse_token_num_t pcmd_intmac_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intmac_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intmac_params, port, RTE_UINT16);
 cmdline_parse_token_etheraddr_t pcmd_intmac_token_mac =
 	TOKEN_ETHERADDR_INITIALIZER(struct pcmd_intmac_params, mac);
 
@@ -106,18 +106,19 @@ cmdline_parse_token_string_t pcmd_ringparam_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intintint_params, cmd,
 		"ringparam");
 cmdline_parse_token_num_t pcmd_intintint_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, port,
+		RTE_UINT16);
 cmdline_parse_token_num_t pcmd_intintint_token_tx =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, tx, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, tx, RTE_UINT16);
 cmdline_parse_token_num_t pcmd_intintint_token_rx =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, rx, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, rx, RTE_UINT16);
 
 
 /* Pause commands */
 cmdline_parse_token_string_t pcmd_pause_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, cmd, "pause");
 cmdline_parse_token_num_t pcmd_pause_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, RTE_UINT16);
 cmdline_parse_token_string_t pcmd_pause_token_opt =
 	TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params,
 		opt, "all#tx#rx#none");
@@ -126,11 +127,11 @@ cmdline_parse_token_string_t pcmd_pause_token_opt =
 cmdline_parse_token_string_t pcmd_vlan_token_cmd =
 	TOKEN_STRING_INITIALIZER(struct pcmd_vlan_params, cmd, "vlan");
 cmdline_parse_token_num_t pcmd_vlan_token_port =
-	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, port, RTE_UINT16);
 cmdline_parse_token_string_t pcmd_vlan_token_mode =
 	TOKEN_STRING_INITIALIZER(struct pcmd_vlan_params, mode, "add#del");
 cmdline_parse_token_num_t pcmd_vlan_token_vid =
-	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, vid, UINT16);
+	TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, vid, RTE_UINT16);
 
 
 static void
diff --git a/examples/ipsec-secgw/parser.c b/examples/ipsec-secgw/parser.c
index 906912991..98dff93b8 100644
--- a/examples/ipsec-secgw/parser.c
+++ b/examples/ipsec-secgw/parser.c
@@ -397,7 +397,7 @@ cmdline_parse_token_string_t cfg_add_neigh_start =
 cmdline_parse_token_string_t cfg_add_neigh_pstr =
 	TOKEN_STRING_INITIALIZER(struct cfg_neigh_add_item, pstr, "port");
 cmdline_parse_token_num_t cfg_add_neigh_port =
-	TOKEN_NUM_INITIALIZER(struct cfg_neigh_add_item, port, UINT16);
+	TOKEN_NUM_INITIALIZER(struct cfg_neigh_add_item, port, RTE_UINT16);
 cmdline_parse_token_string_t cfg_add_neigh_mac =
 	TOKEN_STRING_INITIALIZER(struct cfg_neigh_add_item, mac, NULL);
 
diff --git a/examples/qos_sched/cmdline.c b/examples/qos_sched/cmdline.c
index 1cf7ea97a..257b87a7c 100644
--- a/examples/qos_sched/cmdline.c
+++ b/examples/qos_sched/cmdline.c
@@ -113,7 +113,7 @@ cmdline_parse_token_string_t cmd_setqavg_param_string =
                                 "period#n");
 cmdline_parse_token_num_t cmd_setqavg_number =
         TOKEN_NUM_INITIALIZER(struct cmd_setqavg_result, number,
-                                UINT32);
+				RTE_UINT32);
 
 cmdline_parse_inst_t cmd_setqavg = {
         .f = cmd_setqavg_parsed,
@@ -188,10 +188,10 @@ cmdline_parse_token_string_t cmd_subportstats_subport_string =
                                 "subport");
 cmdline_parse_token_num_t cmd_subportstats_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_subportstats_result, subport_number,
-                                UINT32);
+				RTE_UINT32);
 cmdline_parse_token_num_t cmd_subportstats_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_subportstats_result, port_number,
-			       UINT16);
+				RTE_UINT16);
 
 cmdline_parse_inst_t cmd_subportstats = {
         .f = cmd_subportstats_parsed,
@@ -236,19 +236,19 @@ cmdline_parse_token_string_t cmd_pipestats_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_pipestats_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, port_number,
-			       UINT16);
+				RTE_UINT16);
 cmdline_parse_token_string_t cmd_pipestats_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_pipestats_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_pipestats_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, subport_number,
-                                UINT32);
+				RTE_UINT32);
 cmdline_parse_token_string_t cmd_pipestats_pipe_string =
         TOKEN_STRING_INITIALIZER(struct cmd_pipestats_result, pipe_string,
                                 "pipe");
 cmdline_parse_token_num_t cmd_pipestats_pipe_number =
         TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, pipe_number,
-                                UINT32);
+				RTE_UINT32);
 
 cmdline_parse_inst_t cmd_pipestats = {
         .f = cmd_pipestats_parsed,
@@ -299,31 +299,31 @@ cmdline_parse_token_string_t cmd_avg_q_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_q_port_number =
 	TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, port_number,
-			       UINT16);
+				RTE_UINT16);
 cmdline_parse_token_string_t cmd_avg_q_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_q_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, subport_number,
-                                UINT32);
+				RTE_UINT32);
 cmdline_parse_token_string_t cmd_avg_q_pipe_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, pipe_string,
                                 "pipe");
 cmdline_parse_token_num_t cmd_avg_q_pipe_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, pipe_number,
-                                UINT32);
+				RTE_UINT32);
 cmdline_parse_token_string_t cmd_avg_q_tc_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, tc_string,
                                 "tc");
 cmdline_parse_token_num_t cmd_avg_q_tc_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, tc_number,
-                                UINT8);
+				RTE_UINT8);
 cmdline_parse_token_string_t cmd_avg_q_q_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, q_string,
                                 "q");
 cmdline_parse_token_num_t cmd_avg_q_q_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, q_number,
-                                UINT8);
+				RTE_UINT8);
 
 cmdline_parse_inst_t cmd_avg_q = {
         .f = cmd_avg_q_parsed,
@@ -376,25 +376,25 @@ cmdline_parse_token_string_t cmd_avg_tcpipe_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_tcpipe_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, port_number,
-			       UINT16);
+				RTE_UINT16);
 cmdline_parse_token_string_t cmd_avg_tcpipe_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_tcpipe_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, subport_number,
-                                UINT32);
+				RTE_UINT32);
 cmdline_parse_token_string_t cmd_avg_tcpipe_pipe_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, pipe_string,
                                 "pipe");
 cmdline_parse_token_num_t cmd_avg_tcpipe_pipe_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, pipe_number,
-                                UINT32);
+				RTE_UINT32);
 cmdline_parse_token_string_t cmd_avg_tcpipe_tc_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, tc_string,
                                 "tc");
 cmdline_parse_token_num_t cmd_avg_tcpipe_tc_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, tc_number,
-                                UINT8);
+				RTE_UINT8);
 
 cmdline_parse_inst_t cmd_avg_tcpipe = {
         .f = cmd_avg_tcpipe_parsed,
@@ -443,19 +443,19 @@ cmdline_parse_token_string_t cmd_avg_pipe_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_pipe_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, port_number,
-			       UINT16);
+				RTE_UINT16);
 cmdline_parse_token_string_t cmd_avg_pipe_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_pipe_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_pipe_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, subport_number,
-                                UINT32);
+				RTE_UINT32);
 cmdline_parse_token_string_t cmd_avg_pipe_pipe_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_pipe_result, pipe_string,
                                 "pipe");
 cmdline_parse_token_num_t cmd_avg_pipe_pipe_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, pipe_number,
-                                UINT32);
+				RTE_UINT32);
 
 cmdline_parse_inst_t cmd_avg_pipe = {
         .f = cmd_avg_pipe_parsed,
@@ -502,19 +502,19 @@ cmdline_parse_token_string_t cmd_avg_tcsubport_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_tcsubport_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, port_number,
-			       UINT16);
+				RTE_UINT16);
 cmdline_parse_token_string_t cmd_avg_tcsubport_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcsubport_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_tcsubport_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, subport_number,
-                                UINT32);
+				RTE_UINT32);
 cmdline_parse_token_string_t cmd_avg_tcsubport_tc_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_tcsubport_result, tc_string,
                                 "tc");
 cmdline_parse_token_num_t cmd_avg_tcsubport_tc_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, tc_number,
-                                UINT8);
+				RTE_UINT8);
 
 cmdline_parse_inst_t cmd_avg_tcsubport = {
         .f = cmd_avg_tcsubport_parsed,
@@ -559,13 +559,13 @@ cmdline_parse_token_string_t cmd_avg_subport_port_string =
                                 "port");
 cmdline_parse_token_num_t cmd_avg_subport_port_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_subport_result, port_number,
-			       UINT16);
+				RTE_UINT16);
 cmdline_parse_token_string_t cmd_avg_subport_subport_string =
         TOKEN_STRING_INITIALIZER(struct cmd_avg_subport_result, subport_string,
                                 "subport");
 cmdline_parse_token_num_t cmd_avg_subport_subport_number =
         TOKEN_NUM_INITIALIZER(struct cmd_avg_subport_result, subport_number,
-                                UINT32);
+				RTE_UINT32);
 
 cmdline_parse_inst_t cmd_avg_subport = {
         .f = cmd_avg_subport_parsed,
diff --git a/examples/vdpa/main.c b/examples/vdpa/main.c
index 2345f9866..97e967b9a 100644
--- a/examples/vdpa/main.c
+++ b/examples/vdpa/main.c
@@ -471,7 +471,7 @@ cmdline_parse_token_string_t cmd_device_stats_ =
 cmdline_parse_token_string_t cmd_device_bdf =
 	TOKEN_STRING_INITIALIZER(struct cmd_stats_result, bdf, NULL);
 cmdline_parse_token_num_t cmd_queue_id =
-	TOKEN_NUM_INITIALIZER(struct cmd_stats_result, qid, UINT32);
+	TOKEN_NUM_INITIALIZER(struct cmd_stats_result, qid, RTE_UINT32);
 
 cmdline_parse_inst_t cmd_device_stats = {
 	.f = cmd_device_stats_parsed,
diff --git a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
index f9b47186e..cf1636e78 100644
--- a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
+++ b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
@@ -448,7 +448,7 @@ cmdline_parse_token_string_t cmd_set_cpu_freq =
 			set_cpu_freq, "set_cpu_freq");
 cmdline_parse_token_num_t cmd_set_cpu_freq_core_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_cpu_freq_result,
-			lcore_id, UINT8);
+			lcore_id, RTE_UINT8);
 cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result,
 			cmd, "up#down#min#max#enable_turbo#disable_turbo");
diff --git a/examples/vm_power_manager/vm_power_cli.c b/examples/vm_power_manager/vm_power_cli.c
index 7edeaccda..ed0623a41 100644
--- a/examples/vm_power_manager/vm_power_cli.c
+++ b/examples/vm_power_manager/vm_power_cli.c
@@ -155,10 +155,10 @@ cmdline_parse_token_string_t cmd_set_pcpu_vm_name =
 				vm_name, NULL);
 cmdline_parse_token_num_t set_pcpu_vcpu =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_pcpu_result,
-				vcpu, UINT8);
+				vcpu, RTE_UINT8);
 cmdline_parse_token_num_t set_pcpu_core =
 		TOKEN_NUM_INITIALIZER(struct cmd_set_pcpu_result,
-				core, UINT64);
+				core, RTE_UINT64);
 
 
 cmdline_parse_inst_t cmd_set_pcpu_set = {
@@ -455,7 +455,7 @@ cmdline_parse_token_string_t cmd_show_cpu_freq =
 
 cmdline_parse_token_num_t cmd_show_cpu_freq_core_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_show_cpu_freq_result,
-			core_num, UINT8);
+			core_num, RTE_UINT8);
 
 cmdline_parse_inst_t cmd_show_cpu_freq_set = {
 	.f = cmd_show_cpu_freq_parsed,
@@ -504,7 +504,7 @@ cmdline_parse_token_string_t cmd_set_cpu_freq =
 			set_cpu_freq, "set_cpu_freq");
 cmdline_parse_token_num_t cmd_set_cpu_freq_core_num =
 	TOKEN_NUM_INITIALIZER(struct cmd_set_cpu_freq_result,
-			core_num, UINT8);
+			core_num, RTE_UINT8);
 cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd =
 	TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result,
 			cmd, "up#down#min#max#enable_turbo#disable_turbo");
diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/librte_cmdline/cmdline_parse_num.c
index 478f181b4..b37dd94ae 100644
--- a/lib/librte_cmdline/cmdline_parse_num.c
+++ b/lib/librte_cmdline/cmdline_parse_num.c
@@ -57,9 +57,8 @@ static inline int
 add_to_res(unsigned int c, uint64_t *res, unsigned int base)
 {
 	/* overflow */
-	if ( (UINT64_MAX - c) / base < *res ) {
+	if ((UINT64_MAX - c) / base < *res)
 		return -1;
-	}
 
 	*res = (uint64_t) (*res * base + c);
 	return 0;
@@ -69,23 +68,23 @@ static int
 check_res_size(struct cmdline_token_num_data *nd, unsigned ressize)
 {
 	switch (nd->type) {
-	case INT8:
-	case UINT8:
+	case RTE_INT8:
+	case RTE_UINT8:
 		if (ressize < sizeof(int8_t))
 			return -1;
 		break;
-	case INT16:
-	case UINT16:
+	case RTE_INT16:
+	case RTE_UINT16:
 		if (ressize < sizeof(int16_t))
 			return -1;
 		break;
-	case INT32:
-	case UINT32:
+	case RTE_INT32:
+	case RTE_UINT32:
 		if (ressize < sizeof(int32_t))
 			return -1;
 		break;
-	case INT64:
-	case UINT64:
+	case RTE_INT64:
+	case RTE_UINT64:
 		if (ressize < sizeof(int64_t))
 			return -1;
 		break;
@@ -123,7 +122,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res,
 			return -1;
 	}
 
-	while ( st != ERROR && c && ! cmdline_isendoftoken(c) ) {
+	while (st != ERROR && c && !cmdline_isendoftoken(c)) {
 		debug_printf("%c %x -> ", c, c);
 		switch (st) {
 		case START:
@@ -259,61 +258,53 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res,
 	case HEX_OK:
 	case OCTAL_OK:
 	case BIN_OK:
-		if ( nd.type == INT8 && res1 <= INT8_MAX ) {
+		if (nd.type == RTE_INT8 && res1 <= INT8_MAX) {
 			if (res) *(int8_t *)res = (int8_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT16 && res1 <= INT16_MAX ) {
+		} else if (nd.type == RTE_INT16 && res1 <= INT16_MAX) {
 			if (res) *(int16_t *)res = (int16_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT32 && res1 <= INT32_MAX ) {
+		} else if (nd.type == RTE_INT32 && res1 <= INT32_MAX) {
 			if (res) *(int32_t *)res = (int32_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT64 && res1 <= INT64_MAX ) {
+		} else if (nd.type == RTE_INT64 && res1 <= INT64_MAX) {
 			if (res) *(int64_t *)res = (int64_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == UINT8 && res1 <= UINT8_MAX ) {
+		} else if (nd.type == RTE_UINT8 && res1 <= UINT8_MAX) {
 			if (res) *(uint8_t *)res = (uint8_t) res1;
 			return buf-srcbuf;
-		}
-		else if (nd.type == UINT16  && res1 <= UINT16_MAX ) {
+		} else if (nd.type == RTE_UINT16  && res1 <= UINT16_MAX) {
 			if (res) *(uint16_t *)res = (uint16_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == UINT32 && res1 <= UINT32_MAX ) {
+		} else if (nd.type == RTE_UINT32 && res1 <= UINT32_MAX) {
 			if (res) *(uint32_t *)res = (uint32_t) res1;
 			return buf-srcbuf;
-		}
-		else if ( nd.type == UINT64 ) {
+		} else if (nd.type == RTE_UINT64) {
 			if (res) *(uint64_t *)res = res1;
 			return buf-srcbuf;
-		}
-		else {
+		} else {
 			return -1;
 		}
 		break;
 
 	case DEC_NEG_OK:
-		if ( nd.type == INT8 && res1 <= INT8_MAX + 1 ) {
+		if (nd.type == RTE_INT8 &&
+				res1 <= INT8_MAX + 1) {
 			if (res) *(int8_t *)res = (int8_t) (-res1);
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT16 && res1 <= (uint16_t)INT16_MAX + 1 ) {
+		} else if (nd.type == RTE_INT16 &&
+				res1 <= (uint16_t)INT16_MAX + 1) {
 			if (res) *(int16_t *)res = (int16_t) (-res1);
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT32 && res1 <= (uint32_t)INT32_MAX + 1 ) {
+		} else if (nd.type == RTE_INT32 &&
+				res1 <= (uint32_t)INT32_MAX + 1) {
 			if (res) *(int32_t *)res = (int32_t) (-res1);
 			return buf-srcbuf;
-		}
-		else if ( nd.type == INT64 && res1 <= (uint64_t)INT64_MAX + 1 ) {
+		} else if (nd.type == RTE_INT64 &&
+				res1 <= (uint64_t)INT64_MAX + 1) {
 			if (res) *(int64_t *)res = (int64_t) (-res1);
 			return buf-srcbuf;
-		}
-		else {
+		} else {
 			return -1;
 		}
 		break;
diff --git a/lib/librte_cmdline/cmdline_parse_num.h b/lib/librte_cmdline/cmdline_parse_num.h
index 58b28cad7..02133bb21 100644
--- a/lib/librte_cmdline/cmdline_parse_num.h
+++ b/lib/librte_cmdline/cmdline_parse_num.h
@@ -14,14 +14,14 @@ extern "C" {
 #endif
 
 enum cmdline_numtype {
-	UINT8 = 0,
-	UINT16,
-	UINT32,
-	UINT64,
-	INT8,
-	INT16,
-	INT32,
-	INT64
+	RTE_UINT8 = 0,
+	RTE_UINT16,
+	RTE_UINT32,
+	RTE_UINT64,
+	RTE_INT8,
+	RTE_INT16,
+	RTE_INT32,
+	RTE_INT64
 };
 
 struct cmdline_token_num_data {
-- 
2.28.0


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [dpdk-dev] [PATCH v3] cmdline: avoid name clash with Windows system types
  2020-10-30  1:01   ` [dpdk-dev] [PATCH v3] " Dmitry Kozlyuk
@ 2020-10-30 21:20     ` Ranjit Menon
  2020-10-31  0:00     ` Jie Zhou
  2020-11-05 13:31     ` Olivier Matz
  2 siblings, 0 replies; 13+ messages in thread
From: Ranjit Menon @ 2020-10-30 21:20 UTC (permalink / raw)
  To: Dmitry Kozlyuk, dev
  Cc: Jie Zhou, Olivier Matz, Wenzhuo Lu, Beilei Xing,
	Bernard Iremonger, Ori Kam, Radu Nicolau, Akhil Goyal,
	Cristian Dumitrescu, Jasvinder Singh, Maxime Coquelin,
	Chenbo Xia, David Hunt

On 10/29/2020 6:01 PM, Dmitry Kozlyuk wrote:
> cmdline_numtype member names clash with Windows system identifiers.
> Add RTE_ prefix to cmdline constants to avoid this and possible
> future conflicts.
>
> Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> ---
>
> v3: change prefix from CMDLINE_ to RTE_ (Bruce Richardson)
>
>   app/test-cmdline/commands.c                   |   2 +-
>   app/test-pmd/bpf_cmd.c                        |   8 +-
>   app/test-pmd/cmdline.c                        | 705 +++++++++---------
>   app/test-pmd/cmdline_flow.c                   |   2 +-
>   app/test-pmd/cmdline_mtr.c                    |  89 +--
>   app/test-pmd/cmdline_tm.c                     | 196 ++---
>   app/test/test_cmdline_num.c                   |  48 +-
>   examples/ethtool/ethtool-app/ethapp.c         |  19 +-
>   examples/ipsec-secgw/parser.c                 |   2 +-
>   examples/qos_sched/cmdline.c                  |  46 +-
>   examples/vdpa/main.c                          |   2 +-
>   .../guest_cli/vm_power_cli_guest.c            |   2 +-
>   examples/vm_power_manager/vm_power_cli.c      |   8 +-
>   lib/librte_cmdline/cmdline_parse_num.c        |  65 +-
>   lib/librte_cmdline/cmdline_parse_num.h        |  16 +-
>   15 files changed, 618 insertions(+), 592 deletions(-)
>
Acked-by: Ranjit Menon <ranjit.menon@intel.com>

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [dpdk-dev] [PATCH v3] cmdline: avoid name clash with Windows system types
  2020-10-30  1:01   ` [dpdk-dev] [PATCH v3] " Dmitry Kozlyuk
  2020-10-30 21:20     ` Ranjit Menon
@ 2020-10-31  0:00     ` Jie Zhou
  2020-11-05 13:31     ` Olivier Matz
  2 siblings, 0 replies; 13+ messages in thread
From: Jie Zhou @ 2020-10-31  0:00 UTC (permalink / raw)
  To: Dmitry Kozlyuk
  Cc: dev, Jie Zhou, Ranjit Menon, Olivier Matz, Wenzhuo Lu,
	Beilei Xing, Bernard Iremonger, Ori Kam, Radu Nicolau,
	Akhil Goyal, Cristian Dumitrescu, Jasvinder Singh,
	Maxime Coquelin, Chenbo Xia, David Hunt

On Fri, Oct 30, 2020 at 04:01:26AM +0300, Dmitry Kozlyuk wrote:
> cmdline_numtype member names clash with Windows system identifiers.
> Add RTE_ prefix to cmdline constants to avoid this and possible
> future conflicts.
> 
> Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> ---
> 
> v3: change prefix from CMDLINE_ to RTE_ (Bruce Richardson)
> 
>  app/test-cmdline/commands.c                   |   2 +-
>  app/test-pmd/bpf_cmd.c                        |   8 +-
>  app/test-pmd/cmdline.c                        | 705 +++++++++---------
>  app/test-pmd/cmdline_flow.c                   |   2 +-
>  app/test-pmd/cmdline_mtr.c                    |  89 +--
>  app/test-pmd/cmdline_tm.c                     | 196 ++---
>  app/test/test_cmdline_num.c                   |  48 +-
>  examples/ethtool/ethtool-app/ethapp.c         |  19 +-
>  examples/ipsec-secgw/parser.c                 |   2 +-
>  examples/qos_sched/cmdline.c                  |  46 +-
>  examples/vdpa/main.c                          |   2 +-
>  .../guest_cli/vm_power_cli_guest.c            |   2 +-
>  examples/vm_power_manager/vm_power_cli.c      |   8 +-
>  lib/librte_cmdline/cmdline_parse_num.c        |  65 +-
>  lib/librte_cmdline/cmdline_parse_num.h        |  16 +-
>  15 files changed, 618 insertions(+), 592 deletions(-)

Acked-by: Jie Zhou <jizh@microsoft.com>
Tested-by: Jie Zhou <jizh@microsoft.com> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [dpdk-dev] [PATCH v3] cmdline: avoid name clash with Windows system types
  2020-10-30  1:01   ` [dpdk-dev] [PATCH v3] " Dmitry Kozlyuk
  2020-10-30 21:20     ` Ranjit Menon
  2020-10-31  0:00     ` Jie Zhou
@ 2020-11-05 13:31     ` Olivier Matz
  2020-11-05 16:50       ` Thomas Monjalon
  2 siblings, 1 reply; 13+ messages in thread
From: Olivier Matz @ 2020-11-05 13:31 UTC (permalink / raw)
  To: Dmitry Kozlyuk
  Cc: dev, Jie Zhou, Ranjit Menon, Wenzhuo Lu, Beilei Xing,
	Bernard Iremonger, Ori Kam, Radu Nicolau, Akhil Goyal,
	Cristian Dumitrescu, Jasvinder Singh, Maxime Coquelin,
	Chenbo Xia, David Hunt

On Fri, Oct 30, 2020 at 04:01:26AM +0300, Dmitry Kozlyuk wrote:
> cmdline_numtype member names clash with Windows system identifiers.
> Add RTE_ prefix to cmdline constants to avoid this and possible
> future conflicts.
> 
> Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>

Acked-by: Olivier Matz <olivier.matz@6wind.com>

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [dpdk-dev] [PATCH v3] cmdline: avoid name clash with Windows system types
  2020-11-05 13:31     ` Olivier Matz
@ 2020-11-05 16:50       ` Thomas Monjalon
  0 siblings, 0 replies; 13+ messages in thread
From: Thomas Monjalon @ 2020-11-05 16:50 UTC (permalink / raw)
  To: Dmitry Kozlyuk
  Cc: dev, Jie Zhou, Ranjit Menon, Wenzhuo Lu, Beilei Xing,
	Bernard Iremonger, Ori Kam, Radu Nicolau, Akhil Goyal,
	Cristian Dumitrescu, Jasvinder Singh, Maxime Coquelin,
	Chenbo Xia, David Hunt, Olivier Matz

05/11/2020 14:31, Olivier Matz:
> On Fri, Oct 30, 2020 at 04:01:26AM +0300, Dmitry Kozlyuk wrote:
> > cmdline_numtype member names clash with Windows system identifiers.
> > Add RTE_ prefix to cmdline constants to avoid this and possible
> > future conflicts.
> > 
> > Suggested-by: Ranjit Menon <ranjit.menon@intel.com>
> > Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> 
> Acked-by: Olivier Matz <olivier.matz@6wind.com>

Applied, thanks



^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2020-11-05 16:50 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-21 18:48 [dpdk-dev] [PATCH] cmdline: avoid name clash with Windows system types Dmitry Kozlyuk
2020-08-21 20:58 ` Jie Zhou
2020-08-22  0:43 ` Ranjit Menon
2020-09-02 18:38 ` [dpdk-dev] [PATCH v2] " Dmitry Kozlyuk
2020-09-03  9:20   ` Bruce Richardson
2020-09-03  9:30     ` Dmitry Kozlyuk
2020-09-03  9:40       ` Bruce Richardson
2020-09-17 14:15         ` Olivier Matz
2020-10-30  1:01   ` [dpdk-dev] [PATCH v3] " Dmitry Kozlyuk
2020-10-30 21:20     ` Ranjit Menon
2020-10-31  0:00     ` Jie Zhou
2020-11-05 13:31     ` Olivier Matz
2020-11-05 16:50       ` Thomas Monjalon

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git