Changes in kernel/arch/sparc64/src/drivers/niagara.c [d9ec808b:24abb85d] in mainline

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>
@@ -82 +81 @@
  * buffer definition follows.
  */
-static volatile niagara_output_buffer_t __attribute__ ((aligned(PAGE_SIZE)))
-    output_buffer;
+#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 parea_t outbuf_parea;
@@ -90 +94 @@
  * Analogous to the output_buffer, see the previous definition.
  */
-static volatile niagara_input_buffer_t __attribute__ ((aligned(PAGE_SIZE)))
-    input_buffer;
+#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 parea_t inbuf_parea;