Changeset d9ec808b in mainline

Timestamp:

2017-11-27T08:25:37Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

59953b57

Parents:

7b8f933

git-author:

Jiri Svoboda <jiri@…> (2017-11-26 21:24:27)

git-committer:

Jiri Svoboda <jiri@…> (2017-11-27 08:25:37)

Message:

Niagara console driver buddies should share buffer definition.

Files:

• kernel/arch/sparc64/include/arch/drivers/niagara_buf.h (added)
• kernel/arch/sparc64/src/drivers/niagara.c (modified) (3 diffs)
• uspace/drv/char/sun4v-con/niagara_buf.h (added)
• uspace/drv/char/sun4v-con/sun4v-con.c (modified) (6 diffs)

kernel/arch/sparc64/src/drivers/niagara.c

@@ -42 +42 @@
 #include <arch.h>
 #include <mm/slab.h>
+#include <arch/drivers/niagara_buf.h>
 #include <arch/drivers/kbd.h>
 #include <arch/sun4v/hypercall.h>
@@ -81 +82 @@
  * buffer definition follows.
  */
-#define OUTPUT_BUFFER_SIZE  ((PAGE_SIZE) - 2 * 8)
-
-static volatile struct {
-        uint64_t read_ptr;
-        uint64_t write_ptr;
-        char data[OUTPUT_BUFFER_SIZE];
-} __attribute__ ((packed)) __attribute__ ((aligned(PAGE_SIZE))) output_buffer;
+static volatile niagara_output_buffer_t __attribute__ ((aligned(PAGE_SIZE)))
+    output_buffer;
 
 static parea_t outbuf_parea;
@@ -94 +90 @@
  * Analogous to the output_buffer, see the previous definition.
  */
-#define INPUT_BUFFER_SIZE  ((PAGE_SIZE) - 2 * 8)
-
-static volatile struct {
-        uint64_t write_ptr;
-        uint64_t read_ptr;
-        char data[INPUT_BUFFER_SIZE];
-} __attribute__ ((packed)) __attribute__ ((aligned(PAGE_SIZE))) input_buffer;
+static volatile niagara_input_buffer_t __attribute__ ((aligned(PAGE_SIZE)))
+    input_buffer;
 
 static parea_t inbuf_parea;

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

@@ -39 +39 @@
 #include <stdbool.h>
 
+#include "niagara_buf.h"
 #include "sun4v-con.h"
 
@@ -45 +46 @@
 #define POLL_INTERVAL  10000
 
-/*
- * Kernel counterpart of the driver pushes characters (it has read) here.
- * Keep in sync with the definition from
- * kernel/arch/sparc64/src/drivers/niagara.c.
- */
-#define INPUT_BUFFER_SIZE  ((PAGE_SIZE) - 2 * 8)
-
-typedef volatile struct {
-        uint64_t write_ptr;
-        uint64_t read_ptr;
-        char data[INPUT_BUFFER_SIZE];
-} __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 niagara_input_buffer_t *input_buffer;
+static niagara_output_buffer_t *output_fifo;
 
 static int sun4v_con_read(chardev_srv_t *, void *, size_t, size_t *);
@@ -84 +64 @@
 
         while (output_fifo->write_ptr ==
-            (output_fifo->read_ptr + OUTPUT_FIFO_SIZE - 1)
-            % OUTPUT_FIFO_SIZE);
+            (output_fifo->read_ptr + OUTPUT_BUFFER_SIZE - 1)
+            % OUTPUT_BUFFER_SIZE);
 
         output_fifo->data[output_fifo->write_ptr] = data;
         output_fifo->write_ptr =
-            ((output_fifo->write_ptr) + 1) % OUTPUT_FIFO_SIZE;
+            ((output_fifo->write_ptr) + 1) % OUTPUT_BUFFER_SIZE;
 }
 
@@ -99 +79 @@
 
         con->res = *res;
-        input_buffer = (input_buffer_t) AS_AREA_ANY;
+        input_buffer = (niagara_input_buffer_t *) AS_AREA_ANY;
 
         fun = ddf_fun_create(con->dev, fun_exposed, "a");
@@ -121 +101 @@
         }
 
-        output_fifo = (output_fifo_t *) AS_AREA_ANY;
+        output_fifo = (niagara_output_buffer_t *) AS_AREA_ANY;
 
         rc = physmem_map(res->out_base, 1, AS_AREA_READ | AS_AREA_WRITE,
@@ -140 +120 @@
         return EOK;
 error:
-        if (input_buffer != (input_buffer_t) AS_AREA_ANY)
+        if (input_buffer != (niagara_input_buffer_t *) AS_AREA_ANY)
                 physmem_unmap((void *) input_buffer);
 
-        if (output_fifo != (output_fifo_t *) AS_AREA_ANY)
+        if (output_fifo != (niagara_output_buffer_t *) AS_AREA_ANY)
                 physmem_unmap((void *) output_fifo);