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

apps/examples: Fix some name collisions of both module and sotest examples are enabled.

Browse Source
This commit is contained in:
Gregory Nutt 2017-01-27 11:41:53 -06:00
parent 08b6e087bf
commit 32211e21b6
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/module/Makefile
View File

@ -50,7 +50,7 @@ STACKSIZE = 2048
# Module Example # Module Example
ASRCS = ASRCS =
CSRCS = symtab.c CSRCS = mod_symtab.c
MAINSRC = module_main.c MAINSRC = module_main.c
AOBJS = $(ASRCS:.S=$(OBJEXT)) AOBJS = $(ASRCS:.S=$(OBJEXT))

2
examples/module/drivers/.gitignore vendored
View File

@ -1,5 +1,5 @@
/romfs /romfs
/romfs.h /romfs.h
/romfs.img /romfs.img
/symtab.c /mod_symtab.c

2
examples/module/drivers/Makefile
View File

@ -45,7 +45,7 @@ DRIVER_DIR = $(MODULE_DIR)/drivers
ROMFS_DIR = $(DRIVER_DIR)/romfs ROMFS_DIR = $(DRIVER_DIR)/romfs
ROMFS_IMG = $(DRIVER_DIR)/romfs.img ROMFS_IMG = $(DRIVER_DIR)/romfs.img
ROMFS_HDR = $(DRIVER_DIR)/romfs.h ROMFS_HDR = $(DRIVER_DIR)/romfs.h
SYMTAB_SRC = $(DRIVER_DIR)/symtab.c SYMTAB_SRC = $(DRIVER_DIR)/mod_symtab.c
define DIR_template define DIR_template
$(1)_$(2): $(1)_$(2):

4
examples/module/drivers/mksymtab.sh
View File

@ -38,7 +38,7 @@ for var in $varlist; do
done done
echo "" echo ""
echo "const struct symtab_s exports[] = " echo "const struct symtab_s mod_exports[] = "
echo "{" echo "{"
for var in $varlist; do for var in $varlist; do
@ -47,5 +47,5 @@ done
echo "};" echo "};"
echo "" echo ""
echo "const int nexports = sizeof(exports) / sizeof(struct symtab_s);" echo "const int mod_nexports = sizeof(mod_exports) / sizeof(struct symtab_s);"

8
examples/module/module_main.c
View File

@ -106,8 +106,8 @@ static const char g_write_string[] = "Hi there, installed driver\n";
* Symbols from Auto-Generated Code * Symbols from Auto-Generated Code
****************************************************************************/ ****************************************************************************/
extern const struct symtab_s exports[]; extern const struct symtab_s mod_exports[];
extern const int nexports; extern const int mod_nexports;
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
@ -132,8 +132,8 @@ int module_main(int argc, char *argv[])
/* Set the OS symbol table indirectly through the boardctl() */ /* Set the OS symbol table indirectly through the boardctl() */
symdesc.symtab = (FAR struct symtab_s *)exports; symdesc.symtab = (FAR struct symtab_s *)mod_exports;
symdesc.nsymbols = nexports; symdesc.nsymbols = mod_nexports;
ret = boardctl(BOARDIOC_OS_SYMTAB, (uintptr_t)&symdesc); ret = boardctl(BOARDIOC_OS_SYMTAB, (uintptr_t)&symdesc);
if (ret < 0) if (ret < 0)
{ {

2
examples/sotest/Makefile
View File

@ -50,7 +50,7 @@ STACKSIZE = 2048
# Shared Library Example # Shared Library Example
ASRCS = ASRCS =
CSRCS = symtab.c CSRCS = sot_symtab.c
MAINSRC = sotest_main.c MAINSRC = sotest_main.c
AOBJS = $(ASRCS:.S=$(OBJEXT)) AOBJS = $(ASRCS:.S=$(OBJEXT))

2
examples/sotest/lib/.gitignore vendored
View File

@ -1,5 +1,5 @@
/romfs /romfs
/romfs.h /romfs.h
/romfs.img /romfs.img
/symtab.c /sot_symtab.c

2
examples/sotest/lib/Makefile
View File

@ -45,7 +45,7 @@ LIB_DIR = $(SOTEST_DIR)/lib
ROMFS_DIR = $(LIB_DIR)/romfs ROMFS_DIR = $(LIB_DIR)/romfs
ROMFS_IMG = $(LIB_DIR)/romfs.img ROMFS_IMG = $(LIB_DIR)/romfs.img
ROMFS_HDR = $(LIB_DIR)/romfs.h ROMFS_HDR = $(LIB_DIR)/romfs.h
SYMTAB_SRC = $(LIB_DIR)/symtab.c SYMTAB_SRC = $(LIB_DIR)/sot_symtab.c
define DIR_template define DIR_template
$(1)_$(2): $(1)_$(2):

4
examples/sotest/lib/mksymtab.sh
View File

@ -38,7 +38,7 @@ for var in $varlist; do
done done
echo "" echo ""
echo "const struct symtab_s exports[] = " echo "const struct symtab_s sot_exports[] = "
echo "{" echo "{"
for var in $varlist; do for var in $varlist; do
@ -47,5 +47,5 @@ done
echo "};" echo "};"
echo "" echo ""
echo "const int nexports = sizeof(exports) / sizeof(struct symtab_s);" echo "const int sot_nexports = sizeof(sot_exports) / sizeof(struct symtab_s);"

6
examples/sotest/sotest_main.c
View File

@ -94,8 +94,8 @@
* Symbols from Auto-Generated Code * Symbols from Auto-Generated Code
****************************************************************************/ ****************************************************************************/
extern const struct symtab_s exports[]; extern const struct symtab_s sot_exports[];
extern const int nexports; extern const int sot_nexports;
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
@ -118,7 +118,7 @@ int sotest_main(int argc, char *argv[])
/* Set the shared library symbol table */ /* Set the shared library symbol table */
ret = dlsymtab((FAR struct symtab_s *)exports, nexports); ret = dlsymtab((FAR struct symtab_s *)sot_exports, sot_nexports);
if (ret < 0) if (ret < 0)
{ {
fprintf(stderr, "ERROR: dlsymtab failed: %d\n", ret); fprintf(stderr, "ERROR: dlsymtab failed: %d\n", ret);