sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools/kconfig2html.c and wireless/bluetooth/Kconfig: Fixes needed to generate new configuration variable document.

Browse Source
This commit is contained in:
Gregory Nutt 2018-06-03 10:03:35 -06:00
parent b020ee13b8
commit ae44eb2969
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/kconfig2html.c
View File

@ -2223,7 +2223,7 @@ static inline char *process_menu(FILE *stream, const char *kconfigdir)
*
****************************************************************************/
static void process_kconfigfile(const char *kconfigdir); /* Forward reference */
static void process_kconfigfile(const char *kconfigdir, const char *kconfigname); /* Forward reference */
static char *parse_kconfigfile(FILE *stream, const char *kconfigdir)
{
enum token_type_e tokid;
@ -2253,6 +2253,7 @@ static char *parse_kconfigfile(FILE *stream, const char *kconfigdir)
source = dequote(source);
if (source)
{
char *configname = basename(source);
char *subdir = dirname(source);
char *dirpath;
@ -2289,7 +2290,7 @@ static char *parse_kconfigfile(FILE *stream, const char *kconfigdir)
/* Then recurse */
process_kconfigfile(dirpath);
process_kconfigfile(dirpath, configname);
token = NULL;
free(dirpath);
}
@ -2398,14 +2399,15 @@ static char *parse_kconfigfile(FILE *stream, const char *kconfigdir)
*
****************************************************************************/
static void process_kconfigfile(const char *kconfigdir)
static void process_kconfigfile(const char *kconfigdir,
const char *kconfigname)
{
FILE *stream;
char *kconfigpath;
/* Create the full path to the Kconfig file */
asprintf(&kconfigpath, "%s/Kconfig", kconfigdir);
asprintf(&kconfigpath, "%s/%s", kconfigdir, kconfigname);
debug("process_kconfigfile: Entry\n");
debug(" kconfigdir: %s\n", kconfigdir);
debug(" kconfigpath: %s\n", kconfigpath);
@ -2654,7 +2656,7 @@ int main(int argc, char **argv, char **envp)
/* Process the Kconfig files through recursive descent */
process_kconfigfile(g_kconfigroot);
process_kconfigfile(g_kconfigroot, "Kconfig");
/* Terminate the table of contents */

12
wireless/bluetooth/Kconfig
View File

@ -40,8 +40,7 @@
#############################################################################
menuconfig WIRELESS_BLUETOOTH
bool
prompt "Bluetooth LE support"
bool "Bluetooth LE support"
default n
select MM_IOB
select SCHED_HPWORK
@ -57,8 +56,7 @@ menuconfig WIRELESS_BLUETOOTH
if WIRELESS_BLUETOOTH
config BLUETOOTH_MAX_CONN
int
prompt "Maximum number of simultaneous connections"
int "Maximum number of simultaneous connections"
default 1
range 1 16
---help---
@ -66,8 +64,7 @@ config BLUETOOTH_MAX_CONN
supported. The minimum (and default) number is 1.
config BLUETOOTH_MAX_PAIRED
int
prompt "Maximum number of paired devices"
int "Maximum number of paired devices"
default 1
range 1 32
---help---
@ -172,8 +169,7 @@ config BLUETOOTH_TXCONN_NMSGS
endmenu # Kernel Thread Configuration
config BLUETOOTH_SMP_SELFTEST
bool
prompt "Bluetooth SMP self tests executed on init"
bool "Bluetooth SMP self tests executed on init"
default n
---help---
This option enables SMP self-tests executed on startup