cmdline: avoid name clash with Windows system types

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: Ranjit Menon <ranjit.menon@intel.com>
Acked-by: Jie Zhou <jizh@microsoft.com>
Tested-by: Jie Zhou <jizh@microsoft.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>

diff --git a/app/test-cmdline/commands.c b/app/test-cmdline/commands.c
index ff7ac97..d732976 100644 (file)
--- 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 0a1a178..066619e 100644 (file)
--- 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 84db81c..5e2881e 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1267,7 +1267,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,
@@ -1405,7 +1405,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,
@@ -1629,7 +1629,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");
@@ -1701,7 +1701,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,
@@ -1755,13 +1755,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,
@@ -1846,7 +1846,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,
@@ -1928,7 +1928,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,
@@ -2000,7 +2000,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,
@@ -2049,9 +2049,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,
@@ -2392,7 +2394,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");
@@ -2496,19 +2499,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,
@@ -2597,11 +2600,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");
@@ -2677,13 +2680,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");
@@ -2719,11 +2722,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");
 
@@ -2932,7 +2935,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 =
@@ -3043,13 +3046,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);
@@ -3094,7 +3097,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");
@@ -3198,7 +3202,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 =
@@ -3206,7 +3210,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 =
@@ -3305,7 +3309,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,
@@ -3374,7 +3378,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,
@@ -3438,7 +3442,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,
@@ -3644,7 +3648,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,
@@ -3690,7 +3694,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,
@@ -3738,7 +3742,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,
@@ -4010,7 +4014,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,
@@ -4174,10 +4178,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,
@@ -4224,10 +4228,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,
@@ -4280,10 +4284,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,
@@ -4337,13 +4341,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,
@@ -4395,10 +4399,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");
@@ -4453,7 +4457,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,
@@ -4659,7 +4663,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,
@@ -4730,7 +4734,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,
@@ -4818,10 +4822,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,
@@ -4967,10 +4971,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,
@@ -5034,7 +5038,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");
@@ -5084,7 +5088,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");
@@ -5134,7 +5138,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,
@@ -5184,7 +5188,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,
@@ -5243,7 +5247,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,
@@ -5301,7 +5305,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,
@@ -5444,7 +5448,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,
@@ -5550,7 +5554,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,
@@ -5716,7 +5720,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,
@@ -5765,10 +5769,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,
@@ -5842,7 +5846,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");
@@ -5910,7 +5914,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");
@@ -6058,7 +6062,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,
@@ -6111,10 +6115,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,
@@ -6169,10 +6173,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,
@@ -6227,10 +6231,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,
@@ -6309,10 +6313,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,
@@ -6365,7 +6369,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);
 
@@ -6418,10 +6422,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,
@@ -6480,7 +6484,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(
@@ -6668,11 +6672,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,
@@ -6730,7 +6736,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");
@@ -6804,7 +6810,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");
@@ -6882,25 +6888,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");
@@ -6915,7 +6921,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
@@ -7211,19 +7217,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,
@@ -7361,7 +7367,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,
@@ -7392,7 +7398,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,
@@ -7431,7 +7438,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,
@@ -7628,7 +7636,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,
@@ -7718,7 +7726,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");
 
@@ -7764,9 +7773,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,
@@ -7847,9 +7858,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,
@@ -7892,16 +7903,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,
@@ -7943,11 +7954,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,
@@ -7986,11 +8000,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,
@@ -8035,19 +8049,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,
@@ -8093,13 +8107,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,
@@ -8145,11 +8163,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,
@@ -8227,7 +8248,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);
 
@@ -8273,7 +8294,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);
 
@@ -8322,13 +8344,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,
@@ -8508,7 +8530,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");
@@ -8569,7 +8591,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");
@@ -8626,13 +8648,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");
@@ -8714,13 +8736,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");
@@ -8797,13 +8819,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);
@@ -8888,19 +8910,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,
@@ -8955,19 +8977,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,
@@ -9025,25 +9047,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,
@@ -9106,10 +9128,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,
@@ -9179,7 +9201,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,
@@ -9192,7 +9214,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,
@@ -9232,13 +9254,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"
@@ -9251,7 +9273,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");
@@ -9347,13 +9369,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");
@@ -9362,7 +9384,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");
@@ -9433,13 +9455,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,
@@ -9686,7 +9708,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");
@@ -9695,19 +9717,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,
@@ -9786,7 +9808,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");
@@ -9795,13 +9817,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,
@@ -9877,7 +9899,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");
@@ -9886,13 +9908,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,
@@ -9970,7 +9992,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");
@@ -10051,7 +10073,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");
@@ -10213,7 +10235,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");
@@ -10231,13 +10253,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,
@@ -10360,13 +10382,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");
@@ -10378,7 +10400,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");
@@ -10390,7 +10412,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,
@@ -10409,19 +10431,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,
@@ -10576,7 +10598,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");
@@ -10635,7 +10657,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);
 
@@ -10686,11 +10709,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,
@@ -10792,11 +10815,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,
@@ -10898,11 +10921,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,
@@ -11004,15 +11027,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(
@@ -11102,7 +11125,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,
@@ -11202,7 +11225,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,
@@ -11294,11 +11317,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,
@@ -11388,11 +11411,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);
@@ -11489,7 +11512,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,
@@ -11604,7 +11627,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,
@@ -11699,7 +11722,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,
@@ -11707,7 +11730,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(
@@ -11791,19 +11814,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,
@@ -11911,11 +11934,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,
@@ -12001,11 +12024,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,
@@ -12091,11 +12114,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,
@@ -12185,11 +12208,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,
@@ -12295,19 +12318,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,
@@ -12315,7 +12338,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
@@ -12626,27 +12649,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");
@@ -12661,7 +12684,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");
@@ -12846,7 +12869,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");
@@ -12861,7 +12884,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");
@@ -12992,7 +13015,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");
@@ -13152,7 +13175,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");
@@ -13168,7 +13191,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");
@@ -13376,19 +13399,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");
@@ -13404,7 +13427,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");
@@ -13647,7 +13670,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);
 
@@ -13727,7 +13751,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);
 
@@ -14034,7 +14058,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(
@@ -14185,13 +14210,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,
@@ -14204,7 +14229,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,
@@ -14286,13 +14311,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,
@@ -14349,11 +14374,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(
@@ -14458,11 +14483,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(
@@ -14542,7 +14567,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,
@@ -14624,7 +14649,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,
@@ -14728,7 +14753,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,
@@ -14748,7 +14773,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(
@@ -14842,11 +14867,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(
@@ -14939,19 +14964,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(
@@ -15033,7 +15058,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(
@@ -15106,15 +15131,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(
@@ -15225,7 +15250,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,
@@ -15322,7 +15347,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,
@@ -15404,7 +15429,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,
@@ -15527,7 +15552,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,
@@ -15535,7 +15560,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,
@@ -15636,7 +15661,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,
@@ -15733,7 +15758,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,
@@ -15815,7 +15840,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,
@@ -15944,7 +15969,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,
@@ -15952,7 +15977,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,
@@ -16070,13 +16095,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,
@@ -16149,7 +16174,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");
@@ -16208,7 +16233,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");
@@ -16273,7 +16298,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");
@@ -16355,7 +16380,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");
@@ -16394,7 +16419,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,
@@ -16468,7 +16493,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,
@@ -16616,19 +16641,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");
@@ -16671,7 +16696,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,
@@ -16679,7 +16704,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(
@@ -16764,7 +16789,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 3492cb5..457f740 100644 (file)
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -7838,7 +7838,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 ee16244..399ee56 100644 (file)
--- 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 af99880..9978226 100644 (file)
--- 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 a6ad955..ec479cd 100644 (file)
--- 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 b6b9671..e6c93e1 100644 (file)
--- 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 9069129..98dff93 100644 (file)
--- 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 1cf7ea9..257b87a 100644 (file)
--- 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 2345f98..97e967b 100644 (file)
--- 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 f9b4718..cf1636e 100644 (file)
--- 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 7edeacc..ed0623a 100644 (file)
--- 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 478f181..b37dd94 100644 (file)
--- 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 58b28ca..02133bb 100644 (file)
--- 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 {