diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-17 23:58:46 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-17 23:58:46 +0000 |
| commit | 232543710ef6718a95b3629bcda84350e33cfbea (patch) | |
| tree | 46702e3d891f55305f615fd974c9aef2aa8482a2 /nuttx | |
| parent | 27291c423ba989c93b6cb199f3217ee52328aa61 (diff) | |
| download | px4-nuttx-232543710ef6718a95b3629bcda84350e33cfbea.tar.gz px4-nuttx-232543710ef6718a95b3629bcda84350e33cfbea.tar.bz2 px4-nuttx-232543710ef6718a95b3629bcda84350e33cfbea.zip | |
Needs conditional compilation for POLL disabled
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1273 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/sim/src/up_devconsole.c | 2 | ||||
| -rw-r--r-- | nuttx/drivers/bch/bchdev_driver.c | 6 | ||||
| -rw-r--r-- | nuttx/drivers/can.c | 6 | ||||
| -rwxr-xr-x | nuttx/drivers/lowconsole.c | 6 |
4 files changed, 14 insertions, 6 deletions
diff --git a/nuttx/arch/sim/src/up_devconsole.c b/nuttx/arch/sim/src/up_devconsole.c index 58fa21e3b..89eb33c33 100644 --- a/nuttx/arch/sim/src/up_devconsole.c +++ b/nuttx/arch/sim/src/up_devconsole.c @@ -84,10 +84,12 @@ static ssize_t devconsole_write(struct file *filp, const char *buffer, size_t le return up_hostwrite(buffer, len); } +#ifndef CONFIG_DISABLE_POLL static int devconsole_poll(FAR struct file *filep, FAR struct pollfd *fds) { return OK; } +#endif /**************************************************************************** * Public Functions diff --git a/nuttx/drivers/bch/bchdev_driver.c b/nuttx/drivers/bch/bchdev_driver.c index 98c7f2991..8e36bcb82 100644 --- a/nuttx/drivers/bch/bchdev_driver.c +++ b/nuttx/drivers/bch/bchdev_driver.c @@ -85,8 +85,10 @@ struct file_operations bch_fops = bch_read, /* read */ bch_write, /* write */ 0, /* seek */ - bch_ioctl, /* ioctl */ - 0 /* poll */ + bch_ioctl /* ioctl */ +#ifndef CONFIG_DISABLE_POLL + , 0 /* poll */ +#endif }; /**************************************************************************** diff --git a/nuttx/drivers/can.c b/nuttx/drivers/can.c index 72e3fdd64..3d21634ee 100644 --- a/nuttx/drivers/can.c +++ b/nuttx/drivers/can.c @@ -88,8 +88,10 @@ struct file_operations g_canops = can_read, /* read */ can_write, /* write */ 0, /* seek */ - can_ioctl, /* ioctl */ - 0 /* poll */ + can_ioctl /* ioctl */ +#ifndef CONFIG_DISABLE_POLL + , 0 /* poll */ +#endif }; /**************************************************************************** diff --git a/nuttx/drivers/lowconsole.c b/nuttx/drivers/lowconsole.c index 8b776da19..d1f02ca9d 100755 --- a/nuttx/drivers/lowconsole.c +++ b/nuttx/drivers/lowconsole.c @@ -75,8 +75,10 @@ struct file_operations g_serialops = lowconsole_read, /* read */ lowconsole_write, /* write */ 0, /* seek */ - lowconsole_ioctl, /* ioctl */ - 0 /* poll */ + lowconsole_ioctl /* ioctl */ +#ifndef CONFIG_DISABLE_POLL + , 0 /* poll */ +#endif }; /**************************************************************************** |