Changeset ac307b2 in mainline for uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.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/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h (modified) (3 diffs)

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h

@@ -38 +38 @@
 #define S3C24XX_UART_H_
 
+#include <adt/circ_buf.h>
+#include <async.h>
+#include <fibril_synch.h>
+#include <io/chardev_srv.h>
 #include <stdint.h>
-#include <async.h>
 
 /** S3C24xx UART I/O */
@@ -76 +79 @@
 #define UFCON_FIFO_ENABLE               0x01
 
+enum {
+        s3c24xx_uart_buf_size = 64
+};
 
 /** S3C24xx UART instance */
@@ -85 +91 @@
         s3c24xx_uart_io_t *io;
 
-        /** Callback session to the client */
-        async_sess_t *client_sess;
+        /** Character device service */
+        chardev_srvs_t cds;
 
         /** Service ID */
         service_id_t service_id;
+
+        /** Circular buffer */
+        circ_buf_t cbuf;
+        /** Buffer */
+        uint8_t buf[s3c24xx_uart_buf_size];
+        /** Buffer lock */
+        fibril_mutex_t buf_lock;
+        /** Signal newly added data in buffer */
+        fibril_condvar_t buf_cv;
 } s3c24xx_uart_t;