Changeset 253f35a1 in mainline for kernel/genarch

Timestamp:

2006-09-07T19:56:44Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ab1ae2d9

Parents:

801579fe

Message:

sparc64 work.

• Changes to enable userspace keyboard drivers.
• Fix z8530 initialization (i.e. clear any pending Tx interrupts).
• Experimental support for framebuffers with inverted colors.

Location:

kernel/genarch

Files:

• include/kbd/z8530.h (modified) (1 diff)
• src/fb/fb.c (modified) (8 diffs)
• src/kbd/key.c (modified) (2 diffs)
• src/kbd/z8530.c (modified) (6 diffs)

kernel/genarch/include/kbd/z8530.h

@@ -38 +38 @@
 #define KERN_Z8530_H_
 
+#include <typedefs.h>
+
 #define Z8530_INTRCV_DATA0      0x39    /* hardcoded for use in Simics */
+
+extern bool z8530_belongs_to_kernel;
 
 extern void z8530_init(void);

kernel/genarch/src/fb/fb.c

@@ -61 +61 @@
 static unsigned int bitspp = 0;
 static unsigned int pixelbytes = 0;
+#ifdef FB_INVERT_COLORS
+static bool invert_colors = true;
+#else
+static bool invert_colors = false;
+#endif
 
 static unsigned int position = 0;
@@ -66 +71 @@
 static unsigned int rows = 0;
 
-
 #define COL_WIDTH       8
 #define ROW_BYTES       (scanline * FONT_SCANLINES)
@@ -85 +89 @@
 static void (*rgb2scr)(void *, int);
 static int (*scr2rgb)(void *);
+
+static inline int COLOR(int color)
+{
+        return invert_colors ? ~color : color;
+}
 
 /* Conversion routines between different color representations */
@@ -160 +169 @@
 static void putpixel(unsigned int x, unsigned int y, int color)
 {
-        (*rgb2scr)(&fbaddress[POINTPOS(x,y)],color);
+        (*rgb2scr)(&fbaddress[POINTPOS(x,y)], COLOR(color));
 
         if (dbbuffer) {
                 int dline = (y + dboffset) % yres;
-                (*rgb2scr)(&dbbuffer[POINTPOS(x,dline)],color);
+                (*rgb2scr)(&dbbuffer[POINTPOS(x,dline)], COLOR(color));
         }
 }
@@ -173 +182 @@
         if (dbbuffer) {
                 int dline = (y + dboffset) % yres;
-                return (*scr2rgb)(&dbbuffer[POINTPOS(x,dline)]);
-        }
-        return (*scr2rgb)(&fbaddress[POINTPOS(x,y)]);
+                return COLOR((*scr2rgb)(&dbbuffer[POINTPOS(x,dline)]));
+        }
+        return COLOR((*scr2rgb)(&fbaddress[POINTPOS(x,y)]));
 }
 
@@ -275 +284 @@
                         byte >>= x % 8;
                         if (byte & 1)
-                                putpixel(startx + x, starty + y, LOGOCOLOR);
+                                putpixel(startx + x, starty + y, COLOR(LOGOCOLOR));
                 }
 }
@@ -398 +407 @@
         sysinfo_set_item_val("fb.scanline", NULL, scan);
         sysinfo_set_item_val("fb.address.physical", NULL, addr);
+        sysinfo_set_item_val("fb.invert-colors", NULL, invert_colors);
 
         /* Allocate double buffer */
@@ -417 +427 @@
         if (!blankline)
                 panic("Failed to allocate blank line for framebuffer.");
-        for (y=0; y < FONT_SCANLINES; y++)
-                for (x=0; x < xres; x++)
-                        (*rgb2scr)(&blankline[POINTPOS(x,y)],BGCOLOR);
+        for (y=0; y < FONT_SCANLINES; y++) {
+                for (x=0; x < xres; x++) {
+                        (*rgb2scr)(&blankline[POINTPOS(x,y)], COLOR(BGCOLOR));
+                }
+        }
 
         clear_screen();

kernel/genarch/src/kbd/key.c

@@ -68 +68 @@
         spinlock_lock(&keylock);
         switch (sc) {
-            case SC_LSHIFT:
-            case SC_RSHIFT:
+        case SC_LSHIFT:
+        case SC_RSHIFT:
                 keyflags &= ~PRESSED_SHIFT;
                 break;
-            case SC_CAPSLOCK:
+        case SC_CAPSLOCK:
                 keyflags &= ~PRESSED_CAPSLOCK;
                 if (lockflags & LOCKED_CAPSLOCK)
@@ -79 +79 @@
                         lockflags |= LOCKED_CAPSLOCK;
                 break;
-            default:
+        default:
                 break;
         }

kernel/genarch/src/kbd/z8530.c

@@ -42 +42 @@
 #include <arch/drivers/z8530.h>
 #include <arch/interrupt.h>
+#include <arch/drivers/kbd.h>
 #include <cpu.h>
 #include <arch/asm.h>
@@ -49 +50 @@
 #include <console/console.h>
 #include <interrupt.h>
+#include <sysinfo/sysinfo.h>
+#include <print.h>
 
 /*
@@ -54 +57 @@
  */
 #define IGNORE_CODE     0x7f            /* all keys up */
+
+bool z8530_belongs_to_kernel = true;
 
 static void z8530_suspend(chardev_t *);
@@ -70 +75 @@
 void z8530_grab(void)
 {
+        z8530_belongs_to_kernel = true;
 }
 
@@ -75 +81 @@
 void z8530_release(void)
 {
+        z8530_belongs_to_kernel = false;
 }
 
@@ -83 +90 @@
         stdin = &kbrd;
 
+        sysinfo_set_item_val("kbd", NULL, true);
+        sysinfo_set_item_val("kbd.irq", NULL, 0);
+        sysinfo_set_item_val("kbd.address.virtual", NULL, (uintptr_t) kbd_virt_address);
+
         (void) z8530_read_a(RR8);
 
-        z8530_write_a(WR1, WR1_IARCSC); /* interrupt on all characters */
+        /*
+         * Clear any pending TX interrupts or we never manage
+         * to set FHC UART interrupt state to idle.
+         */
+        z8530_write_a(WR0, WR0_TX_IP_RST);
+
+        z8530_write_a(WR1, WR1_IARCSC);         /* interrupt on all characters */
 
         /* 8 bits per character and enable receiver */
         z8530_write_a(WR3, WR3_RX8BITSCH | WR3_RX_ENABLE);
         
-        z8530_write_a(WR9, WR9_MIE);    /* Master Interrupt Enable. */
+        z8530_write_a(WR9, WR9_MIE);            /* Master Interrupt Enable. */
         
         /*