Changeset ac307b2 in mainline for uspace/drv/char/ski-con/ski-con.h

Timestamp:

2017-11-25T11:12:23Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

98cb5e0d

Parents:

f571ca49 (diff), 0851a3d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into callcaps

File:

• uspace/drv/char/ski-con/ski-con.h (modified) (2 diffs)

uspace/drv/char/ski-con/ski-con.h

@@ -36 +36 @@
 #define SKI_CON_H
 
+#include <adt/circ_buf.h>
 #include <async.h>
 #include <ddf/driver.h>
+#include <io/chardev_srv.h>
 #include <loc.h>
 #include <stdint.h>
+
+enum {
+        ski_con_buf_size = 64
+};
 
 /** Ski console */
@@ -45 +51 @@
         async_sess_t *client_sess;
         ddf_dev_t *dev;
+        chardev_srvs_t cds;
+        circ_buf_t cbuf;
+        uint8_t buf[ski_con_buf_size];
+        fibril_mutex_t buf_lock;
+        fibril_condvar_t buf_cv;
 } ski_con_t;