From a230ee84e170a578d795c339ac759530ba32160c Mon Sep 17 00:00:00 2001 From: ChUrl Date: Mon, 4 Jul 2022 13:21:43 +0200 Subject: [PATCH] reformat --- c_os/kernel/allocator/TreeAllocator.h | 2 +- c_os/kernel/interrupts/Bluescreen.cc | 2 +- c_os/kernel/interrupts/IntDispatcher.cc | 12 +++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/c_os/kernel/allocator/TreeAllocator.h b/c_os/kernel/allocator/TreeAllocator.h index 48b0970..c2d46b4 100755 --- a/c_os/kernel/allocator/TreeAllocator.h +++ b/c_os/kernel/allocator/TreeAllocator.h @@ -45,7 +45,7 @@ private: void dump_free_memory(tree_block_t* node); - // NOTE: Would be nice to have this stuff somewhere else for general use, + // NOTE: Would be nice to have this stuff somewhere else for general use (scheduling?) // but that would require different rbt_node/dll_node structures. // If I need this again later I should move it. void rbt_rot_l(tree_block_t* x); diff --git a/c_os/kernel/interrupts/Bluescreen.cc b/c_os/kernel/interrupts/Bluescreen.cc index 8a39c63..1cd36b8 100644 --- a/c_os/kernel/interrupts/Bluescreen.cc +++ b/c_os/kernel/interrupts/Bluescreen.cc @@ -163,7 +163,7 @@ void bs_dump(unsigned int exceptionNr) { unsigned int has_error_code = 0; bs_clear(); - bs_print_string("HHUos crashed with Exception\0"); + bs_print_string("HHUos crashed with Exception \0"); // Exception mit Error-Code? if ((exceptionNr >= 8 && exceptionNr <= 14) || exceptionNr == 17 || exceptionNr == 30) { diff --git a/c_os/kernel/interrupts/IntDispatcher.cc b/c_os/kernel/interrupts/IntDispatcher.cc index 636105d..4230820 100755 --- a/c_os/kernel/interrupts/IntDispatcher.cc +++ b/c_os/kernel/interrupts/IntDispatcher.cc @@ -10,12 +10,11 @@ * * * Autor: Michael Schoettner, 31.8.2016 * *****************************************************************************/ +#include "kernel/interrupts/IntDispatcher.h" #include "kernel/CPU.h" #include "kernel/Globals.h" -#include "kernel/interrupts/IntDispatcher.h" #include "kernel/interrupts/Bluescreen.h" - extern "C" void int_disp(unsigned int slot); /***************************************************************************** @@ -35,17 +34,16 @@ void int_disp(unsigned int vector) { /* hier muss Code eingefuegt werden */ if (vector < 32) { bs_dump(vector); - cpu.halt (); + cpu.halt(); } - if (intdis.report (vector) < 0) { + if (intdis.report(vector) < 0) { kout << "Panic: unexpected interrupt " << vector; kout << " - processor halted." << endl; - cpu.halt (); - } + cpu.halt(); + } } - /***************************************************************************** * Konstruktor: IntDispatcher::IntDispatcher * *---------------------------------------------------------------------------*