Changeset 132ab5d1 in mainline for uspace/drv/char/sun4v-con/sun4v-con.h

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

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

@@ -38 +38 @@
 #include <async.h>
 #include <ddf/driver.h>
+#include <io/chardev_srv.h>
 #include <loc.h>
 #include <stdint.h>
+
+#include "niagara_buf.h"
+
+/** Sun4v console resources */
+typedef struct {
+        uintptr_t in_base;
+        uintptr_t out_base;
+} sun4v_con_res_t;
 
 /** Sun4v console */
@@ -45 +54 @@
         async_sess_t *client_sess;
         ddf_dev_t *dev;
+        chardev_srvs_t cds;
+        sun4v_con_res_t res;
+        /** Virtual address of the shared input buffer */
+        niagara_input_buffer_t *input_buffer;
+        /** Virtual address of the shared input buffer */
+        niagara_output_buffer_t *output_buffer;
 } sun4v_con_t;
 
-extern int sun4v_con_init(sun4v_con_t *);
-extern void sun4v_con_write(uint8_t data);
-
-
-extern int sun4v_con_add(sun4v_con_t *);
+extern int sun4v_con_add(sun4v_con_t *, sun4v_con_res_t *);
 extern int sun4v_con_remove(sun4v_con_t *);
 extern int sun4v_con_gone(sun4v_con_t *);