Changeset f2d88f3 in mainline for uspace/drv/char/ski-con/ski-con.c
- Timestamp:
- 2019-01-04T21:22:17Z (5 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/drv/char/ski-con/ski-con.c
r06412ba rf2d88f3 55 55 static void ski_con_connection(ipc_call_t *, void *); 56 56 57 static errno_t ski_con_read(chardev_srv_t *, void *, size_t, size_t *); 57 static errno_t ski_con_read(chardev_srv_t *, void *, size_t, size_t *, 58 chardev_flags_t); 58 59 static errno_t ski_con_write(chardev_srv_t *, const void *, size_t, size_t *); 59 60 … … 260 261 /** Read from Ski console device */ 261 262 static errno_t ski_con_read(chardev_srv_t *srv, void *buf, size_t size, 262 size_t *nread )263 size_t *nread, chardev_flags_t flags) 263 264 { 264 265 ski_con_t *con = (ski_con_t *) srv->srvs->sarg; … … 269 270 fibril_mutex_lock(&con->buf_lock); 270 271 271 while (circ_buf_nused(&con->cbuf) == 0) 272 while ((flags & chardev_f_nonblock) == 0 && 273 circ_buf_nused(&con->cbuf) == 0) 272 274 fibril_condvar_wait(&con->buf_cv, &con->buf_lock); 273 275
Note:
See TracChangeset
for help on using the changeset viewer.