Changeset f2d88f3 in mainline for uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c
- Timestamp:
- 2019-01-04T21:22:17Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- af7b85b
- Parents:
- 06412ba
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c
r06412ba rf2d88f3 69 69 static void s3c24xx_uart_sendb(s3c24xx_uart_t *, uint8_t); 70 70 71 static errno_t s3c24xx_uart_read(chardev_srv_t *, void *, size_t, size_t *); 71 static errno_t s3c24xx_uart_read(chardev_srv_t *, void *, size_t, size_t *, 72 chardev_flags_t); 72 73 static errno_t s3c24xx_uart_write(chardev_srv_t *, const void *, size_t, size_t *); 73 74 … … 199 200 200 201 static errno_t s3c24xx_uart_read(chardev_srv_t *srv, void *buf, size_t size, 201 size_t *nread )202 size_t *nread, chardev_flags_t flags) 202 203 { 203 204 s3c24xx_uart_t *uart = (s3c24xx_uart_t *) srv->srvs->sarg; … … 208 209 fibril_mutex_lock(&uart->buf_lock); 209 210 210 while (circ_buf_nused(&uart->cbuf) == 0) 211 while ((flags & chardev_f_nonblock) == 0 && 212 circ_buf_nused(&uart->cbuf) == 0) 211 213 fibril_condvar_wait(&uart->buf_cv, &uart->buf_lock); 212 214
Note:
See TracChangeset
for help on using the changeset viewer.