Changeset 7a6065c in mainline for uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h

Timestamp:

2017-11-23T11:56:31Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

221176c1

Parents:

74017ce

git-author:

Jiri Svoboda <jiri@…> (2017-11-22 19:55:36)

git-committer:

Jiri Svoboda <jiri@…> (2017-11-23 11:56:31)

Message:

Convert ipc/char.h users to chardev.

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;