summaryrefslogtreecommitdiff
path: root/kernel/include
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/include')
-rw-r--r--kernel/include/arch/i686/acpi.h106
-rw-r--r--kernel/include/arch/i686/asm.h13
-rw-r--r--kernel/include/arch/i686/drivers/ps2ctrl.h14
-rw-r--r--kernel/include/arch/i686/drivers/rtc.h7
-rw-r--r--kernel/include/arch/i686/idt.h6
-rw-r--r--kernel/include/arch/i686/mboot.h34
-rw-r--r--kernel/include/arch/i686/memory.h22
-rw-r--r--kernel/include/arch/i686/pic.h11
-rw-r--r--kernel/include/drivers/ps2kb.h15
-rw-r--r--kernel/include/drivers/ps2mouse.h18
-rw-r--r--kernel/include/drivers/vga.h32
-rw-r--r--kernel/include/memory.h6
-rw-r--r--kernel/include/print.h14
-rw-r--r--kernel/include/sys.h10
-rw-r--r--kernel/include/term.h26
-rw-r--r--kernel/include/time.h23
16 files changed, 339 insertions, 18 deletions
diff --git a/kernel/include/arch/i686/acpi.h b/kernel/include/arch/i686/acpi.h
new file mode 100644
index 0000000..bb35010
--- /dev/null
+++ b/kernel/include/arch/i686/acpi.h
@@ -0,0 +1,106 @@
+#pragma once
+
+#include <stdint.h>
+
+struct RootSystemDescriptionPointer {
+ char signature[8];
+ uint8_t checksum;
+ char oemid[6];
+ uint8_t revision;
+ uint32_t rsdt_address;
+};
+
+struct SystemDescriptionTableHeader {
+ char signature[4];
+ uint32_t length;
+ uint8_t revision;
+ uint8_t checksum;
+ char oem_id[6];
+ char oem_table_id[8];
+ uint32_t oem_revision;
+ uint32_t creator_id;
+ uint32_t creator_revision;
+};
+
+struct RootSystemDescriptionTable {
+ struct SystemDescriptionTableHeader header;
+ uint32_t sdt_table[];
+};
+
+struct GenericAddressStructure {
+ uint8_t address_space;
+ uint8_t bit_width;
+ uint8_t bit_offset;
+ uint8_t access_size;
+ uint64_t address;
+};
+
+struct FixedACPIDescriptionTable {
+ struct SystemDescriptionTableHeader header;
+ uint32_t firmware_ctrl;
+ uint32_t dsdt;
+
+ // field used in ACPI 1.0; no longer in use, for compatibility only
+ uint8_t reserved;
+
+ uint8_t preferred_power_management_profile;
+ uint16_t sci_interrupt;
+ uint32_t smi_command_port;
+ uint8_t acpi_enable;
+ uint8_t acpi_disable;
+ uint8_t s4bios_req;
+ uint8_t pstate_control;
+ uint32_t pm1_a_event_block;
+ uint32_t pm1_b_event_block;
+ uint32_t pm1_a_control_block;
+ uint32_t pm1_b_control_block;
+ uint32_t pm2_control_block;
+ uint32_t pm_timer_block;
+ uint32_t gpe0_block;
+ uint32_t gpe1_block;
+ uint8_t pm1_event_length;
+ uint8_t pm1_control_length;
+ uint8_t pm2_control_length;
+ uint8_t pm_timer_length;
+ uint8_t gpe0_length;
+ uint8_t gpe1_length;
+ uint8_t gpe1_base;
+ uint8_t cstate_control;
+ uint16_t worst_c2_latency;
+ uint16_t worst_c3_latency;
+ uint16_t flush_size;
+ uint16_t flush_stride;
+ uint8_t duty_offset;
+ uint8_t duty_width;
+ uint8_t day_alarm;
+ uint8_t month_alarm;
+ uint8_t century;
+
+ // reserved in ACPI 1.0; used since ACPI 2.0+
+ uint16_t boot_architecture_flags;
+
+ uint8_t reserved_2;
+ uint32_t flags;
+
+ // 12 byte structure; see below for details
+ struct GenericAddressStructure reset_reg;
+
+ uint8_t reset_value;
+ uint8_t reserved_3[3];
+
+ // 64bit pointers - Available on ACPI 2.0+
+ uint64_t x_firmware_control;
+ uint64_t x_dsdt;
+
+ struct GenericAddressStructure x_pm1_a_event_block;
+ struct GenericAddressStructure x_pm1_b_event_block;
+ struct GenericAddressStructure x_pm1_a_control_block;
+ struct GenericAddressStructure x_pm1_b_control_block;
+ struct GenericAddressStructure x_pm2_control_block;
+ struct GenericAddressStructure x_pm_timer_block;
+ struct GenericAddressStructure x_gpe0_block;
+ struct GenericAddressStructure x_gpe1_block;
+};
+
+void acpi_init(void *rsdp);
+void acpi_poweroff(void);
diff --git a/kernel/include/arch/i686/asm.h b/kernel/include/arch/i686/asm.h
new file mode 100644
index 0000000..0e2d9db
--- /dev/null
+++ b/kernel/include/arch/i686/asm.h
@@ -0,0 +1,13 @@
+#include <stdint.h>
+
+extern uint8_t inb(uint16_t port);
+extern void outb(uint16_t port, uint8_t val);
+extern uint16_t inw(uint16_t port);
+extern void outw(uint16_t port, uint16_t val);
+extern uint32_t inl(uint16_t port);
+extern void outl(uint16_t port, uint32_t val);
+extern void io_wait(void);
+extern void int_enable(void);
+extern void int_disable(void);
+extern void int_wait(void);
+extern void halt(void);
diff --git a/kernel/include/arch/i686/drivers/ps2ctrl.h b/kernel/include/arch/i686/drivers/ps2ctrl.h
new file mode 100644
index 0000000..a674c57
--- /dev/null
+++ b/kernel/include/arch/i686/drivers/ps2ctrl.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+
+uint8_t ps2ctrl_in(void);
+uint8_t ps2ctrl_in_status(void);
+void ps2ctrl_out_cmd(uint8_t cmd);
+void ps2ctrl_out_data(uint8_t data);
+void ps2ctrl_set_port2(void);
+
+void ps2ctrl_init(void);
+
+bool ps2ctrl_is_init(void);
diff --git a/kernel/include/arch/i686/drivers/rtc.h b/kernel/include/arch/i686/drivers/rtc.h
new file mode 100644
index 0000000..29dbf8f
--- /dev/null
+++ b/kernel/include/arch/i686/drivers/rtc.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include <time.h>
+
+extern void rtc_update(void);
+extern struct Time rtc_utctime(void);
+extern struct Time rtc_localtime(enum Timezone tz);
diff --git a/kernel/include/arch/i686/idt.h b/kernel/include/arch/i686/idt.h
new file mode 100644
index 0000000..8dcee02
--- /dev/null
+++ b/kernel/include/arch/i686/idt.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#define IDT_SIZE 256
+#define IDT_INTERRUPTS 256
+
+void idt_init(void);
diff --git a/kernel/include/arch/i686/mboot.h b/kernel/include/arch/i686/mboot.h
new file mode 100644
index 0000000..394071f
--- /dev/null
+++ b/kernel/include/arch/i686/mboot.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <arch/i686/mboot.h>
+#include <arch/i686/memory.h>
+
+#define CMDLINE_MAX 32
+
+struct BootTag {
+ uint8_t valid;
+ uint32_t type;
+ uint32_t size;
+ union {
+ char cmdline[CMDLINE_MAX];
+ struct MemoryMap *memory_map;
+ struct RootSystemDescriptionPointer *rsdp;
+ } data;
+};
+
+struct BootInfo {
+ uint32_t total_size;
+ uint32_t reserved;
+ struct BootTag tags[21];
+};
+
+enum BootTagID {
+ ID_CMDLINE = 0,
+ iD_MEMORYMAP = 6,
+ ID_RSDP = 14
+};
+
+void load_boot_info(void* boot_info);
+bool get_boot_tag(enum BootTagID id, struct BootTag **tag);
diff --git a/kernel/include/arch/i686/memory.h b/kernel/include/arch/i686/memory.h
new file mode 100644
index 0000000..5d99025
--- /dev/null
+++ b/kernel/include/arch/i686/memory.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <stdint.h>
+
+struct MemorySegment {
+ uint64_t addr;
+ uint64_t len;
+ uint32_t type;
+ uint32_t reserved;
+} __attribute__((packed));
+
+struct MemoryMap {
+ uint32_t entry_size;
+ uint32_t entry_version;
+ struct MemorySegment entries[];
+} __attribute__((packed));
+
+uint32_t memory_total(void);
+uint32_t memory_free(void);
+uint32_t memory_used(void);
+
+void memory_init(void);
diff --git a/kernel/include/arch/i686/pic.h b/kernel/include/arch/i686/pic.h
new file mode 100644
index 0000000..593a33a
--- /dev/null
+++ b/kernel/include/arch/i686/pic.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <stdint.h>
+
+#define PIC_REMAP_OFFSET 0x20
+
+void pic_remap(void);
+void pic_mask(int irq);
+void pic_unmask(int irq);
+void pic_disable(void);
+void pic_eoi(int irq);
diff --git a/kernel/include/drivers/ps2kb.h b/kernel/include/drivers/ps2kb.h
new file mode 100644
index 0000000..1aaefb2
--- /dev/null
+++ b/kernel/include/drivers/ps2kb.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <keycodes.h>
+
+struct Keycode {
+ uint8_t key;
+ uint8_t flags;
+};
+
+void ps2kb_init(void);
+
+void ps2kb_recv(void);
+struct Keycode ps2kb_get(void);
diff --git a/kernel/include/drivers/ps2mouse.h b/kernel/include/drivers/ps2mouse.h
new file mode 100644
index 0000000..9cd4818
--- /dev/null
+++ b/kernel/include/drivers/ps2mouse.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+
+struct MouseEvent {
+ bool updated;
+ bool lmb;
+ bool rmb;
+ bool mmb;
+ int relx;
+ int rely;
+};
+
+void ps2mouse_init(void);
+
+void ps2mouse_recv(void);
+struct MouseEvent ps2mouse_get(void);
diff --git a/kernel/include/drivers/vga.h b/kernel/include/drivers/vga.h
new file mode 100644
index 0000000..68e8690
--- /dev/null
+++ b/kernel/include/drivers/vga.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+enum vga_color {
+ VGA_BLACK = 0,
+ VGA_BLUE = 1,
+ VGA_GREEN = 2,
+ VGA_CYAN = 3,
+ VGA_RED = 4,
+ VGA_MAGENTA = 5,
+ VGA_BROWN = 6,
+ VGA_LIGHT_GREY = 7,
+ VGA_DARK_GREY = 8,
+ VGA_LIGHT_BLUE = 9,
+ VGA_LIGHT_GREEN = 10,
+ VGA_LIGHT_CYAN = 11,
+ VGA_LIGHT_RED = 12,
+ VGA_LIGHT_MAGENTA = 13,
+ VGA_LIGHT_BROWN = 14,
+ VGA_WHITE = 15,
+};
+
+#define VGA_TEXT_W 80
+#define VGA_TEXT_H 25
+
+void vgatext_write_char(char c, enum vga_color color, uint8_t x, uint8_t y);
+void vgatext_write_data(uint16_t data, uint16_t index);
+void vgatext_write_buf(const uint16_t *buffer);
+void vgatext_cur_mov(uint8_t x, uint8_t y);
+void vgatext_cur_resize(uint8_t start, uint8_t end);
+void vgatext_cur_visible(bool visible);
diff --git a/kernel/include/memory.h b/kernel/include/memory.h
new file mode 100644
index 0000000..07a55c0
--- /dev/null
+++ b/kernel/include/memory.h
@@ -0,0 +1,6 @@
+#pragma once
+
+extern int memory_lock(void);
+extern int memory_unlock(void);
+extern void *memory_alloc_page(int);
+extern int memory_free_page(void* ,int);
diff --git a/kernel/include/print.h b/kernel/include/print.h
index dc7f862..7dbd298 100644
--- a/kernel/include/print.h
+++ b/kernel/include/print.h
@@ -7,17 +7,3 @@ extern void putchar(int c);
extern void puts(const char* s);
extern void printk(const char *restrict format, ...);
extern void vprintk(const char *restrict format, va_list ap);
-
-#ifdef KERNEL_LOG
-#define debugk(msg, ...) _debugk_impl(msg, ## __VA_ARGS__)
-#define succek(msg, ...) _succek_impl(msg, ## __VA_ARGS__)
-#define errork(msg, ...) _errork_impl(msg, ## __VA_ARGS__)
-#else
-#define debugk(msg, ...)
-#define succek(msg, ...)
-#define errork(msg, ...)
-#endif
-
-extern void _debugk_impl(char* msg, ...);
-extern void _succek_impl(char* msg, ...);
-extern void _errork_impl(char* msg, ...);
diff --git a/kernel/include/sys.h b/kernel/include/sys.h
new file mode 100644
index 0000000..003f85c
--- /dev/null
+++ b/kernel/include/sys.h
@@ -0,0 +1,10 @@
+#pragma once
+
+extern void arch_init(void *boot_info);
+extern void arch_update(void);
+extern void arch_halt(void);
+extern void arch_wait_io(void);
+extern void arch_wait_int(void);
+extern void arch_disable_int(void);
+extern void arch_enable_int(void);
+extern void arch_poweroff(void);
diff --git a/kernel/include/term.h b/kernel/include/term.h
new file mode 100644
index 0000000..8a8f1ef
--- /dev/null
+++ b/kernel/include/term.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <stdint.h>
+#include <stddef.h>
+#include <drivers/vga.h>
+
+#define TERM_W VGA_TEXT_W
+#define TERM_H VGA_TEXT_H
+
+void term_init(void);
+void term_reset(void);
+void term_setfg(enum vga_color color);
+void term_setbg(enum vga_color color);
+void term_clear(void);
+void term_scroll(int lines);
+void term_setpos(uint8_t x, uint8_t y);
+
+uint32_t term_save(void);
+void term_load(uint32_t state);
+
+uint16_t term_save_col(void);
+void term_load_col(uint16_t color);
+
+bool term_newline(void);
+
+void term_flush(void);
diff --git a/kernel/include/time.h b/kernel/include/time.h
index 783d96f..2e86a69 100644
--- a/kernel/include/time.h
+++ b/kernel/include/time.h
@@ -16,10 +16,25 @@ struct Time {
int leap; /// If year is a leap year (True == 1)
};
-extern void rtc_update(void);
-extern void rtc_set_timezone(int offset);
-extern struct Time *rtc_utctime(void);
-extern struct Time *rtc_localtime(void);
+enum Timezone {
+ UTC = 0,
+ EST = -4
+};
+
+/**
+ * Sets the current timezone
+ */
+extern void set_timezone(enum Timezone tz);
+
+/**
+ * Returns current time in UTC
+ */
+extern struct Time get_utctime(void);
+
+/**
+ * Returns current time from current Timezone
+ */
+extern struct Time get_localtime(void);
/**
* Converts the time into a string format
generated by cgit v1.2.3-freya (git 2.51.0) at 2025-09-22 19:17:27 +0000