aboutsummaryrefslogtreecommitdiff
path: root/kernel/include
diff options
context:
space:
mode:
authorFranklin Wei <frankhwei536@gmail.com>2015-03-01 14:20:47 -0500
committerFranklin Wei <frankhwei536@gmail.com>2015-03-01 14:20:47 -0500
commitc7252588ebb95f97631e9470778c69afa00c35b5 (patch)
tree06d760878e18f6cddbe4305cddd4d5dfa74529f8 /kernel/include
parentb8f54e63d2b8f8007c580adf2a6034c98a0f2eaa (diff)
downloadkappa-c7252588ebb95f97631e9470778c69afa00c35b5.zip
kappa-c7252588ebb95f97631e9470778c69afa00c35b5.tar.gz
kappa-c7252588ebb95f97631e9470778c69afa00c35b5.tar.bz2
kappa-c7252588ebb95f97631e9470778c69afa00c35b5.tar.xz
Huge restructure
Diffstat (limited to 'kernel/include')
-rw-r--r--kernel/include/fpu.h2
-rw-r--r--kernel/include/gdt.h23
-rw-r--r--kernel/include/heap.h5
-rw-r--r--kernel/include/idt.h23
-rw-r--r--kernel/include/io.h5
-rw-r--r--kernel/include/irq.h19
-rw-r--r--kernel/include/isr.h51
-rw-r--r--kernel/include/log.h3
-rw-r--r--kernel/include/multiboot.h90
-rw-r--r--kernel/include/paging.h8
-rw-r--r--kernel/include/panic.h1
-rw-r--r--kernel/include/timer.h13
-rw-r--r--kernel/include/version.h2
13 files changed, 0 insertions, 245 deletions
diff --git a/kernel/include/fpu.h b/kernel/include/fpu.h
deleted file mode 100644
index 0eb448a..0000000
--- a/kernel/include/fpu.h
+++ /dev/null
@@ -1,2 +0,0 @@
-void fpu_enable(void);
-void fpu_disable(void);
diff --git a/kernel/include/gdt.h b/kernel/include/gdt.h
deleted file mode 100644
index 4cf7c4f..0000000
--- a/kernel/include/gdt.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdint.h>
-
-struct gdt_entry {
- uint16_t limit_low;
- uint16_t base_low;
- uint8_t base_middle;
- uint8_t access;
- uint8_t granularity;
- uint8_t base_high;
-} __attribute__((packed));
-
-struct gdt_ptr {
- uint16_t limit;
- uint32_t base;
-} __attribute__((packed));
-
-struct gdt_entry gdt[3];
-struct gdt_ptr gp;
-
-/* assembly */
-extern void gdt_flush(uint32_t);
-
-void gdt_init(void);
diff --git a/kernel/include/heap.h b/kernel/include/heap.h
deleted file mode 100644
index dfadf36..0000000
--- a/kernel/include/heap.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stddef.h>
-void *kmalloc(size_t);
-void *kmalloc_a(size_t);
-void *kmalloc_p(size_t, void**);
-void *kmalloc_ap(size_t, void**);
diff --git a/kernel/include/idt.h b/kernel/include/idt.h
deleted file mode 100644
index 250ab82..0000000
--- a/kernel/include/idt.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdint.h>
-
-struct idt_entry {
- uint16_t base_lo;
- uint16_t sel;
- uint8_t zero;
- uint8_t flags;
- uint16_t base_hi;
-} __attribute__((packed));
-
-struct idt_ptr {
- uint16_t limit;
- uint32_t base;
-} __attribute__((packed));
-
-struct idt_entry idt[0x100];
-struct idt_ptr idt_pt;
-
-void idt_init(void);
-
-extern void idt_flush(uint32_t);
-
-void idt_set_gate(uint8_t idx, uint32_t base, uint16_t sel, uint8_t flags);
diff --git a/kernel/include/io.h b/kernel/include/io.h
deleted file mode 100644
index d1177ac..0000000
--- a/kernel/include/io.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdint.h>
-void outb(uint16_t port, uint8_t val);
-void outw(uint16_t port, uint16_t val);
-uint8_t inb(uint16_t port);
-uint16_t inw(uint16_t port);
diff --git a/kernel/include/irq.h b/kernel/include/irq.h
deleted file mode 100644
index 13461e9..0000000
--- a/kernel/include/irq.h
+++ /dev/null
@@ -1,19 +0,0 @@
-extern void _irq0(void);
-extern void _irq1(void);
-extern void _irq2(void);
-extern void _irq3(void);
-extern void _irq4(void);
-extern void _irq5(void);
-extern void _irq6(void);
-extern void _irq7(void);
-extern void _irq8(void);
-extern void _irq9(void);
-extern void _irq10(void);
-extern void _irq11(void);
-extern void _irq12(void);
-extern void _irq13(void);
-extern void _irq14(void);
-extern void _irq15(void);
-extern void _int0x80(void);
-
-void irq_init(void);
diff --git a/kernel/include/isr.h b/kernel/include/isr.h
deleted file mode 100644
index 4cc7f1b..0000000
--- a/kernel/include/isr.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <stdint.h>
-
-/* these are all implemented in isr-as.S */
-extern void _isr0(void);
-extern void _isr1(void);
-extern void _isr2(void);
-extern void _isr3(void);
-extern void _isr4(void);
-extern void _isr5(void);
-extern void _isr6(void);
-extern void _isr7(void);
-extern void _isr8(void);
-extern void _isr9(void);
-extern void _isr10(void);
-extern void _isr11(void);
-extern void _isr12(void);
-extern void _isr13(void);
-extern void _isr14(void);
-extern void _isr15(void);
-extern void _isr16(void);
-extern void _isr17(void);
-extern void _isr18(void);
-extern void _isr19(void);
-extern void _isr20(void);
-extern void _isr21(void);
-extern void _isr22(void);
-extern void _isr23(void);
-extern void _isr24(void);
-extern void _isr25(void);
-extern void _isr26(void);
-extern void _isr27(void);
-extern void _isr28(void);
-extern void _isr29(void);
-extern void _isr30(void);
-extern void _isr31(void);
-
-/* installs ISR's 0-31 */
-void isr_init(void);
-
-/* This defines what the stack looks like after an ISR was running */
-struct regs_t {
- uint32_t gs, fs, es, ds; /* pushed the segs last */
- uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax; /* pushed by 'pusha' */
- uint32_t int_no; /* interrupt stubs do this */
- uint32_t err_code; /* exceptions push this */
- uint32_t eip, cs, eflags, useresp, ss; /* pushed by the processor automatically */
-} __attribute__((packed));
-
-#define IRQ(x) (32+x)
-
-void set_interrupt_handler(uint8_t interrupt, void (*func)(struct regs_t*));
diff --git a/kernel/include/log.h b/kernel/include/log.h
deleted file mode 100644
index 1a28c0d..0000000
--- a/kernel/include/log.h
+++ /dev/null
@@ -1,3 +0,0 @@
-void log_putchar(int);
-void log_puts(const char*);
-void log(const char*, ...);
diff --git a/kernel/include/multiboot.h b/kernel/include/multiboot.h
deleted file mode 100644
index e1f7cf0..0000000
--- a/kernel/include/multiboot.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#include <stdint.h>
-
-struct multiboot_aout_symbol_table_t
-{
- uint32_t tabsize;
- uint32_t strsize;
- uint32_t addr;
- uint32_t reserved;
-} __attribute__((packed));
-
-struct multiboot_elf_section_header_table_t
-{
- uint32_t num;
- uint32_t size;
- uint32_t addr;
- uint32_t shndx;
-} __attribute__((packed));
-
-struct vbe_info_t {
- uint16_t attributes;
- uint8_t winA, winB;
- uint16_t granularity;
- uint16_t winsize;
- uint16_t segmentA, segmentB;
- uint32_t realFctPtr;
- uint16_t pitch;
- uint16_t Xres, Yres;
- uint8_t Wchar, Ychar, planes, bpp, banks;
- uint8_t memory_model, bank_size, image_pages;
- uint8_t reserved0;
- uint8_t red_mask, red_position;
- uint8_t green_mask, green_position;
- uint8_t blue_mask, blue_position;
- uint8_t rsv_mask, rsv_position;
- uint8_t directcolor_attributes;
- uint32_t physbase;
- uint32_t reserved1;
- uint16_t reserved2;
-} __attribute__((packed));
-
-struct multiboot_info_t
-{
- /* Multiboot info version number */
- uint32_t flags;
-
- /* Available memory from BIOS */
- uint32_t mem_lower;
- uint32_t mem_upper;
-
- /* "root" partition */
- uint32_t boot_device;
-
- /* Kernel command line */
- uint32_t cmdline;
-
- /* Boot-Module list */
- uint32_t mods_count;
- uint32_t mods_addr;
-
- union
- {
- struct multiboot_aout_symbol_table_t aout_sym;
- struct multiboot_elf_section_header_table_t elf_sec;
- } u;
-
- /* Memory Mapping buffer */
- uint32_t mmap_length;
- uint32_t mmap_addr;
-
- /* Drive Info buffer */
- uint32_t drives_length;
- uint32_t drives_addr;
-
- /* ROM configuration table */
- uint32_t config_table;
-
- /* Boot Loader Name */
- uint32_t boot_loader_name;
-
- /* APM table */
- uint32_t apm_table;
-
- /* Video */
- uint32_t vbe_control_info;
- uint32_t vbe_mode_info;
- uint16_t vbe_mode;
- uint16_t vbe_interface_seg;
- uint16_t vbe_interface_off;
- uint16_t vbe_interface_len;
-} __attribute__((packed));
diff --git a/kernel/include/paging.h b/kernel/include/paging.h
deleted file mode 100644
index 0481069..0000000
--- a/kernel/include/paging.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#define PAGE_PRESENT (1<<0)
-#define PAGE_RW (1<<1)
-#define PAGE_USER (1<<2)
-
-#define PAGE_MASK 0xFFFFF000
-#define PAGE_SIZE 0x1000
-
-void paging_init(void);
diff --git a/kernel/include/panic.h b/kernel/include/panic.h
deleted file mode 100644
index db53e8e..0000000
--- a/kernel/include/panic.h
+++ /dev/null
@@ -1 +0,0 @@
-void panic(const char*, ...);
diff --git a/kernel/include/timer.h b/kernel/include/timer.h
deleted file mode 100644
index 7a15949..0000000
--- a/kernel/include/timer.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdint.h>
-
-#define HZ 100
-#define PIT_FREQ 1193182
-
-extern volatile const uint64_t *current_tick;
-
-struct regs_t;
-
-void timer_init(uint32_t freq);
-
-/* NOTE: enables interrupts by default */
-void timer_delay(uint64_t ticks);
diff --git a/kernel/include/version.h b/kernel/include/version.h
deleted file mode 100644
index 8fff367..0000000
--- a/kernel/include/version.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define KAPPA_KERNEL_VERSION "0.0.1-alpha"
-#define KAPPA_KERNEL_CODENAME "Ayatollah's Buybacks"