kernel: Remove kbd and vga processes from kernel tree

diff --git a/kernel/Makefile b/kernel/Makefile
index eb275df9cb003c48904ab6da7258c0de5f588c30..cb1446439c8ec6a4f6c1f82ad8f5fd65373279ce 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,6 +1,6 @@
-OBJECTS = arch/arch.o core/core.o vga/vga.o kbd/kbd.o sched/sched.o
+OBJECTS = arch/arch.o core/core.o sched/sched.o
 OBJECTS += klibc/klibc.a # klibc needs to be last
-DEPS = arch core vga kbd klibc sched
+DEPS = arch core klibc sched
 LDFLAGS = --oformat=elf32-i386 -b elf32-i386 -m elf_i386
 CFLAGS = -m32 -Wall -nostdlib -nodefaultlibs -nostartfiles -ffreestanding -nostdinc \
         -fno-builtin -fno-builtin-memcpy

diff --git a/kernel/kbd/Makefile b/kernel/kbd/Makefile
deleted file mode 100644 (file)
index 27233ca..0000000
--- a/kernel/kbd/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-OBJECTS = main.o
-OUTPUT = kbd.o
-INCLUDES = -I../include -I../../include -I../..
-CFLAGS += $(INCLUDES)
-ASFLAGS = $(CFLAGS)
-PHONY = clean
-
-all: $(OUTPUT)
-
-$(OUTPUT): $(OBJECTS)
-       ld -r $(LDFLAGS) -o $@ $^
-
-clean:
-       rm -f $(OBJECTS) $(OUTPUT)
-
-.PHONY: $(PHONY)

diff --git a/kernel/kbd/main.c b/kernel/kbd/main.c
deleted file mode 100644 (file)
index d898320..0000000
--- a/kernel/kbd/main.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <crxstd.h>
-#include <stdio.h>
-#include <signal.h>
-#include <string.h>
-#include <errno.h>
-#include <arch.h>
-
-void _kbd_int_handler(int);
-
-int _int_register(void)
-{
-       struct sigaction sa;
-       int ret_val;
-
-       memset(&sa, 0, sizeof(sa));
-
-       sa.sa_handler = _kbd_int_handler;
-       sigemptyset(&(sa.sa_mask));
-       sigaddset(&(sa.sa_mask), INT_KEYBOARD);
-
-       if(sigaction(SIGHWINT, &sa, NULL) < 0) {
-               ret_val = -errno;
-       } else {
-               ret_val = 0;
-       }
-
-       return(ret_val);
-}
-
-void _kbd_int_handler(int signal)
-{
-       char buf[64];
-       int len;
-
-       debug("It works?\n", 10);
-       len = snprintf(buf, sizeof(buf), "%s: EIP = %p\n", __func__, *(((unsigned int*)&signal) - 1));
-
-       debug(buf, len);
-}
-
-int kbd_main(int argc, char *argv[])
-{
-       struct cxmsg msg;
-       int err;
-
-       err = _int_register();
-
-       if(!err) {
-               printf("Keyboard interrupt handler registered\n");
-
-               while(1) {
-                       err = cxrecv(PID_ANY, &msg);
-
-                       debug("Test\n", 5);
-
-                       if(err > 0) {
-                               /* FIXME: Handle received message */
-                               debug("cxrecv() > 0\n", 13);
-                       } else {
-                               debug("cxrecv() <= 0\n", 14);
-                       }
-               }
-       } else {
-               printf("Could not register keyboard interrupt handler\n");
-       }
-
-       return(0);
-}

diff --git a/kernel/vga/Makefile b/kernel/vga/Makefile
deleted file mode 100644 (file)
index 55fff93..0000000
--- a/kernel/vga/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-OBJECTS = main.o
-OUTPUT = vga.o
-INCLUDES = -I../include -I../../include -I../..
-CFLAGS += $(INCLUDES)
-ASFLAGS = $(CFLAGS)
-PHONY = clean
-
-all: $(OUTPUT)
-
-$(OUTPUT): $(OBJECTS)
-       ld -r $(LDFLAGS) -o $@ $^
-
-clean:
-       rm -f $(OBJECTS) $(OUTPUT)
-
-.PHONY: $(PHONY)

diff --git a/kernel/vga/main.c b/kernel/vga/main.c
deleted file mode 100644 (file)
index 024e531..0000000
--- a/kernel/vga/main.c
+++ /dev/null
@@ -1,113 +0,0 @@
-#include <sys/mman.h>
-#include <corax/ipc.h>
-#include <crxstd.h>
-#include <string.h>
-#include <stdio.h>
-
-enum vgacolor {
-       BLACK = 0,
-       BLUE,
-       GREEN,
-       CYAN,
-       RED,
-       MAGENTA,
-       BROWN,
-       LGRAY,
-       GRAY,
-       LBLUE,
-       LGREEN,
-       LCYAN,
-       LRED,
-       LMAGENTA,
-       YELLOW,
-       WHITE
-};
-
-#define FG(c)            ((unsigned short)(((c) & 0xf) << 8))
-#define BG(c)            ((unsigned short)(((c) & 0xf) << 12))
-
-#define VGA_BUFFER_ADDR   ((void*)0xb8000)
-#define VGA_BUFFER_COLS   80
-#define VGA_BUFFER_ROWS   24
-#define VGA_ROW_BYTES     (VGA_BUFFER_COLS << 1)
-#define VGA_SCROLL_SIZE   (VGA_BUFFER_COLS * (VGA_BUFFER_ROWS - 1))
-#define VGA_SCROLL_BYTES  (VGA_BUFFER_SIZE << 1)
-#define VGA_BUFFER_SIZE   (VGA_BUFFER_COLS * VGA_BUFFER_ROWS)
-#define VGA_BUFFER_BYTES  (VGA_BUFFER_SIZE << 1)
-
-struct context {
-       unsigned short *buffer;
-       long offset;
-       unsigned short attrs;
-};
-
-static void _putchar(struct context *ctx, int c)
-{
-       if(c == '\n') {
-               ctx->offset += VGA_BUFFER_COLS - (ctx->offset % VGA_BUFFER_COLS);
-       } else {
-               if(ctx->offset >= VGA_BUFFER_SIZE) {
-                       ctx->offset = VGA_SCROLL_SIZE;
-                       memcpy((void*)ctx->buffer, (void*)ctx->buffer + VGA_ROW_BYTES, VGA_SCROLL_BYTES);
-                       memset((void*)ctx->buffer + VGA_SCROLL_BYTES, 0, VGA_ROW_BYTES);
-               }
-
-               ctx->buffer[ctx->offset++] = ctx->attrs | (c & 0xff);
-       }
-
-       return;
-}
-
-static int _puts(struct context *ctx, const char *s)
-{
-       int i;
-
-       for(i = 0; s[i]; i++) {
-               _putchar(ctx, s[i]);
-       }
-
-       return(i);
-}
-
-int vga_main(int argc, char *argv[])
-{
-       struct context ctx;
-       char line[80];
-
-       ctx.buffer = mmap(VGA_BUFFER_ADDR, 0x1000, PROT_READ | PROT_WRITE, MAP_PHYS, 0, 0);
-
-       if(!ctx.buffer) {
-               /* nothing to do if we can't get access to the VGA buffer */
-               return(1);
-       }
-
-       ctx.offset = VGA_BUFFER_SIZE;
-       ctx.attrs = FG(LGRAY) | BG(BLACK);
-       memset(ctx.buffer, 0, VGA_BUFFER_SIZE);
-
-       snprintf(line, sizeof(line), "VGA video memory mapped at %p\n", ctx.buffer);
-       _puts(&ctx, line);
-
-       while(1) {
-               struct cxmsg msg;
-               int err;
-
-               memset(&msg, 0, sizeof(msg));
-
-               err = cxrecv(PID_ANY, &msg);
-
-               /* FIXME: Validate message */
-               /* FIXME: Only accept messages from IO process */
-
-               if(!err) {
-                       err = _puts(&ctx, (const char*)msg.cm_data);
-               }
-
-               msg.cm_retval = err;
-               cxsend(msg.cm_src, &msg);
-       }
-
-       munmap(ctx.buffer, 0x1000);
-
-       return(0);
-}