Changeset eeb643d in mainline

Timestamp:

2010-01-24T17:40:43Z (15 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.

Files:

• kernel/arch/sparc64/src/drivers/niagara.c (modified) (6 diffs)
• uspace/app/init/init.c (modified) (1 diff)
• uspace/srv/hid/fb/Makefile.build (modified) (1 diff)
• uspace/srv/hid/fb/main.c (modified) (2 diffs)
• uspace/srv/hid/fb/niagara.c (added)
• uspace/srv/hid/fb/niagara.h (added)
• uspace/srv/hid/kbd/Makefile.build (modified) (1 diff)
• uspace/srv/hid/kbd/generic/kbd.c (modified) (2 diffs)
• uspace/srv/hid/kbd/port/niagara.c (added)

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
 

uspace/app/init/init.c

@@ -263 +263 @@
         }
         
-        spawn("/srv/fhc");
-        spawn("/srv/obio");
-        srv_start("/srv/i8042");
-        srv_start("/srv/c_mouse");
+        //spawn("/srv/fhc");
+        //spawn("/srv/obio");
+        //srv_start("/srv/i8042");
+        //srv_start("/srv/c_mouse");
 
         spawn("/srv/fb");

uspace/srv/hid/fb/Makefile.build

@@ -72 +72 @@
 
 ifeq ($(UARCH),sparc64)
-        SOURCES += sgcn.c \
-                serial_console.c
-        CFLAGS += -DSGCN_ENABLED
+        ifeq ($(PROCESSOR), sun4v)
+                SOURCES += niagara.c \
+                        serial_console.c
+                CFLAGS += -DNIAGARA_ENABLED
+        endif
+
+        ifeq ($(MACHINE), serengeti)
+                SOURCES += sgcn.c \
+                        serial_console.c
+                CFLAGS += -DSGCN_ENABLED
+        endif
 endif
 

uspace/srv/hid/fb/main.c

@@ -41 +41 @@
 #include "ski.h"
 #include "sgcn.h"
+#include "niagara.h"
 #include "main.h"
 
@@ -88 +89 @@
         }
 #endif
+#ifdef NIAGARA_ENABLED
+        if ((!initialized) && (sysinfo_value("fb.kind") == 5)) {
+                if (niagara_init() == 0)
+                        initialized = true;
+        }
+#endif
 #ifdef SKI_ENABLED
         if ((!initialized) && (sysinfo_value("fb") != true)) {

uspace/srv/hid/kbd/Makefile.build

@@ -130 +130 @@
 
 ifeq ($(UARCH),sparc64)
-        ifeq ($(MACHINE),serengeti)
-                SOURCES += \
-                        port/sgcn.c \
-                        ctl/stty.c
-        else
-                SOURCES += \
+        ifeq ($(PROCESSOR),sun4u)
+                ifeq ($(MACHINE),serengeti)
+                        SOURCES += \
+                                port/sgcn.c \
+                                ctl/stty.c
+                endif
+                ifeq ($(MACHINE),generic)
+                        SOURCES += \
                         port/sun.c \
                         port/z8530.c \
                         port/ns16550.c \
                         ctl/sun.c
+                endif
+        endif
+        ifeq ($(PROCESSOR),sun4v)
+                SOURCES += \
+                        port/niagara.c \
+                        ctl/stty.c
         endif
 endif

uspace/srv/hid/kbd/generic/kbd.c

@@ -219 +219 @@
                 cir_service = SERVICE_OBIO;
         
+/*
         if (cir_service) {
                 while (cir_phone < 0) {
@@ -225 +226 @@
                 }
         }
+*/
+printf("KBD driver!!!\n");
         
         /* Initialize port driver. */