\n"); + outfunc("
\n"); newpara = false; } @@ -1209,32 +1268,32 @@ static inline void process_help(FILE *stream) { if (!preformatted) { - body("\n
\n");
+ outfunc("\n \n");
preformatted = true;
}
- body("%s\n", htmlize_text(ptr));
+ outfunc("%s\n", htmlize_text(ptr));
}
else
{
if (preformatted)
{
- body("\n");
+ outfunc("\n");
preformatted = false;
}
- body(" %s", htmlize_text(ptr));
+ outfunc(" %s", htmlize_text(ptr));
}
}
if (!newpara)
{
- body("\n\n");
+ outfunc("\n\n");
}
if (preformatted)
{
- body("\n");
+ outfunc("\n");
}
}
@@ -1254,7 +1313,7 @@ static void process_default(FILE *stream, struct default_s *defp)
/* Check if we have space for another default value */
- ndx = defp->dnitems;
+ ndx = defp->d_nitems;
if (ndx >= MAX_DEFAULTS)
{
error("Too many default values\n");
@@ -1270,8 +1329,8 @@ static void process_default(FILE *stream, struct default_s *defp)
exit(ERROR_MISSING_DEFAULT_VALUE);
}
- defp->ditem[ndx].ddefault = strdup(token);
- defp->ditem[ndx].ddependency = NULL;
+ defp->d_item[ndx].d_default = strdup(token);
+ defp->d_item[ndx].d_dependency = NULL;
/* Check if the default value is followed by "depends on" */
@@ -1289,12 +1348,12 @@ static void process_default(FILE *stream, struct default_s *defp)
/* The rest of the line is the dependency */
- defp->ditem[ndx].ddependency = strdup(g_lnptr);
+ defp->d_item[ndx].d_dependency = strdup(g_lnptr);
}
/* Update the number of defaults we have encountered in this block */
- defp->dnitems++;
+ defp->d_nitems++;
}
/****************************************************************************
@@ -1305,66 +1364,66 @@ static void process_default(FILE *stream, struct default_s *defp)
*
****************************************************************************/
-static void print_default(struct default_s *defp)
+static void print_default(struct default_s *defp, output_t outfunc)
{
struct default_item_s *item;
int i;
/* Check if there are any default value */
- if (defp->dnitems > 0)
+ if (defp->d_nitems > 0)
{
/* Yes, output the defaults differently if there is only one */
- if (defp->dnitems == 1)
+ if (defp->d_nitems == 1)
{
/* Output the Default */
- item = &defp->ditem[0];
- body(" \n"); - body(" Dependency:\n"); - body(" %s\n", htmlize_expression(item->ddependency)); - body("
\n"); + outfunc("\n"); + outfunc(" Dependency:\n"); + outfunc(" %s\n", htmlize_expression(item->d_dependency)); + outfunc("
\n"); } - body("\n"); - body(" Dependency:\n"); - body(" %s\n", htmlize_expression(item->ddependency)); - body("
\n"); + outfunc("\n"); + outfunc(" Dependency:\n"); + outfunc(" %s\n", htmlize_expression(item->d_dependency)); + outfunc("
\n"); } } - body("CONFIG_%s",
- config.cname, paranum, config.cname);
- body("%s ", paranum);
- incr_paranum();
- }
-
- body("CONFIG_%s", config.cname);
-
- if (config.cdesc)
- {
- if (!g_inchoice)
- {
- output(": %s", config.cdesc);
- }
-
- body(": %s", config.cdesc);
- }
-
- body("%s/Kconfig\n", kconfigdir);
-
- /* Print any help text */
-
- if (help)
- {
- process_help(stream);
- token = NULL;
- }
- else if (!config.cdesc)
- {
- body("This is a hidden, internal configuration variable that cannot be explicitly set by the user.
\n"); - } - - /* End of configuration description */ - - body("CONFIG_%s",
+ config.c_name, paranum, config.c_name);
+ outfunc("%s ", paranum);
+ incr_paranum();
}
+ outfunc("CONFIG_%s", config.c_name);
+
+ /* Output the short description in the paragraph title (if we have one) */
+
+ if (config.c_desc)
+ {
+ if (!hidden)
+ {
+ output(": %s", config.c_desc);
+ }
+
+ outfunc(": %s", config.c_desc);
+ }
+
+ outfunc("\n");
+
+ if (!hidden)
+ {
+ output("%s/Kconfig\n", kconfigdir);
+
+ /* Print any help text */
+
+ if (help)
+ {
+ process_help(stream, outfunc);
+ token = NULL;
+ }
+
+ /* End of configuration description */
+
+ outfunc("Choice Options:
", kconfigdir); body("%s/Kconfig\n", kconfigdir);
body("\n"); @@ -2440,6 +2510,12 @@ int main(int argc, char **argv, char **envp) body(" This configurable options are descrived in this document.\n"); body("
\n"); body("\n");
+ body(" Main Menu.\n");
+ body(" The normal way to start the NuttX configuration is to enter this command line from the NuttX build directory: make menuconfig.\n");
+ body(" Note that NuttX must first be configured before this command so that the configuration file (.config) is present in the top-level build directory.\n");
+ body(" The main menu is the name give to the opening menu display after this command is executed.\n");
+ body("
\n");
body(" Mainenance Note.\n");
body(" This documenation was auto-generated using the kconfig2html tool\n");
body(" That tools analyzes the NuttX Kconfig and generates this HTML document.\n");
@@ -2453,30 +2529,34 @@ int main(int argc, char **argv, char **envp)
/* Terminate the table of contents */
+ output("
\n");
+ output(" This appendex holds internal configurations variables that are not visible to the user.\n");
+ output(" These settings are presented out-of-context because they cannot be directly controlled by the user.\n");
+ output(" Many of these settings are selected automatically and indirectly when other, visible configuration variables are selected.\n");
+ output(" One purpose of these hidden configuration variables is to control menuing in the kconfig-frontends configuration tool.\n");
+ output(" Many configuration variables with a form like CONFIG_ARCH_HAVE_feature, for example, are used only to indicate that the selected archicture supports feature and so addition selection associated with feature will become accessible to the user.\n");
+ output("