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

Merged nuttx/apps/master into master

Browse Source
This commit is contained in:
Masayuki Ishikawa 2017-03-03 10:23:36 +09:00
commit 130e841fe5
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/gpio/gpio_main.c
View File

@ -250,7 +250,6 @@ int gpio_main(int argc, char *argv[])
if (havesigno) if (havesigno)
{ {
struct timespec ts; struct timespec ts;
struct siginfo info;
sigset_t set; sigset_t set;
/* Set up to receive signal */ /* Set up to receive signal */
@ -273,7 +272,7 @@ int gpio_main(int argc, char *argv[])
ts.tv_sec = 5; ts.tv_sec = 5;
ts.tv_nsec = 0; ts.tv_nsec = 0;
ret = sigtimedwait(&set, &info, &ts); ret = sigtimedwait(&set, NULL, &ts);
(void)ioctl(fd, GPIOC_UNREGISTER, 0); (void)ioctl(fd, GPIOC_UNREGISTER, 0);
if (ret < 0) if (ret < 0)

3
examples/oneshot/oneshot_main.c
View File

@ -116,7 +116,6 @@ int oneshot_main(int argc, char *argv[])
unsigned long usecs = CONFIG_EXAMPLE_ONESHOT_DELAY; unsigned long usecs = CONFIG_EXAMPLE_ONESHOT_DELAY;
unsigned long secs; unsigned long secs;
struct oneshot_start_s start; struct oneshot_start_s start;
struct siginfo info;
struct timespec ts; struct timespec ts;
uint64_t maxus; uint64_t maxus;
sigset_t set; sigset_t set;
@ -252,7 +251,7 @@ int oneshot_main(int argc, char *argv[])
/* Wait for the oneshot to fire */ /* Wait for the oneshot to fire */
printf("Waiting...\n"); printf("Waiting...\n");
ret = sigwaitinfo(&set, &info); ret = sigwaitinfo(&set, NULL);
if (ret < 0) if (ret < 0)
{ {
fprintf(stderr, "ERROR: sigwaitinfo failed: %d\n", fprintf(stderr, "ERROR: sigwaitinfo failed: %d\n",

3
graphics/traveler/src/trv_input.c
View File

@ -146,14 +146,13 @@ static struct trv_joystick_s g_trv_joystick;
static int trv_joystick_wait(void) static int trv_joystick_wait(void)
{ {
sigset_t set; sigset_t set;
struct siginfo value;
int ret; int ret;
/* Wait for a signal */ /* Wait for a signal */
(void)sigemptyset(&set); (void)sigemptyset(&set);
(void)sigaddset(&set, CONFIG_GRAPHICS_TRAVELER_JOYSTICK_SIGNO); (void)sigaddset(&set, CONFIG_GRAPHICS_TRAVELER_JOYSTICK_SIGNO);
ret = sigwaitinfo(&set, &value); ret = sigwaitinfo(&set, NULL);
if (ret < 0) if (ret < 0)
{ {
int errcode = errno; int errcode = errno;