VBE support

We now boot into 1024x768 and draw a background image, and overlay
the boot log.

Adds a font in unifont.c, and a bg image in ayame.c

tty.c is now the skeleton of a shared buffer for either text
or graphical modes to pull from and render.

At the moment, nothing is driving the screen to redraw, so
graphical output will 'hang' after the bg draws for the first time.

Author: zid

ayame.c

@@ -0,0 +1,6 @@
+#ifndef _TTY_H
+#define _TTY_H
+void tty_write_str(const char *);
+void tty_putchar(unsigned char c);
+unsigned short *tty_get_line(int);
+#endif

boros.bochs

@@ -0,0 +1,6 @@
+#ifndef VBE_H
+#define VBE_H
+#include "types.h"
+#include "device.h"
+void vbe_init(struct device *dev);
+#endif

include/tty.h

@@ -18,8 +18,8 @@ void kmain(void *mem)
 
 	gdt_install();
 	int_install();
-	/* acpi_init(); - PCI-E not delivering interrupts yet */
-	pci_init();
+	acpi_init();
+	//pci_init();
 	syscall_install();
 
 	/* No infrastructure for this exists yet, hardcoded here */

include/vbe.h

@@ -3,8 +3,10 @@
 #include <pci.h>
 #include <device.h>
 #include <cpu.h>
+
 #include <e1000.h>
 #include <virtio.h>
+#include <vbe.h>
 
 #define PCI_CONFIG_ADDRESS 0xCF8
 #define PCI_DATA_ADDRESS 0xCFC
@@ -68,6 +70,9 @@ static void pci_dump(struct device d)
 
 	if(vendor_id == 0x1af4 && device_id == 0x1000)
 		virtio_init(&d);
+
+	if(vendor_id == 0x1234 && device_id == 0x1111)
+		vbe_init(&d);
 }
 
 struct pcie_config
@@ -115,6 +120,8 @@ static void pcie_handle_device(struct pcie_config *cfg)
 		virtio_init(&d);
 	if(cfg->vendor_id == 0x8086 && cfg->device_id == 0x100E)
 		e1000_init(&d);
+	if(cfg->vendor_id == 0x1234 && cfg->device_id == 0x1111)
+		vbe_init(&d);
 }
 
 static void pcie_parse_device(u64 addr)

main.c

@@ -1,6 +1,7 @@
 #include <stdarg.h>
 #include "print.h"
 #include "stdlib.h"
+#include "tty.h"
 
 #define BUF_SIZ 64
 
@@ -41,25 +42,7 @@ static void newline(void)
 
 static void putchar(unsigned char c)
 {
-	if(c == '\n')
-		return newline();
-	if(c == '\t')
-	{
-		putchar(' ');
-		putchar(' ');
-		putchar(' ');
-		putchar(' ');
-		return;
-	}
-
-	if(vmem >= (unsigned short *)(0xB8000 + (80 * 25 * 2)))
-	{
-		vmem -= 80; /* Short *, not an offset */
-		memmove((void *)0xB8000, (void *)0xB8000 + 160, 80 * 24 * 2);
-		 memset((void *)0xB8000+80*24*2, 0, 160);
-	}
-
-	*vmem++ = 0xF00 | c;
+	tty_putchar(c);
 }
 
 static void put_number(unsigned long n, int islong, int base, char pad_char, int width)
@@ -91,8 +74,7 @@ static void put_number(unsigned long n, int islong, int base, char pad_char, int
 
 static void puts(const char *str)
 {
-	while(*str)
-		putchar(*str++);
+	tty_write_str(str);
 }
 
 static void vprint(const char *fmt, va_list ap)

pci.c

@@ -0,0 +1,59 @@
+#include <tty.h>
+#include <cpu.h>
+
+struct line
+{
+	unsigned short text[80];
+};
+
+static struct line buffer[40];
+static int buf_line;
+static int buf_pos;
+
+void tty_write_str(const char *str)
+{
+	char c;
+
+	do
+	{
+		c = *str++;
+		tty_putchar(c);
+	} while(c); 
+}
+
+void tty_putchar(unsigned char c)
+{
+	if(c == '\t')
+	{
+		buffer[buf_line].text[buf_pos+0] = ' ';
+		buffer[buf_line].text[buf_pos+1] = ' ';
+		buffer[buf_line].text[buf_pos+2] = ' ';
+		buffer[buf_line].text[buf_pos+3] = ' ';
+		buf_pos += 4;
+	}
+
+	if(c == '\n' || buf_pos >= 80)
+	{
+		buf_pos = 0;
+		buf_line++;
+		buffer[buf_line].text[0] = 0;
+		if(buf_line >= 40)
+			buf_line = 0;
+	}
+
+	if(c != '\n' && c != '\t')
+		buffer[buf_line].text[buf_pos++] = c;
+}
+
+unsigned short *tty_get_line(int n)
+{
+	int line;
+
+	line = buf_line + n;
+	if(line > 40)
+		line -= 40;
+	if(line < 0)
+		line += 40;
+
+	return buffer[line].text;
+}