hackathon-dev #1

Merged
amy merged 101 commits from hackathon-dev into develop 2019-12-12 13:56:11 -07:00
Showing only changes of commit 746962454d - Show all commits

View File

@ -81,12 +81,12 @@ static BOOL poll_touchscreen(void)
xerrno = errno; xerrno = errno;
if ((xerrno != EAGAIN) && (xerrno != EWOULDBLOCK)) if ((xerrno != EAGAIN) && (xerrno != EWOULDBLOCK))
Log(LERROR, "Error reading from touchscreen device (%d)", xerrno); Log(LERROR, "Error reading from touchscreen device (%d)", xerrno);
return; return FALSE;
} }
else if (nb == 0) else if (nb == 0)
{ {
Log(LERROR, "Unexpected end of file reading from touchscreen device"); Log(LERROR, "Unexpected end of file reading from touchscreen device");
return; return FALSE;
} }
nev = nb / sizeof(struct input_event); nev = nb / sizeof(struct input_event);
@ -207,6 +207,6 @@ void Sys_wait_for_input(void)
{ {
pthread_mutex_lock(&wait_mutex); pthread_mutex_lock(&wait_mutex);
while (Mq_is_empty(Sys_Queue)) while (Mq_is_empty(Sys_Queue))
pthread_cond_wait(&wait_cond); pthread_cond_wait(&wait_cond, &wait_mutex);
pthread_mutex_unlock(&wait_mutex); pthread_mutex_unlock(&wait_mutex);
} }