diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-20 14:44:56 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-20 14:44:56 +0000 |
commit | 2023adff45d28a5f4f369320c18865783baab5e6 (patch) | |
tree | 24870db0845e5543eb1dccb5c36af93962acea84 /nuttx | |
parent | fc112daf3adc5b4c2154c74633e4b33f1158454c (diff) | |
download | px4-nuttx-2023adff45d28a5f4f369320c18865783baab5e6.tar.gz px4-nuttx-2023adff45d28a5f4f369320c18865783baab5e6.tar.bz2 px4-nuttx-2023adff45d28a5f4f369320c18865783baab5e6.zip |
Remove warnings
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1915 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/binfmt/binfmt_loadmodule.c | 2 | ||||
-rw-r--r-- | nuttx/examples/nx/Makefile | 10 | ||||
-rw-r--r-- | nuttx/examples/nxflat/Makefile | 75 | ||||
-rw-r--r-- | nuttx/examples/nxflat/tests/task/task.c | 2 |
4 files changed, 81 insertions, 8 deletions
diff --git a/nuttx/binfmt/binfmt_loadmodule.c b/nuttx/binfmt/binfmt_loadmodule.c index 7ab613c02..1034ad16f 100644 --- a/nuttx/binfmt/binfmt_loadmodule.c +++ b/nuttx/binfmt/binfmt_loadmodule.c @@ -94,8 +94,8 @@ int load_module(const char *filename, FAR struct binary_s *bin) ret = -EINVAL; } else - { #endif + { bdbg("Loading %s\n", filename); /* Disabling pre-emption should be sufficient protection while diff --git a/nuttx/examples/nx/Makefile b/nuttx/examples/nx/Makefile index dd67eee50..da10fc50d 100644 --- a/nuttx/examples/nx/Makefile +++ b/nuttx/examples/nx/Makefile @@ -1,7 +1,7 @@ ############################################################################ -# examples/nx/Makefile +# examples/nxflat/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2009 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -39,10 +39,7 @@ ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = nx_main.c nx_events.c nx_kbdin.c -ifeq ($(CONFIG_NX_MULTIUSER),y) -CSRCS += nx_server.c -endif +CSRCS = COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) @@ -77,3 +74,4 @@ distclean: clean @rm -f Make.dep .depend -include Make.dep + diff --git a/nuttx/examples/nxflat/Makefile b/nuttx/examples/nxflat/Makefile new file mode 100644 index 000000000..5c9e4e5ce --- /dev/null +++ b/nuttx/examples/nxflat/Makefile @@ -0,0 +1,75 @@ +############################################################################ +# examples/hello/Makefile +# +# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +-include $(TOPDIR)/.config +-include $(TOPDIR)/Make.defs + +ASRCS = +AOBJS = $(ASRCS:.S=$(OBJEXT)) +CSRCS = +COBJS = $(CSRCS:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) + +BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) + +all: $(BIN) + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +$(BIN): $(OBJS) + @( for obj in $(OBJS) ; do \ + $(call ARCHIVE, $@, $${obj}); \ + done ; ) + +.depend: Makefile $(SRCS) + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + +depend: .depend + +clean: + @rm -f $(BIN) *~ .*.swp + $(call CLEAN) + +distclean: clean + @rm -f Make.dep .depend + +-include Make.dep diff --git a/nuttx/examples/nxflat/tests/task/task.c b/nuttx/examples/nxflat/tests/task/task.c index 13490ede1..039dff953 100644 --- a/nuttx/examples/nxflat/tests/task/task.c +++ b/nuttx/examples/nxflat/tests/task/task.c @@ -111,7 +111,7 @@ int main(int argc, char **argv) child_argv[0] = child_arg; child_argv[1] = 0; - ret = task_create(child_name, 50, 512, child_task, (char**)child_argv); + ret = task_create(child_name, 50, 512, child_task, (const char**)child_argv); if (ret != 0) { printf("Parent: task_create failed: %d\n", errno); |