3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serialqueue: Fix registration of serial fd in debug mode 

When in debug output mode, make sure to register the fd correctly.
Otherwise, the poll() call will use the 0 fd which could cause random
results.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-10-30 13:45:28 -04:00
parent 19b2363c93
commit aaf3dc6ac3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
klippy/chelper/serialqueue.c
View File

@ -88,10 +88,11 @@ pollreactor_free(struct pollreactor *pr)
// Add a callback for when a file descriptor (fd) becomes readable // Add a callback for when a file descriptor (fd) becomes readable
static void static void
pollreactor_add_fd(struct pollreactor *pr, int pos, int fd, void *callback) pollreactor_add_fd(struct pollreactor *pr, int pos, int fd, void *callback
, int write_only)
{ {
pr->fds[pos].fd = fd; pr->fds[pos].fd = fd;
pr->fds[pos].events = POLLIN|POLLHUP; pr->fds[pos].events = POLLHUP | (write_only ? 0 : POLLIN);
pr->fds[pos].revents = 0; pr->fds[pos].revents = 0;
pr->fd_callbacks[pos] = callback; pr->fd_callbacks[pos] = callback;
} }
@ -838,9 +839,9 @@ serialqueue_alloc(int serial_fd, int write_only)
if (ret) if (ret)
goto fail; goto fail;
pollreactor_setup(&sq->pr, SQPF_NUM, SQPT_NUM, sq); pollreactor_setup(&sq->pr, SQPF_NUM, SQPT_NUM, sq);
if (!write_only) pollreactor_add_fd(&sq->pr, SQPF_SERIAL, serial_fd, input_event
pollreactor_add_fd(&sq->pr, SQPF_SERIAL, serial_fd, input_event); , write_only);
pollreactor_add_fd(&sq->pr, SQPF_PIPE, sq->pipe_fds[0], kick_event); pollreactor_add_fd(&sq->pr, SQPF_PIPE, sq->pipe_fds[0], kick_event, 0);
pollreactor_add_timer(&sq->pr, SQPT_RETRANSMIT, retransmit_event); pollreactor_add_timer(&sq->pr, SQPT_RETRANSMIT, retransmit_event);
pollreactor_add_timer(&sq->pr, SQPT_COMMAND, command_event); pollreactor_add_timer(&sq->pr, SQPT_COMMAND, command_event);
set_non_blocking(serial_fd); set_non_blocking(serial_fd);