Ignore:
Timestamp:
2019-01-04T21:22:17Z (6 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
af7b85b
Parents:
06412ba
Message:

Add forgotten changes to enable non-blocking chardev read

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

    r06412ba rf2d88f3  
    6969static void s3c24xx_uart_sendb(s3c24xx_uart_t *, uint8_t);
    7070
    71 static errno_t s3c24xx_uart_read(chardev_srv_t *, void *, size_t, size_t *);
     71static errno_t s3c24xx_uart_read(chardev_srv_t *, void *, size_t, size_t *,
     72    chardev_flags_t);
    7273static errno_t s3c24xx_uart_write(chardev_srv_t *, const void *, size_t, size_t *);
    7374
     
    199200
    200201static 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)
    202203{
    203204        s3c24xx_uart_t *uart = (s3c24xx_uart_t *) srv->srvs->sarg;
     
    208209        fibril_mutex_lock(&uart->buf_lock);
    209210
    210         while (circ_buf_nused(&uart->cbuf) == 0)
     211        while ((flags & chardev_f_nonblock) == 0 &&
     212            circ_buf_nused(&uart->cbuf) == 0)
    211213                fibril_condvar_wait(&uart->buf_cv, &uart->buf_lock);
    212214
Note: See TracChangeset for help on using the changeset viewer.