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

Timestamp:

2010-01-24T17:40:43Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

86018c1

Parents:

99de22b

Message:

Implemented Niagara output userspace driver.

File:

• kernel/arch/sparc64/src/drivers/niagara.c (modified) (6 diffs)

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

@@ -85 +85 @@
  * the mapped buffer. The shared buffer definition follows.
  */
-/*
 #define OUTPUT_BUFFER_SIZE      ((PAGE_SIZE) - 2 * 8)
 static volatile struct {
@@ -95 +94 @@
         __attribute__ ((aligned(PAGE_SIZE)))
         output_buffer;
-*/
 
 #if 0
@@ -193 +191 @@
 static void niagara_poll(niagara_instance_t *instance)
 {
-        /*
         while (output_buffer.read_ptr != output_buffer.write_ptr) {
                 do_putchar(output_buffer.data[output_buffer.read_ptr]);
@@ -199 +196 @@
                         ((output_buffer.read_ptr) + 1) % OUTPUT_BUFFER_SIZE;
         }
-        */
 
         uint64_t c;
@@ -245 +241 @@
 
         instance->srlnin = NULL;
+        sysinfo_set_item_val("fb.kind", NULL, 5);
+
+        /*
+         * Set sysinfos and pareas so that the userspace counterpart of the
+         * niagara fb driver can communicate with kernel using a shared buffer.
+         */
+        output_buffer.read_ptr = 0;
+        output_buffer.write_ptr = 0;
+
+        sysinfo_set_item_val("niagara.outbuf.address", NULL,
+                KA2PA(&output_buffer));
+        sysinfo_set_item_val("niagara.outbuf.size", NULL,
+                PAGE_SIZE);
+        sysinfo_set_item_val("niagara.outbuf.datasize", NULL,
+                OUTPUT_BUFFER_SIZE);
+
+        static parea_t outbuf_parea;
+        outbuf_parea.pbase = (uintptr_t) (KA2PA(&output_buffer));
+        outbuf_parea.frames = 1;
+        ddi_parea_register(&outbuf_parea);
 
         #if 0
@@ -261 +277 @@
         sysinfo_set_item_val("kbd.devno", NULL, devno);
         sysinfo_set_item_val("kbd.inr", NULL, FICTIONAL_INR);
-        sysinfo_set_item_val("fb.kind", NULL, 5);
         #endif