diff options
| -rw-r--r-- | kernel/cpu/idt.c | 6 | ||||
| -rw-r--r-- | kernel/fs/fs.c | 35 | ||||
| -rw-r--r-- | kernel/include/comus/cpu.h | 44 |
3 files changed, 43 insertions, 42 deletions
diff --git a/kernel/cpu/idt.c b/kernel/cpu/idt.c index 3929990..748826c 100644 --- a/kernel/cpu/idt.c +++ b/kernel/cpu/idt.c @@ -89,7 +89,8 @@ static void isr_print_regs(regs_t *regs) printf("r14: %#016lx (%lu)\n", regs->r14, regs->r14); printf("r15: %#016lx (%lu)\n", regs->r15, regs->r15); printf("rip: %#016lx (%lu)\n", regs->rip, regs->rip); - printf("rflags: %#016lx (%lu)\n", (uint64_t)regs->rflags.raw, (uint64_t)regs->rflags.raw); + printf("rflags: %#016lx (%lu)\n", (uint64_t)regs->rflags.raw, + (uint64_t)regs->rflags.raw); puts("rflags: "); if (regs->rflags.cf) puts("CF "); @@ -170,8 +171,7 @@ char *EXCEPTIONS[] = { "Reserved", }; -void idt_exception_handler(uint64_t exception, uint64_t code, - regs_t *state) +void idt_exception_handler(uint64_t exception, uint64_t code, regs_t *state) { uint64_t cr2; diff --git a/kernel/fs/fs.c b/kernel/fs/fs.c index 7a8c93e..2bc7d99 100644 --- a/kernel/fs/fs.c +++ b/kernel/fs/fs.c @@ -4,8 +4,8 @@ struct disk fs_disks[MAX_DISKS]; struct file_system fs_loaded_file_systems[MAX_DISKS]; -void fs_init(void) { - +void fs_init(void) +{ // zero structures memsetv(fs_disks, 0, sizeof(fs_disks)); memsetv(fs_loaded_file_systems, 0, sizeof(fs_loaded_file_systems)); @@ -13,10 +13,10 @@ void fs_init(void) { // TODO: go though ide and/or sata drivers to load all disks into `fs_disks` structures // TODO: go though each disk and attempt to load a file system - } -struct disk *fs_get_root_disk(void) { +struct disk *fs_get_root_disk(void) +{ // NOTE: currently im just getting the first disk // found, is this fine? @@ -29,7 +29,8 @@ struct disk *fs_get_root_disk(void) { return NULL; } -struct file_system *fs_get_root_file_system(void) { +struct file_system *fs_get_root_file_system(void) +{ // NOTE: currently im just getting the first file system // found, is this fine? @@ -44,36 +45,36 @@ struct file_system *fs_get_root_file_system(void) { struct file *fs_find_file_abs(struct file_system *fs, char *abs_path) { - (void) fs; - (void) abs_path; + (void)fs; + (void)abs_path; panic("fs_find_file_abs NOT YET IMPLEMENTED"); } struct file *fs_find_file_rel(struct file *rel, char *rel_path) { - (void) rel; - (void) rel_path; + (void)rel; + (void)rel_path; panic("fs_find_file_rel NOT YET IMPLEMENTED"); } int disk_read(struct disk *disk, size_t offset, size_t len, uint8_t *buffer) { - (void) disk; - (void) offset; - (void) len; - (void) buffer; + (void)disk; + (void)offset; + (void)len; + (void)buffer; panic("disk_read NOT YET IMPLEMENTED"); } int disk_write(struct disk *disk, size_t offset, size_t len, uint8_t *buffer) { - (void) disk; - (void) offset; - (void) len; - (void) buffer; + (void)disk; + (void)offset; + (void)len; + (void)buffer; panic("disk_write NOT YET IMPLEMENTED"); } diff --git a/kernel/include/comus/cpu.h b/kernel/include/comus/cpu.h index a976695..c49fb45 100644 --- a/kernel/include/comus/cpu.h +++ b/kernel/include/comus/cpu.h @@ -14,28 +14,28 @@ typedef union { uint64_t raw; struct { - uint64_t cf : 1; - uint64_t : 1; - uint64_t pf : 1; - uint64_t : 1; - uint64_t af : 1; - uint64_t : 1; - uint64_t zf : 1; - uint64_t sf : 1; - uint64_t tf : 1; - uint64_t if_ : 1; - uint64_t df : 1; - uint64_t of : 1; - uint64_t iopl : 2; - uint64_t nt : 1; - uint64_t md : 1; - uint64_t rf : 1; - uint64_t vm : 1; - uint64_t ac : 1; - uint64_t vif : 1; - uint64_t vip : 1; - uint64_t id : 1; - uint64_t : 42; + uint64_t cf : 1; + uint64_t : 1; + uint64_t pf : 1; + uint64_t : 1; + uint64_t af : 1; + uint64_t : 1; + uint64_t zf : 1; + uint64_t sf : 1; + uint64_t tf : 1; + uint64_t if_ : 1; + uint64_t df : 1; + uint64_t of : 1; + uint64_t iopl : 2; + uint64_t nt : 1; + uint64_t md : 1; + uint64_t rf : 1; + uint64_t vm : 1; + uint64_t ac : 1; + uint64_t vif : 1; + uint64_t vip : 1; + uint64_t id : 1; + uint64_t : 42; }; } rflags_t; |