Merged nuttx/apps/master into master
This commit is contained in:
commit
130e841fe5
@ -250,7 +250,6 @@ int gpio_main(int argc, char *argv[])
|
||||
if (havesigno)
|
||||
{
|
||||
struct timespec ts;
|
||||
struct siginfo info;
|
||||
sigset_t set;
|
||||
|
||||
/* Set up to receive signal */
|
||||
@ -273,7 +272,7 @@ int gpio_main(int argc, char *argv[])
|
||||
ts.tv_sec = 5;
|
||||
ts.tv_nsec = 0;
|
||||
|
||||
ret = sigtimedwait(&set, &info, &ts);
|
||||
ret = sigtimedwait(&set, NULL, &ts);
|
||||
(void)ioctl(fd, GPIOC_UNREGISTER, 0);
|
||||
|
||||
if (ret < 0)
|
||||
|
@ -116,7 +116,6 @@ int oneshot_main(int argc, char *argv[])
|
||||
unsigned long usecs = CONFIG_EXAMPLE_ONESHOT_DELAY;
|
||||
unsigned long secs;
|
||||
struct oneshot_start_s start;
|
||||
struct siginfo info;
|
||||
struct timespec ts;
|
||||
uint64_t maxus;
|
||||
sigset_t set;
|
||||
@ -252,7 +251,7 @@ int oneshot_main(int argc, char *argv[])
|
||||
/* Wait for the oneshot to fire */
|
||||
|
||||
printf("Waiting...\n");
|
||||
ret = sigwaitinfo(&set, &info);
|
||||
ret = sigwaitinfo(&set, NULL);
|
||||
if (ret < 0)
|
||||
{
|
||||
fprintf(stderr, "ERROR: sigwaitinfo failed: %d\n",
|
||||
|
@ -146,14 +146,13 @@ static struct trv_joystick_s g_trv_joystick;
|
||||
static int trv_joystick_wait(void)
|
||||
{
|
||||
sigset_t set;
|
||||
struct siginfo value;
|
||||
int ret;
|
||||
|
||||
/* Wait for a signal */
|
||||
|
||||
(void)sigemptyset(&set);
|
||||
(void)sigaddset(&set, CONFIG_GRAPHICS_TRAVELER_JOYSTICK_SIGNO);
|
||||
ret = sigwaitinfo(&set, &value);
|
||||
ret = sigwaitinfo(&set, NULL);
|
||||
if (ret < 0)
|
||||
{
|
||||
int errcode = errno;
|
||||
|
Loading…
Reference in New Issue
Block a user