Changeset 5f4c41b2 in mainline for uspace/drv/char/sun4v-con/sun4v-con.c

Timestamp:

2017-11-26T02:41:55Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f4cfd271

Parents:

9940ce0

Message:

Move sending side of Sun4v console out of output server.

File:

• uspace/drv/char/sun4v-con/sun4v-con.c (modified) (5 diffs)

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

@@ -38 +38 @@
 #include <io/chardev_srv.h>
 #include <stdbool.h>
-#include <thread.h>
+#include <sysinfo.h>
 
 #include "sun4v-con.h"
@@ -59 +59 @@
 } __attribute__((packed)) __attribute__((aligned(PAGE_SIZE))) *input_buffer_t;
 
+#define OUTPUT_FIFO_SIZE  ((PAGE_SIZE) - 2 * sizeof(uint64_t))
+
+typedef volatile struct {
+        uint64_t read_ptr;
+        uint64_t write_ptr;
+        char data[OUTPUT_FIFO_SIZE];
+} __attribute__((packed)) output_fifo_t;
+
 /* virtual address of the shared buffer */
 static input_buffer_t input_buffer;
+static output_fifo_t *output_fifo;
 
 static int sun4v_con_read(chardev_srv_t *, void *, size_t, size_t *);
@@ -72 +81 @@
 static void sun4v_con_putchar(sun4v_con_t *con, uint8_t data)
 {
-        (void) con;
-        (void) data;
+        if (data == '\n')
+                sun4v_con_putchar(con, '\r');
+
+        while (output_fifo->write_ptr ==
+            (output_fifo->read_ptr + OUTPUT_FIFO_SIZE - 1)
+            % OUTPUT_FIFO_SIZE);
+
+        output_fifo->data[output_fifo->write_ptr] = data;
+        output_fifo->write_ptr =
+            ((output_fifo->write_ptr) + 1) % OUTPUT_FIFO_SIZE;
 }
 
@@ -105 +122 @@
         }
 
+        sysarg_t paddr;
+        rc = sysinfo_get_value("niagara.outbuf.address", &paddr);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Outbuf address information not found");
+                return rc;
+        }
+
+        output_fifo = (output_fifo_t *) AS_AREA_ANY;
+
+        rc = physmem_map(paddr, 1, AS_AREA_READ | AS_AREA_WRITE,
+            (void *) &output_fifo);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Error mapping memory: %d", rc);
+                return rc;
+        }
+
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
@@ -111 +144 @@
         }
 
+        ddf_fun_add_to_category(fun, "console");
+
         return EOK;
 error:
-        /* XXX Clean up thread */
-
         if (input_buffer != (input_buffer_t) AS_AREA_ANY)
                 physmem_unmap((void *) input_buffer);