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

BAS: Fix some build errors wtih apps/examples/bastest

Browse Source
This commit is contained in:
Gregory Nutt 2014-11-07 15:35:09 -06:00
parent e0b6137de7
commit c2c42f5e5b
5 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/Make.defs
View File

@ -38,6 +38,10 @@ ifeq ($(CONFIG_EXAMPLES_ADC),y)
CONFIGURED_APPS += examples/adc CONFIGURED_APPS += examples/adc
endif endif
ifeq ($(CONFIG_EXAMPLES_BASTEST),y)
CONFIGURED_APPS += examples/bastest
endif
ifeq ($(CONFIG_EXAMPLES_BUTTONS),y) ifeq ($(CONFIG_EXAMPLES_BUTTONS),y)
CONFIGURED_APPS += examples/buttons CONFIGURED_APPS += examples/buttons
endif endif

2
examples/bastest/.gitignore vendored
View File

@ -1,6 +1,8 @@
/Make.dep /Make.dep
/.depend /.depend
/.built /.built
/romfs.img
/romfs.h
/*.asm /*.asm
/*.obj /*.obj
/*.rel /*.rel

2
examples/bastest/Kconfig
View File

@ -8,7 +8,7 @@ config EXAMPLES_BASTEST
default n default n
depends on INTERPRETERS_BAS depends on INTERPRETERS_BAS
---help--- ---help---
Mount the ROMFS file system containing the BAS test files. Mount the ROMFS file system containing the BAS test files at /mnt/romfs.
if EXAMPLES_BASTEST if EXAMPLES_BASTEST

24
examples/bastest/Makefile
View File

@ -78,8 +78,8 @@ endif
BASTEST_DIR = $(APPDIR)$(DELIM)examples$(DELIM)bastest BASTEST_DIR = $(APPDIR)$(DELIM)examples$(DELIM)bastest
TESTS_DIR = $(BASTEST_DIR)$(DELIM)tests TESTS_DIR = $(BASTEST_DIR)$(DELIM)tests
ROMFS_IMG = $(BASTEST_DIR)$(DELIM)romfs.img ROMFS_IMG = romfs.img
ROMFS_HDR = $(BASTEST_DIR)$(DELIM)romfs.h ROMFS_HDR = romfs.h
PROGNAME = bastest$(EXEEXT) PROGNAME = bastest$(EXEEXT)
@ -98,15 +98,19 @@ $(AOBJS): %$(OBJEXT): %.S
$(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
.built: $(OBJS)
$(call ARCHIVE, $(BIN), $(OBJS))
@touch .built
# Create the romfs.h header file from the tests/ directory # Create the romfs.h header file from the tests/ directory
$(ROMFS_IMG) :
$(Q) genromfs -f $@ -d $(TESTS_DIR) -V "BASTEST"
$(ROMFS_HDR) : $(ROMFS_IMG) $(ROMFS_HDR) : $(ROMFS_IMG)
$(Q) genromfs -f $@ -d $(TESTS_DIR) -V "BASTEST" $(Q) (xxd -i $(ROMFS_IMG) | sed -e "s/^unsigned/static const unsigned/g" >$@)
$(Q) (xxd -i romfs.img | sed -e "s/^unsigned/static const unsigned/g" >$@)
# Add the BASTEST object to the archive
.built: $(ROMFS_HDR) $(OBJS)
$(call ARCHIVE, $(BIN), $(OBJS))
@touch .built
# Link and install the program binary # Link and install the program binary
@ -123,7 +127,7 @@ install:
endif endif
# Register the NSH builtin appliation # Register the NSH builtin application
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
@ -147,6 +151,8 @@ clean:
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
$(call DELFILE, $(ROMFS_HDR))
$(call DELFILE, $(ROMFS_IMG))
$(call DELFILE, Make.dep) $(call DELFILE, Make.dep)
$(call DELFILE, .depend) $(call DELFILE, .depend)

13
examples/bastest/bastest_main.c
View File

@ -38,7 +38,12 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/mount.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h>
#include <nuttx/fs/ramdisk.h>
#include "romfs.h" #include "romfs.h"
@ -93,6 +98,8 @@ int main(int argc, FAR char *argv[])
int bastest_main(int argc, char *argv[]) int bastest_main(int argc, char *argv[])
#endif #endif
{ {
int ret;
/* Create a ROM disk for the ROMFS filesystem */ /* Create a ROM disk for the ROMFS filesystem */
printf("Registering romdisk at /dev/ram%d\n", CONFIG_EXAMPLES_BASTEST_DEVMINOR); printf("Registering romdisk at /dev/ram%d\n", CONFIG_EXAMPLES_BASTEST_DEVMINOR);
@ -100,19 +107,19 @@ int bastest_main(int argc, char *argv[])
NSECTORS(romfs_img_len), SECTORSIZE); NSECTORS(romfs_img_len), SECTORSIZE);
if (ret < 0) if (ret < 0)
{ {
err("ERROR: romdisk_register failed: %d\n", ret); fprintf(stderr, "ERROR: romdisk_register failed: %d\n", ret);
return 1; return 1;
} }
/* Mount the file system */ /* Mount the file system */
message("Mounting ROMFS filesystem at target=%s with source=%s\n", printf("Mounting ROMFS filesystem at target=%s with source=%s\n",
MOUNTPT, CONFIG_EXAMPLES_BASTEST_DEVPATH); MOUNTPT, CONFIG_EXAMPLES_BASTEST_DEVPATH);
ret = mount(CONFIG_EXAMPLES_BASTEST_DEVPATH, MOUNTPT, "romfs", MS_RDONLY, NULL); ret = mount(CONFIG_EXAMPLES_BASTEST_DEVPATH, MOUNTPT, "romfs", MS_RDONLY, NULL);
if (ret < 0) if (ret < 0)
{ {
err("ERROR: mount(%s,%s,romfs) failed: %s\n", fprintf(stderr, "ERROR: mount(%s,%s,romfs) failed: %s\n",
CONFIG_EXAMPLES_BASTEST_DEVPATH, MOUNTPT, errno); CONFIG_EXAMPLES_BASTEST_DEVPATH, MOUNTPT, errno);
return 1; return 1;
} }