diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-18 18:12:32 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-18 18:12:32 +0000 |
| commit | 03f8a20959a56f7de21a0650b04f93621708893e (patch) | |
| tree | cdd560bf070421d64ea5e81705999712de3398c2 /nuttx/examples | |
| parent | 71b5c1f6b328bd39aa93b32ffa17ba0ec8817cc9 (diff) | |
| download | px4-nuttx-03f8a20959a56f7de21a0650b04f93621708893e.tar.gz px4-nuttx-03f8a20959a56f7de21a0650b04f93621708893e.tar.bz2 px4-nuttx-03f8a20959a56f7de21a0650b04f93621708893e.zip | |
Bringing examples/pashello back to life
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2388 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/examples')
| -rw-r--r-- | nuttx/examples/pashello/Makefile | 10 | ||||
| -rw-r--r-- | nuttx/examples/pashello/device.c | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/nuttx/examples/pashello/Makefile b/nuttx/examples/pashello/Makefile index cce7b526e..aeb220028 100644 --- a/nuttx/examples/pashello/Makefile +++ b/nuttx/examples/pashello/Makefile @@ -40,14 +40,8 @@ ifeq ($(WINTOOL),y) INCDIROPT = -w endif -COMPILER = ${shell basename $(CC)} -USRINCLUDES = ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$CC" $(TOPDIR)/pcode/include $(TOPDIR)/pcode/insn/include} -ifneq ($(ARCHSTDINCLUDES),) -INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) -else -INCLUDES = $(ARCHINCLUDES) $(USRINCLUDES) -endif -CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) +CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/pcode/include } +CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/pcode/insn/include} ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) diff --git a/nuttx/examples/pashello/device.c b/nuttx/examples/pashello/device.c index def8f60ec..5f0038ad7 100644 --- a/nuttx/examples/pashello/device.c +++ b/nuttx/examples/pashello/device.c @@ -69,7 +69,9 @@ static const struct file_operations hello_fops = 0, /* write */ 0, /* seek */ 0, /* ioctl */ +#ifndef CONFIG_DISABLE_POLL 0 /* poll */ +#endif }; /**************************************************************************** |