diff options
Diffstat (limited to 'src/kern')
-rw-r--r-- | src/kern/init.c | 15 | ||||
-rw-r--r-- | src/kern/log.c | 2 | ||||
-rw-r--r-- | src/kern/main.c | 2 | ||||
-rw-r--r-- | src/kern/mem.c | 2 | ||||
-rw-r--r-- | src/kern/mpu/mpu_manager.c | 3 | ||||
-rw-r--r-- | src/kern/panic.c | 17 | ||||
-rw-r--r-- | src/kern/priv.c | 4 | ||||
-rw-r--r-- | src/kern/svc.c | 4 | ||||
-rw-r--r-- | src/kern/syscalls/logs.c | 2 |
9 files changed, 27 insertions, 24 deletions
diff --git a/src/kern/init.c b/src/kern/init.c index 247c44f..5120745 100644 --- a/src/kern/init.c +++ b/src/kern/init.c @@ -38,12 +38,12 @@ extern uint32_t INIT_7_END; init2() { - volatile uint32_t bss_start_ptr = (uint32_t) &BSS_START; - volatile uint32_t bss_end_ptr = (uint32_t) &BSS_END; - volatile uint32_t init_data_values_ptr = (uint32_t) &INIT_DATA_VALUES; - volatile uint32_t data_segment_start_ptr = (uint32_t) &DATA_SEGMENT_START; - volatile uint32_t data_segment_stop_ptr = (uint32_t) &DATA_SEGMENT_STOP; - + volatile uint32_t bss_start_ptr = (uint32_t)&BSS_START; + volatile uint32_t bss_end_ptr = (uint32_t)&BSS_END; + volatile uint32_t init_data_values_ptr = (uint32_t)&INIT_DATA_VALUES; + volatile uint32_t data_segment_start_ptr = (uint32_t)&DATA_SEGMENT_START; + volatile uint32_t data_segment_stop_ptr = (uint32_t)&DATA_SEGMENT_STOP; + klogf("Copy data segments from flash ... \n"); klogf(" .data ...\n"); @@ -109,7 +109,8 @@ void run_init_routines() void (**initfn)(); - klogf("Init routines at (%p - %p)\n", + klogf( + "Init routines at (%p - %p)\n", &INIT_ROUTINES_FLASH_START, &INIT_ROUTINES_FLASH_STOP); diff --git a/src/kern/log.c b/src/kern/log.c index e6bbec6..3eb61a1 100644 --- a/src/kern/log.c +++ b/src/kern/log.c @@ -3,9 +3,9 @@ #include "arch/stm32l4xxx/peripherals/clock.h" #include "arch/stm32l4xxx/peripherals/usart.h" #include "kern/common.h" +#include "kern/delay.h" #include "kern/gpio/gpio_manager.h" #include "kern/init.h" -#include "kern/delay.h" void setup_usart2(uint32_t baud_rate); diff --git a/src/kern/main.c b/src/kern/main.c index cdaa2b1..957e43f 100644 --- a/src/kern/main.c +++ b/src/kern/main.c @@ -198,7 +198,7 @@ static void set_red() static void reset_state() { ws2812b_t* tmp = state.drv; - memset((void*) &state, 0, sizeof(state)); + memset((void*)&state, 0, sizeof(state)); state.drv = tmp; state.brightness = 255; state.n_leds = 250; diff --git a/src/kern/mem.c b/src/kern/mem.c index d7f7dc3..8960883 100644 --- a/src/kern/mem.c +++ b/src/kern/mem.c @@ -224,7 +224,7 @@ void debug_print_blocks() cur->prev, kalloc_node_get_canary(cur)); total_words += cur->size_words; - total_blocks ++; + total_blocks++; cur = kalloc_node_next(cur); } diff --git a/src/kern/mpu/mpu_manager.c b/src/kern/mpu/mpu_manager.c index 0d03c39..1cff2a2 100644 --- a/src/kern/mpu/mpu_manager.c +++ b/src/kern/mpu/mpu_manager.c @@ -63,8 +63,7 @@ static int find_unused_region_slot() // memory_region_opts_t memory_regions[8]; int i; - for (i = 0; i < sizeof(memory_regions) / sizeof(memory_region_opts_t); - ++i) { + for (i = 0; i < sizeof(memory_regions) / sizeof(memory_region_opts_t); ++i) { if (!memory_regions[i].enable) { return i; } diff --git a/src/kern/panic.c b/src/kern/panic.c index e005bcc..75ce52a 100644 --- a/src/kern/panic.c +++ b/src/kern/panic.c @@ -1,14 +1,15 @@ -#include "arch.h" #include "kern/panic.h" -#include "kern/log.h" -#include "kern/init.h" -#include "arch/stm32l4xxx/peripherals/clock.h" -#include "kern/gpio/sysled.h" -#include "kern/gpio/gpio_manager.h" -#include "kern/delay.h" #include <stdarg.h> +#include "arch.h" +#include "arch/stm32l4xxx/peripherals/clock.h" +#include "kern/delay.h" +#include "kern/gpio/gpio_manager.h" +#include "kern/gpio/sysled.h" +#include "kern/init.h" +#include "kern/log.h" + #ifdef ARCH_STM32L4 _Noreturn void panic(const char* fmt, ...) { @@ -23,7 +24,7 @@ _Noreturn void panic(const char* fmt, ...) kerr_logf("** Stack:\n"); int i = 0; - for (; i < 20 && &base[i] != (void*)STACK_TOP; ++ i) { + for (; i < 20 && &base[i] != (void*)STACK_TOP; ++i) { kerr_logf(" (%p) %p\n", &base[i], base[i]); } diff --git a/src/kern/priv.c b/src/kern/priv.c index ba25c26..6698350 100644 --- a/src/kern/priv.c +++ b/src/kern/priv.c @@ -37,6 +37,8 @@ void jump_to_user_mode() "msr control, r0\n\t" "isb\n\t" "dsb\n\t" - "b usermode_start\n\t" : : "r"(new_stack)); + "b usermode_start\n\t" + : + : "r"(new_stack)); } #endif diff --git a/src/kern/svc.c b/src/kern/svc.c index ceca5fa..16bfd3a 100644 --- a/src/kern/svc.c +++ b/src/kern/svc.c @@ -10,8 +10,8 @@ void handle_svc_call( case 0x04: switch (syscall_id) { #define SYSCALL(id, fn, kernfn, argt) \ - case id: \ - kernfn((argt)syscall_arg); \ + case id: \ + kernfn((argt)syscall_arg); \ break; #include "kern/syscall/syscall_tbl.inc" #undef SYSCALL diff --git a/src/kern/syscalls/logs.c b/src/kern/syscalls/logs.c index 855672c..61a65da 100644 --- a/src/kern/syscalls/logs.c +++ b/src/kern/syscalls/logs.c @@ -1,5 +1,5 @@ -#include "kern/syscall.h" #include "kern/log.h" +#include "kern/syscall.h" void kern_logs(const char* str) { |