net/ice: clean input set macro definition

[dpdk.git] / app / test-pmd / cmdline_mtr.c

diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c
index ee16244..3982787 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,
@@ -312,7 +312,7 @@ static void cmd_show_port_meter_cap_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_show_port_meter_cap = {
        .f = cmd_show_port_meter_cap_parsed,
        .data = NULL,
-       .help_str = "Show port meter cap",
+       .help_str = "show port meter cap <port_id>",
        .tokens = {
                (void *)&cmd_show_port_meter_cap_show,
                (void *)&cmd_show_port_meter_cap_port,
@@ -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,
@@ -408,7 +408,7 @@ static void cmd_add_port_meter_profile_srtcm_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_add_port_meter_profile_srtcm = {
        .f = cmd_add_port_meter_profile_srtcm_parsed,
        .data = NULL,
-       .help_str = "Add port meter profile srtcm (rfc2697)",
+       .help_str = "add port meter profile srtcm_rfc2697 <port_id> <profile_id> <cir> <cbs> <ebs>",
        .tokens = {
                (void *)&cmd_add_port_meter_profile_srtcm_add,
                (void *)&cmd_add_port_meter_profile_srtcm_port,
@@ -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,
@@ -515,7 +515,7 @@ static void cmd_add_port_meter_profile_trtcm_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm = {
        .f = cmd_add_port_meter_profile_trtcm_parsed,
        .data = NULL,
-       .help_str = "Add port meter profile trtcm (rfc2698)",
+       .help_str = "add port meter profile trtcm_rfc2698 <port_id> <profile_id> <cir> <pir> <cbs> <pbs>",
        .tokens = {
                (void *)&cmd_add_port_meter_profile_trtcm_add,
                (void *)&cmd_add_port_meter_profile_trtcm_port,
@@ -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,
@@ -627,7 +627,7 @@ static void cmd_add_port_meter_profile_trtcm_rfc4115_parsed(
 cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm_rfc4115 = {
        .f = cmd_add_port_meter_profile_trtcm_rfc4115_parsed,
        .data = NULL,
-       .help_str = "Add port meter profile trtcm (rfc4115)",
+       .help_str = "add port meter profile trtcm_rfc4115 <port_id> <profile_id> <cir> <eir> <cbs> <ebs>",
        .tokens = {
                (void *)&cmd_add_port_meter_profile_trtcm_rfc4115_add,
                (void *)&cmd_add_port_meter_profile_trtcm_rfc4115_port,
@@ -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,
@@ -702,7 +702,7 @@ static void cmd_del_port_meter_profile_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_del_port_meter_profile = {
        .f = cmd_del_port_meter_profile_parsed,
        .data = NULL,
-       .help_str = "Delete port meter profile",
+       .help_str = "del port meter profile <port_id> <profile_id>",
        .tokens = {
                (void *)&cmd_del_port_meter_profile_del,
                (void *)&cmd_del_port_meter_profile_port,
@@ -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);
@@ -827,7 +827,10 @@ static void cmd_create_port_meter_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_create_port_meter = {
        .f = cmd_create_port_meter_parsed,
        .data = NULL,
-       .help_str = "Create port meter",
+       .help_str = "create port meter <port_id> <mtr_id> <profile_id> <meter_enable>(yes|no) "
+               "<g_action>(R|Y|G|D) <y_action>(R|Y|G|D) <r_action>(R|Y|G|D) "
+               "<stats_mask> <shared> <use_pre_meter_color> "
+               "[<dscp_tbl_entry0> <dscp_tbl_entry1> ...<dscp_tbl_entry63>]",
        .tokens = {
                (void *)&cmd_create_port_meter_create,
                (void *)&cmd_create_port_meter_port,
@@ -866,10 +869,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,
@@ -896,7 +899,7 @@ static void cmd_enable_port_meter_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_enable_port_meter = {
        .f = cmd_enable_port_meter_parsed,
        .data = NULL,
-       .help_str = "Enable port meter",
+       .help_str = "enable port meter <port_id> <mtr_id>",
        .tokens = {
                (void *)&cmd_enable_port_meter_enable,
                (void *)&cmd_enable_port_meter_port,
@@ -927,10 +930,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,
@@ -957,7 +960,7 @@ static void cmd_disable_port_meter_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_disable_port_meter = {
        .f = cmd_disable_port_meter_parsed,
        .data = NULL,
-       .help_str = "Disable port meter",
+       .help_str = "disable port meter <port_id> <mtr_id>",
        .tokens = {
                (void *)&cmd_disable_port_meter_disable,
                (void *)&cmd_disable_port_meter_port,
@@ -988,10 +991,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,
@@ -1018,7 +1021,7 @@ static void cmd_del_port_meter_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_del_port_meter = {
        .f = cmd_del_port_meter_parsed,
        .data = NULL,
-       .help_str = "Delete port meter",
+       .help_str = "del port meter <port_id> <mtr_id>",
        .tokens = {
                (void *)&cmd_del_port_meter_del,
                (void *)&cmd_del_port_meter_port,
@@ -1054,13 +1057,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,
@@ -1089,7 +1095,7 @@ static void cmd_set_port_meter_profile_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_set_port_meter_profile = {
        .f = cmd_set_port_meter_profile_parsed,
        .data = NULL,
-       .help_str = "Set port meter profile",
+       .help_str = "set port meter profile <port_id> <mtr_id> <profile_id>",
        .tokens = {
                (void *)&cmd_set_port_meter_profile_set,
                (void *)&cmd_set_port_meter_profile_port,
@@ -1163,7 +1169,8 @@ free_table:
 cmdline_parse_inst_t cmd_set_port_meter_dscp_table = {
        .f = cmd_set_port_meter_dscp_table_parsed,
        .data = NULL,
-       .help_str = "Update port meter dscp table",
+       .help_str = "set port meter dscp table <port_id> <mtr_id> "
+               "[<dscp_tbl_entry0> <dscp_tbl_entry1> ... <dscp_tbl_entry63>]",
        .tokens = {
                (void *)&cmd_set_port_meter_dscp_table_set,
                (void *)&cmd_set_port_meter_dscp_table_port,
@@ -1208,15 +1215,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,
@@ -1273,7 +1280,8 @@ static void cmd_set_port_meter_policer_action_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_set_port_meter_policer_action = {
        .f = cmd_set_port_meter_policer_action_parsed,
        .data = NULL,
-       .help_str = "Set port meter policer action",
+       .help_str = "set port meter policer action <port_id> <mtr_id> "
+               "<action_mask> <action0> [<action1> <action2>]",
        .tokens = {
                (void *)&cmd_set_port_meter_policer_action_set,
                (void *)&cmd_set_port_meter_policer_action_port,
@@ -1317,14 +1325,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,
@@ -1350,7 +1360,7 @@ static void cmd_set_port_meter_stats_mask_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_set_port_meter_stats_mask = {
        .f = cmd_set_port_meter_stats_mask_parsed,
        .data = NULL,
-       .help_str = "Set port meter stats mask",
+       .help_str = "set port meter stats mask <port_id> <mtr_id> <stats_mask>",
        .tokens = {
                (void *)&cmd_set_port_meter_stats_mask_set,
                (void *)&cmd_set_port_meter_stats_mask_port,
@@ -1389,10 +1399,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");
@@ -1454,7 +1464,7 @@ static void cmd_show_port_meter_stats_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_show_port_meter_stats = {
        .f = cmd_show_port_meter_stats_parsed,
        .data = NULL,
-       .help_str = "Show port meter stats",
+       .help_str = "show port meter stats <port_id> <mtr_id> <clear>(yes|no)",
        .tokens = {
                (void *)&cmd_show_port_meter_stats_show,
                (void *)&cmd_show_port_meter_stats_port,