Removed ACPICA, added uACPI, added LAPIC timer, added RTC

Author: pbalduino

Makefile

@@ -1,16 +1,14 @@
-DOCKER = $(shell which docker)
-DOCKER_IMAGE = menios:latest
-
+GIT_BRANCH = $(shell git branch --show-current)
 IMAGE_NAME = menios
 
+DOCKER = $(shell which docker)
+DOCKER_IMAGE = $(IMAGE_NAME):$(GIT_BRANCH)
+
 ARCH ?= x86-64
 GCC_DIR = /usr/bin
 LIB_DIR = src/libc
 CINCLUDE = \
-	-I./include \
-	-I../../include \
-	-I./vendor/acpica/include \
-	-I../../vendor/acpica/include
+	-I./include
 
 OUTPUT_DIR = bin
 KERNEL_DIR = src/kernel
@@ -19,19 +17,17 @@ KERNEL = $(OUTPUT_DIR)/kernel.elf
 
 OBJDIR         = obj
 LIBDIR         = lib
-ACPICA_OBJ = $(OBJDIR)/acpica
+UACPI_OBJ      = $(OBJDIR)/uacpi
 KERNEL_OBJ     = $(OBJDIR)/kernel
 
-LIB_ACPICA = $(LIBDIR)/libacpica.a
-
 KERNEL_SRC = $(shell find -L src -type f -name '*.c')
 KERNEL_ASM = $(shell find -L src/kernel -type f -name '*.s')
 KERNEL_OBJS = $(patsubst %.c, %.o, $(KERNEL_SRC))
 
-ACPICA_SRC = $(shell find -L vendor/acpica -type f -name '*.c')
-ACPICA_OBJS := $(patsubst %.c, %.o, $(ACPICA_SRC))
+UACPI_SRC = $(shell find -L vendor/uacpi -type f -name '*.c')
+UACPI_OBJS := $(patsubst %.c, %.o, $(UACPI_SRC))
 
-OBJS = $(KERNEL_OBJS) $(ACPICA_OBJS)
+OBJS = $(KERNEL_OBJS) $(UACPI_OBJS)
 
 override CFLAGS += \
     -Wall \
@@ -55,7 +51,8 @@ override CFLAGS += \
     -mno-sse \
     -mno-sse2 \
 		-DMENIOS_KERNEL \
-		-DACPI_DEBUG_OUTPUT
+		-DACPI_DEBUG_OUTPUT \
+		-DUACPI_KERNEL_INITIALIZATION
 
 override CPPFLAGS := \
     $(CINCLUDE) \
@@ -106,12 +103,16 @@ clean:
 
 .PHONY: docker
 docker:
-ifeq ($(shell docker images menios -q), )
-	docker rmi -f menios && \
-	docker build --platform linux/amd64 -t menios:latest .
+ifeq ($(OS_NAME),linux)
+	@echo Skipping Docker
+else
+ifeq ($(shell docker images $(DOCKER_IMAGE) -q), )
+	docker rmi -f $(DOCKER_IMAGE) && \
+	docker build --platform linux/amd64 -t $(DOCKER_IMAGE) .
 else
 	@echo "The Docker image for meniOS already exists"
 endif
+endif
 
 %.o: %.c
 ifeq ($(OS_NAME),linux)
@@ -121,7 +122,7 @@ else
 endif
 
 .PHONY: build
-build: $(OBJS)
+build: docker $(OBJS)
 ifeq ($(OS_NAME),linux)
 	@set -eux
 
@@ -163,7 +164,7 @@ endif
 
 .PHONY: run
 run:
-	qemu-system-x86_64 -smp cpus=1,maxcpus=1,sockets=1,dies=1,clusters=1,cores=1 -vga std -no-reboot --no-shutdown -M q35 -m size=2G,maxmem=2G -hda menios.hdd -serial file:com1.log -monitor stdio -d int -M hpet=on -usb -machine q35
+	qemu-system-x86_64 -smp cpus=1,maxcpus=2,sockets=1,dies=1,clusters=1,cores=2 -vga std -no-reboot --no-shutdown -M q35 -m size=2G,maxmem=2G -hda menios.hdd -serial file:com1.log -monitor stdio -d int -M hpet=on -usb -machine q35 -rtc base=utc,clock=host
 
 .PHONY: test
 test:
@@ -173,7 +174,7 @@ ifeq ($(OS_NAME),linux)
 	@echo "Testing inside Linux"
 
 	for file in $(shell find -L test -type f -name 'test_*.c'); do \
-		gcc -I./include $$file test/unity.c src/kernel/mem/kmalloc.c -o "$$file".bin ; \
+		gcc -DMENIOS_NO_DEBUG -I./include $$file test/unity.c src/kernel/mem/kmalloc.c -o "$$file".bin ; \
 		echo "Testing $(.c:.bin=$$file)" ; \
 		"$$file".bin ; \
 		rm "$$file".bin ; \

include/errno.h

@@ -0,0 +1,14 @@
+#ifndef MENIOS_INCLUDE_ERRNO_H
+#define MENIOS_INCLUDE_ERRNO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/errno.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MENIOS_INCLUDE_SYS_ERRNO_H */

include/kernel/acpi.h

@@ -1,8 +1,7 @@
 #ifndef MENIOS_INCLUDE_KERNEL_ACPI_H
 #define MENIOS_INCLUDE_KERNEL_ACPI_H
 
-#include <acpi.h>
-#include <acpixf.h>
+#include <types.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,8 +39,6 @@ typedef struct {
   uint32_t creator_revision;
 } acpi_sdt_header_t;
 
-#define ACPI_SDT_HEADER_SIZE 36
-
 typedef struct {
   acpi_sdt_header_t header;
   uint32_t* sdt;
@@ -53,7 +50,7 @@ typedef struct {
 } acpi_xsdt_t;
 
 int acpi_init();
-void acpi_shutdown();
+int acpi_shutdown();
 
 #ifdef __cplusplus
 }

include/kernel/apic.h

@@ -12,6 +12,17 @@
 #define PIC2_COMMAND_PORT 0xa0
 #define PIC2_DATA_PORT    0xa1
 
+#define IOAPIC_REG_ENTRYCOUNT 1
+
+#define LAPIC_SVR           0x0f0
+#define LAPIC_EOI           0x0b0
+#define LAPIC_TIMER_DIV     0x3e0
+#define LAPIC_TIMER_INIT    0x380
+#define LAPIC_TIMER_CURR    0x390
+#define LAPIC_TIMER_LVT     0x320
+
 void apic_init();
+void write_lapic(uintptr_t reg, uint32_t value);
+uint32_t read_lapic(uintptr_t reg);
 
 #endif

include/kernel/console.h

@@ -10,8 +10,16 @@
 #define FLAG_TYPE  0x08 // The '#' flag
 #define FLAG_ZERO  0x10 // The '0' flag
 
+typedef struct screen_pos_t {
+    uint8_t x;
+    uint8_t y;
+} screen_pos_t;
+
 void set_cursor_position(uint16_t pos);
 
 uint16_t get_cursor_position();
 
+void gotoxy(uint32_t x, uint32_t y);
+void get_cursor_pos(screen_pos_t* pos);
+
 #endif

include/kernel/heap.h

@@ -43,6 +43,8 @@ void* kmalloc(size_t size);
 void kfree(void* ptr);
 // void* kmem_align(uint64_t size);
 
+void dump_heap(heap_node_p heap, size_t size);
+
 #ifdef __cplusplus
 }
 #endif

include/kernel/idt.h

@@ -20,6 +20,7 @@
 #define ISR_FLOAT_POINT_EXCEPTION    0x10
 #define ISR_ALIGNMENT_CHECK          0x11
 #define ISR_MACHINE_CHECK            0x12
+#define ISR_PERIODIC_TIMER           0x20
 
 typedef struct {
   uint16_t base_low;      // Lower 16 bits of ISR address
@@ -66,7 +67,9 @@ extern void idt_generic_isr_asm_handler();
 extern void idt_gpf_isr_asm_handler();
 extern void idt_load(idt_pointer_t *idt_ptr);
 extern void idt_pf_isr_asm_handler();
+extern void idt_period_timer_isr_asm_handler();
 
+void idt_add_isr(int interruption, void* handler);
 void idt_init();
 
 #endif

include/kernel/kernel.h

@@ -5,11 +5,13 @@
 
 uint8_t inb(uint16_t port);
 uint16_t inw(uint16_t port);
+uint32_t inl(uint16_t port);
 
 void cli();
 void hcf() __attribute__((noreturn));
 void outb(uint16_t port, uint8_t value);
 void outw(uint16_t port, uint16_t value);
+void outl(uint16_t port, uint32_t value);
 void sti();
 
 #endif

include/sys/mman.h include/kernel/mman.hinclude/sys/mman.h renamed to include/kernel/mman.h

@@ -1,5 +1,5 @@
-#ifndef MENIOS_INCLUDE_SYS_MMAN_H
-#define MENIOS_INCLUDE_SYS_MMAN_H
+#ifndef MENIOS_INCLUDE_KERNEL_MMAN_H
+#define MENIOS_INCLUDE_KERNEL_MMAN_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -20,10 +20,10 @@ extern "C" {
 
 #define MAP_FAILED ((void *) -1) // mapping failed
 
-void* mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset);
-int   munmap(void *addr, size_t len);
+void* kmmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset);
+int   kmunmap(void *addr, size_t len);
 
 #ifdef __cplusplus
 }
 #endif
-#endif //MENIOS_INCLUDE_SYS_MMAN_H
+#endif //MENIOS_INCLUDE_KERNEL_MMAN_H

include/kernel/rtc.h

@@ -0,0 +1,33 @@
+#ifndef MENIOS_INCLUDE_KERNEL_RTC_H
+#define MENIOS_INCLUDE_KERNEL_RTC_H
+
+#include <types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define RTC_INDEX_PORT 0x70
+#define RTC_DATA_PORT  0x71
+
+typedef struct rtc_time_t {
+  uint8_t seconds;
+  uint8_t minutes;
+  uint8_t hours;
+  uint8_t day;
+  uint8_t month;
+  uint8_t year;
+  uint16_t full_year;
+  uint8_t weekday;
+  uint8_t century;
+  uint8_t register_b;
+} rtc_time_t;
+
+void rtc_time(rtc_time_t* time);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif // MENIOS_INCLUDE_KERNEL_RTC_H