From patchwork Thu Oct 24 18:09:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 61934 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0FFE81EC02; Thu, 24 Oct 2019 20:09:43 +0200 (CEST) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by dpdk.org (Postfix) with ESMTP id 4E6071EB8A for ; Thu, 24 Oct 2019 20:09:40 +0200 (CEST) Received: by mail-pl1-f175.google.com with SMTP id k7so12261078pll.1 for ; Thu, 24 Oct 2019 11:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EQY2vyYxfZ1K2+MBaPI0FwGXEU0BW9rhGy1J25iKQCc=; b=qBnfFFFY+hECevZdugD1BaqZ+47MmhqpPEIIOWs7fvxEVo06sc5/NUOy5vzjt1LBcQ plR5tS1+wjxWWrMmCrbokX77fGQyoBVriV5xNUhXXaaP6p7JEL65YqY25ugMeFICAOBG Us4aZrp/tvr6MQnV5El6ogIcKEYbn2NTwPC9Dq5e5NFyAuuH88XjeV9vDVPrNxIhERoY gizPd1LMEyTon9SaCa4dMZ/TX40TPEpje6HyO8VnFz4zfEkbUbcdcmJcWK+8ltg5J/p7 bB4yfw5wVv785pnrC5adxVMhEqbemxjC4rFlzO6QUKNFYQi2f4hovbr05DqBb/G4SNUT mCwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EQY2vyYxfZ1K2+MBaPI0FwGXEU0BW9rhGy1J25iKQCc=; b=fiyrsF7Eso3hr6QHpWRHdVVS8ri43KuTsQ8MtjbibXaHRpE4MV6OdwC8R9Ks+/8iNH dKnwLmx9PXQM6oJFxAarWN78lzbP6cF9OfwgP0Ldx6eIuzvVGyfn+5b+ieZvdbQx0/Cv HlHBLTtlG7EZj3tOWb7j0IiK05q0FUMAvSFIhHISW4IP/2SyhfH4HmMhQ3AThQkPDmqH a691y2BKvfyeZedvJ66maB5V7RtrifIElymrgXZoZcqhzqwvMXT0vkoIfBRFWMS9Gbmi //Guzw1LZafxUsMVl+GO378ONLLEWSAJfrA+XZLsvThjc6/8vJKTIGcFbrOb/btqphQF vbeQ== X-Gm-Message-State: APjAAAXraef+0tHyNAsDz0bVjvP2ucipy3NF7V7L7ZE5QE8y8lB3QVUN dVJossY7EriGnQTudWkek11DYxVoLF+Kvg== X-Google-Smtp-Source: APXvYqwaxxGy72zUUX0GHaQ1TxEbFnkrFEOdwfQBF9wYCJvjv0fFku/eX2fKOE8CWjtiMHRc217W6A== X-Received: by 2002:a17:902:ac85:: with SMTP id h5mr17738730plr.44.1571940576699; Thu, 24 Oct 2019 11:09:36 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id k23sm26115929pgi.49.2019.10.24.11.09.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 11:09:35 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 24 Oct 2019 11:09:26 -0700 Message-Id: <20191024180926.8304-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] cmdline: prefix cmdline numeric enum X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The values in an enum are really global names and not specific to the enum in question. This can lead to namespace conflicts in applications if a common value is visible. The DPDK cmdline API has an enum for numeric type values with names line UINT32 which could be used or defined in a user application. Change these to be prefixed with the enum name like other places in DPDK. Lots of lines changed with no change in actual code generated. Signed-off-by: Stephen Hemminger --- app/test-cmdline/commands.c | 2 +- app/test-pmd/bpf_cmd.c | 8 +- app/test-pmd/cmdline.c | 656 +++++++++--------- app/test-pmd/cmdline_mtr.c | 84 +-- app/test-pmd/cmdline_tm.c | 172 ++--- app/test/test_cmdline_num.c | 48 +- doc/guides/rel_notes/release_19_11.rst | 3 + examples/ethtool/ethtool-app/ethapp.c | 18 +- examples/ipsec-secgw/parser.c | 2 +- examples/qos_sched/cmdline.c | 46 +- examples/quota_watermark/qwctl/commands.c | 2 +- .../guest_cli/vm_power_cli_guest.c | 2 +- examples/vm_power_manager/vm_power_cli.c | 8 +- lib/librte_cmdline/cmdline_parse_num.c | 40 +- lib/librte_cmdline/cmdline_parse_num.h | 16 +- 15 files changed, 555 insertions(+), 552 deletions(-) diff --git a/app/test-cmdline/commands.c b/app/test-cmdline/commands.c index d81da9665aff..a3d8143d372b 100644 --- a/app/test-cmdline/commands.c +++ b/app/test-cmdline/commands.c @@ -191,7 +191,7 @@ cmd_num_parsed(void *parsed_result, } cmdline_parse_token_num_t cmd_num_tok = - TOKEN_NUM_INITIALIZER(struct cmd_num_result, num, UINT32); + TOKEN_NUM_INITIALIZER(struct cmd_num_result, num, CMDLINE_UINT32); cmdline_parse_inst_t cmd_num = { .f = cmd_num_parsed, /* function to call */ diff --git a/app/test-pmd/bpf_cmd.c b/app/test-pmd/bpf_cmd.c index 830bfc13a520..465d5c46f0cb 100644 --- a/app/test-pmd/bpf_cmd.c +++ b/app/test-pmd/bpf_cmd.c @@ -124,9 +124,9 @@ cmdline_parse_token_string_t cmd_load_bpf_dir = TOKEN_STRING_INITIALIZER(struct cmd_bpf_ld_result, dir, "rx#tx"); cmdline_parse_token_num_t cmd_load_bpf_port = - TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, port, UINT8); + TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, port, CMDLINE_UINT8); cmdline_parse_token_num_t cmd_load_bpf_queue = - TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, queue, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, queue, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_load_bpf_flags = TOKEN_STRING_INITIALIZER(struct cmd_bpf_ld_result, flags, NULL); @@ -180,9 +180,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, CMDLINE_UINT8); cmdline_parse_token_num_t cmd_unload_bpf_queue = - TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, queue, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, queue, CMDLINE_UINT16); cmdline_parse_inst_t cmd_operate_bpf_unld_parse = { .f = cmd_operate_bpf_unld_parsed, diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 1bd977f91d87..bda239fc9497 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1362,7 +1362,7 @@ cmdline_parse_token_string_t cmd_operate_specific_port_port = name, "start#stop#close#reset"); cmdline_parse_token_num_t cmd_operate_specific_port_id = TOKEN_NUM_INITIALIZER(struct cmd_operate_specific_port_result, - value, UINT8); + value, CMDLINE_UINT8); cmdline_parse_inst_t cmd_operate_specific_port = { .f = cmd_operate_specific_port_parsed, @@ -1498,7 +1498,7 @@ cmdline_parse_token_string_t cmd_operate_detach_port_keyword = keyword, "detach"); cmdline_parse_token_num_t cmd_operate_detach_port_port_id = TOKEN_NUM_INITIALIZER(struct cmd_operate_detach_port_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_operate_detach_port = { .f = cmd_operate_detach_port_parsed, @@ -1720,7 +1720,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, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_speed_specific_item1 = TOKEN_STRING_INITIALIZER(struct cmd_config_speed_specific, item1, "speed"); @@ -1792,7 +1792,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, CMDLINE_UINT32); cmdline_parse_inst_t cmd_config_loopback_all = { .f = cmd_config_loopback_all_parsed, @@ -1846,13 +1846,13 @@ cmdline_parse_token_string_t cmd_config_loopback_specific_keyword = "config"); cmdline_parse_token_num_t cmd_config_loopback_specific_id = TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_specific, port_id, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_loopback_specific_item = TOKEN_STRING_INITIALIZER(struct cmd_config_loopback_specific, item, "loopback"); cmdline_parse_token_num_t cmd_config_loopback_specific_mode = TOKEN_NUM_INITIALIZER(struct cmd_config_loopback_specific, mode, - UINT32); + CMDLINE_UINT32); cmdline_parse_inst_t cmd_config_loopback_specific = { .f = cmd_config_loopback_specific_parsed, @@ -1942,7 +1942,7 @@ cmdline_parse_token_string_t cmd_config_rx_tx_name = TOKEN_STRING_INITIALIZER(struct cmd_config_rx_tx, name, "rxq#txq#rxd#txd"); cmdline_parse_token_num_t cmd_config_rx_tx_value = - TOKEN_NUM_INITIALIZER(struct cmd_config_rx_tx, value, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_config_rx_tx, value, CMDLINE_UINT16); cmdline_parse_inst_t cmd_config_rx_tx = { .f = cmd_config_rx_tx_parsed, @@ -2024,7 +2024,7 @@ cmdline_parse_token_string_t cmd_config_max_pkt_len_name = "max-pkt-len"); cmdline_parse_token_num_t cmd_config_max_pkt_len_value = TOKEN_NUM_INITIALIZER(struct cmd_config_max_pkt_len_result, value, - UINT32); + CMDLINE_UINT32); cmdline_parse_inst_t cmd_config_max_pkt_len = { .f = cmd_config_max_pkt_len_parsed, @@ -2073,9 +2073,9 @@ cmdline_parse_token_string_t cmd_config_mtu_mtu = TOKEN_STRING_INITIALIZER(struct cmd_config_mtu_result, keyword, "mtu"); cmdline_parse_token_num_t cmd_config_mtu_port_id = - TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_config_mtu_value = - TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_config_mtu_result, value, CMDLINE_UINT16); cmdline_parse_inst_t cmd_config_mtu = { .f = cmd_config_mtu_parsed, @@ -2362,7 +2362,7 @@ cmdline_parse_token_string_t cmd_config_rss_hash_key_config = TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, config, "config"); cmdline_parse_token_num_t cmd_config_rss_hash_key_port_id = - TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_hash_key = TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, rss_hash_key, "rss-hash-key"); @@ -2460,19 +2460,19 @@ cmdline_parse_token_string_t cmd_config_rxtx_ring_size_config = config, "config"); cmdline_parse_token_num_t cmd_config_rxtx_ring_size_portid = TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size, - portid, UINT16); + portid, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rxtxq = TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size, rxtxq, "rxq#txq"); cmdline_parse_token_num_t cmd_config_rxtx_ring_size_qid = TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size, - qid, UINT16); + qid, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_rxtx_ring_size_rsize = TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_ring_size, rsize, "ring_size"); cmdline_parse_token_num_t cmd_config_rxtx_ring_size_size = TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_ring_size, - size, UINT16); + size, CMDLINE_UINT16); cmdline_parse_inst_t cmd_config_rxtx_ring_size = { .f = cmd_config_rxtx_ring_size_parsed, @@ -2561,11 +2561,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, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_rxtx_queue_rxtxq = TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, rxtxq, "rxq#txq"); cmdline_parse_token_num_t cmd_config_rxtx_queue_qid = - TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_config_rxtx_queue, qid, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_rxtx_queue_opname = TOKEN_STRING_INITIALIZER(struct cmd_config_rxtx_queue, opname, "start#stop"); @@ -2641,13 +2641,13 @@ cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_port = port, "port"); cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_port_id = TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_rxtxq = TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue, rxtxq, "rxq#txq"); cmdline_parse_token_num_t cmd_config_deferred_start_rxtx_queue_qid = TOKEN_NUM_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue, - qid, UINT16); + qid, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_deferred_start_rxtx_queue_opname = TOKEN_STRING_INITIALIZER(struct cmd_config_deferred_start_rxtx_queue, opname, "deferred_start"); @@ -2683,11 +2683,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, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_setup_rxtx_queue_rxtxq = TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, rxtxq, "rxq#txq"); cmdline_parse_token_num_t cmd_setup_rxtx_queue_qid = - TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, qid, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_setup_rxtx_queue, qid, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_setup_rxtx_queue_setup = TOKEN_STRING_INITIALIZER(struct cmd_setup_rxtx_queue, setup, "setup"); @@ -2896,7 +2896,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, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_rss_reta_name = TOKEN_STRING_INITIALIZER(struct cmd_config_rss_reta, name, "rss"); cmdline_parse_token_string_t cmd_config_rss_reta_list_name = @@ -3007,13 +3007,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, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_showport_reta_rss = TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, rss, "rss"); cmdline_parse_token_string_t cmd_showport_reta_reta = TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, reta, "reta"); cmdline_parse_token_num_t cmd_showport_reta_size = - TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_showport_reta, size, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_showport_reta_list_of_items = TOKEN_STRING_INITIALIZER(struct cmd_showport_reta, list_of_items, NULL); @@ -3058,7 +3058,7 @@ cmdline_parse_token_string_t cmd_showport_rss_hash_show = cmdline_parse_token_string_t cmd_showport_rss_hash_port = TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, port, "port"); cmdline_parse_token_num_t cmd_showport_rss_hash_port_id = - TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_showport_rss_hash_rss_hash = TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, rss_hash, "rss-hash"); @@ -3162,7 +3162,7 @@ cmdline_parse_token_string_t cmd_config_dcb_port = cmdline_parse_token_string_t cmd_config_dcb_config = TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, config, "config"); cmdline_parse_token_num_t cmd_config_dcb_port_id = - TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_dcb_dcb = TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, dcb, "dcb"); cmdline_parse_token_string_t cmd_config_dcb_vt = @@ -3170,7 +3170,7 @@ cmdline_parse_token_string_t cmd_config_dcb_vt = cmdline_parse_token_string_t cmd_config_dcb_vt_en = TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, vt_en, "on#off"); cmdline_parse_token_num_t cmd_config_dcb_num_tcs = - TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, num_tcs, UINT8); + TOKEN_NUM_INITIALIZER(struct cmd_config_dcb, num_tcs, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_config_dcb_pfc= TOKEN_STRING_INITIALIZER(struct cmd_config_dcb, pfc, "pfc"); cmdline_parse_token_string_t cmd_config_dcb_pfc_en = @@ -3269,7 +3269,7 @@ cmdline_parse_token_string_t cmd_config_burst_all = cmdline_parse_token_string_t cmd_config_burst_name = TOKEN_STRING_INITIALIZER(struct cmd_config_burst, name, "burst"); cmdline_parse_token_num_t cmd_config_burst_value = - TOKEN_NUM_INITIALIZER(struct cmd_config_burst, value, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_config_burst, value, CMDLINE_UINT16); cmdline_parse_inst_t cmd_config_burst = { .f = cmd_config_burst_parsed, @@ -3338,7 +3338,7 @@ cmdline_parse_token_string_t cmd_config_thresh_name = TOKEN_STRING_INITIALIZER(struct cmd_config_thresh, name, "txpt#txht#txwt#rxpt#rxht#rxwt"); cmdline_parse_token_num_t cmd_config_thresh_value = - TOKEN_NUM_INITIALIZER(struct cmd_config_thresh, value, UINT8); + TOKEN_NUM_INITIALIZER(struct cmd_config_thresh, value, CMDLINE_UINT8); cmdline_parse_inst_t cmd_config_thresh = { .f = cmd_config_thresh_parsed, @@ -3402,7 +3402,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, CMDLINE_UINT16); cmdline_parse_inst_t cmd_config_threshold = { .f = cmd_config_threshold_parsed, @@ -3608,7 +3608,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, CMDLINE_UINT64); cmdline_parse_inst_t cmd_set_fwd_mask = { .f = cmd_set_mask_parsed, @@ -3654,7 +3654,7 @@ cmdline_parse_token_string_t cmd_set_what = TOKEN_STRING_INITIALIZER(struct cmd_set_result, what, "nbport#nbcore#burst#verbose"); cmdline_parse_token_num_t cmd_set_value = - TOKEN_NUM_INITIALIZER(struct cmd_set_result, value, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_set_result, value, CMDLINE_UINT16); cmdline_parse_inst_t cmd_set_numbers = { .f = cmd_set_parsed, @@ -3702,7 +3702,7 @@ cmdline_parse_token_string_t cmd_set_log_log = cmdline_parse_token_string_t cmd_set_log_type = TOKEN_STRING_INITIALIZER(struct cmd_set_log_result, type, NULL); cmdline_parse_token_num_t cmd_set_log_level = - TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, UINT32); + TOKEN_NUM_INITIALIZER(struct cmd_set_log_result, level, CMDLINE_UINT32); cmdline_parse_inst_t cmd_set_log = { .f = cmd_set_log_parsed, @@ -3836,7 +3836,7 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_all_all = all, "all"); cmdline_parse_token_num_t cmd_rx_vlan_filter_all_portid = TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_all_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_rx_vlan_filter_all = { .f = cmd_rx_vlan_filter_all_parsed, @@ -3998,10 +3998,10 @@ cmdline_parse_token_string_t cmd_vlan_tpid_what = what, "tpid"); cmdline_parse_token_num_t cmd_vlan_tpid_tpid = TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result, - tp_id, UINT16); + tp_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_vlan_tpid_portid = TOKEN_NUM_INITIALIZER(struct cmd_vlan_tpid_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_vlan_tpid = { .f = cmd_vlan_tpid_parsed, @@ -4048,10 +4048,10 @@ cmdline_parse_token_string_t cmd_rx_vlan_filter_what = what, "add#rm"); cmdline_parse_token_num_t cmd_rx_vlan_filter_vlanid = TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result, - vlan_id, UINT16); + vlan_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_rx_vlan_filter_portid = TOKEN_NUM_INITIALIZER(struct cmd_rx_vlan_filter_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_rx_vlan_filter = { .f = cmd_rx_vlan_filter_parsed, @@ -4101,10 +4101,10 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_set = set, "set"); cmdline_parse_token_num_t cmd_tx_vlan_set_portid = TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_tx_vlan_set_vlanid = TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_result, - vlan_id, UINT16); + vlan_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_tx_vlan_set = { .f = cmd_tx_vlan_set_parsed, @@ -4155,13 +4155,13 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_qinq_set = set, "set"); cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_portid = TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid = TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result, - vlan_id, UINT16); + vlan_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_tx_vlan_set_qinq_vlanid_outer = TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_qinq_result, - vlan_id_outer, UINT16); + vlan_id_outer, CMDLINE_UINT16); cmdline_parse_inst_t cmd_tx_vlan_set_qinq = { .f = cmd_tx_vlan_set_qinq_parsed, @@ -4213,10 +4213,10 @@ cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_pvid = pvid, "pvid"); cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_port_id = TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_tx_vlan_set_pvid_vlan_id = TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_set_pvid_result, - vlan_id, UINT16); + vlan_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_tx_vlan_set_pvid_mode = TOKEN_STRING_INITIALIZER(struct cmd_tx_vlan_set_pvid_result, mode, "on#off"); @@ -4268,7 +4268,7 @@ cmdline_parse_token_string_t cmd_tx_vlan_reset_reset = reset, "reset"); cmdline_parse_token_num_t cmd_tx_vlan_reset_portid = TOKEN_NUM_INITIALIZER(struct cmd_tx_vlan_reset_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_tx_vlan_reset = { .f = cmd_tx_vlan_reset_parsed, @@ -4474,7 +4474,7 @@ cmdline_parse_token_string_t cmd_csum_hwsw = hwsw, "hw#sw"); cmdline_parse_token_num_t cmd_csum_portid = TOKEN_NUM_INITIALIZER(struct cmd_csum_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_csum_set = { .f = cmd_csum_parsed, @@ -4545,7 +4545,7 @@ cmdline_parse_token_string_t cmd_csum_tunnel_onoff = onoff, "on#off"); cmdline_parse_token_num_t cmd_csum_tunnel_portid = TOKEN_NUM_INITIALIZER(struct cmd_csum_tunnel_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_csum_tunnel = { .f = cmd_csum_tunnel_parsed, @@ -4633,10 +4633,10 @@ cmdline_parse_token_string_t cmd_tso_set_mode = mode, "set"); cmdline_parse_token_num_t cmd_tso_set_tso_segsz = TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result, - tso_segsz, UINT16); + tso_segsz, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_tso_set_portid = TOKEN_NUM_INITIALIZER(struct cmd_tso_set_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_tso_set = { .f = cmd_tso_set_parsed, @@ -4782,10 +4782,10 @@ cmdline_parse_token_string_t cmd_tunnel_tso_set_mode = mode, "set"); cmdline_parse_token_num_t cmd_tunnel_tso_set_tso_segsz = TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result, - tso_segsz, UINT16); + tso_segsz, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_tunnel_tso_set_portid = TOKEN_NUM_INITIALIZER(struct cmd_tunnel_tso_set_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_tunnel_tso_set = { .f = cmd_tunnel_tso_set_parsed, @@ -4849,7 +4849,7 @@ cmdline_parse_token_string_t cmd_gro_enable_port = cmd_keyword, "port"); cmdline_parse_token_num_t cmd_gro_enable_pid = TOKEN_NUM_INITIALIZER(struct cmd_gro_enable_result, - cmd_pid, UINT16); + cmd_pid, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_gro_enable_keyword = TOKEN_STRING_INITIALIZER(struct cmd_gro_enable_result, cmd_keyword, "gro"); @@ -4899,7 +4899,7 @@ cmdline_parse_token_string_t cmd_gro_show_port = cmd_port, "port"); cmdline_parse_token_num_t cmd_gro_show_pid = TOKEN_NUM_INITIALIZER(struct cmd_gro_show_result, - cmd_pid, UINT16); + cmd_pid, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_gro_show_keyword = TOKEN_STRING_INITIALIZER(struct cmd_gro_show_result, cmd_keyword, "gro"); @@ -4949,7 +4949,7 @@ cmdline_parse_token_string_t cmd_gro_flush_flush = cmd_flush, "flush"); cmdline_parse_token_num_t cmd_gro_flush_cycles = TOKEN_NUM_INITIALIZER(struct cmd_gro_flush_result, - cmd_cycles, UINT8); + cmd_cycles, CMDLINE_UINT8); cmdline_parse_inst_t cmd_gro_flush = { .f = cmd_gro_flush_parsed, @@ -4999,7 +4999,7 @@ cmdline_parse_token_string_t cmd_gso_enable_mode = cmd_mode, "on#off"); cmdline_parse_token_num_t cmd_gso_enable_pid = TOKEN_NUM_INITIALIZER(struct cmd_gso_enable_result, - cmd_pid, UINT16); + cmd_pid, CMDLINE_UINT16); cmdline_parse_inst_t cmd_gso_enable = { .f = cmd_gso_enable_parsed, @@ -5058,7 +5058,7 @@ cmdline_parse_token_string_t cmd_gso_size_segsz = cmd_segsz, "segsz"); cmdline_parse_token_num_t cmd_gso_size_size = TOKEN_NUM_INITIALIZER(struct cmd_gso_size_result, - cmd_size, UINT16); + cmd_size, CMDLINE_UINT16); cmdline_parse_inst_t cmd_gso_size = { .f = cmd_gso_size_parsed, @@ -5116,7 +5116,7 @@ cmdline_parse_token_string_t cmd_gso_show_keyword = cmd_keyword, "gso"); cmdline_parse_token_num_t cmd_gso_show_pid = TOKEN_NUM_INITIALIZER(struct cmd_gso_show_result, - cmd_pid, UINT16); + cmd_pid, CMDLINE_UINT16); cmdline_parse_inst_t cmd_gso_show = { .f = cmd_gso_show_parsed, @@ -5259,7 +5259,7 @@ cmdline_parse_token_string_t cmd_setbypass_mode_value = value, "normal#bypass#isolate"); cmdline_parse_token_num_t cmd_setbypass_mode_port = TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_mode_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_set_bypass_mode = { .f = cmd_set_bypass_mode_parsed, @@ -5365,7 +5365,7 @@ cmdline_parse_token_string_t cmd_setbypass_event_mode_value = mode_value, "normal#bypass#isolate"); cmdline_parse_token_num_t cmd_setbypass_event_port = TOKEN_NUM_INITIALIZER(struct cmd_set_bypass_event_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_set_bypass_event = { .f = cmd_set_bypass_event_parsed, @@ -5532,7 +5532,7 @@ cmdline_parse_token_string_t cmd_showbypass_config_config = config, "config"); cmdline_parse_token_num_t cmd_showbypass_config_port = TOKEN_NUM_INITIALIZER(struct cmd_show_bypass_config_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_show_bypass_config = { .f = cmd_show_bypass_config_parsed, @@ -5581,10 +5581,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_mode_result, mode, "mode"); cmdline_parse_token_num_t cmd_setbonding_mode_value = TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result, - value, UINT8); + value, CMDLINE_UINT8); cmdline_parse_token_num_t cmd_setbonding_mode_port = TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_mode_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_set_bonding_mode = { .f = cmd_set_bonding_mode_parsed, @@ -5658,7 +5658,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result, dedicated_queues, "dedicated_queues"); cmdline_parse_token_num_t cmd_setbonding_lacp_dedicated_queues_port_id = TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_setbonding_lacp_dedicated_queues_mode = TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_lacp_dedicated_queues_result, mode, "enable#disable"); @@ -5726,7 +5726,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, balance_xmit_policy, "balance_xmit_policy"); cmdline_parse_token_num_t cmd_setbonding_balance_xmit_policy_port = TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_setbonding_balance_xmit_policy_policy = TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_balance_xmit_policy_result, policy, "l2#l23#l34"); @@ -5874,7 +5874,7 @@ TOKEN_STRING_INITIALIZER(struct cmd_show_bonding_config_result, config, "config"); cmdline_parse_token_num_t cmd_showbonding_config_port = TOKEN_NUM_INITIALIZER(struct cmd_show_bonding_config_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_show_bonding_config = { .f = cmd_show_bonding_config_parsed, @@ -5927,10 +5927,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_set_bonding_primary_result, primary, "primary"); cmdline_parse_token_num_t cmd_setbonding_primary_slave = TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result, - slave_id, UINT16); + slave_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_setbonding_primary_port = TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_primary_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_set_bonding_primary = { .f = cmd_set_bonding_primary_parsed, @@ -5985,10 +5985,10 @@ TOKEN_STRING_INITIALIZER(struct cmd_add_bonding_slave_result, slave, "slave"); cmdline_parse_token_num_t cmd_addbonding_slave_slaveid = TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result, - slave_id, UINT16); + slave_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_addbonding_slave_port = TOKEN_NUM_INITIALIZER(struct cmd_add_bonding_slave_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_add_bonding_slave = { .f = cmd_add_bonding_slave_parsed, @@ -6043,10 +6043,10 @@ cmdline_parse_token_string_t cmd_removebonding_slave_slave = slave, "slave"); cmdline_parse_token_num_t cmd_removebonding_slave_slaveid = TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result, - slave_id, UINT16); + slave_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_removebonding_slave_port = TOKEN_NUM_INITIALIZER(struct cmd_remove_bonding_slave_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_remove_bonding_slave = { .f = cmd_remove_bonding_slave_parsed, @@ -6125,10 +6125,10 @@ cmdline_parse_token_string_t cmd_createbonded_device_device = device, "device"); cmdline_parse_token_num_t cmd_createbonded_device_mode = TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result, - mode, UINT8); + mode, CMDLINE_UINT8); cmdline_parse_token_num_t cmd_createbonded_device_socket = TOKEN_NUM_INITIALIZER(struct cmd_create_bonded_device_result, - socket, UINT8); + socket, CMDLINE_UINT8); cmdline_parse_inst_t cmd_create_bonded_device = { .f = cmd_create_bonded_device_parsed, @@ -6181,7 +6181,7 @@ cmdline_parse_token_string_t cmd_set_bond_mac_addr_mac = "mac_addr"); cmdline_parse_token_num_t cmd_set_bond_mac_addr_portnum = TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mac_addr_result, - port_num, UINT16); + port_num, CMDLINE_UINT16); cmdline_parse_token_etheraddr_t cmd_set_bond_mac_addr_addr = TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_bond_mac_addr_result, address); @@ -6234,10 +6234,10 @@ cmdline_parse_token_string_t cmd_set_bond_mon_period_mon_period = mon_period, "mon_period"); cmdline_parse_token_num_t cmd_set_bond_mon_period_portnum = TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result, - port_num, UINT16); + port_num, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_set_bond_mon_period_period_ms = TOKEN_NUM_INITIALIZER(struct cmd_set_bond_mon_period_result, - period_ms, UINT32); + period_ms, CMDLINE_UINT32); cmdline_parse_inst_t cmd_set_bond_mon_period = { .f = cmd_set_bond_mon_period_parsed, @@ -6296,7 +6296,7 @@ cmdline_parse_token_string_t cmd_set_bonding_agg_mode_agg_mode = cmdline_parse_token_num_t cmd_set_bonding_agg_mode_portnum = TOKEN_NUM_INITIALIZER(struct cmd_set_bonding_agg_mode_policy_result, - port_num, UINT16); + port_num, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_bonding_agg_mode_policy_string = TOKEN_STRING_INITIALIZER( @@ -6484,11 +6484,11 @@ cmdline_parse_token_string_t cmd_set_burst_tx_retry_tx = cmdline_parse_token_string_t cmd_set_burst_tx_retry_delay = TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, delay, "delay"); cmdline_parse_token_num_t cmd_set_burst_tx_retry_time = - TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time, UINT32); + TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, time, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_set_burst_tx_retry_retry = TOKEN_STRING_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry, "retry"); cmdline_parse_token_num_t cmd_set_burst_tx_retry_retry_num = - TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num, UINT32); + TOKEN_NUM_INITIALIZER(struct cmd_set_burst_tx_retry_result, retry_num, CMDLINE_UINT32); cmdline_parse_inst_t cmd_set_burst_tx_retry = { .f = cmd_set_burst_tx_retry_parsed, @@ -6546,7 +6546,7 @@ cmdline_parse_token_string_t cmd_setpromisc_portall = "all"); cmdline_parse_token_num_t cmd_setpromisc_portnum = TOKEN_NUM_INITIALIZER(struct cmd_set_promisc_mode_result, port_num, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_setpromisc_mode = TOKEN_STRING_INITIALIZER(struct cmd_set_promisc_mode_result, mode, "on#off"); @@ -6620,7 +6620,7 @@ cmdline_parse_token_string_t cmd_setallmulti_portall = "all"); cmdline_parse_token_num_t cmd_setallmulti_portnum = TOKEN_NUM_INITIALIZER(struct cmd_set_allmulti_mode_result, port_num, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_setallmulti_mode = TOKEN_STRING_INITIALIZER(struct cmd_set_allmulti_mode_result, mode, "on#off"); @@ -6698,25 +6698,25 @@ cmdline_parse_token_string_t cmd_lfc_set_high_water_str = hw_str, "high_water"); cmdline_parse_token_num_t cmd_lfc_set_high_water = TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result, - high_water, UINT32); + high_water, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_lfc_set_low_water_str = TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result, lw_str, "low_water"); cmdline_parse_token_num_t cmd_lfc_set_low_water = TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result, - low_water, UINT32); + low_water, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_lfc_set_pause_time_str = TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result, pt_str, "pause_time"); cmdline_parse_token_num_t cmd_lfc_set_pause_time = TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result, - pause_time, UINT16); + pause_time, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_lfc_set_send_xon_str = TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result, xon_str, "send_xon"); cmdline_parse_token_num_t cmd_lfc_set_send_xon = TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result, - send_xon, UINT16); + send_xon, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_lfc_set_mac_ctrl_frame_fwd_mode = TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_set_result, mac_ctrl_frame_fwd, "mac_ctrl_frame_fwd"); @@ -6731,7 +6731,7 @@ cmdline_parse_token_string_t cmd_lfc_set_autoneg = autoneg, "on#off"); cmdline_parse_token_num_t cmd_lfc_set_portid = TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_set_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); /* forward declaration */ static void @@ -7026,19 +7026,19 @@ cmdline_parse_token_string_t cmd_pfc_set_tx_mode = tx_pfc_mode, "on#off"); cmdline_parse_token_num_t cmd_pfc_set_high_water = TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result, - high_water, UINT32); + high_water, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_pfc_set_low_water = TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result, - low_water, UINT32); + low_water, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_pfc_set_pause_time = TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result, - pause_time, UINT16); + pause_time, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_pfc_set_priority = TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result, - priority, UINT8); + priority, CMDLINE_UINT8); cmdline_parse_token_num_t cmd_pfc_set_portid = TOKEN_NUM_INITIALIZER(struct cmd_priority_flow_ctrl_set_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_priority_flow_control_set = { .f = cmd_priority_flow_ctrl_set_parsed, @@ -7176,7 +7176,7 @@ cmdline_parse_token_string_t cmd_start_tx_first_n_tx_first = tx_first, "tx_first"); cmdline_parse_token_num_t cmd_start_tx_first_n_tx_num = TOKEN_NUM_INITIALIZER(struct cmd_start_tx_first_n_result, - tx_num, UINT32); + tx_num, CMDLINE_UINT32); cmdline_parse_inst_t cmd_start_tx_first_n = { .f = cmd_start_tx_first_n_parsed, @@ -7207,7 +7207,7 @@ cmdline_parse_token_string_t cmd_set_link_up_link_up = cmdline_parse_token_string_t cmd_set_link_up_port = TOKEN_STRING_INITIALIZER(struct cmd_set_link_up_result, port, "port"); cmdline_parse_token_num_t cmd_set_link_up_port_id = - TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_set_link_up_result, port_id, CMDLINE_UINT16); static void cmd_set_link_up_parsed(__attribute__((unused)) void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -7246,7 +7246,7 @@ cmdline_parse_token_string_t cmd_set_link_down_link_down = cmdline_parse_token_string_t cmd_set_link_down_port = TOKEN_STRING_INITIALIZER(struct cmd_set_link_down_result, port, "port"); cmdline_parse_token_num_t cmd_set_link_down_port_id = - TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_set_link_down_result, port_id, CMDLINE_UINT16); static void cmd_set_link_down_parsed( __attribute__((unused)) void *parsed_result, @@ -7433,7 +7433,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, CMDLINE_UINT16); cmdline_parse_inst_t cmd_showport = { .f = cmd_showport_parsed, @@ -7524,9 +7524,9 @@ cmdline_parse_token_string_t cmd_showqueue_type = cmdline_parse_token_string_t cmd_showqueue_what = TOKEN_STRING_INITIALIZER(struct cmd_showqueue_result, what, "info"); cmdline_parse_token_num_t cmd_showqueue_portnum = - TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, portnum, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_showqueue_queuenum = - TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_showqueue_result, queuenum, CMDLINE_UINT16); cmdline_parse_inst_t cmd_showqueue = { .f = cmd_showqueue_parsed, @@ -7607,9 +7607,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, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_read_reg_reg_off = - TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off, UINT32); + TOKEN_NUM_INITIALIZER(struct cmd_read_reg_result, reg_off, CMDLINE_UINT32); cmdline_parse_inst_t cmd_read_reg = { .f = cmd_read_reg_parsed, @@ -7652,16 +7652,16 @@ cmdline_parse_token_string_t cmd_read_reg_bit_field_regfield = regfield, "regfield"); cmdline_parse_token_num_t cmd_read_reg_bit_field_port_id = TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, port_id, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_num_t cmd_read_reg_bit_field_reg_off = TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, reg_off, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_num_t cmd_read_reg_bit_field_bit1_pos = TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, bit1_pos, - UINT8); + CMDLINE_UINT8); cmdline_parse_token_num_t cmd_read_reg_bit_field_bit2_pos = TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_field_result, bit2_pos, - UINT8); + CMDLINE_UINT8); cmdline_parse_inst_t cmd_read_reg_bit_field = { .f = cmd_read_reg_bit_field_parsed, @@ -7703,11 +7703,11 @@ cmdline_parse_token_string_t cmd_read_reg_bit_regbit = TOKEN_STRING_INITIALIZER(struct cmd_read_reg_bit_result, regbit, "regbit"); cmdline_parse_token_num_t cmd_read_reg_bit_port_id = - TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_read_reg_bit_reg_off = - TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off, UINT32); + TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, reg_off, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_read_reg_bit_bit_pos = - TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, bit_pos, UINT8); + TOKEN_NUM_INITIALIZER(struct cmd_read_reg_bit_result, bit_pos, CMDLINE_UINT8); cmdline_parse_inst_t cmd_read_reg_bit = { .f = cmd_read_reg_bit_parsed, @@ -7746,11 +7746,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, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_write_reg_reg_off = - TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off, UINT32); + TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, reg_off, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_write_reg_value = - TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, value, UINT32); + TOKEN_NUM_INITIALIZER(struct cmd_write_reg_result, value, CMDLINE_UINT32); cmdline_parse_inst_t cmd_write_reg = { .f = cmd_write_reg_parsed, @@ -7795,19 +7795,19 @@ cmdline_parse_token_string_t cmd_write_reg_bit_field_regfield = regfield, "regfield"); cmdline_parse_token_num_t cmd_write_reg_bit_field_port_id = TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, port_id, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_num_t cmd_write_reg_bit_field_reg_off = TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, reg_off, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_num_t cmd_write_reg_bit_field_bit1_pos = TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, bit1_pos, - UINT8); + CMDLINE_UINT8); cmdline_parse_token_num_t cmd_write_reg_bit_field_bit2_pos = TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, bit2_pos, - UINT8); + CMDLINE_UINT8); cmdline_parse_token_num_t cmd_write_reg_bit_field_value = TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_field_result, value, - UINT32); + CMDLINE_UINT32); cmdline_parse_inst_t cmd_write_reg_bit_field = { .f = cmd_write_reg_bit_field_parsed, @@ -7853,13 +7853,13 @@ cmdline_parse_token_string_t cmd_write_reg_bit_regbit = TOKEN_STRING_INITIALIZER(struct cmd_write_reg_bit_result, regbit, "regbit"); cmdline_parse_token_num_t cmd_write_reg_bit_port_id = - TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_write_reg_bit_reg_off = - TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off, UINT32); + TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, reg_off, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_write_reg_bit_bit_pos = - TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, bit_pos, UINT8); + TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, bit_pos, CMDLINE_UINT8); cmdline_parse_token_num_t cmd_write_reg_bit_value = - TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, value, UINT8); + TOKEN_NUM_INITIALIZER(struct cmd_write_reg_bit_result, value, CMDLINE_UINT8); cmdline_parse_inst_t cmd_write_reg_bit = { .f = cmd_write_reg_bit_parsed, @@ -7905,11 +7905,11 @@ cmdline_parse_token_string_t cmd_read_rxd_txd_rxd_txd = TOKEN_STRING_INITIALIZER(struct cmd_read_rxd_txd_result, rxd_txd, "rxd#txd"); cmdline_parse_token_num_t cmd_read_rxd_txd_port_id = - TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_read_rxd_txd_queue_id = - TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, queue_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_read_rxd_txd_desc_id = - TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, desc_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_read_rxd_txd_result, desc_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_read_rxd_txd = { .f = cmd_read_rxd_txd_parsed, @@ -7987,7 +7987,7 @@ cmdline_parse_token_string_t cmd_mac_addr_what = "add#remove#set"); cmdline_parse_token_num_t cmd_mac_addr_portnum = TOKEN_NUM_INITIALIZER(struct cmd_mac_addr_result, port_num, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_etheraddr_t cmd_mac_addr_addr = TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address); @@ -8033,7 +8033,7 @@ cmdline_parse_token_string_t cmd_eth_peer_set = cmdline_parse_token_string_t cmd_eth_peer = TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, eth_peer, "eth-peer"); cmdline_parse_token_num_t cmd_eth_peer_port_id = - TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_eth_peer_result, port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_eth_peer_addr = TOKEN_STRING_INITIALIZER(struct cmd_eth_peer_result, peer_addr, NULL); @@ -8082,13 +8082,13 @@ cmdline_parse_token_string_t cmd_setqmap_what = what, "tx#rx"); cmdline_parse_token_num_t cmd_setqmap_portid = TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_setqmap_queueid = TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result, - queue_id, UINT16); + queue_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_setqmap_mapvalue = TOKEN_NUM_INITIALIZER(struct cmd_set_qmap_result, - map_value, UINT8); + map_value, CMDLINE_UINT8); cmdline_parse_inst_t cmd_set_qmap = { .f = cmd_set_qmap_parsed, @@ -8184,7 +8184,7 @@ cmdline_parse_token_string_t cmd_set_uc_hash_port = port, "port"); cmdline_parse_token_num_t cmd_set_uc_hash_portid = TOKEN_NUM_INITIALIZER(struct cmd_set_uc_hash_table, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_uc_hash_what = TOKEN_STRING_INITIALIZER(struct cmd_set_uc_hash_table, what, "uta"); @@ -8245,7 +8245,7 @@ cmdline_parse_token_string_t cmd_set_uc_all_hash_port = port, "port"); cmdline_parse_token_num_t cmd_set_uc_all_hash_portid = TOKEN_NUM_INITIALIZER(struct cmd_set_uc_all_hash_table, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_uc_all_hash_what = TOKEN_STRING_INITIALIZER(struct cmd_set_uc_all_hash_table, what, "uta"); @@ -8337,13 +8337,13 @@ cmdline_parse_token_string_t cmd_set_vf_macvlan_port = port, "port"); cmdline_parse_token_num_t cmd_set_vf_macvlan_portid = TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_vf_macvlan_vf = TOKEN_STRING_INITIALIZER(struct cmd_set_vf_macvlan_filter, vf, "vf"); cmdline_parse_token_num_t cmd_set_vf_macvlan_vf_id = TOKEN_NUM_INITIALIZER(struct cmd_set_vf_macvlan_filter, - vf_id, UINT8); + vf_id, CMDLINE_UINT8); cmdline_parse_token_etheraddr_t cmd_set_vf_macvlan_mac = TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_macvlan_filter, address); @@ -8406,13 +8406,13 @@ cmdline_parse_token_string_t cmd_setvf_traffic_port = port, "port"); cmdline_parse_token_num_t cmd_setvf_traffic_portid = TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_setvf_traffic_vf = TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic, vf, "vf"); cmdline_parse_token_num_t cmd_setvf_traffic_vfid = TOKEN_NUM_INITIALIZER(struct cmd_set_vf_traffic, - vf_id, UINT8); + vf_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_setvf_traffic_what = TOKEN_STRING_INITIALIZER(struct cmd_set_vf_traffic, what, "tx#rx"); @@ -8494,13 +8494,13 @@ cmdline_parse_token_string_t cmd_set_vf_rxmode_port = port, "port"); cmdline_parse_token_num_t cmd_set_vf_rxmode_portid = TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_vf_rxmode_vf = TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode, vf, "vf"); cmdline_parse_token_num_t cmd_set_vf_rxmode_vfid = TOKEN_NUM_INITIALIZER(struct cmd_set_vf_rxmode, - vf_id, UINT8); + vf_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_set_vf_rxmode_what = TOKEN_STRING_INITIALIZER(struct cmd_set_vf_rxmode, what, "rxmode"); @@ -8577,13 +8577,13 @@ cmdline_parse_token_string_t cmd_vf_mac_addr_port = port,"port"); cmdline_parse_token_num_t cmd_vf_mac_addr_portnum = TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result, - port_num, UINT16); + port_num, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_vf_mac_addr_vf = TOKEN_STRING_INITIALIZER(struct cmd_vf_mac_addr_result, vf,"vf"); cmdline_parse_token_num_t cmd_vf_mac_addr_vfnum = TOKEN_NUM_INITIALIZER(struct cmd_vf_mac_addr_result, - vf_num, UINT8); + vf_num, CMDLINE_UINT8); cmdline_parse_token_etheraddr_t cmd_vf_mac_addr_addr = TOKEN_ETHERADDR_INITIALIZER(struct cmd_vf_mac_addr_result, address); @@ -8668,19 +8668,19 @@ cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_what = what, "add#rm"); cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vlanid = TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter, - vlan_id, UINT16); + vlan_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_port = TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter, port, "port"); cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_portid = TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_vf_rx_vlan_filter_vf = TOKEN_STRING_INITIALIZER(struct cmd_vf_rx_vlan_filter, vf, "vf"); cmdline_parse_token_num_t cmd_vf_rx_vlan_filter_vf_mask = TOKEN_NUM_INITIALIZER(struct cmd_vf_rx_vlan_filter, - vf_mask, UINT64); + vf_mask, CMDLINE_UINT64); cmdline_parse_inst_t cmd_vf_rxvlan_filter = { .f = cmd_vf_rx_vlan_filter_parsed, @@ -8735,19 +8735,19 @@ cmdline_parse_token_string_t cmd_queue_rate_limit_port = port, "port"); cmdline_parse_token_num_t cmd_queue_rate_limit_portnum = TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result, - port_num, UINT16); + port_num, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_queue_rate_limit_queue = TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result, queue, "queue"); cmdline_parse_token_num_t cmd_queue_rate_limit_queuenum = TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result, - queue_num, UINT8); + queue_num, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_queue_rate_limit_rate = TOKEN_STRING_INITIALIZER(struct cmd_queue_rate_limit_result, rate, "rate"); cmdline_parse_token_num_t cmd_queue_rate_limit_ratenum = TOKEN_NUM_INITIALIZER(struct cmd_queue_rate_limit_result, - rate_num, UINT16); + rate_num, CMDLINE_UINT16); cmdline_parse_inst_t cmd_queue_rate_limit = { .f = cmd_queue_rate_limit_parsed, @@ -8805,25 +8805,25 @@ cmdline_parse_token_string_t cmd_vf_rate_limit_port = port, "port"); cmdline_parse_token_num_t cmd_vf_rate_limit_portnum = TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result, - port_num, UINT16); + port_num, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_vf_rate_limit_vf = TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result, vf, "vf"); cmdline_parse_token_num_t cmd_vf_rate_limit_vfnum = TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result, - vf_num, UINT8); + vf_num, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_vf_rate_limit_rate = TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result, rate, "rate"); cmdline_parse_token_num_t cmd_vf_rate_limit_ratenum = TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result, - rate_num, UINT16); + rate_num, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_vf_rate_limit_q_msk = TOKEN_STRING_INITIALIZER(struct cmd_vf_rate_limit_result, q_msk, "queue_mask"); cmdline_parse_token_num_t cmd_vf_rate_limit_q_msk_val = TOKEN_NUM_INITIALIZER(struct cmd_vf_rate_limit_result, - q_msk_val, UINT64); + q_msk_val, CMDLINE_UINT64); cmdline_parse_inst_t cmd_vf_rate_limit = { .f = cmd_vf_rate_limit_parsed, @@ -8945,7 +8945,7 @@ cmdline_parse_token_string_t cmd_tunnel_filter_what = what, "add#rm"); cmdline_parse_token_num_t cmd_tunnel_filter_port_id = TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_etheraddr_t cmd_tunnel_filter_outer_mac = TOKEN_ETHERADDR_INITIALIZER(struct cmd_tunnel_filter_result, outer_mac); @@ -8954,7 +8954,7 @@ cmdline_parse_token_etheraddr_t cmd_tunnel_filter_inner_mac = inner_mac); cmdline_parse_token_num_t cmd_tunnel_filter_innner_vlan = TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result, - inner_vlan, UINT16); + inner_vlan, CMDLINE_UINT16); cmdline_parse_token_ipaddr_t cmd_tunnel_filter_ip_value = TOKEN_IPADDR_INITIALIZER(struct cmd_tunnel_filter_result, ip_value); @@ -8968,10 +8968,10 @@ cmdline_parse_token_string_t cmd_tunnel_filter_filter_type = "imac#omac-imac-tenid"); cmdline_parse_token_num_t cmd_tunnel_filter_tenant_id = TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result, - tenant_id, UINT32); + tenant_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_tunnel_filter_queue_num = TOKEN_NUM_INITIALIZER(struct cmd_tunnel_filter_result, - queue_num, UINT16); + queue_num, CMDLINE_UINT16); cmdline_parse_inst_t cmd_tunnel_filter = { .f = cmd_tunnel_filter_parsed, @@ -9037,10 +9037,10 @@ cmdline_parse_token_string_t cmd_tunnel_udp_config_what = what, "add#rm"); cmdline_parse_token_num_t cmd_tunnel_udp_config_udp_port = TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config, - udp_port, UINT16); + udp_port, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_tunnel_udp_config_port_id = TOKEN_NUM_INITIALIZER(struct cmd_tunnel_udp_config, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_tunnel_udp_config = { .f = cmd_tunnel_udp_config_parsed, @@ -9110,7 +9110,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_config = "config"); cmdline_parse_token_num_t cmd_config_tunnel_udp_port_port_id = TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, port_id, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_port = TOKEN_STRING_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_tunnel_port, @@ -9123,7 +9123,7 @@ cmdline_parse_token_string_t cmd_config_tunnel_udp_port_tunnel_type = "vxlan#geneve#vxlan-gpe"); cmdline_parse_token_num_t cmd_config_tunnel_udp_port_value = TOKEN_NUM_INITIALIZER(struct cmd_config_tunnel_udp_port, udp_port, - UINT16); + CMDLINE_UINT16); cmdline_parse_inst_t cmd_cfg_tunnel_udp_port = { .f = cmd_cfg_tunnel_udp_port_parsed, @@ -9172,13 +9172,13 @@ cmdline_parse_token_string_t cmd_global_config_cmd = "global_config"); cmdline_parse_token_num_t cmd_global_config_port_id = TOKEN_NUM_INITIALIZER(struct cmd_global_config_result, port_id, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_global_config_type = TOKEN_STRING_INITIALIZER(struct cmd_global_config_result, cfg_type, "gre-key-len"); cmdline_parse_token_num_t cmd_global_config_gre_key_len = TOKEN_NUM_INITIALIZER(struct cmd_global_config_result, - len, UINT8); + len, CMDLINE_UINT8); cmdline_parse_inst_t cmd_global_config = { .f = cmd_global_config_parsed, @@ -9215,13 +9215,13 @@ cmdline_parse_token_string_t cmd_mirror_mask_port = port, "port"); cmdline_parse_token_num_t cmd_mirror_mask_portid = TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_mirror_mask_mirror = TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result, mirror, "mirror-rule"); cmdline_parse_token_num_t cmd_mirror_mask_ruleid = TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result, - rule_id, UINT8); + rule_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_mirror_mask_what = TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result, what, "pool-mirror-up#pool-mirror-down" @@ -9234,7 +9234,7 @@ cmdline_parse_token_string_t cmd_mirror_mask_dstpool = dstpool, "dst-pool"); cmdline_parse_token_num_t cmd_mirror_mask_poolid = TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_mask_result, - dstpool_id, UINT8); + dstpool_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_mirror_mask_on = TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_mask_result, on, "on#off"); @@ -9330,13 +9330,13 @@ cmdline_parse_token_string_t cmd_mirror_link_port = port, "port"); cmdline_parse_token_num_t cmd_mirror_link_portid = TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_mirror_link_mirror = TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result, mirror, "mirror-rule"); cmdline_parse_token_num_t cmd_mirror_link_ruleid = TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result, - rule_id, UINT8); + rule_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_mirror_link_what = TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result, what, "uplink-mirror#downlink-mirror"); @@ -9345,7 +9345,7 @@ cmdline_parse_token_string_t cmd_mirror_link_dstpool = dstpool, "dst-pool"); cmdline_parse_token_num_t cmd_mirror_link_poolid = TOKEN_NUM_INITIALIZER(struct cmd_set_mirror_link_result, - dstpool_id, UINT8); + dstpool_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_mirror_link_on = TOKEN_STRING_INITIALIZER(struct cmd_set_mirror_link_result, on, "on#off"); @@ -9416,13 +9416,13 @@ cmdline_parse_token_string_t cmd_rm_mirror_rule_port = port, "port"); cmdline_parse_token_num_t cmd_rm_mirror_rule_portid = TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_rm_mirror_rule_mirror = TOKEN_STRING_INITIALIZER(struct cmd_rm_mirror_rule_result, mirror, "mirror-rule"); cmdline_parse_token_num_t cmd_rm_mirror_rule_ruleid = TOKEN_NUM_INITIALIZER(struct cmd_rm_mirror_rule_result, - rule_id, UINT8); + rule_id, CMDLINE_UINT8); static void cmd_reset_mirror_rule_parsed(void *parsed_result, @@ -9615,7 +9615,7 @@ cmdline_parse_token_string_t cmd_syn_filter_filter = filter, "syn_filter"); cmdline_parse_token_num_t cmd_syn_filter_port_id = TOKEN_NUM_INITIALIZER(struct cmd_syn_filter_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_syn_filter_ops = TOKEN_STRING_INITIALIZER(struct cmd_syn_filter_result, ops, "add#del"); @@ -9630,7 +9630,7 @@ cmdline_parse_token_string_t cmd_syn_filter_queue = queue, "queue"); cmdline_parse_token_num_t cmd_syn_filter_queue_id = TOKEN_NUM_INITIALIZER(struct cmd_syn_filter_result, - queue_id, UINT16); + queue_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_syn_filter = { .f = cmd_syn_filter_parsed, @@ -9707,7 +9707,7 @@ cmdline_parse_token_string_t cmd_queue_region_port = TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result, port, "port"); cmdline_parse_token_num_t cmd_queue_region_port_id = TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_queue_region_cmd = TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result, cmd, "queue-region"); @@ -9716,19 +9716,19 @@ cmdline_parse_token_string_t cmd_queue_region_id = region, "region_id"); cmdline_parse_token_num_t cmd_queue_region_index = TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result, - region_id, UINT8); + region_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_queue_region_queue_start_index = TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result, queue_start_index, "queue_start_index"); cmdline_parse_token_num_t cmd_queue_region_queue_id = TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result, - queue_id, UINT8); + queue_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_queue_region_queue_num = TOKEN_STRING_INITIALIZER(struct cmd_queue_region_result, queue_num, "queue_num"); cmdline_parse_token_num_t cmd_queue_region_queue_num_value = TOKEN_NUM_INITIALIZER(struct cmd_queue_region_result, - queue_num_value, UINT8); + queue_num_value, CMDLINE_UINT8); cmdline_parse_inst_t cmd_queue_region = { .f = cmd_queue_region_parsed, @@ -9807,7 +9807,7 @@ cmdline_parse_token_string_t cmd_region_flowtype_port = port, "port"); cmdline_parse_token_num_t cmd_region_flowtype_port_index = TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_region_flowtype_cmd = TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result, cmd, "queue-region"); @@ -9816,13 +9816,13 @@ cmdline_parse_token_string_t cmd_region_flowtype_index = region, "region_id"); cmdline_parse_token_num_t cmd_region_flowtype_id = TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result, - region_id, UINT8); + region_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_region_flowtype_flow_index = TOKEN_STRING_INITIALIZER(struct cmd_region_flowtype_result, flowtype, "flowtype"); cmdline_parse_token_num_t cmd_region_flowtype_flow_id = TOKEN_NUM_INITIALIZER(struct cmd_region_flowtype_result, - flowtype_id, UINT8); + flowtype_id, CMDLINE_UINT8); cmdline_parse_inst_t cmd_region_flowtype = { .f = cmd_region_flowtype_parsed, .data = NULL, @@ -9898,7 +9898,7 @@ cmdline_parse_token_string_t cmd_user_priority_region_port = port, "port"); cmdline_parse_token_num_t cmd_user_priority_region_port_index = TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_user_priority_region_cmd = TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result, cmd, "queue-region"); @@ -9907,13 +9907,13 @@ cmdline_parse_token_string_t cmd_user_priority_region_UP = user_priority, "UP"); cmdline_parse_token_num_t cmd_user_priority_region_UP_id = TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result, - user_priority_id, UINT8); + user_priority_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_user_priority_region_region = TOKEN_STRING_INITIALIZER(struct cmd_user_priority_region_result, region, "region_id"); cmdline_parse_token_num_t cmd_user_priority_region_region_id = TOKEN_NUM_INITIALIZER(struct cmd_user_priority_region_result, - region_id, UINT8); + region_id, CMDLINE_UINT8); cmdline_parse_inst_t cmd_user_priority_region = { .f = cmd_user_priority_region_parsed, @@ -9991,7 +9991,7 @@ cmdline_parse_token_string_t cmd_flush_queue_region_port = port, "port"); cmdline_parse_token_num_t cmd_flush_queue_region_port_index = TOKEN_NUM_INITIALIZER(struct cmd_flush_queue_region_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flush_queue_region_cmd = TOKEN_STRING_INITIALIZER(struct cmd_flush_queue_region_result, cmd, "queue-region"); @@ -10072,7 +10072,7 @@ cmdline_parse_token_string_t cmd_show_queue_region_info_port = port, "port"); cmdline_parse_token_num_t cmd_show_queue_region_info_port_index = TOKEN_NUM_INITIALIZER(struct cmd_show_queue_region_info, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_show_queue_region_info_cmd = TOKEN_STRING_INITIALIZER(struct cmd_show_queue_region_info, cmd, "queue-region"); @@ -10173,7 +10173,7 @@ cmdline_parse_token_string_t cmd_2tuple_filter_filter = filter, "2tuple_filter"); cmdline_parse_token_num_t cmd_2tuple_filter_port_id = TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_2tuple_filter_ops = TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result, ops, "add#del"); @@ -10182,37 +10182,37 @@ cmdline_parse_token_string_t cmd_2tuple_filter_dst_port = dst_port, "dst_port"); cmdline_parse_token_num_t cmd_2tuple_filter_dst_port_value = TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result, - dst_port_value, UINT16); + dst_port_value, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_2tuple_filter_protocol = TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result, protocol, "protocol"); cmdline_parse_token_num_t cmd_2tuple_filter_protocol_value = TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result, - protocol_value, UINT8); + protocol_value, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_2tuple_filter_mask = TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result, mask, "mask"); cmdline_parse_token_num_t cmd_2tuple_filter_mask_value = TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result, - mask_value, INT8); + mask_value, CMDLINE_INT8); cmdline_parse_token_string_t cmd_2tuple_filter_tcp_flags = TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result, tcp_flags, "tcp_flags"); cmdline_parse_token_num_t cmd_2tuple_filter_tcp_flags_value = TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result, - tcp_flags_value, UINT8); + tcp_flags_value, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_2tuple_filter_priority = TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result, priority, "priority"); cmdline_parse_token_num_t cmd_2tuple_filter_priority_value = TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result, - priority_value, UINT8); + priority_value, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_2tuple_filter_queue = TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result, queue, "queue"); cmdline_parse_token_num_t cmd_2tuple_filter_queue_id = TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result, - queue_id, UINT16); + queue_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_2tuple_filter = { .f = cmd_2tuple_filter_parsed, @@ -10352,7 +10352,7 @@ cmdline_parse_token_string_t cmd_5tuple_filter_filter = filter, "5tuple_filter"); cmdline_parse_token_num_t cmd_5tuple_filter_port_id = TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_5tuple_filter_ops = TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result, ops, "add#del"); @@ -10373,43 +10373,43 @@ cmdline_parse_token_string_t cmd_5tuple_filter_dst_port = dst_port, "dst_port"); cmdline_parse_token_num_t cmd_5tuple_filter_dst_port_value = TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result, - dst_port_value, UINT16); + dst_port_value, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_5tuple_filter_src_port = TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result, src_port, "src_port"); cmdline_parse_token_num_t cmd_5tuple_filter_src_port_value = TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result, - src_port_value, UINT16); + src_port_value, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_5tuple_filter_protocol = TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result, protocol, "protocol"); cmdline_parse_token_num_t cmd_5tuple_filter_protocol_value = TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result, - protocol_value, UINT8); + protocol_value, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_5tuple_filter_mask = TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result, mask, "mask"); cmdline_parse_token_num_t cmd_5tuple_filter_mask_value = TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result, - mask_value, INT8); + mask_value, CMDLINE_INT8); cmdline_parse_token_string_t cmd_5tuple_filter_tcp_flags = TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result, tcp_flags, "tcp_flags"); cmdline_parse_token_num_t cmd_5tuple_filter_tcp_flags_value = TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result, - tcp_flags_value, UINT8); + tcp_flags_value, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_5tuple_filter_priority = TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result, priority, "priority"); cmdline_parse_token_num_t cmd_5tuple_filter_priority_value = TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result, - priority_value, UINT8); + priority_value, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_5tuple_filter_queue = TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result, queue, "queue"); cmdline_parse_token_num_t cmd_5tuple_filter_queue_id = TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result, - queue_id, UINT16); + queue_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_5tuple_filter = { .f = cmd_5tuple_filter_parsed, @@ -10575,7 +10575,7 @@ cmdline_parse_token_string_t cmd_flex_filter_filter = filter, "flex_filter"); cmdline_parse_token_num_t cmd_flex_filter_port_id = TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flex_filter_ops = TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result, ops, "add#del"); @@ -10584,7 +10584,7 @@ cmdline_parse_token_string_t cmd_flex_filter_len = len, "len"); cmdline_parse_token_num_t cmd_flex_filter_len_value = TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result, - len_value, UINT8); + len_value, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_flex_filter_bytes = TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result, bytes, "bytes"); @@ -10602,13 +10602,13 @@ cmdline_parse_token_string_t cmd_flex_filter_priority = priority, "priority"); cmdline_parse_token_num_t cmd_flex_filter_priority_value = TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result, - priority_value, UINT8); + priority_value, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_flex_filter_queue = TOKEN_STRING_INITIALIZER(struct cmd_flex_filter_result, queue, "queue"); cmdline_parse_token_num_t cmd_flex_filter_queue_id = TOKEN_NUM_INITIALIZER(struct cmd_flex_filter_result, - queue_id, UINT16); + queue_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_flex_filter = { .f = cmd_flex_filter_parsed, .data = NULL, @@ -10654,7 +10654,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_filter = filter, "ethertype_filter"); cmdline_parse_token_num_t cmd_ethertype_filter_port_id = TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_ethertype_filter_ops = TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result, ops, "add#del"); @@ -10669,7 +10669,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_ethertype = ethertype, "ethertype"); cmdline_parse_token_num_t cmd_ethertype_filter_ethertype_value = TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result, - ethertype_value, UINT16); + ethertype_value, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_ethertype_filter_drop = TOKEN_STRING_INITIALIZER(struct cmd_ethertype_filter_result, drop, "drop#fwd"); @@ -10678,7 +10678,7 @@ cmdline_parse_token_string_t cmd_ethertype_filter_queue = queue, "queue"); cmdline_parse_token_num_t cmd_ethertype_filter_queue_id = TOKEN_NUM_INITIALIZER(struct cmd_ethertype_filter_result, - queue_id, UINT16); + queue_id, CMDLINE_UINT16); static void cmd_ethertype_filter_parsed(void *parsed_result, @@ -11157,7 +11157,7 @@ cmdline_parse_token_string_t cmd_flow_director_filter = flow_director_filter, "flow_director_filter"); cmdline_parse_token_num_t cmd_flow_director_port_id = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flow_director_ops = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result, ops, "add#del#update"); @@ -11172,7 +11172,7 @@ cmdline_parse_token_string_t cmd_flow_director_ether = ether, "ether"); cmdline_parse_token_num_t cmd_flow_director_ether_type = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result, - ether_type, UINT16); + ether_type, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flow_director_src = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result, src, "src"); @@ -11181,7 +11181,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_ip_src = ip_src); cmdline_parse_token_num_t cmd_flow_director_port_src = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result, - port_src, UINT16); + port_src, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flow_director_dst = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result, dst, "dst"); @@ -11190,37 +11190,37 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_ip_dst = ip_dst); cmdline_parse_token_num_t cmd_flow_director_port_dst = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result, - port_dst, UINT16); + port_dst, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flow_director_verify_tag = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result, verify_tag, "verify_tag"); cmdline_parse_token_num_t cmd_flow_director_verify_tag_value = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result, - verify_tag_value, UINT32); + verify_tag_value, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_flow_director_tos = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result, tos, "tos"); cmdline_parse_token_num_t cmd_flow_director_tos_value = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result, - tos_value, UINT8); + tos_value, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_flow_director_proto = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result, proto, "proto"); cmdline_parse_token_num_t cmd_flow_director_proto_value = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result, - proto_value, UINT8); + proto_value, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_flow_director_ttl = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result, ttl, "ttl"); cmdline_parse_token_num_t cmd_flow_director_ttl_value = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result, - ttl_value, UINT8); + ttl_value, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_flow_director_vlan = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result, vlan, "vlan"); cmdline_parse_token_num_t cmd_flow_director_vlan_value = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result, - vlan_value, UINT16); + vlan_value, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flow_director_flexbytes = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result, flexbytes, "flexbytes"); @@ -11238,13 +11238,13 @@ cmdline_parse_token_string_t cmd_flow_director_queue = queue, "queue"); cmdline_parse_token_num_t cmd_flow_director_queue_id = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result, - queue_id, UINT16); + queue_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flow_director_fd_id = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result, fd_id, "fd_id"); cmdline_parse_token_num_t cmd_flow_director_fd_id_value = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result, - fd_id_value, UINT32); + fd_id_value, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_flow_director_mode = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result, @@ -11278,7 +11278,7 @@ cmdline_parse_token_string_t cmd_flow_director_tunnel_id = tunnel_id, "tunnel-id"); cmdline_parse_token_num_t cmd_flow_director_tunnel_id_value = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_result, - tunnel_id_value, UINT32); + tunnel_id_value, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_flow_director_packet = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_result, packet, "packet"); @@ -11522,7 +11522,7 @@ cmdline_parse_token_string_t cmd_flush_flow_director_flush = flush_flow_director, "flush_flow_director"); cmdline_parse_token_num_t cmd_flush_flow_director_port_id = TOKEN_NUM_INITIALIZER(struct cmd_flush_flow_director_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); static void cmd_flush_flow_director_parsed(void *parsed_result, @@ -11640,13 +11640,13 @@ cmdline_parse_token_string_t cmd_flow_director_mask = flow_director_mask, "flow_director_mask"); cmdline_parse_token_num_t cmd_flow_director_mask_port_id = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flow_director_mask_vlan = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result, vlan, "vlan"); cmdline_parse_token_num_t cmd_flow_director_mask_vlan_value = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result, - vlan_mask, UINT16); + vlan_mask, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flow_director_mask_src = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result, src_mask, "src_mask"); @@ -11658,7 +11658,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_mask_ipv6_src = ipv6_src); cmdline_parse_token_num_t cmd_flow_director_mask_port_src = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result, - port_src, UINT16); + port_src, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flow_director_mask_dst = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result, dst_mask, "dst_mask"); @@ -11670,7 +11670,7 @@ cmdline_parse_token_ipaddr_t cmd_flow_director_mask_ipv6_dst = ipv6_dst); cmdline_parse_token_num_t cmd_flow_director_mask_port_dst = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result, - port_dst, UINT16); + port_dst, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flow_director_mask_mode = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result, @@ -11689,19 +11689,19 @@ cmdline_parse_token_string_t cmd_flow_director_mask_mac = mac, "mac"); cmdline_parse_token_num_t cmd_flow_director_mask_mac_value = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result, - mac_addr_byte_mask, UINT8); + mac_addr_byte_mask, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_flow_director_mask_tunnel_type = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result, tunnel_type, "tunnel-type"); cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_type_value = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result, - tunnel_type_mask, UINT8); + tunnel_type_mask, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_flow_director_mask_tunnel_id = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_mask_result, tunnel_id, "tunnel-id"); cmdline_parse_token_num_t cmd_flow_director_mask_tunnel_id_value = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_mask_result, - tunnel_id_mask, UINT32); + tunnel_id_mask, CMDLINE_UINT32); cmdline_parse_inst_t cmd_set_flow_director_ip_mask = { .f = cmd_flow_director_mask_parsed, @@ -11855,7 +11855,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexmask = "flow_director_flex_mask"); cmdline_parse_token_num_t cmd_flow_director_flexmask_port_id = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flex_mask_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flow_director_flexmask_flow = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flex_mask_result, flow, "flow"); @@ -11973,7 +11973,7 @@ cmdline_parse_token_string_t cmd_flow_director_flexpayload = "flow_director_flex_payload"); cmdline_parse_token_num_t cmd_flow_director_flexpayload_port_id = TOKEN_NUM_INITIALIZER(struct cmd_flow_director_flexpayload_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_flow_director_flexpayload_payload_layer = TOKEN_STRING_INITIALIZER(struct cmd_flow_director_flexpayload_result, payload_layer, "raw#l2#l3#l4"); @@ -12041,7 +12041,7 @@ cmdline_parse_token_string_t cmd_get_sym_hash_ena_per_port_all = get_sym_hash_ena_per_port, "get_sym_hash_ena_per_port"); cmdline_parse_token_num_t cmd_get_sym_hash_ena_per_port_port_id = TOKEN_NUM_INITIALIZER(struct cmd_get_sym_hash_ena_per_port_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_get_sym_hash_ena_per_port = { .f = cmd_get_sym_hash_per_port_parsed, @@ -12097,7 +12097,7 @@ cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_all = set_sym_hash_ena_per_port, "set_sym_hash_ena_per_port"); cmdline_parse_token_num_t cmd_set_sym_hash_ena_per_port_port_id = TOKEN_NUM_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_sym_hash_ena_per_port_enable = TOKEN_STRING_INITIALIZER(struct cmd_set_sym_hash_ena_per_port_result, enable, "enable#disable"); @@ -12222,7 +12222,7 @@ cmdline_parse_token_string_t cmd_get_hash_global_config_all = get_hash_global_config, "get_hash_global_config"); cmdline_parse_token_num_t cmd_get_hash_global_config_port_id = TOKEN_NUM_INITIALIZER(struct cmd_get_hash_global_config_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_inst_t cmd_get_hash_global_config = { .f = cmd_get_hash_global_config_parsed, @@ -12297,7 +12297,7 @@ cmdline_parse_token_string_t cmd_set_hash_global_config_all = set_hash_global_config, "set_hash_global_config"); cmdline_parse_token_num_t cmd_set_hash_global_config_port_id = TOKEN_NUM_INITIALIZER(struct cmd_set_hash_global_config_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_hash_global_config_hash_func = TOKEN_STRING_INITIALIZER(struct cmd_set_hash_global_config_result, hash_func, "toeplitz#simple_xor#symmetric_toeplitz#default"); @@ -12413,7 +12413,7 @@ cmdline_parse_token_string_t cmd_set_hash_input_set_cmd = set_hash_input_set, "set_hash_input_set"); cmdline_parse_token_num_t cmd_set_hash_input_set_port_id = TOKEN_NUM_INITIALIZER(struct cmd_set_hash_input_set_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_hash_input_set_flow_type = TOKEN_STRING_INITIALIZER(struct cmd_set_hash_input_set_result, flow_type, NULL); @@ -12486,7 +12486,7 @@ cmdline_parse_token_string_t cmd_set_fdir_input_set_cmd = set_fdir_input_set, "set_fdir_input_set"); cmdline_parse_token_num_t cmd_set_fdir_input_set_port_id = TOKEN_NUM_INITIALIZER(struct cmd_set_fdir_input_set_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_fdir_input_set_flow_type = TOKEN_STRING_INITIALIZER(struct cmd_set_fdir_input_set_result, flow_type, @@ -12559,7 +12559,7 @@ cmdline_parse_token_string_t cmd_mcast_addr_what = TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result, what, "add#remove"); cmdline_parse_token_num_t cmd_mcast_addr_portnum = - TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num, CMDLINE_UINT16); cmdline_parse_token_etheraddr_t cmd_mcast_addr_addr = TOKEN_ETHERADDR_INITIALIZER(struct cmd_mac_addr_result, address); @@ -12608,7 +12608,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_all_str = cmdline_parse_token_num_t cmd_config_l2_tunnel_eth_type_id = TOKEN_NUM_INITIALIZER (struct cmd_config_l2_tunnel_eth_type_result, - id, UINT16); + id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_l2_tunnel = TOKEN_STRING_INITIALIZER (struct cmd_config_l2_tunnel_eth_type_result, @@ -12624,7 +12624,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_eth_type_eth_type = cmdline_parse_token_num_t cmd_config_l2_tunnel_eth_type_eth_type_val = TOKEN_NUM_INITIALIZER (struct cmd_config_l2_tunnel_eth_type_result, - eth_type_val, UINT16); + eth_type_val, CMDLINE_UINT16); static enum rte_eth_tunnel_type str2fdir_l2_tunnel_type(char *string) @@ -12742,7 +12742,7 @@ cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_all_str = cmdline_parse_token_num_t cmd_config_l2_tunnel_en_dis_id = TOKEN_NUM_INITIALIZER (struct cmd_config_l2_tunnel_en_dis_result, - id, UINT16); + id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_l2_tunnel_en_dis_l2_tunnel = TOKEN_STRING_INITIALIZER (struct cmd_config_l2_tunnel_en_dis_result, @@ -12920,7 +12920,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_port_tag_id = cmdline_parse_token_num_t cmd_config_e_tag_port_tag_id_val = TOKEN_NUM_INITIALIZER (struct cmd_config_e_tag_result, - port_tag_id_val, UINT32); + port_tag_id_val, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_config_e_tag_e_tag_id = TOKEN_STRING_INITIALIZER (struct cmd_config_e_tag_result, @@ -12928,7 +12928,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_e_tag_id = cmdline_parse_token_num_t cmd_config_e_tag_e_tag_id_val = TOKEN_NUM_INITIALIZER (struct cmd_config_e_tag_result, - e_tag_id_val, UINT16); + e_tag_id_val, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_e_tag_dst_pool = TOKEN_STRING_INITIALIZER (struct cmd_config_e_tag_result, @@ -12936,7 +12936,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_dst_pool = cmdline_parse_token_num_t cmd_config_e_tag_dst_pool_val = TOKEN_NUM_INITIALIZER (struct cmd_config_e_tag_result, - dst_pool_val, UINT8); + dst_pool_val, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_config_e_tag_port = TOKEN_STRING_INITIALIZER (struct cmd_config_e_tag_result, @@ -12944,7 +12944,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_port = cmdline_parse_token_num_t cmd_config_e_tag_port_id = TOKEN_NUM_INITIALIZER (struct cmd_config_e_tag_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_e_tag_vf = TOKEN_STRING_INITIALIZER (struct cmd_config_e_tag_result, @@ -12952,7 +12952,7 @@ cmdline_parse_token_string_t cmd_config_e_tag_vf = cmdline_parse_token_num_t cmd_config_e_tag_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_config_e_tag_result, - vf_id, UINT8); + vf_id, CMDLINE_UINT8); /* E-tag insertion configuration */ static void @@ -13271,11 +13271,11 @@ cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_antispoof = cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_port_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_vlan_anti_spoof_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_vf_vlan_anti_spoof_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_vlan_anti_spoof_result, - vf_id, UINT32); + vf_id, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_vf_vlan_anti_spoof_on_off = TOKEN_STRING_INITIALIZER (struct cmd_vf_vlan_anti_spoof_result, @@ -13377,11 +13377,11 @@ cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_antispoof = cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_port_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_mac_anti_spoof_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_vf_mac_anti_spoof_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_mac_anti_spoof_result, - vf_id, UINT32); + vf_id, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_vf_mac_anti_spoof_on_off = TOKEN_STRING_INITIALIZER (struct cmd_vf_mac_anti_spoof_result, @@ -13483,11 +13483,11 @@ cmdline_parse_token_string_t cmd_vf_vlan_stripq_stripq = cmdline_parse_token_num_t cmd_vf_vlan_stripq_port_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_vlan_stripq_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_vf_vlan_stripq_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_vlan_stripq_result, - vf_id, UINT16); + vf_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_vf_vlan_stripq_on_off = TOKEN_STRING_INITIALIZER (struct cmd_vf_vlan_stripq_result, @@ -13589,15 +13589,15 @@ cmdline_parse_token_string_t cmd_vf_vlan_insert_insert = cmdline_parse_token_num_t cmd_vf_vlan_insert_port_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_vlan_insert_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_vf_vlan_insert_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_vlan_insert_result, - vf_id, UINT16); + vf_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_vf_vlan_insert_vlan_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_vlan_insert_result, - vlan_id, UINT16); + vlan_id, CMDLINE_UINT16); static void cmd_set_vf_vlan_insert_parsed( @@ -13687,7 +13687,7 @@ cmdline_parse_token_string_t cmd_tx_loopback_loopback = cmdline_parse_token_num_t cmd_tx_loopback_port_id = TOKEN_NUM_INITIALIZER (struct cmd_tx_loopback_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_tx_loopback_on_off = TOKEN_STRING_INITIALIZER (struct cmd_tx_loopback_result, @@ -13787,7 +13787,7 @@ cmdline_parse_token_string_t cmd_all_queues_drop_en_drop = cmdline_parse_token_num_t cmd_all_queues_drop_en_port_id = TOKEN_NUM_INITIALIZER (struct cmd_all_queues_drop_en_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_all_queues_drop_en_on_off = TOKEN_STRING_INITIALIZER (struct cmd_all_queues_drop_en_result, @@ -13879,11 +13879,11 @@ cmdline_parse_token_string_t cmd_vf_split_drop_en_drop = cmdline_parse_token_num_t cmd_vf_split_drop_en_port_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_split_drop_en_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_vf_split_drop_en_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_split_drop_en_result, - vf_id, UINT16); + vf_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_vf_split_drop_en_on_off = TOKEN_STRING_INITIALIZER (struct cmd_vf_split_drop_en_result, @@ -13973,11 +13973,11 @@ cmdline_parse_token_string_t cmd_set_vf_mac_addr_addr = cmdline_parse_token_num_t cmd_set_vf_mac_addr_port_id = TOKEN_NUM_INITIALIZER (struct cmd_set_vf_mac_addr_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_set_vf_mac_addr_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_set_vf_mac_addr_result, - vf_id, UINT16); + vf_id, CMDLINE_UINT16); cmdline_parse_token_etheraddr_t cmd_set_vf_mac_addr_mac_addr = TOKEN_ETHERADDR_INITIALIZER(struct cmd_set_vf_mac_addr_result, mac_addr); @@ -14074,7 +14074,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_on_offload = cmdline_parse_token_num_t cmd_macsec_offload_on_port_id = TOKEN_NUM_INITIALIZER (struct cmd_macsec_offload_on_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_macsec_offload_on_on = TOKEN_STRING_INITIALIZER (struct cmd_macsec_offload_on_result, @@ -14189,7 +14189,7 @@ cmdline_parse_token_string_t cmd_macsec_offload_off_offload = cmdline_parse_token_num_t cmd_macsec_offload_off_port_id = TOKEN_NUM_INITIALIZER (struct cmd_macsec_offload_off_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_macsec_offload_off_off = TOKEN_STRING_INITIALIZER (struct cmd_macsec_offload_off_result, @@ -14284,7 +14284,7 @@ cmdline_parse_token_string_t cmd_macsec_sc_tx_rx = cmdline_parse_token_num_t cmd_macsec_sc_port_id = TOKEN_NUM_INITIALIZER (struct cmd_macsec_sc_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac = TOKEN_ETHERADDR_INITIALIZER (struct cmd_macsec_sc_result, @@ -14292,7 +14292,7 @@ cmdline_parse_token_etheraddr_t cmd_macsec_sc_mac = cmdline_parse_token_num_t cmd_macsec_sc_pi = TOKEN_NUM_INITIALIZER (struct cmd_macsec_sc_result, - pi, UINT16); + pi, CMDLINE_UINT16); static void cmd_set_macsec_sc_parsed( @@ -14376,19 +14376,19 @@ cmdline_parse_token_string_t cmd_macsec_sa_tx_rx = cmdline_parse_token_num_t cmd_macsec_sa_port_id = TOKEN_NUM_INITIALIZER (struct cmd_macsec_sa_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_macsec_sa_idx = TOKEN_NUM_INITIALIZER (struct cmd_macsec_sa_result, - idx, UINT8); + idx, CMDLINE_UINT8); cmdline_parse_token_num_t cmd_macsec_sa_an = TOKEN_NUM_INITIALIZER (struct cmd_macsec_sa_result, - an, UINT8); + an, CMDLINE_UINT8); cmdline_parse_token_num_t cmd_macsec_sa_pn = TOKEN_NUM_INITIALIZER (struct cmd_macsec_sa_result, - pn, UINT32); + pn, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_macsec_sa_key = TOKEN_STRING_INITIALIZER (struct cmd_macsec_sa_result, @@ -14496,11 +14496,11 @@ cmdline_parse_token_string_t cmd_vf_promisc_promisc = cmdline_parse_token_num_t cmd_vf_promisc_port_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_promisc_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_vf_promisc_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_promisc_result, - vf_id, UINT32); + vf_id, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_vf_promisc_on_off = TOKEN_STRING_INITIALIZER (struct cmd_vf_promisc_result, @@ -14586,11 +14586,11 @@ cmdline_parse_token_string_t cmd_vf_allmulti_allmulti = cmdline_parse_token_num_t cmd_vf_allmulti_port_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_allmulti_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_vf_allmulti_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_allmulti_result, - vf_id, UINT32); + vf_id, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_vf_allmulti_on_off = TOKEN_STRING_INITIALIZER (struct cmd_vf_allmulti_result, @@ -14676,11 +14676,11 @@ cmdline_parse_token_string_t cmd_set_vf_broadcast_broadcast = cmdline_parse_token_num_t cmd_set_vf_broadcast_port_id = TOKEN_NUM_INITIALIZER (struct cmd_set_vf_broadcast_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_set_vf_broadcast_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_set_vf_broadcast_result, - vf_id, UINT16); + vf_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_vf_broadcast_on_off = TOKEN_STRING_INITIALIZER (struct cmd_set_vf_broadcast_result, @@ -14770,11 +14770,11 @@ cmdline_parse_token_string_t cmd_set_vf_vlan_tag_tag = cmdline_parse_token_num_t cmd_set_vf_vlan_tag_port_id = TOKEN_NUM_INITIALIZER (struct cmd_set_vf_vlan_tag_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_set_vf_vlan_tag_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_set_vf_vlan_tag_result, - vf_id, UINT16); + vf_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_vf_vlan_tag_on_off = TOKEN_STRING_INITIALIZER (struct cmd_set_vf_vlan_tag_result, @@ -14880,19 +14880,19 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_max_bw = cmdline_parse_token_num_t cmd_vf_tc_bw_port_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_tc_bw_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_vf_tc_bw_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_vf_tc_bw_result, - vf_id, UINT16); + vf_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_vf_tc_bw_tc_no = TOKEN_NUM_INITIALIZER (struct cmd_vf_tc_bw_result, - tc_no, UINT8); + tc_no, CMDLINE_UINT8); cmdline_parse_token_num_t cmd_vf_tc_bw_bw = TOKEN_NUM_INITIALIZER (struct cmd_vf_tc_bw_result, - bw, UINT32); + bw, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list = TOKEN_STRING_INITIALIZER (struct cmd_vf_tc_bw_result, @@ -14900,7 +14900,7 @@ cmdline_parse_token_string_t cmd_vf_tc_bw_bw_list = cmdline_parse_token_num_t cmd_vf_tc_bw_tc_map = TOKEN_NUM_INITIALIZER (struct cmd_vf_tc_bw_result, - tc_map, UINT8); + tc_map, CMDLINE_UINT8); /* VF max bandwidth setting */ static void @@ -15205,7 +15205,7 @@ cmdline_parse_token_string_t cmd_set_port_tm_hierarchy_default_default = cmdline_parse_token_num_t cmd_set_port_tm_hierarchy_default_port_id = TOKEN_NUM_INITIALIZER( struct cmd_set_port_tm_hierarchy_default_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); static void cmd_set_port_tm_hierarchy_default_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -15285,27 +15285,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, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_set_vxlan_udp_src = TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token, "udp-src"); cmdline_parse_token_num_t cmd_set_vxlan_udp_src_value = - TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_src, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_vxlan_udp_dst = TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token, "udp-dst"); cmdline_parse_token_num_t cmd_set_vxlan_udp_dst_value = - TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, udp_dst, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_vxlan_ip_tos = TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token, "ip-tos"); cmdline_parse_token_num_t cmd_set_vxlan_ip_tos_value = - TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, UINT8); + TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tos, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_set_vxlan_ip_ttl = TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token, "ip-ttl"); cmdline_parse_token_num_t cmd_set_vxlan_ip_ttl_value = - TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, UINT8); + TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, ttl, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_set_vxlan_ip_src = TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token, "ip-src"); @@ -15320,7 +15320,7 @@ cmdline_parse_token_string_t cmd_set_vxlan_vlan = TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token, "vlan-tci"); cmdline_parse_token_num_t cmd_set_vxlan_vlan_value = - TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_set_vxlan_result, tci, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_vxlan_eth_src = TOKEN_STRING_INITIALIZER(struct cmd_set_vxlan_result, pos_token, "eth-src"); @@ -15505,7 +15505,7 @@ cmdline_parse_token_string_t cmd_set_nvgre_tni = TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token, "tni"); cmdline_parse_token_num_t cmd_set_nvgre_tni_value = - TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, UINT32); + TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tni, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_set_nvgre_ip_src = TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token, "ip-src"); @@ -15520,7 +15520,7 @@ cmdline_parse_token_string_t cmd_set_nvgre_vlan = TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token, "vlan-tci"); cmdline_parse_token_num_t cmd_set_nvgre_vlan_value = - TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_set_nvgre_result, tci, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_nvgre_eth_src = TOKEN_STRING_INITIALIZER(struct cmd_set_nvgre_result, pos_token, "eth-src"); @@ -15651,7 +15651,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, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_l2_encap_eth_src = TOKEN_STRING_INITIALIZER(struct cmd_set_l2_encap_result, pos_token, "eth-src"); @@ -15811,7 +15811,7 @@ cmdline_parse_token_string_t cmd_set_mplsogre_encap_label = pos_token, "label"); cmdline_parse_token_num_t cmd_set_mplsogre_encap_label_value = TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, label, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_string_t cmd_set_mplsogre_encap_ip_src = TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result, pos_token, "ip-src"); @@ -15827,7 +15827,7 @@ cmdline_parse_token_string_t cmd_set_mplsogre_encap_vlan = pos_token, "vlan-tci"); cmdline_parse_token_num_t cmd_set_mplsogre_encap_vlan_value = TOKEN_NUM_INITIALIZER(struct cmd_set_mplsogre_encap_result, tci, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_mplsogre_encap_eth_src = TOKEN_STRING_INITIALIZER(struct cmd_set_mplsogre_encap_result, pos_token, "eth-src"); @@ -16035,19 +16035,19 @@ cmdline_parse_token_string_t cmd_set_mplsoudp_encap_label = pos_token, "label"); cmdline_parse_token_num_t cmd_set_mplsoudp_encap_label_value = TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, label, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_src = TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result, pos_token, "udp-src"); cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_src_value = TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_src, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_mplsoudp_encap_udp_dst = TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result, pos_token, "udp-dst"); cmdline_parse_token_num_t cmd_set_mplsoudp_encap_udp_dst_value = TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, udp_dst, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_mplsoudp_encap_ip_src = TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result, pos_token, "ip-src"); @@ -16063,7 +16063,7 @@ cmdline_parse_token_string_t cmd_set_mplsoudp_encap_vlan = pos_token, "vlan-tci"); cmdline_parse_token_num_t cmd_set_mplsoudp_encap_vlan_value = TOKEN_NUM_INITIALIZER(struct cmd_set_mplsoudp_encap_result, tci, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_set_mplsoudp_encap_eth_src = TOKEN_STRING_INITIALIZER(struct cmd_set_mplsoudp_encap_result, pos_token, "eth-src"); @@ -16306,7 +16306,7 @@ cmdline_parse_token_string_t cmd_ddp_add_ddp = cmdline_parse_token_string_t cmd_ddp_add_add = TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, add, "add"); cmdline_parse_token_num_t cmd_ddp_add_port_id = - TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_ddp_add_filepath = TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, filepath, NULL); @@ -16386,7 +16386,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, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_ddp_del_filepath = TOKEN_STRING_INITIALIZER(struct cmd_ddp_del_result, filepath, NULL); @@ -16693,7 +16693,7 @@ cmdline_parse_token_string_t cmd_ddp_get_list_get = cmdline_parse_token_string_t cmd_ddp_get_list_list = TOKEN_STRING_INITIALIZER(struct cmd_ddp_get_list_result, list, "list"); cmdline_parse_token_num_t cmd_ddp_get_list_port_id = - TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_ddp_get_list_result, port_id, CMDLINE_UINT16); static void cmd_ddp_get_list_parsed( @@ -16842,13 +16842,13 @@ cmdline_parse_token_string_t cmd_cfg_input_set_cfg = cfg, "config"); cmdline_parse_token_num_t cmd_cfg_input_set_port_id = TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_cfg_input_set_pctype = TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result, pctype, "pctype"); cmdline_parse_token_num_t cmd_cfg_input_set_pctype_id = TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result, - pctype_id, UINT8); + pctype_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_cfg_input_set_inset_type = TOKEN_STRING_INITIALIZER(struct cmd_cfg_input_set_result, inset_type, @@ -16861,7 +16861,7 @@ cmdline_parse_token_string_t cmd_cfg_input_set_field = field, "field"); cmdline_parse_token_num_t cmd_cfg_input_set_field_idx = TOKEN_NUM_INITIALIZER(struct cmd_cfg_input_set_result, - field_idx, UINT8); + field_idx, CMDLINE_UINT8); cmdline_parse_inst_t cmd_cfg_input_set = { .f = cmd_cfg_input_set_parsed, @@ -16943,13 +16943,13 @@ cmdline_parse_token_string_t cmd_clear_input_set_cfg = cfg, "config"); cmdline_parse_token_num_t cmd_clear_input_set_port_id = TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_clear_input_set_pctype = TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result, pctype, "pctype"); cmdline_parse_token_num_t cmd_clear_input_set_pctype_id = TOKEN_NUM_INITIALIZER(struct cmd_clear_input_set_result, - pctype_id, UINT8); + pctype_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_clear_input_set_inset_type = TOKEN_STRING_INITIALIZER(struct cmd_clear_input_set_result, inset_type, @@ -17006,11 +17006,11 @@ cmdline_parse_token_string_t cmd_show_vf_stats_stats = cmdline_parse_token_num_t cmd_show_vf_stats_port_id = TOKEN_NUM_INITIALIZER (struct cmd_show_vf_stats_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_show_vf_stats_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_show_vf_stats_result, - vf_id, UINT16); + vf_id, CMDLINE_UINT16); static void cmd_show_vf_stats_parsed( @@ -17115,11 +17115,11 @@ cmdline_parse_token_string_t cmd_clear_vf_stats_stats = cmdline_parse_token_num_t cmd_clear_vf_stats_port_id = TOKEN_NUM_INITIALIZER (struct cmd_clear_vf_stats_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_clear_vf_stats_vf_id = TOKEN_NUM_INITIALIZER (struct cmd_clear_vf_stats_result, - vf_id, UINT16); + vf_id, CMDLINE_UINT16); static void cmd_clear_vf_stats_parsed( @@ -17199,7 +17199,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_reset_config = cmdline_parse_token_num_t cmd_pctype_mapping_reset_port_id = TOKEN_NUM_INITIALIZER (struct cmd_pctype_mapping_reset_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_pctype_mapping_reset_pctype = TOKEN_STRING_INITIALIZER (struct cmd_pctype_mapping_reset_result, @@ -17281,7 +17281,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_get_port = cmdline_parse_token_num_t cmd_pctype_mapping_get_port_id = TOKEN_NUM_INITIALIZER (struct cmd_pctype_mapping_get_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_pctype_mapping_get_pctype = TOKEN_STRING_INITIALIZER (struct cmd_pctype_mapping_get_result, @@ -17385,7 +17385,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_config = cmdline_parse_token_num_t cmd_pctype_mapping_update_port_id = TOKEN_NUM_INITIALIZER (struct cmd_pctype_mapping_update_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_pctype_mapping_update_pctype = TOKEN_STRING_INITIALIZER (struct cmd_pctype_mapping_update_result, @@ -17405,7 +17405,7 @@ cmdline_parse_token_string_t cmd_pctype_mapping_update_pc_type = cmdline_parse_token_num_t cmd_pctype_mapping_update_flow_type = TOKEN_NUM_INITIALIZER (struct cmd_pctype_mapping_update_result, - flow_type, UINT16); + flow_type, CMDLINE_UINT16); static void cmd_pctype_mapping_update_parsed( @@ -17499,11 +17499,11 @@ cmdline_parse_token_string_t cmd_ptype_mapping_get_get = cmdline_parse_token_num_t cmd_ptype_mapping_get_port_id = TOKEN_NUM_INITIALIZER (struct cmd_ptype_mapping_get_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_ptype_mapping_get_valid_only = TOKEN_NUM_INITIALIZER (struct cmd_ptype_mapping_get_result, - valid_only, UINT8); + valid_only, CMDLINE_UINT8); static void cmd_ptype_mapping_get_parsed( @@ -17596,19 +17596,19 @@ cmdline_parse_token_string_t cmd_ptype_mapping_replace_replace = cmdline_parse_token_num_t cmd_ptype_mapping_replace_port_id = TOKEN_NUM_INITIALIZER (struct cmd_ptype_mapping_replace_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_ptype_mapping_replace_target = TOKEN_NUM_INITIALIZER (struct cmd_ptype_mapping_replace_result, - target, UINT32); + target, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_ptype_mapping_replace_mask = TOKEN_NUM_INITIALIZER (struct cmd_ptype_mapping_replace_result, - mask, UINT8); + mask, CMDLINE_UINT8); cmdline_parse_token_num_t cmd_ptype_mapping_replace_pkt_type = TOKEN_NUM_INITIALIZER (struct cmd_ptype_mapping_replace_result, - pkt_type, UINT32); + pkt_type, CMDLINE_UINT32); static void cmd_ptype_mapping_replace_parsed( @@ -17690,7 +17690,7 @@ cmdline_parse_token_string_t cmd_ptype_mapping_reset_reset = cmdline_parse_token_num_t cmd_ptype_mapping_reset_port_id = TOKEN_NUM_INITIALIZER (struct cmd_ptype_mapping_reset_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); static void cmd_ptype_mapping_reset_parsed( @@ -17763,15 +17763,15 @@ cmdline_parse_token_string_t cmd_ptype_mapping_update_update = cmdline_parse_token_num_t cmd_ptype_mapping_update_port_id = TOKEN_NUM_INITIALIZER (struct cmd_ptype_mapping_update_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_ptype_mapping_update_hw_ptype = TOKEN_NUM_INITIALIZER (struct cmd_ptype_mapping_update_result, - hw_ptype, UINT8); + hw_ptype, CMDLINE_UINT8); cmdline_parse_token_num_t cmd_ptype_mapping_update_sw_ptype = TOKEN_NUM_INITIALIZER (struct cmd_ptype_mapping_update_result, - sw_ptype, UINT32); + sw_ptype, CMDLINE_UINT32); static void cmd_ptype_mapping_update_parsed( @@ -17882,7 +17882,7 @@ cmdline_parse_token_string_t cmd_rx_offload_get_capa_port = cmdline_parse_token_num_t cmd_rx_offload_get_capa_port_id = TOKEN_NUM_INITIALIZER (struct cmd_rx_offload_get_capa_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_rx_offload_get_capa_rx_offload = TOKEN_STRING_INITIALIZER (struct cmd_rx_offload_get_capa_result, @@ -17979,7 +17979,7 @@ cmdline_parse_token_string_t cmd_rx_offload_get_configuration_port = cmdline_parse_token_num_t cmd_rx_offload_get_configuration_port_id = TOKEN_NUM_INITIALIZER (struct cmd_rx_offload_get_configuration_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_rx_offload_get_configuration_rx_offload = TOKEN_STRING_INITIALIZER (struct cmd_rx_offload_get_configuration_result, @@ -18061,7 +18061,7 @@ cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_config = cmdline_parse_token_num_t cmd_config_per_port_rx_offload_result_port_id = TOKEN_NUM_INITIALIZER (struct cmd_config_per_port_rx_offload_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_per_port_rx_offload_result_rx_offload = TOKEN_STRING_INITIALIZER (struct cmd_config_per_port_rx_offload_result, @@ -18183,7 +18183,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_port = cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_port_id = TOKEN_NUM_INITIALIZER (struct cmd_config_per_queue_rx_offload_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq = TOKEN_STRING_INITIALIZER (struct cmd_config_per_queue_rx_offload_result, @@ -18191,7 +18191,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxq = cmdline_parse_token_num_t cmd_config_per_queue_rx_offload_result_queue_id = TOKEN_NUM_INITIALIZER (struct cmd_config_per_queue_rx_offload_result, - queue_id, UINT16); + queue_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_per_queue_rx_offload_result_rxoffload = TOKEN_STRING_INITIALIZER (struct cmd_config_per_queue_rx_offload_result, @@ -18292,7 +18292,7 @@ cmdline_parse_token_string_t cmd_tx_offload_get_capa_port = cmdline_parse_token_num_t cmd_tx_offload_get_capa_port_id = TOKEN_NUM_INITIALIZER (struct cmd_tx_offload_get_capa_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_tx_offload_get_capa_tx_offload = TOKEN_STRING_INITIALIZER (struct cmd_tx_offload_get_capa_result, @@ -18389,7 +18389,7 @@ cmdline_parse_token_string_t cmd_tx_offload_get_configuration_port = cmdline_parse_token_num_t cmd_tx_offload_get_configuration_port_id = TOKEN_NUM_INITIALIZER (struct cmd_tx_offload_get_configuration_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_tx_offload_get_configuration_tx_offload = TOKEN_STRING_INITIALIZER (struct cmd_tx_offload_get_configuration_result, @@ -18471,7 +18471,7 @@ cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_config = cmdline_parse_token_num_t cmd_config_per_port_tx_offload_result_port_id = TOKEN_NUM_INITIALIZER (struct cmd_config_per_port_tx_offload_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_per_port_tx_offload_result_tx_offload = TOKEN_STRING_INITIALIZER (struct cmd_config_per_port_tx_offload_result, @@ -18600,7 +18600,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_port = cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_port_id = TOKEN_NUM_INITIALIZER (struct cmd_config_per_queue_tx_offload_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq = TOKEN_STRING_INITIALIZER (struct cmd_config_per_queue_tx_offload_result, @@ -18608,7 +18608,7 @@ cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txq = cmdline_parse_token_num_t cmd_config_per_queue_tx_offload_result_queue_id = TOKEN_NUM_INITIALIZER (struct cmd_config_per_queue_tx_offload_result, - queue_id, UINT16); + queue_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_per_queue_tx_offload_result_txoffload = TOKEN_STRING_INITIALIZER (struct cmd_config_per_queue_tx_offload_result, @@ -18725,13 +18725,13 @@ cmdline_parse_token_string_t cmd_config_tx_metadata_specific_keyword = keyword, "config"); cmdline_parse_token_num_t cmd_config_tx_metadata_specific_id = TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_config_tx_metadata_specific_item = TOKEN_STRING_INITIALIZER(struct cmd_config_tx_metadata_specific_result, item, "tx_metadata"); cmdline_parse_token_num_t cmd_config_tx_metadata_specific_value = TOKEN_NUM_INITIALIZER(struct cmd_config_tx_metadata_specific_result, - value, UINT32); + value, CMDLINE_UINT32); cmdline_parse_inst_t cmd_config_tx_metadata_specific = { .f = cmd_config_tx_metadata_specific_parsed, @@ -18780,7 +18780,7 @@ cmdline_parse_token_string_t cmd_show_tx_metadata_port = cmd_port, "port"); cmdline_parse_token_num_t cmd_show_tx_metadata_pid = TOKEN_NUM_INITIALIZER(struct cmd_show_tx_metadata_result, - cmd_pid, UINT16); + cmd_pid, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_show_tx_metadata_keyword = TOKEN_STRING_INITIALIZER(struct cmd_show_tx_metadata_result, cmd_keyword, "tx_metadata"); diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c index ab5c8642dba3..b21e1a633ecb 100644 --- a/app/test-pmd/cmdline_mtr.c +++ b/app/test-pmd/cmdline_mtr.c @@ -253,7 +253,7 @@ cmdline_parse_token_string_t cmd_show_port_meter_cap_cap = struct cmd_show_port_meter_cap_result, cap, "cap"); cmdline_parse_token_num_t cmd_show_port_meter_cap_port_id = TOKEN_NUM_INITIALIZER( - struct cmd_show_port_meter_cap_result, port_id, UINT16); + struct cmd_show_port_meter_cap_result, port_id, CMDLINE_UINT16); static void cmd_show_port_meter_cap_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -359,23 +359,23 @@ cmdline_parse_token_string_t cmd_add_port_meter_profile_srtcm_srtcm_rfc2697 = cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_port_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_srtcm_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_profile_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_srtcm_result, - profile_id, UINT32); + profile_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_cir = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_srtcm_result, - cir, UINT64); + cir, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_cbs = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_srtcm_result, - cbs, UINT64); + cbs, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_meter_profile_srtcm_ebs = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_srtcm_result, - ebs, UINT64); + ebs, CMDLINE_UINT64); static void cmd_add_port_meter_profile_srtcm_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -461,27 +461,27 @@ cmdline_parse_token_string_t cmd_add_port_meter_profile_trtcm_trtcm_rfc2698 = cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_port_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_trtcm_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_profile_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_trtcm_result, - profile_id, UINT32); + profile_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_cir = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_trtcm_result, - cir, UINT64); + cir, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_pir = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_trtcm_result, - pir, UINT64); + pir, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_cbs = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_trtcm_result, - cbs, UINT64); + cbs, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_pbs = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_trtcm_result, - pbs, UINT64); + pbs, CMDLINE_UINT64); static void cmd_add_port_meter_profile_trtcm_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -571,27 +571,27 @@ cmdline_parse_token_string_t cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_port_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_trtcm_rfc4115_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_profile_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_trtcm_rfc4115_result, - profile_id, UINT32); + profile_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_cir = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_trtcm_rfc4115_result, - cir, UINT64); + cir, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_eir = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_trtcm_rfc4115_result, - eir, UINT64); + eir, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_cbs = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_trtcm_rfc4115_result, - cbs, UINT64); + cbs, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_meter_profile_trtcm_rfc4115_ebs = TOKEN_NUM_INITIALIZER( struct cmd_add_port_meter_profile_trtcm_rfc4115_result, - ebs, UINT64); + ebs, CMDLINE_UINT64); static void cmd_add_port_meter_profile_trtcm_rfc4115_parsed( void *parsed_result, @@ -672,11 +672,11 @@ cmdline_parse_token_string_t cmd_del_port_meter_profile_profile = cmdline_parse_token_num_t cmd_del_port_meter_profile_port_id = TOKEN_NUM_INITIALIZER( struct cmd_del_port_meter_profile_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_del_port_meter_profile_profile_id = TOKEN_NUM_INITIALIZER( struct cmd_del_port_meter_profile_result, - profile_id, UINT32); + profile_id, CMDLINE_UINT32); static void cmd_del_port_meter_profile_parsed(void *parsed_result, __attribute__((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, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_create_port_meter_mtr_id = TOKEN_NUM_INITIALIZER( - struct cmd_create_port_meter_result, mtr_id, UINT32); + struct cmd_create_port_meter_result, mtr_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_create_port_meter_profile_id = TOKEN_NUM_INITIALIZER( - struct cmd_create_port_meter_result, profile_id, UINT32); + struct cmd_create_port_meter_result, profile_id, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_create_port_meter_meter_enable = TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result, meter_enable, "yes#no"); @@ -763,10 +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, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_create_port_meter_shared = TOKEN_NUM_INITIALIZER(struct cmd_create_port_meter_result, - shared, UINT32); + shared, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_create_port_meter_input_color = TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result, meter_input_color, TOKEN_STRING_MULTI); @@ -866,10 +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, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_enable_port_meter_mtr_id = TOKEN_NUM_INITIALIZER( - struct cmd_enable_port_meter_result, mtr_id, UINT32); + struct cmd_enable_port_meter_result, mtr_id, CMDLINE_UINT32); static void cmd_enable_port_meter_parsed(void *parsed_result, __attribute__((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, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_disable_port_meter_mtr_id = TOKEN_NUM_INITIALIZER( - struct cmd_disable_port_meter_result, mtr_id, UINT32); + struct cmd_disable_port_meter_result, mtr_id, CMDLINE_UINT32); static void cmd_disable_port_meter_parsed(void *parsed_result, __attribute__((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, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_del_port_meter_mtr_id = TOKEN_NUM_INITIALIZER( - struct cmd_del_port_meter_result, mtr_id, UINT32); + struct cmd_del_port_meter_result, mtr_id, CMDLINE_UINT32); static void cmd_del_port_meter_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -1054,13 +1054,13 @@ cmdline_parse_token_string_t cmd_set_port_meter_profile_profile = struct cmd_set_port_meter_profile_result, profile, "profile"); cmdline_parse_token_num_t cmd_set_port_meter_profile_port_id = TOKEN_NUM_INITIALIZER( - struct cmd_set_port_meter_profile_result, port_id, UINT16); + struct cmd_set_port_meter_profile_result, port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_set_port_meter_profile_mtr_id = TOKEN_NUM_INITIALIZER( - struct cmd_set_port_meter_profile_result, mtr_id, UINT32); + struct cmd_set_port_meter_profile_result, mtr_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_set_port_meter_profile_profile_id = TOKEN_NUM_INITIALIZER( - struct cmd_set_port_meter_profile_result, profile_id, UINT32); + struct cmd_set_port_meter_profile_result, profile_id, CMDLINE_UINT32); static void cmd_set_port_meter_profile_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -1208,15 +1208,15 @@ cmdline_parse_token_string_t cmd_set_port_meter_policer_action_action = cmdline_parse_token_num_t cmd_set_port_meter_policer_action_port_id = TOKEN_NUM_INITIALIZER( struct cmd_set_port_meter_policer_action_result, port_id, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_num_t cmd_set_port_meter_policer_action_mtr_id = TOKEN_NUM_INITIALIZER( struct cmd_set_port_meter_policer_action_result, mtr_id, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_num_t cmd_set_port_meter_policer_action_action_mask = TOKEN_NUM_INITIALIZER( struct cmd_set_port_meter_policer_action_result, action_mask, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_string_t cmd_set_port_meter_policer_action_policer_action = TOKEN_STRING_INITIALIZER( struct cmd_set_port_meter_policer_action_result, @@ -1316,14 +1316,14 @@ cmdline_parse_token_string_t cmd_set_port_meter_stats_mask_mask = struct cmd_set_port_meter_stats_mask_result, mask, "mask"); cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_port_id = TOKEN_NUM_INITIALIZER( - struct cmd_set_port_meter_stats_mask_result, port_id, UINT16); + struct cmd_set_port_meter_stats_mask_result, port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_mtr_id = TOKEN_NUM_INITIALIZER( - struct cmd_set_port_meter_stats_mask_result, mtr_id, UINT32); + struct cmd_set_port_meter_stats_mask_result, mtr_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_set_port_meter_stats_mask_stats_mask = TOKEN_NUM_INITIALIZER( struct cmd_set_port_meter_stats_mask_result, stats_mask, - UINT64); + CMDLINE_UINT64); static void cmd_set_port_meter_stats_mask_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -1388,10 +1388,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, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_show_port_meter_stats_mtr_id = TOKEN_NUM_INITIALIZER( - struct cmd_show_port_meter_stats_result, mtr_id, UINT32); + struct cmd_show_port_meter_stats_result, mtr_id, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_show_port_meter_stats_clear = TOKEN_STRING_INITIALIZER( struct cmd_show_port_meter_stats_result, clear, "yes#no"); diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c index d62a4f54439f..506fb9055be0 100644 --- a/app/test-pmd/cmdline_tm.c +++ b/app/test-pmd/cmdline_tm.c @@ -217,7 +217,7 @@ cmdline_parse_token_string_t cmd_show_port_tm_cap_cap = cap, "cap"); cmdline_parse_token_num_t cmd_show_port_tm_cap_port_id = TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_cap_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); static void cmd_show_port_tm_cap_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -354,10 +354,10 @@ cmdline_parse_token_string_t cmd_show_port_tm_level_cap_cap = cap, "cap"); cmdline_parse_token_num_t cmd_show_port_tm_level_cap_port_id = TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_level_cap_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_show_port_tm_level_cap_level_id = TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_level_cap_result, - level_id, UINT32); + level_id, CMDLINE_UINT32); static void cmd_show_port_tm_level_cap_parsed(void *parsed_result, @@ -481,10 +481,10 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_cap_cap = cap, "cap"); cmdline_parse_token_num_t cmd_show_port_tm_node_cap_port_id = TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_cap_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_show_port_tm_node_cap_node_id = TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_cap_result, - node_id, UINT32); + node_id, CMDLINE_UINT32); static void cmd_show_port_tm_node_cap_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -593,14 +593,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, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_show_port_tm_node_stats_node_id = TOKEN_NUM_INITIALIZER( struct cmd_show_port_tm_node_stats_result, - node_id, UINT32); + node_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_show_port_tm_node_stats_clear = TOKEN_NUM_INITIALIZER( - struct cmd_show_port_tm_node_stats_result, clear, UINT32); + struct cmd_show_port_tm_node_stats_result, clear, CMDLINE_UINT32); static void cmd_show_port_tm_node_stats_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -712,11 +712,11 @@ cmdline_parse_token_string_t cmd_show_port_tm_node_type_type = cmdline_parse_token_num_t cmd_show_port_tm_node_type_port_id = TOKEN_NUM_INITIALIZER( struct cmd_show_port_tm_node_type_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_show_port_tm_node_type_node_id = TOKEN_NUM_INITIALIZER( struct cmd_show_port_tm_node_type_result, - node_id, UINT32); + node_id, CMDLINE_UINT32); static void cmd_show_port_tm_node_type_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -804,31 +804,31 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_profile = cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_port_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_shaper_profile_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_shaper_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_shaper_profile_result, - shaper_id, UINT32); + shaper_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_rate = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_shaper_profile_result, - cmit_tb_rate, UINT64); + cmit_tb_rate, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_size = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_shaper_profile_result, - cmit_tb_size, UINT64); + cmit_tb_size, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_rate = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_shaper_profile_result, - peak_tb_rate, UINT64); + peak_tb_rate, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_size = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_shaper_profile_result, - peak_tb_size, UINT64); + peak_tb_size, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_pktlen_adjust = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_shaper_profile_result, - pktlen_adjust, UINT32); + pktlen_adjust, CMDLINE_UINT32); static void cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -920,11 +920,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_profile = cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_port_id = TOKEN_NUM_INITIALIZER( struct cmd_del_port_tm_node_shaper_profile_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_shaper_id = TOKEN_NUM_INITIALIZER( struct cmd_del_port_tm_node_shaper_profile_result, - shaper_id, UINT32); + shaper_id, CMDLINE_UINT32); static void cmd_del_port_tm_node_shaper_profile_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -1001,15 +1001,15 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_shaper = cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_port_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_shared_shaper_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shared_shaper_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_shared_shaper_result, - shared_shaper_id, UINT32); + shared_shaper_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shaper_profile_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_shared_shaper_result, - shaper_profile_id, UINT32); + shaper_profile_id, CMDLINE_UINT32); static void cmd_add_port_tm_node_shared_shaper_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -1101,11 +1101,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_shaper = cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_port_id = TOKEN_NUM_INITIALIZER( struct cmd_del_port_tm_node_shared_shaper_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_shared_shaper_id = TOKEN_NUM_INITIALIZER( struct cmd_del_port_tm_node_shared_shaper_result, - shared_shaper_id, UINT32); + shared_shaper_id, CMDLINE_UINT32); static void cmd_del_port_tm_node_shared_shaper_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -1194,11 +1194,11 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_profile = cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_port_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wred_profile_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - wred_profile_id, UINT32); + wred_profile_id, CMDLINE_UINT32); cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g = TOKEN_STRING_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, @@ -1206,19 +1206,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g = cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_g = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - min_th_g, UINT64); + min_th_g, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_g = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - max_th_g, UINT64); + max_th_g, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_g = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - maxp_inv_g, UINT16); + maxp_inv_g, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_g = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - wq_log2_g, UINT16); + wq_log2_g, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y = TOKEN_STRING_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, @@ -1226,19 +1226,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y = cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_y = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - min_th_y, UINT64); + min_th_y, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_y = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - max_th_y, UINT64); + max_th_y, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_y = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - maxp_inv_y, UINT16); + maxp_inv_y, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_y = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - wq_log2_y, UINT16); + wq_log2_y, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r = TOKEN_STRING_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, @@ -1246,19 +1246,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r = cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_r = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - min_th_r, UINT64); + min_th_r, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_r = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - max_th_r, UINT64); + max_th_r, CMDLINE_UINT64); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_r = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - maxp_inv_r, UINT16); + maxp_inv_r, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_r = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_node_wred_profile_result, - wq_log2_r, UINT16); + wq_log2_r, CMDLINE_UINT16); static void cmd_add_port_tm_node_wred_profile_parsed(void *parsed_result, @@ -1374,11 +1374,11 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_profile = cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_port_id = TOKEN_NUM_INITIALIZER( struct cmd_del_port_tm_node_wred_profile_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_wred_profile_id = TOKEN_NUM_INITIALIZER( struct cmd_del_port_tm_node_wred_profile_result, - wred_profile_id, UINT32); + wred_profile_id, CMDLINE_UINT32); static void cmd_del_port_tm_node_wred_profile_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -1456,15 +1456,15 @@ cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_profile = cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_port_id = TOKEN_NUM_INITIALIZER( struct cmd_set_port_tm_node_shaper_profile_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_node_id = TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_shaper_profile_result, - node_id, UINT32); + node_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_shaper_profile_profile_id = TOKEN_NUM_INITIALIZER( struct cmd_set_port_tm_node_shaper_profile_result, - shaper_profile_id, UINT32); + shaper_profile_id, CMDLINE_UINT32); static void cmd_set_port_tm_node_shaper_profile_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -1550,31 +1550,31 @@ cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_node = cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_port_id = TOKEN_NUM_INITIALIZER( struct cmd_add_port_tm_nonleaf_node_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_node_id = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result, - node_id, UINT32); + node_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_parent_node_id = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result, - parent_node_id, INT32); + parent_node_id, CMDLINE_INT32); cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_priority = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result, - priority, UINT32); + priority, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_weight = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result, - weight, UINT32); + weight, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_level_id = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result, - level_id, UINT32); + level_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_shaper_profile_id = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result, - shaper_profile_id, INT32); + shaper_profile_id, CMDLINE_INT32); cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_n_sp_priorities = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result, - n_sp_priorities, UINT32); + n_sp_priorities, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_stats_mask = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result, - stats_mask, UINT64); + stats_mask, CMDLINE_UINT64); cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_multi_shared_shaper_id = TOKEN_STRING_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result, @@ -1708,34 +1708,34 @@ cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_node = struct cmd_add_port_tm_leaf_node_result, node, "node"); cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_port_id = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_node_id = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result, - node_id, UINT32); + node_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_parent_node_id = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result, - parent_node_id, INT32); + parent_node_id, CMDLINE_INT32); cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_priority = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result, - priority, UINT32); + priority, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_weight = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result, - weight, UINT32); + weight, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_level_id = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result, - level_id, UINT32); + level_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_shaper_profile_id = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result, - shaper_profile_id, INT32); + shaper_profile_id, CMDLINE_INT32); cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_cman_mode = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result, - cman_mode, UINT32); + cman_mode, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_wred_profile_id = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result, - wred_profile_id, UINT32); + wred_profile_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_stats_mask = TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result, - stats_mask, UINT64); + stats_mask, CMDLINE_UINT64); cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_multi_shared_shaper_id = TOKEN_STRING_INITIALIZER(struct cmd_add_port_tm_leaf_node_result, @@ -1858,10 +1858,10 @@ cmdline_parse_token_string_t cmd_del_port_tm_node_node = struct cmd_del_port_tm_node_result, node, "node"); cmdline_parse_token_num_t cmd_del_port_tm_node_port_id = TOKEN_NUM_INITIALIZER(struct cmd_del_port_tm_node_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_del_port_tm_node_node_id = TOKEN_NUM_INITIALIZER(struct cmd_del_port_tm_node_result, - node_id, UINT32); + node_id, CMDLINE_UINT32); static void cmd_del_port_tm_node_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -1936,19 +1936,19 @@ cmdline_parse_token_string_t cmd_set_port_tm_node_parent_parent = struct cmd_set_port_tm_node_parent_result, parent, "parent"); cmdline_parse_token_num_t cmd_set_port_tm_node_parent_port_id = TOKEN_NUM_INITIALIZER( - struct cmd_set_port_tm_node_parent_result, port_id, UINT16); + struct cmd_set_port_tm_node_parent_result, port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_set_port_tm_node_parent_node_id = TOKEN_NUM_INITIALIZER( - struct cmd_set_port_tm_node_parent_result, node_id, UINT32); + struct cmd_set_port_tm_node_parent_result, node_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_set_port_tm_node_parent_parent_id = TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result, - parent_id, UINT32); + parent_id, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_set_port_tm_node_parent_priority = TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result, - priority, UINT32); + priority, CMDLINE_UINT32); cmdline_parse_token_num_t cmd_set_port_tm_node_parent_weight = TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result, - weight, UINT32); + weight, CMDLINE_UINT32); static void cmd_set_port_tm_node_parent_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -2024,10 +2024,10 @@ cmdline_parse_token_string_t cmd_suspend_port_tm_node_node = struct cmd_suspend_port_tm_node_result, node, "node"); cmdline_parse_token_num_t cmd_suspend_port_tm_node_port_id = TOKEN_NUM_INITIALIZER( - struct cmd_suspend_port_tm_node_result, port_id, UINT16); + struct cmd_suspend_port_tm_node_result, port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_suspend_port_tm_node_node_id = TOKEN_NUM_INITIALIZER( - struct cmd_suspend_port_tm_node_result, node_id, UINT32); + struct cmd_suspend_port_tm_node_result, node_id, CMDLINE_UINT32); static void cmd_suspend_port_tm_node_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -2089,10 +2089,10 @@ cmdline_parse_token_string_t cmd_resume_port_tm_node_node = struct cmd_resume_port_tm_node_result, node, "node"); cmdline_parse_token_num_t cmd_resume_port_tm_node_port_id = TOKEN_NUM_INITIALIZER( - struct cmd_resume_port_tm_node_result, port_id, UINT16); + struct cmd_resume_port_tm_node_result, port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_resume_port_tm_node_node_id = TOKEN_NUM_INITIALIZER( - struct cmd_resume_port_tm_node_result, node_id, UINT32); + struct cmd_resume_port_tm_node_result, node_id, CMDLINE_UINT32); static void cmd_resume_port_tm_node_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -2156,7 +2156,7 @@ cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_commit = cmdline_parse_token_num_t cmd_port_tm_hierarchy_commit_port_id = TOKEN_NUM_INITIALIZER( struct cmd_port_tm_hierarchy_commit_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_clean_on_fail = TOKEN_STRING_INITIALIZER(struct cmd_port_tm_hierarchy_commit_result, clean_on_fail, "yes#no"); @@ -2236,17 +2236,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_ip_ecn = ip_ecn, "ip_ecn"); cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_port_id = TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_green = TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result, - green, UINT16); + green, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_yellow = TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result, - yellow, UINT16); + yellow, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_red = TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result, - red, UINT16); + red, CMDLINE_UINT16); static void cmd_port_tm_mark_ip_ecn_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -2323,17 +2323,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_ip_dscp = ip_dscp, "ip_dscp"); cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_port_id = TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_green = TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result, - green, UINT16); + green, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_yellow = TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result, - yellow, UINT16); + yellow, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_red = TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result, - red, UINT16); + red, CMDLINE_UINT16); static void cmd_port_tm_mark_ip_dscp_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, @@ -2410,17 +2410,17 @@ cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_vlan_dei = vlan_dei, "vlan_dei"); cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_port_id = TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result, - port_id, UINT16); + port_id, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_green = TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result, - green, UINT16); + green, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_yellow = TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result, - yellow, UINT16); + yellow, CMDLINE_UINT16); cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_red = TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result, - red, UINT16); + red, CMDLINE_UINT16); static void cmd_port_tm_mark_vlan_dei_parsed(void *parsed_result, __attribute__((unused)) struct cmdline *cl, diff --git a/app/test/test_cmdline_num.c b/app/test/test_cmdline_num.c index 4c97caf3d0bf..9e76dadf5d92 100644 --- a/app/test/test_cmdline_num.c +++ b/app/test/test_cmdline_num.c @@ -233,31 +233,31 @@ static int can_parse_unsigned(uint64_t expected_result, enum cmdline_numtype type) { switch (type) { - case UINT8: + case CMDLINE_UINT8: if (expected_result > UINT8_MAX) return 0; break; - case UINT16: + case CMDLINE_UINT16: if (expected_result > UINT16_MAX) return 0; break; - case UINT32: + case CMDLINE_UINT32: if (expected_result > UINT32_MAX) return 0; break; - case INT8: + case CMDLINE_INT8: if (expected_result > INT8_MAX) return 0; break; - case INT16: + case CMDLINE_INT16: if (expected_result > INT16_MAX) return 0; break; - case INT32: + case CMDLINE_INT32: if (expected_result > INT32_MAX) return 0; break; - case INT64: + case CMDLINE_INT64: if (expected_result > INT64_MAX) return 0; break; @@ -271,31 +271,31 @@ static int can_parse_signed(int64_t expected_result, enum cmdline_numtype type) { switch (type) { - case UINT8: + case CMDLINE_UINT8: if (expected_result > UINT8_MAX || expected_result < 0) return 0; break; - case UINT16: + case CMDLINE_UINT16: if (expected_result > UINT16_MAX || expected_result < 0) return 0; break; - case UINT32: + case CMDLINE_UINT32: if (expected_result > UINT32_MAX || expected_result < 0) return 0; break; - case UINT64: + case CMDLINE_UINT64: if (expected_result < 0) return 0; break; - case INT8: + case CMDLINE_INT8: if (expected_result > INT8_MAX || expected_result < INT8_MIN) return 0; break; - case INT16: + case CMDLINE_INT16: if (expected_result > INT16_MAX || expected_result < INT16_MIN) return 0; break; - case INT32: + case CMDLINE_INT32: if (expected_result > INT32_MAX || expected_result < INT32_MIN) return 0; break; @@ -315,7 +315,7 @@ test_parse_num_invalid_param(void) int ret = 0; /* set up a token */ - token.num_data.type = UINT32; + token.num_data.type = CMDLINE_UINT32; /* copy string to buffer */ strlcpy(buf, num_valid_positive_strs[0].str, sizeof(buf)); @@ -388,7 +388,7 @@ test_parse_num_invalid_data(void) cmdline_parse_token_num_t token; /* cycle through all possible parsed types */ - for (type = UINT8; type <= INT64; type++) { + for (type = CMDLINE_UINT8; type <= CMDLINE_INT64; type++) { token.num_data.type = type; /* test full strings */ @@ -427,7 +427,7 @@ test_parse_num_valid(void) /** valid strings **/ /* cycle through all possible parsed types */ - for (type = UINT8; type <= INT64; type++) { + for (type = CMDLINE_UINT8; type <= CMDLINE_INT64; type++) { token.num_data.type = type; /* test positive strings */ @@ -481,13 +481,13 @@ test_parse_num_valid(void) if (ret > 0) { /* detect negative */ switch (type) { - case INT8: + case CMDLINE_INT8: result = (int8_t) result; break; - case INT16: + case CMDLINE_INT16: result = (int16_t) result; break; - case INT32: + case CMDLINE_INT32: result = (int32_t) result; break; default: @@ -505,7 +505,7 @@ test_parse_num_valid(void) /** garbage strings **/ /* cycle through all possible parsed types */ - for (type = UINT8; type <= INT64; type++) { + for (type = CMDLINE_UINT8; type <= CMDLINE_INT64; type++) { token.num_data.type = type; /* test positive garbage strings */ @@ -559,15 +559,15 @@ test_parse_num_valid(void) if (ret > 0) { /* detect negative */ switch (type) { - case INT8: + case CMDLINE_INT8: if (result & (INT8_MAX + 1)) result |= 0xFFFFFFFFFFFFFF00ULL; break; - case INT16: + case CMDLINE_INT16: if (result & (INT16_MAX + 1)) result |= 0xFFFFFFFFFFFF0000ULL; break; - case INT32: + case CMDLINE_INT32: if (result & (INT32_MAX + 1ULL)) result |= 0xFFFFFFFF00000000ULL; break; diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst index f59a283074f6..e4377d42af44 100644 --- a/doc/guides/rel_notes/release_19_11.rst +++ b/doc/guides/rel_notes/release_19_11.rst @@ -228,6 +228,9 @@ API Changes has been introduced in this release is used when used when all the packets enqueued in the tx adapter are destined for the same Ethernet port & Tx queue. +* cmdline: the cmdline_numtype enum values have been been prefixed + by ``CMDLINE_`` to avoid conflicts with user code. + ABI Changes ----------- diff --git a/examples/ethtool/ethtool-app/ethapp.c b/examples/ethtool/ethtool-app/ethapp.c index b6b967118e4c..0e8b2315c467 100644 --- a/examples/ethtool/ethtool-app/ethapp.c +++ b/examples/ethtool/ethtool-app/ethapp.c @@ -70,7 +70,7 @@ cmdline_parse_token_string_t pcmd_rxmode_token_cmd = cmdline_parse_token_string_t pcmd_portstats_token_cmd = TOKEN_STRING_INITIALIZER(struct pcmd_int_params, cmd, "portstats"); cmdline_parse_token_num_t pcmd_int_token_port = - TOKEN_NUM_INITIALIZER(struct pcmd_int_params, port, UINT16); + TOKEN_NUM_INITIALIZER(struct pcmd_int_params, port, CMDLINE_UINT16); /* Commands taking port id and string */ cmdline_parse_token_string_t pcmd_eeprom_token_cmd = @@ -84,7 +84,7 @@ cmdline_parse_token_string_t pcmd_regs_token_cmd = TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, cmd, "regs"); cmdline_parse_token_num_t pcmd_intstr_token_port = - TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, UINT16); + TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, CMDLINE_UINT16); cmdline_parse_token_string_t pcmd_intstr_token_opt = TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, opt, NULL); @@ -92,7 +92,7 @@ cmdline_parse_token_string_t pcmd_intstr_token_opt = cmdline_parse_token_string_t pcmd_macaddr_token_cmd = TOKEN_STRING_INITIALIZER(struct pcmd_intmac_params, cmd, "macaddr"); cmdline_parse_token_num_t pcmd_intmac_token_port = - TOKEN_NUM_INITIALIZER(struct pcmd_intmac_params, port, UINT16); + TOKEN_NUM_INITIALIZER(struct pcmd_intmac_params, port, CMDLINE_UINT16); cmdline_parse_token_etheraddr_t pcmd_intmac_token_mac = TOKEN_ETHERADDR_INITIALIZER(struct pcmd_intmac_params, mac); @@ -106,18 +106,18 @@ cmdline_parse_token_string_t pcmd_ringparam_token_cmd = TOKEN_STRING_INITIALIZER(struct pcmd_intintint_params, cmd, "ringparam"); cmdline_parse_token_num_t pcmd_intintint_token_port = - TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, port, UINT16); + TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, port, CMDLINE_UINT16); cmdline_parse_token_num_t pcmd_intintint_token_tx = - TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, tx, UINT16); + TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, tx, CMDLINE_UINT16); cmdline_parse_token_num_t pcmd_intintint_token_rx = - TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, rx, UINT16); + TOKEN_NUM_INITIALIZER(struct pcmd_intintint_params, rx, CMDLINE_UINT16); /* Pause commands */ cmdline_parse_token_string_t pcmd_pause_token_cmd = TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, cmd, "pause"); cmdline_parse_token_num_t pcmd_pause_token_port = - TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, UINT16); + TOKEN_NUM_INITIALIZER(struct pcmd_intstr_params, port, CMDLINE_UINT16); cmdline_parse_token_string_t pcmd_pause_token_opt = TOKEN_STRING_INITIALIZER(struct pcmd_intstr_params, opt, "all#tx#rx#none"); @@ -126,11 +126,11 @@ cmdline_parse_token_string_t pcmd_pause_token_opt = cmdline_parse_token_string_t pcmd_vlan_token_cmd = TOKEN_STRING_INITIALIZER(struct pcmd_vlan_params, cmd, "vlan"); cmdline_parse_token_num_t pcmd_vlan_token_port = - TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, port, UINT16); + TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, port, CMDLINE_UINT16); cmdline_parse_token_string_t pcmd_vlan_token_mode = TOKEN_STRING_INITIALIZER(struct pcmd_vlan_params, mode, "add#del"); cmdline_parse_token_num_t pcmd_vlan_token_vid = - TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, vid, UINT16); + TOKEN_NUM_INITIALIZER(struct pcmd_vlan_params, vid, CMDLINE_UINT16); static void diff --git a/examples/ipsec-secgw/parser.c b/examples/ipsec-secgw/parser.c index fc8c238fe5a5..b46d5184b5e0 100644 --- a/examples/ipsec-secgw/parser.c +++ b/examples/ipsec-secgw/parser.c @@ -516,7 +516,7 @@ cmdline_parse_token_string_t cfg_add_neigh_start = cmdline_parse_token_string_t cfg_add_neigh_pstr = TOKEN_STRING_INITIALIZER(struct cfg_neigh_add_item, pstr, "port"); cmdline_parse_token_num_t cfg_add_neigh_port = - TOKEN_NUM_INITIALIZER(struct cfg_neigh_add_item, port, UINT16); + TOKEN_NUM_INITIALIZER(struct cfg_neigh_add_item, port, CMDLINE_UINT16); cmdline_parse_token_string_t cfg_add_neigh_mac = TOKEN_STRING_INITIALIZER(struct cfg_neigh_add_item, mac, NULL); diff --git a/examples/qos_sched/cmdline.c b/examples/qos_sched/cmdline.c index 15f51830c160..cd43419a8823 100644 --- a/examples/qos_sched/cmdline.c +++ b/examples/qos_sched/cmdline.c @@ -113,7 +113,7 @@ cmdline_parse_token_string_t cmd_setqavg_param_string = "period#n"); cmdline_parse_token_num_t cmd_setqavg_number = TOKEN_NUM_INITIALIZER(struct cmd_setqavg_result, number, - UINT32); + CMDLINE_UINT32); cmdline_parse_inst_t cmd_setqavg = { .f = cmd_setqavg_parsed, @@ -188,10 +188,10 @@ cmdline_parse_token_string_t cmd_subportstats_subport_string = "subport"); cmdline_parse_token_num_t cmd_subportstats_subport_number = TOKEN_NUM_INITIALIZER(struct cmd_subportstats_result, subport_number, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_num_t cmd_subportstats_port_number = TOKEN_NUM_INITIALIZER(struct cmd_subportstats_result, port_number, - UINT16); + CMDLINE_UINT16); cmdline_parse_inst_t cmd_subportstats = { .f = cmd_subportstats_parsed, @@ -236,19 +236,19 @@ cmdline_parse_token_string_t cmd_pipestats_port_string = "port"); cmdline_parse_token_num_t cmd_pipestats_port_number = TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, port_number, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_pipestats_subport_string = TOKEN_STRING_INITIALIZER(struct cmd_pipestats_result, subport_string, "subport"); cmdline_parse_token_num_t cmd_pipestats_subport_number = TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, subport_number, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_string_t cmd_pipestats_pipe_string = TOKEN_STRING_INITIALIZER(struct cmd_pipestats_result, pipe_string, "pipe"); cmdline_parse_token_num_t cmd_pipestats_pipe_number = TOKEN_NUM_INITIALIZER(struct cmd_pipestats_result, pipe_number, - UINT32); + CMDLINE_UINT32); cmdline_parse_inst_t cmd_pipestats = { .f = cmd_pipestats_parsed, @@ -299,31 +299,31 @@ cmdline_parse_token_string_t cmd_avg_q_port_string = "port"); cmdline_parse_token_num_t cmd_avg_q_port_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, port_number, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_avg_q_subport_string = TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, subport_string, "subport"); cmdline_parse_token_num_t cmd_avg_q_subport_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, subport_number, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_string_t cmd_avg_q_pipe_string = TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, pipe_string, "pipe"); cmdline_parse_token_num_t cmd_avg_q_pipe_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, pipe_number, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_string_t cmd_avg_q_tc_string = TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, tc_string, "tc"); cmdline_parse_token_num_t cmd_avg_q_tc_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, tc_number, - UINT8); + CMDLINE_UINT8); cmdline_parse_token_string_t cmd_avg_q_q_string = TOKEN_STRING_INITIALIZER(struct cmd_avg_q_result, q_string, "q"); cmdline_parse_token_num_t cmd_avg_q_q_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_q_result, q_number, - UINT8); + CMDLINE_UINT8); cmdline_parse_inst_t cmd_avg_q = { .f = cmd_avg_q_parsed, @@ -376,25 +376,25 @@ cmdline_parse_token_string_t cmd_avg_tcpipe_port_string = "port"); cmdline_parse_token_num_t cmd_avg_tcpipe_port_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, port_number, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_avg_tcpipe_subport_string = TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, subport_string, "subport"); cmdline_parse_token_num_t cmd_avg_tcpipe_subport_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, subport_number, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_string_t cmd_avg_tcpipe_pipe_string = TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, pipe_string, "pipe"); cmdline_parse_token_num_t cmd_avg_tcpipe_pipe_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, pipe_number, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_string_t cmd_avg_tcpipe_tc_string = TOKEN_STRING_INITIALIZER(struct cmd_avg_tcpipe_result, tc_string, "tc"); cmdline_parse_token_num_t cmd_avg_tcpipe_tc_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_tcpipe_result, tc_number, - UINT8); + CMDLINE_UINT8); cmdline_parse_inst_t cmd_avg_tcpipe = { .f = cmd_avg_tcpipe_parsed, @@ -443,19 +443,19 @@ cmdline_parse_token_string_t cmd_avg_pipe_port_string = "port"); cmdline_parse_token_num_t cmd_avg_pipe_port_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, port_number, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_avg_pipe_subport_string = TOKEN_STRING_INITIALIZER(struct cmd_avg_pipe_result, subport_string, "subport"); cmdline_parse_token_num_t cmd_avg_pipe_subport_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, subport_number, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_string_t cmd_avg_pipe_pipe_string = TOKEN_STRING_INITIALIZER(struct cmd_avg_pipe_result, pipe_string, "pipe"); cmdline_parse_token_num_t cmd_avg_pipe_pipe_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_pipe_result, pipe_number, - UINT32); + CMDLINE_UINT32); cmdline_parse_inst_t cmd_avg_pipe = { .f = cmd_avg_pipe_parsed, @@ -502,19 +502,19 @@ cmdline_parse_token_string_t cmd_avg_tcsubport_port_string = "port"); cmdline_parse_token_num_t cmd_avg_tcsubport_port_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, port_number, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_avg_tcsubport_subport_string = TOKEN_STRING_INITIALIZER(struct cmd_avg_tcsubport_result, subport_string, "subport"); cmdline_parse_token_num_t cmd_avg_tcsubport_subport_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, subport_number, - UINT32); + CMDLINE_UINT32); cmdline_parse_token_string_t cmd_avg_tcsubport_tc_string = TOKEN_STRING_INITIALIZER(struct cmd_avg_tcsubport_result, tc_string, "tc"); cmdline_parse_token_num_t cmd_avg_tcsubport_tc_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_tcsubport_result, tc_number, - UINT8); + CMDLINE_UINT8); cmdline_parse_inst_t cmd_avg_tcsubport = { .f = cmd_avg_tcsubport_parsed, @@ -559,13 +559,13 @@ cmdline_parse_token_string_t cmd_avg_subport_port_string = "port"); cmdline_parse_token_num_t cmd_avg_subport_port_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_subport_result, port_number, - UINT16); + CMDLINE_UINT16); cmdline_parse_token_string_t cmd_avg_subport_subport_string = TOKEN_STRING_INITIALIZER(struct cmd_avg_subport_result, subport_string, "subport"); cmdline_parse_token_num_t cmd_avg_subport_subport_number = TOKEN_NUM_INITIALIZER(struct cmd_avg_subport_result, subport_number, - UINT32); + CMDLINE_UINT32); cmdline_parse_inst_t cmd_avg_subport = { .f = cmd_avg_subport_parsed, diff --git a/examples/quota_watermark/qwctl/commands.c b/examples/quota_watermark/qwctl/commands.c index a1c646b9fb52..f2579519c277 100644 --- a/examples/quota_watermark/qwctl/commands.c +++ b/examples/quota_watermark/qwctl/commands.c @@ -74,7 +74,7 @@ cmdline_parse_token_string_t cmd_set_variable = TOKEN_STRING_INITIALIZER(struct cmd_set_tokens, variable, NULL); cmdline_parse_token_num_t cmd_set_value = - TOKEN_NUM_INITIALIZER(struct cmd_set_tokens, value, UINT32); + TOKEN_NUM_INITIALIZER(struct cmd_set_tokens, value, CMDLINE_UINT32); static void cmd_set_handler(__attribute__((unused)) void *parsed_result, 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 fe09b0778ac1..a914549ddcb3 100644 --- a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c +++ b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c @@ -173,7 +173,7 @@ cmdline_parse_token_string_t cmd_set_cpu_freq = set_cpu_freq, "set_cpu_freq"); cmdline_parse_token_string_t cmd_set_cpu_freq_core_num = TOKEN_NUM_INITIALIZER(struct cmd_set_cpu_freq_result, - lcore_id, UINT8); + lcore_id, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd = TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result, cmd, "up#down#min#max#enable_turbo#disable_turbo"); diff --git a/examples/vm_power_manager/vm_power_cli.c b/examples/vm_power_manager/vm_power_cli.c index 89b000d923a8..4a7fb510a40f 100644 --- a/examples/vm_power_manager/vm_power_cli.c +++ b/examples/vm_power_manager/vm_power_cli.c @@ -155,10 +155,10 @@ cmdline_parse_token_string_t cmd_set_pcpu_vm_name = vm_name, NULL); cmdline_parse_token_num_t set_pcpu_vcpu = TOKEN_NUM_INITIALIZER(struct cmd_set_pcpu_result, - vcpu, UINT8); + vcpu, CMDLINE_UINT8); cmdline_parse_token_num_t set_pcpu_core = TOKEN_NUM_INITIALIZER(struct cmd_set_pcpu_result, - core, UINT64); + core, CMDLINE_UINT64); cmdline_parse_inst_t cmd_set_pcpu_set = { @@ -408,7 +408,7 @@ cmdline_parse_token_string_t cmd_show_cpu_freq = cmdline_parse_token_num_t cmd_show_cpu_freq_core_num = TOKEN_NUM_INITIALIZER(struct cmd_show_cpu_freq_result, - core_num, UINT8); + core_num, CMDLINE_UINT8); cmdline_parse_inst_t cmd_show_cpu_freq_set = { .f = cmd_show_cpu_freq_parsed, @@ -457,7 +457,7 @@ cmdline_parse_token_string_t cmd_set_cpu_freq = set_cpu_freq, "set_cpu_freq"); cmdline_parse_token_num_t cmd_set_cpu_freq_core_num = TOKEN_NUM_INITIALIZER(struct cmd_set_cpu_freq_result, - core_num, UINT8); + core_num, CMDLINE_UINT8); cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd = TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result, cmd, "up#down#min#max#enable_turbo#disable_turbo"); diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/librte_cmdline/cmdline_parse_num.c index 478f181b4443..0d9f63aef797 100644 --- a/lib/librte_cmdline/cmdline_parse_num.c +++ b/lib/librte_cmdline/cmdline_parse_num.c @@ -69,23 +69,23 @@ static int check_res_size(struct cmdline_token_num_data *nd, unsigned ressize) { switch (nd->type) { - case INT8: - case UINT8: + case CMDLINE_INT8: + case CMDLINE_UINT8: if (ressize < sizeof(int8_t)) return -1; break; - case INT16: - case UINT16: + case CMDLINE_INT16: + case CMDLINE_UINT16: if (ressize < sizeof(int16_t)) return -1; break; - case INT32: - case UINT32: + case CMDLINE_INT32: + case CMDLINE_UINT32: if (ressize < sizeof(int32_t)) return -1; break; - case INT64: - case UINT64: + case CMDLINE_INT64: + case CMDLINE_UINT64: if (ressize < sizeof(int64_t)) return -1; break; @@ -259,35 +259,35 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res, case HEX_OK: case OCTAL_OK: case BIN_OK: - if ( nd.type == INT8 && res1 <= INT8_MAX ) { + if ( nd.type == CMDLINE_INT8 && res1 <= INT8_MAX ) { if (res) *(int8_t *)res = (int8_t) res1; return buf-srcbuf; } - else if ( nd.type == INT16 && res1 <= INT16_MAX ) { + else if ( nd.type == CMDLINE_INT16 && res1 <= INT16_MAX ) { if (res) *(int16_t *)res = (int16_t) res1; return buf-srcbuf; } - else if ( nd.type == INT32 && res1 <= INT32_MAX ) { + else if ( nd.type == CMDLINE_INT32 && res1 <= INT32_MAX ) { if (res) *(int32_t *)res = (int32_t) res1; return buf-srcbuf; } - else if ( nd.type == INT64 && res1 <= INT64_MAX ) { + else if ( nd.type == CMDLINE_INT64 && res1 <= INT64_MAX ) { if (res) *(int64_t *)res = (int64_t) res1; return buf-srcbuf; } - else if ( nd.type == UINT8 && res1 <= UINT8_MAX ) { + else if ( nd.type == CMDLINE_UINT8 && res1 <= UINT8_MAX ) { if (res) *(uint8_t *)res = (uint8_t) res1; return buf-srcbuf; } - else if (nd.type == UINT16 && res1 <= UINT16_MAX ) { + else if (nd.type == CMDLINE_UINT16 && res1 <= UINT16_MAX ) { if (res) *(uint16_t *)res = (uint16_t) res1; return buf-srcbuf; } - else if ( nd.type == UINT32 && res1 <= UINT32_MAX ) { + else if ( nd.type == CMDLINE_UINT32 && res1 <= UINT32_MAX ) { if (res) *(uint32_t *)res = (uint32_t) res1; return buf-srcbuf; } - else if ( nd.type == UINT64 ) { + else if ( nd.type == CMDLINE_UINT64 ) { if (res) *(uint64_t *)res = res1; return buf-srcbuf; } @@ -297,19 +297,19 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res, break; case DEC_NEG_OK: - if ( nd.type == INT8 && res1 <= INT8_MAX + 1 ) { + if ( nd.type == CMDLINE_INT8 && res1 <= INT8_MAX + 1 ) { if (res) *(int8_t *)res = (int8_t) (-res1); return buf-srcbuf; } - else if ( nd.type == INT16 && res1 <= (uint16_t)INT16_MAX + 1 ) { + else if ( nd.type == CMDLINE_INT16 && res1 <= (uint16_t)INT16_MAX + 1 ) { if (res) *(int16_t *)res = (int16_t) (-res1); return buf-srcbuf; } - else if ( nd.type == INT32 && res1 <= (uint32_t)INT32_MAX + 1 ) { + else if ( nd.type == CMDLINE_INT32 && res1 <= (uint32_t)INT32_MAX + 1 ) { if (res) *(int32_t *)res = (int32_t) (-res1); return buf-srcbuf; } - else if ( nd.type == INT64 && res1 <= (uint64_t)INT64_MAX + 1 ) { + else if ( nd.type == CMDLINE_INT64 && res1 <= (uint64_t)INT64_MAX + 1 ) { if (res) *(int64_t *)res = (int64_t) (-res1); return buf-srcbuf; } diff --git a/lib/librte_cmdline/cmdline_parse_num.h b/lib/librte_cmdline/cmdline_parse_num.h index 58b28cad7c41..28b04520f01e 100644 --- a/lib/librte_cmdline/cmdline_parse_num.h +++ b/lib/librte_cmdline/cmdline_parse_num.h @@ -14,14 +14,14 @@ extern "C" { #endif enum cmdline_numtype { - UINT8 = 0, - UINT16, - UINT32, - UINT64, - INT8, - INT16, - INT32, - INT64 + CMDLINE_UINT8 = 0, + CMDLINE_UINT16, + CMDLINE_UINT32, + CMDLINE_UINT64, + CMDLINE_INT8, + CMDLINE_INT16, + CMDLINE_INT32, + CMDLINE_INT64 }; struct cmdline_token_num_data {