rename to baseline to finix (new!)

README.md

@@ -1,10 +1,18 @@
-# Comus
+# Finix
 
 Comus is a kernel!
 
+## Contributor
+
+1. Freya Murphy <freya@freyacat.org>
+2. Tristan Miller <trimill@trimill.xyz>
+3. Simon Kadesh <simon@kade.sh>
+4. Ian McFarlane <i.mcfarlane2002@gmail.com>
+5. Galen Sagarin <gsp5307@rit.edu>
+
 ## Dependencies
 
-To build comus, a c11 compiler is required, along with the gnu assembler
+To build finix, a c11 compiler is required, along with the gnu assembler
 and linker.
 
 To build the boot iso for qemu, `grub-mkrescue` is needed from grub.

kernel/cpu/cpu.c

@@ -1,6 +1,6 @@
 #include <lib.h>
-#include <comus/cpu.h>
-#include <comus/asm.h>
+#include <finix/cpu.h>
+#include <finix/asm.h>
 
 #include "pic.h"
 #include "idt.h"

kernel/cpu/idt.c

@@ -1,13 +1,13 @@
-#include "comus/drivers/spkr.h"
+#include "finix/drivers/spkr.h"
 #include "lib/klib.h"
 #include <lib.h>
-#include <comus/memory.h>
-#include <comus/asm.h>
-#include <comus/cpu.h>
-#include <comus/drivers/ps2.h>
-#include <comus/drivers/pit.h>
-#include <comus/procs.h>
-#include <comus/memory.h>
+#include <finix/memory.h>
+#include <finix/asm.h>
+#include <finix/cpu.h>
+#include <finix/drivers/ps2.h>
+#include <finix/drivers/pit.h>
+#include <finix/procs.h>
+#include <finix/memory.h>
 
 #include "idt.h"
 #include "pic.h"

kernel/cpu/pic.c

@@ -1,4 +1,4 @@
-#include <comus/asm.h>
+#include <finix/asm.h>
 
 #include "pic.h"
 

kernel/cpu/tss.c

@@ -1,4 +1,4 @@
-#include <comus/memory.h>
+#include <finix/memory.h>
 #include <lib.h>
 
 #include "tss.h"

kernel/drivers.c

@@ -1,12 +1,12 @@
-#include <comus/drivers.h>
-#include <comus/drivers/acpi.h>
-#include <comus/drivers/uart.h>
-#include <comus/drivers/ps2.h>
-#include <comus/drivers/pci.h>
-#include <comus/drivers/ata.h>
-#include <comus/drivers/gpu.h>
-#include <comus/drivers/pit.h>
-#include <comus/mboot.h>
+#include <finix/drivers.h>
+#include <finix/drivers/acpi.h>
+#include <finix/drivers/uart.h>
+#include <finix/drivers/ps2.h>
+#include <finix/drivers/pci.h>
+#include <finix/drivers/ata.h>
+#include <finix/drivers/gpu.h>
+#include <finix/drivers/pit.h>
+#include <finix/mboot.h>
 
 void drivers_init(void)
 {

kernel/drivers/acpi.c

@@ -1,7 +1,7 @@
 #include <lib.h>
-#include <comus/drivers/acpi.h>
-#include <comus/asm.h>
-#include <comus/memory.h>
+#include <finix/drivers/acpi.h>
+#include <finix/asm.h>
+#include <finix/memory.h>
 #include <stdint.h>
 
 struct acpi_header {

kernel/drivers/ata.c

@@ -107,9 +107,9 @@
 #define      ATA_WRITE     0x01
 // clang-format on
 
-#include <comus/drivers/ata.h>
-#include <comus/drivers/pci.h>
-#include <comus/asm.h>
+#include <finix/drivers/ata.h>
+#include <finix/drivers/pci.h>
+#include <finix/asm.h>
 #include <lib.h>
 
 struct ide_channel {

kernel/drivers/clock.c

@@ -1,6 +1,6 @@
 #include <lib.h>
-#include <comus/asm.h>
-#include <comus/time.h>
+#include <finix/asm.h>
+#include <finix/time.h>
 
 #define CMOS_WRITE_PORT 0x70
 #define CMOS_READ_PORT 0x71

kernel/drivers/gpu.c

@@ -1,11 +1,11 @@
 #include <lib.h>
-#include <comus/drivers/gpu.h>
-#include <comus/drivers/gpu/gop.h>
-#include <comus/drivers/gpu/bochs.h>
-#include <comus/drivers/gpu/vga_text.h>
-#include <comus/error.h>
-#include <comus/term.h>
-#include <comus/asm.h>
+#include <finix/drivers/gpu.h>
+#include <finix/drivers/gpu/gop.h>
+#include <finix/drivers/gpu/bochs.h>
+#include <finix/drivers/gpu/vga_text.h>
+#include <finix/error.h>
+#include <finix/term.h>
+#include <finix/asm.h>
 
 struct gpu_dev *gpu_dev = NULL;
 

kernel/drivers/gpu/bochs.c

@@ -1,9 +1,9 @@
 #include <lib.h>
-#include <comus/asm.h>
-#include <comus/memory.h>
-#include <comus/drivers/pci.h>
-#include <comus/drivers/gpu.h>
-#include <comus/drivers/gpu/bochs.h>
+#include <finix/asm.h>
+#include <finix/memory.h>
+#include <finix/drivers/pci.h>
+#include <finix/drivers/gpu.h>
+#include <finix/drivers/gpu/bochs.h>
 
 #define INDEX 0x1CE
 #define DATA 0x1CF

kernel/drivers/gpu/gop.c

@@ -1,8 +1,8 @@
 #include <lib.h>
-#include <comus/asm.h>
-#include <comus/drivers/gpu.h>
-#include <comus/drivers/gpu/gop.h>
-#include <comus/efi.h>
+#include <finix/asm.h>
+#include <finix/drivers/gpu.h>
+#include <finix/drivers/gpu/gop.h>
+#include <finix/efi.h>
 #include <efi.h>
 
 struct gpu_dev gop_dev = { 0 };

kernel/drivers/gpu/vga_text.c

@@ -1,8 +1,8 @@
 #include <lib.h>
-#include <comus/term.h>
-#include <comus/asm.h>
-#include <comus/memory.h>
-#include <comus/drivers/gpu/vga_text.h>
+#include <finix/term.h>
+#include <finix/asm.h>
+#include <finix/memory.h>
+#include <finix/drivers/gpu/vga_text.h>
 
 #define VGA_ADDR 0xB8000
 #define VGA_WIDTH 80

kernel/drivers/pci.c

@@ -1,6 +1,6 @@
-#include <comus/drivers/pci.h>
-#include <comus/asm.h>
-#include <comus/limits.h>
+#include <finix/drivers/pci.h>
+#include <finix/asm.h>
+#include <finix/limits.h>
 #include <lib.h>
 
 #define CONF_ADDR 0xCF8

kernel/drivers/pit.c

@@ -1,7 +1,7 @@
 #include "lib/klib.h"
-#include <comus/asm.h>
-#include <comus/drivers/pit.h>
-#include <comus/drivers/spkr.h>
+#include <finix/asm.h>
+#include <finix/drivers/pit.h>
+#include <finix/drivers/spkr.h>
 #include <lib.h>
 
 #define CMD 0x43

kernel/drivers/ps2.c

@@ -1,7 +1,7 @@
-#include <comus/drivers/ps2.h>
-#include <comus/keycodes.h>
-#include <comus/input.h>
-#include <comus/asm.h>
+#include <finix/drivers/ps2.h>
+#include <finix/keycodes.h>
+#include <finix/input.h>
+#include <finix/asm.h>
 #include <lib.h>
 
 #define STATUS_OUT_BUF ((uint8_t)0x01)

kernel/drivers/uart.c

@@ -1,5 +1,5 @@
-#include <comus/drivers/uart.h>
-#include <comus/asm.h>
+#include <finix/drivers/uart.h>
+#include <finix/asm.h>
 
 #define PORT 0x3F8
 

kernel/efi/efi.c

@@ -1,7 +1,7 @@
 #include <lib.h>
-#include <comus/efi.h>
-#include <comus/mboot.h>
-#include <comus/memory.h>
+#include <finix/efi.h>
+#include <finix/mboot.h>
+#include <finix/memory.h>
 #include <efi.h>
 
 #include "efi.h"

kernel/efi/gop.c

@@ -1,6 +1,6 @@
 #include <lib.h>
 #include <efi.h>
-#include <comus/efi.h>
+#include <finix/efi.h>
 
 static EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL;
 

kernel/efi/mmap.c

@@ -1,7 +1,7 @@
 #include <lib.h>
 #include <efi.h>
-#include <comus/efi.h>
-#include <comus/memory.h>
+#include <finix/efi.h>
+#include <finix/memory.h>
 
 struct memory_map efi_mmap = { 0 };
 

kernel/entry.S

@@ -1,4 +1,4 @@
-#include <comus/limits.h>
+#include <finix/limits.h>
 
 	.globl _start
 	.globl kernel_pml4

kernel/fs/fs.c

@@ -1,8 +1,8 @@
 #include <lib.h>
-#include <comus/fs.h>
-#include <comus/fs/tar.h>
-#include <comus/mboot.h>
-#include <comus/error.h>
+#include <finix/fs.h>
+#include <finix/fs/tar.h>
+#include <finix/mboot.h>
+#include <finix/error.h>
 
 struct disk fs_disks[N_DISKS];
 struct file_system fs_loaded_file_systems[N_DISKS];

kernel/fs/tar.c

@@ -1,6 +1,6 @@
-#include <comus/fs.h>
+#include <finix/fs.h>
 #include <lib.h>
-#include <comus/tar.h>
+#include <finix/tar.h>
 
 // the placements of these values mimics their placement in standard UStar
 struct tar_header {

kernel/include/finix/drivers/gpu/bochs.h

@@ -9,7 +9,7 @@
 #ifndef BOCHS_H_
 #define BOCHS_H_
 
-#include <comus/drivers/gpu.h>
+#include <finix/drivers/gpu.h>
 
 /**
  * Loads the bochs graphics driver

kernel/include/finix/drivers/gpu/gop.h

@@ -9,7 +9,7 @@
 #ifndef GOP_H_
 #define GOP_H_
 
-#include <comus/drivers/gpu.h>
+#include <finix/drivers/gpu.h>
 
 /**
  * Loads the uefi gop graphics driver

kernel/include/finix/efi.h

@@ -9,7 +9,7 @@
 #ifndef EFI_H_
 #define EFI_H_
 
-#include <comus/memory.h>
+#include <finix/memory.h>
 #include <efi.h>
 
 /**

kernel/include/finix/fs.h

@@ -10,8 +10,8 @@
 #define FS_H_
 
 #include <stddef.h>
-#include <comus/limits.h>
-#include <comus/drivers/ata.h>
+#include <finix/limits.h>
+#include <finix/drivers/ata.h>
 
 enum disk_type {
 	DISK_TYPE_ATA,

kernel/include/finix/fs/tar.h

@@ -7,7 +7,7 @@
 #ifndef TAR_FS_H_
 #define TAR_FS_H_
 
-#include <comus/fs.h>
+#include <finix/fs.h>
 
 /**
  * Attempts to mount tar filesystem on disk

kernel/include/finix/input.h

@@ -5,8 +5,8 @@
 #ifndef INPUT_H_
 #define INPUT_H_
 
-#include <comus/keycodes.h>
-#include <comus/limits.h>
+#include <finix/keycodes.h>
+#include <finix/limits.h>
 #include <stdbool.h>
 #include <stddef.h>
 

kernel/include/finix/mboot.h

@@ -9,7 +9,7 @@
 #ifndef MBOOT_H_
 #define MBOOT_H_
 
-#include <comus/memory.h>
+#include <finix/memory.h>
 #include <efi.h>
 
 /**

kernel/include/finix/memory.h

@@ -9,7 +9,7 @@
 #ifndef _MEMORY_H
 #define _MEMORY_H
 
-#include <comus/limits.h>
+#include <finix/limits.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>

kernel/include/finix/procs.h

@@ -9,11 +9,11 @@
 #ifndef _PROCS_H
 #define _PROCS_H
 
-#include <comus/cpu.h>
-#include <comus/limits.h>
-#include <comus/memory.h>
-#include <comus/syscalls.h>
-#include <comus/fs.h>
+#include <finix/cpu.h>
+#include <finix/limits.h>
+#include <finix/memory.h>
+#include <finix/syscalls.h>
+#include <finix/fs.h>
 #include <lib.h>
 #include <elf.h>
 

kernel/include/finix/tar.h

@@ -1,4 +1,4 @@
-#include <comus/fs.h>
+#include <finix/fs.h>
 #ifndef TAR_FS_H_
 #define TAR_FS_H_
 

kernel/include/finix/user.h

@@ -9,9 +9,9 @@
 #ifndef USER_H_
 #define USER_H_
 
-#include "comus/memory.h"
-#include <comus/procs.h>
-#include <comus/fs.h>
+#include "finix/memory.h"
+#include <finix/procs.h>
+#include <finix/fs.h>
 
 /**
  * Load a user elf program from a file into a pcb

kernel/input.c

@@ -1,4 +1,4 @@
-#include <comus/input.h>
+#include <finix/input.h>
 
 struct mouse_event_buf {
 	struct mouse_event data[N_MOUSEEV];

kernel/lib/backtrace.c

@@ -1,5 +1,5 @@
 #include <lib.h>
-#include <comus/mboot.h>
+#include <finix/mboot.h>
 
 struct stackframe {
 	struct stackframe *rbp;

kernel/lib/kalloc.c

@@ -1,5 +1,5 @@
 #include <lib.h>
-#include <comus/memory.h>
+#include <finix/memory.h>
 
 #define MAGIC 0xBEEFCAFE
 

kernel/lib/kprintf.c

@@ -1,6 +1,6 @@
 #include <lib.h>
-#include <comus/term.h>
-#include <comus/drivers/uart.h>
+#include <finix/term.h>
+#include <finix/drivers/uart.h>
 
 #define PRINTF_NUMERIC_BUF_LEN 50
 

kernel/lib/kspin.c

@@ -1,6 +1,6 @@
 #include <lib.h>
-#include <comus/drivers/pit.h>
-#include <comus/asm.h>
+#include <finix/drivers/pit.h>
+#include <finix/asm.h>
 
 void kspin_seconds(size_t seconds)
 {

kernel/lib/panic.c

@@ -1,8 +1,8 @@
 #include <lib.h>
 #include <stdarg.h>
-#include <comus/asm.h>
-#include <comus/drivers/ps2.h>
-#include <comus/drivers/spkr.h>
+#include <finix/asm.h>
+#include <finix/drivers/ps2.h>
+#include <finix/drivers/spkr.h>
 
 __attribute__((noreturn)) void __panic(unsigned int line, const char *file,
 									   const char *format, ...)

kernel/main.c

@@ -1,15 +1,15 @@
-#include <comus/cpu.h>
-#include <comus/memory.h>
-#include <comus/mboot.h>
-#include <comus/efi.h>
-#include <comus/drivers.h>
-#include <comus/drivers/acpi.h>
-#include <comus/drivers/pci.h>
-#include <comus/drivers/gpu.h>
-#include <comus/drivers/ata.h>
-#include <comus/user.h>
-#include <comus/fs.h>
-#include <comus/procs.h>
+#include <finix/cpu.h>
+#include <finix/memory.h>
+#include <finix/mboot.h>
+#include <finix/efi.h>
+#include <finix/drivers.h>
+#include <finix/drivers/acpi.h>
+#include <finix/drivers/pci.h>
+#include <finix/drivers/gpu.h>
+#include <finix/drivers/ata.h>
+#include <finix/user.h>
+#include <finix/fs.h>
+#include <finix/procs.h>
 #include <lib.h>
 
 void kreport(void)

kernel/mboot/efi.c

@@ -1,4 +1,4 @@
-#include <comus/mboot.h>
+#include <finix/mboot.h>
 
 #include "mboot.h"
 

kernel/mboot/elf.c

@@ -1,6 +1,6 @@
 #include <lib.h>
 #include <elf.h>
-#include <comus/mboot.h>
+#include <finix/mboot.h>
 
 #include "mboot.h"
 

kernel/mboot/mboot.c

@@ -1,5 +1,5 @@
 #include <lib.h>
-#include <comus/mboot.h>
+#include <finix/mboot.h>
 
 #include "mboot.h"
 

kernel/mboot/mmap.c

@@ -1,5 +1,5 @@
 #include <lib.h>
-#include <comus/mboot.h>
+#include <finix/mboot.h>
 
 #include "mboot.h"
 

kernel/mboot/module.c

@@ -1,5 +1,5 @@
-#include <comus/memory.h>
-#include <comus/mboot.h>
+#include <finix/memory.h>
+#include <finix/mboot.h>
 
 #include "mboot.h"
 

kernel/mboot/rsdp.c

@@ -1,5 +1,5 @@
 #include <lib.h>
-#include <comus/mboot.h>
+#include <finix/mboot.h>
 
 #include "mboot.h"
 

kernel/memory/memory.c

@@ -1,8 +1,8 @@
-#include <comus/memory.h>
-#include <comus/asm.h>
-#include <comus/mboot.h>
-#include <comus/efi.h>
-#include <comus/limits.h>
+#include <finix/memory.h>
+#include <finix/asm.h>
+#include <finix/mboot.h>
+#include <finix/efi.h>
+#include <finix/limits.h>
 #include <lib.h>
 
 #include "memory.h"

kernel/memory/memory.h

@@ -1,5 +1,5 @@
 
-#include <comus/memory.h>
+#include <finix/memory.h>
 #include "virtalloc.h"
 
 struct mem_ctx_s {

kernel/memory/paging.c

@@ -1,5 +1,5 @@
 #include <lib.h>
-#include <comus/memory.h>
+#include <finix/memory.h>
 
 #include "virtalloc.h"
 #include "physalloc.h"

kernel/memory/physalloc.c

@@ -1,7 +1,7 @@
 #include <lib.h>
-#include <comus/memory.h>
-#include <comus/asm.h>
-#include <comus/mboot.h>
+#include <finix/memory.h>
+#include <finix/asm.h>
+#include <finix/mboot.h>
 #include <stdint.h>
 
 #include "physalloc.h"

kernel/memory/physalloc.h

@@ -9,7 +9,7 @@
 #ifndef PHYSALLOC_H_
 #define PHYSALLOC_H_
 
-#include <comus/memory.h>
+#include <finix/memory.h>
 
 /// Represents some contiguous physical pages
 struct phys_page_slice {

kernel/memory/virtalloc.c

@@ -1,5 +1,5 @@
 #include <lib.h>
-#include <comus/memory.h>
+#include <finix/memory.h>
 #include <stdint.h>
 
 #include "virtalloc.h"

kernel/procs.c

@@ -1,10 +1,10 @@
-#include <comus/drivers/pit.h>
-#include <comus/syscalls.h>
-#include <comus/memory.h>
-#include <comus/procs.h>
-#include <comus/error.h>
-#include <comus/cpu.h>
-#include <comus/asm.h>
+#include <finix/drivers/pit.h>
+#include <finix/syscalls.h>
+#include <finix/memory.h>
+#include <finix/procs.h>
+#include <finix/error.h>
+#include <finix/cpu.h>
+#include <finix/asm.h>
 
 #define PCB_QUEUE_EMPTY(q) ((q)->head == NULL)
 

kernel/syscall.c

@@ -1,16 +1,16 @@
-#include "comus/fs.h"
+#include "finix/fs.h"
 #include "lib/kio.h"
-#include <comus/user.h>
-#include <comus/cpu.h>
-#include <comus/syscalls.h>
-#include <comus/input.h>
-#include <comus/drivers/acpi.h>
-#include <comus/drivers/gpu.h>
-#include <comus/drivers/pit.h>
-#include <comus/memory.h>
-#include <comus/procs.h>
-#include <comus/time.h>
-#include <comus/error.h>
+#include <finix/user.h>
+#include <finix/cpu.h>
+#include <finix/syscalls.h>
+#include <finix/input.h>
+#include <finix/drivers/acpi.h>
+#include <finix/drivers/gpu.h>
+#include <finix/drivers/pit.h>
+#include <finix/memory.h>
+#include <finix/procs.h>
+#include <finix/time.h>
+#include <finix/error.h>
 #include <lib.h>
 #include <stddef.h>
 

kernel/term.c

@@ -1,8 +1,8 @@
 #include <lib.h>
-#include <comus/term.h>
-#include <comus/asm.h>
-#include <comus/limits.h>
-#include <comus/drivers/gpu.h>
+#include <finix/term.h>
+#include <finix/asm.h>
+#include <finix/limits.h>
+#include <finix/drivers/gpu.h>
 
 // terminal data
 static char buffer[TERM_MAX_WIDTH * TERM_MAX_HEIGHT];

kernel/user.c

@@ -1,8 +1,8 @@
 #include "lib/kio.h"
-#include <comus/fs.h>
-#include <comus/procs.h>
-#include <comus/memory.h>
-#include <comus/user.h>
+#include <finix/fs.h>
+#include <finix/procs.h>
+#include <finix/memory.h>
+#include <finix/user.h>
 #include <elf.h>
 
 /// FIXME: the following code is using direct

user/forkman.c

@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "../kernel/include/comus/keycodes.h"
+#include "../kernel/include/finix/keycodes.h"
 
 #define DBG