diff options
author | Zachary Yedidia <zyedidia@gmail.com> | 2022-05-13 16:54:22 -0700 |
---|---|---|
committer | Zachary Yedidia <zyedidia@gmail.com> | 2022-05-13 16:54:22 -0700 |
commit | dea65e57770c987bb0b1ab0655e9875c0caffe0d (patch) | |
tree | c59adcba6933d4bbe5b12a49369ae531e1c71319 | |
parent | 1aef408ec5cd68af28f3c75e5599bc87a04b9e83 (diff) |
Autoformat
-rw-r--r-- | kern/interrupts.c | 3 | ||||
-rw-r--r-- | kern/kern.c | 10 | ||||
-rw-r--r-- | kern/proc.c | 4 | ||||
-rw-r--r-- | kern/timer.c | 2 | ||||
-rw-r--r-- | kern/timer.h | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/kern/interrupts.c b/kern/interrupts.c index 9c80a84..7322ef8 100644 --- a/kern/interrupts.c +++ b/kern/interrupts.c @@ -106,7 +106,8 @@ void __attribute__((interrupt("ABORT"))) vec_data_abort() { #include "timer.h" void vec_irq(regs_t *regs) { dev_barrier(); - if (!timer_has_irq()) return; + if (!timer_has_irq()) + return; proc_scheduler_irq(regs); diff --git a/kern/kern.c b/kern/kern.c index 39d0b4b..bfea720 100644 --- a/kern/kern.c +++ b/kern/kern.c @@ -8,9 +8,9 @@ #include "ksan.h" #include "proc.h" #include "sys.h" +#include "timer.h" #include "uart.h" #include "vm.h" -#include "timer.h" void reboot() { printf("DONE!!!\n"); @@ -52,14 +52,16 @@ void kernel_start() { #ifdef PIDOS extern uint8_t _binary_pidos_bin_start; extern uint8_t _binary_pidos_bin_end; - proc_t *p_pidos_1 = proc_new(&_binary_pidos_bin_start, &_binary_pidos_bin_end); + proc_t *p_pidos_1 = + proc_new(&_binary_pidos_bin_start, &_binary_pidos_bin_end); proc_new(&_binary_pidos_bin_start, &_binary_pidos_bin_end); - enable_interrupts(); // TODO: Set this in the SPSR + enable_interrupts(); // TODO: Set this in the SPSR proc_run(p_pidos_1); #else extern uint8_t _binary_basic_bin_start; extern uint8_t _binary_basic_bin_end; - proc_t* p_basic = proc_new(&_binary_basic_bin_start, &_binary_basic_bin_end); + proc_t *p_basic = + proc_new(&_binary_basic_bin_start, &_binary_basic_bin_end); proc_run(p_basic); #endif diff --git a/kern/proc.c b/kern/proc.c index 8fd8bc7..3275a58 100644 --- a/kern/proc.c +++ b/kern/proc.c @@ -57,10 +57,8 @@ void swippityswap(regs_t *live_state, proc_t *new_thread, proc_t *old_thread) { memcpy(live_state, &(new_thread->regs), sizeof(regs_t)); } - void proc_scheduler_irq(regs_t *regs) { - pid_t curr_pid = curproc->id, - next_pid = (curr_pid + 1) % id; + pid_t curr_pid = curproc->id, next_pid = (curr_pid + 1) % id; swippityswap(regs, &(procs[next_pid]), &(procs[curr_pid])); diff --git a/kern/timer.c b/kern/timer.c index addfbcf..95300c0 100644 --- a/kern/timer.c +++ b/kern/timer.c @@ -26,7 +26,7 @@ typedef struct { #define TIMER_CTRL_DISABLE (0 << 7) #define pa2ka(pa) (((pa) | (1UL << 31))) -static volatile timer_t* const timer = (timer_t*) pa2ka(0x2000b400); +static volatile timer_t *const timer = (timer_t *) pa2ka(0x2000b400); void timer_irq_load(uint32_t load) { timer->load = load; diff --git a/kern/timer.h b/kern/timer.h index 28840b5..d0e7e3e 100644 --- a/kern/timer.h +++ b/kern/timer.h @@ -1,8 +1,8 @@ #pragma once -#include "sys.h" #include <stdbool.h> #include <stdint.h> +#include "sys.h" static inline void timer_init() { asm volatile("mcr p15, 0, %0, c15, c12, 0" ::"r"(1)); |