From d737e95480f4893f47b28acd7ac935d919456682 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 27 Nov 2014 11:02:11 +0100 Subject: [PATCH] doc: no more bare metal environment Signed-off-by: Thomas Monjalon --- doc/guides/prog_guide/dev_kit_build_system.rst | 2 +- doc/guides/sample_app_ug/cmd_line.rst | 2 +- doc/guides/sample_app_ug/hello_world.rst | 2 +- doc/guides/sample_app_ug/l3_forward_power_man.rst | 4 ++-- doc/guides/sample_app_ug/quota_watermark.rst | 4 ++-- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst index 4981688d64..d5ee9943f9 100644 --- a/doc/guides/prog_guide/dev_kit_build_system.rst +++ b/doc/guides/prog_guide/dev_kit_build_system.rst @@ -300,7 +300,7 @@ Misc * rte.doc.mk: Documentation in the development kit framework -* rte.gnuconfigure.mk: Build an application that is configure-based (used to compile *newlib*). +* rte.gnuconfigure.mk: Build an application that is configure-based. * rte.subdir.mk: Build several directories in the development kit framework. diff --git a/doc/guides/sample_app_ug/cmd_line.rst b/doc/guides/sample_app_ug/cmd_line.rst index dadd32d966..0a0ea41171 100644 --- a/doc/guides/sample_app_ug/cmd_line.rst +++ b/doc/guides/sample_app_ug/cmd_line.rst @@ -114,7 +114,7 @@ This is achieved as follows: .. code-block:: c - int MAIN(int argc, char **argv) + int main(int argc, char **argv) { ret = rte_eal_init(argc, argv); if (ret < 0) diff --git a/doc/guides/sample_app_ug/hello_world.rst b/doc/guides/sample_app_ug/hello_world.rst index 22702b91db..3213ba8116 100644 --- a/doc/guides/sample_app_ug/hello_world.rst +++ b/doc/guides/sample_app_ug/hello_world.rst @@ -85,7 +85,7 @@ This is done in the main() function using the following code: int - MAIN(int argc, char **argv) + main(int argc, char **argv) { ret = rte_eal_init(argc, argv); diff --git a/doc/guides/sample_app_ug/l3_forward_power_man.rst b/doc/guides/sample_app_ug/l3_forward_power_man.rst index f02c3480de..3a93a6b4e9 100644 --- a/doc/guides/sample_app_ug/l3_forward_power_man.rst +++ b/doc/guides/sample_app_ug/l3_forward_power_man.rst @@ -165,7 +165,7 @@ The following sections describe aspects that are specific to the L3 Forwarding w Power Library Initialization ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The Power library is initialized in the MAIN routine. +The Power library is initialized in the main routine. It changes the P-state governor to userspace for specific cores that are under control. The Timer library is also initialized and several timers are created later on, responsible for checking if it needs to scale down frequency at run time by checking CPU utilization statistics. @@ -176,7 +176,7 @@ responsible for checking if it needs to scale down frequency at run time by chec .. code-block:: c - int MAIN(int argc, char **argv) + int main(int argc, char **argv) { struct lcore_conf *qconf; int ret; diff --git a/doc/guides/sample_app_ug/quota_watermark.rst b/doc/guides/sample_app_ug/quota_watermark.rst index c44b0b8137..6f537ae99f 100644 --- a/doc/guides/sample_app_ug/quota_watermark.rst +++ b/doc/guides/sample_app_ug/quota_watermark.rst @@ -182,7 +182,7 @@ Core Application - qw EAL and Drivers Setup ^^^^^^^^^^^^^^^^^^^^^ -The EAL arguments are parsed at the beginning of the MAIN() function: +The EAL arguments are parsed at the beginning of the main() function: .. code-block:: c @@ -236,7 +236,7 @@ The quota and low_watermark shared variables are put into an rte_memzone using a low_watermark = (unsigned int *) qw_memzone->addr + sizeof(int); } -These two variables are initialized to a default value in MAIN() and +These two variables are initialized to a default value in main() and can be changed while qw is running using the qwctl control program. Application Arguments diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 93fd3d4fea..5e62ff9e77 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -103,7 +103,7 @@ stop quit ~~~~ -Quit to prompt in Linux or reboot on Baremetal: +Quit to prompt: quit -- 2.20.1