Changeset d9ec808b in mainline for kernel/arch/sparc64/src/drivers/niagara.c

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.

File:

• kernel/arch/sparc64/src/drivers/niagara.c (modified) (3 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;