Cleaning up bkerndev code

include/gdt.h

@@ -0,0 +1,29 @@
+#ifndef gdt_h
+#define gdt_h
+
+/* This defines what the stack looks like after an ISR was running */
+struct regs {
+        unsigned int gs, fs, es, ds;
+        unsigned int edi, esi, ebp, esp, ebx, edx, ecx, eax;
+        unsigned int int_no, err_code;
+        unsigned int eip, cs, eflags, useresp, ss;    
+};
+
+// from gdt.c
+extern void gdt_set_gate(int num, unsigned long base, unsigned long limit, unsigned char access, unsigned char gran);
+extern void gdt_install();
+
+// from idt.c
+extern void idt_set_gate(unsigned char num, unsigned long base, unsigned short sel, unsigned char flags);
+extern void idt_install();
+
+// from isrs.c
+extern void isrs_install();
+
+// from irq.c
+extern void irq_install_handler(int irq, void (*handler)(struct regs *r));
+extern void irq_uninstall_handler(int irq);
+extern void irq_install();
+
+
+#endif

include/kb.h

@@ -11,20 +11,20 @@ void handle_kb();
 extern unsigned char* kbcmd_trans;
 extern char kb_buf;
 extern char kb_cmd;
+extern void keyboard_install();
 #endif // not kb.c
 
 #ifdef kb_c
 char caps;
 char mode;
 char kb_buf;
 char kb_cmd;
-#ifdef user_kb
+void keyboard_install();
+#ifdef USER_KB
 
 /* write your own keymapping and use the same names */
 
-#endif
-
-#ifndef user_kb
+#else
 unsigned char kbd[128] = {
         0,  27, '1', '2', '3', '4', '5', '6', '7', '8', /* 9 */
         '9', '0', '-', '=', '\b',       /* Backspace */

include/system.h

@@ -1,65 +1,13 @@
-/* bkerndev - Bran's Kernel Development Tutorial
-*  By:   Brandon F. ([email protected])
-*  Desc: Global function declarations and type definitions
-*
-*  Notes: No warranty expressed or implied. Use at own risk. */
 #ifndef __SYSTEM_H
 #define __SYSTEM_H
 
 #include "kernel_assert.h"
 #include "vga.h"
 #include "zz.h"
 #include "io.h"
-
-
-typedef int size_t;
-
-/* This defines what the stack looks like after an ISR was running */
-struct regs {
-	unsigned int gs, fs, es, ds;
-	unsigned int edi, esi, ebp, esp, ebx, edx, ecx, eax;
-	unsigned int int_no, err_code;
-	unsigned int eip, cs, eflags, useresp, ss;    
-};
-
-// from util.c
-extern void *memcpy(void *dest, const void *src, size_t count);
-extern void *memset(void *dest, char val, size_t count);
-extern unsigned short *memsetw(unsigned short *dest, unsigned short val, size_t count);
-extern size_t strlen(const char *str);
-extern int pow(int, int);
-extern char* itoa(int, char*);
-extern char* padl(int, char*, char);
-
-// from gdt.c
-extern void gdt_set_gate(int num, unsigned long base, unsigned long limit, unsigned char access, unsigned char gran);
-extern void gdt_install();
-
-// from idt.c
-extern void idt_set_gate(unsigned char num, unsigned long base, unsigned short sel, unsigned char flags);
-extern void idt_install();
-
-// from isrs.c
-extern void isrs_install();
-
-// from irq.c
-extern void irq_install_handler(int irq, void (*handler)(struct regs *r));
-extern void irq_uninstall_handler(int irq);
-extern void irq_install();
-
-// from timer.c
-extern void timer_wait(int ticks);
-extern void timer_install();
-extern void displaytime();
-extern int request_atomicity(int);
-extern void yield();
-extern int spawn(void(*fn)(int));
-extern int fork();
-extern void kill(int);
-extern int renice(int, int);
-#define MAX_PROCESSES 512
-
-// from kb.c
-extern void keyboard_install();
+#include "kb.h"
+#include "timer.h"
+#include "util.h"
+#include "gdt.h"
 
 #endif

include/timer.h

@@ -0,0 +1,14 @@
+#ifndef timer_h
+#define timer_h
+extern void timer_wait(int ticks);
+extern void timer_install();
+extern void displaytime();
+extern int request_atomicity(int);
+extern void yield();
+extern int spawn(void(*fn)(int));
+extern int fork();
+extern void kill(int);
+extern int renice(int, int);
+#define MAX_PROCESSES 512
+#endif
+

include/util.h

@@ -0,0 +1,14 @@
+#ifndef util_h
+#define util_h
+
+typedef int size_t;
+
+extern void *memcpy(void *dest, const void *src, size_t count);
+extern void *memset(void *dest, char val, size_t count);
+extern unsigned short *memsetw(unsigned short *dest, unsigned short val, size_t count);
+extern size_t strlen(const char *str);
+extern int pow(int, int);
+extern char* itoa(int, char*);
+extern char* padl(int, char*, char);
+
+#endif

include/vga.h

@@ -9,7 +9,6 @@ typedef struct vgapair_t {
 	char attr;
 } vgapair;
 
-//typedef vgapair[VGAX][VGAY] vgascreen;
 #ifdef vga_c
 vgapair*** screen=(vgapair***)VGAADDR;
 int cursorx;

src/kb.c

@@ -1,6 +1,6 @@
-#include <system.h>
 #define kb_c
-#include "kb.h"
+#undef USER_KB
+#include "system.h"
 
 
 /* Handles the keyboard interrupt */