diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-21 08:20:25 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-11-21 08:20:25 -0600 |
| commit | 187c8ccafca5163c8e404e956632c09c0f3dbd6e (patch) | |
| tree | 67868d3150a51b64b25b17ffc4027908596099a2 /nuttx | |
| parent | 90d6968f87a3ef65dd41029e9bb31bf0a8b7dfeb (diff) | |
| download | nuttx-187c8ccafca5163c8e404e956632c09c0f3dbd6e.tar.gz nuttx-187c8ccafca5163c8e404e956632c09c0f3dbd6e.tar.bz2 nuttx-187c8ccafca5163c8e404e956632c09c0f3dbd6e.zip | |
apps/examples/bridge: Add host-side test driver
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/configs/sama5d3-xplained/bridge/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/fs/vfs/fs_poll.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/nuttx/configs/sama5d3-xplained/bridge/defconfig b/nuttx/configs/sama5d3-xplained/bridge/defconfig index feea51f4f..0fa04e646 100644 --- a/nuttx/configs/sama5d3-xplained/bridge/defconfig +++ b/nuttx/configs/sama5d3-xplained/bridge/defconfig @@ -813,6 +813,7 @@ CONFIG_EXAMPLES_BRIDGE_NET1_MACADDR=0x00e0deadbeef CONFIG_EXAMPLES_BRIDGE_NET1_IPADDR=0x0a000002 CONFIG_EXAMPLES_BRIDGE_NET1_DRIPADDR=0x0a000001 CONFIG_EXAMPLES_BRIDGE_NET1_NETMASK=0xffffff00 +CONFIG_EXAMPLES_BRIDGE_NET1_IPHOST=0x0a000001 CONFIG_EXAMPLES_BRIDGE_NET1_STACKSIZE=2048 CONFIG_EXAMPLES_BRIDGE_NET1_PRIORITY=100 @@ -829,6 +830,7 @@ CONFIG_EXAMPLES_BRIDGE_NET2_MACADDR=0x00e0f00dface CONFIG_EXAMPLES_BRIDGE_NET2_IPADDR=0x0a000003 CONFIG_EXAMPLES_BRIDGE_NET2_DRIPADDR=0x0a000001 CONFIG_EXAMPLES_BRIDGE_NET2_NETMASK=0xffffff00 +CONFIG_EXAMPLES_BRIDGE_NET2_IPHOST=0x0a000001 CONFIG_EXAMPLES_BRIDGE_NET2_STACKSIZE=2048 CONFIG_EXAMPLES_BRIDGE_NET2_PRIORITY=100 # CONFIG_EXAMPLES_BUTTONS is not set diff --git a/nuttx/fs/vfs/fs_poll.c b/nuttx/fs/vfs/fs_poll.c index a7fd5ed62..d968defb6 100644 --- a/nuttx/fs/vfs/fs_poll.c +++ b/nuttx/fs/vfs/fs_poll.c @@ -346,6 +346,8 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout) } else { + /* EINTR is the only other error expected in normal operation */ + ret = -err; } } |