christoph/lecture-operating-system-development
1
Fork 0
Code Activity

use static logger

Browse Source
This commit is contained in:
Christoph Urlacher
2022-07-22 23:32:46 +02:00
parent ec09b0e6d2
commit bd95c02a08
24 changed files with 139 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c_os/kernel/interrupts/IntDispatcher.cc
View File

@ -61,12 +61,12 @@ int IntDispatcher::assign(unsigned int vector, ISR& isr) {
/* hier muss Code eingefuegt werden */
if (vector >= this->size) {
log << ERROR << "Invalid vector number when assigning" << endl;
log.error() << "Invalid vector number when assigning" << endl;
return -1;
}
this->map[vector] = &isr;
log << INFO << "Registered ISR for vector " << dec << vector << endl;
log.info() << "Registered ISR for vector " << dec << vector << endl;
return 0;
}
@ -92,15 +92,15 @@ int IntDispatcher::report(unsigned int vector) {
ISR* isr = this->map[vector];
if (isr == 0) {
log << ERROR << "No ISR registered for vector " << vector << endl;
log.error() << "No ISR registered for vector " << vector << endl;
return -1;
}
// 32 = Timer
// 33 = Keyboard
// log << TRACE << "Interrupt: " << dec << vector << endl;
// log.trace() << "Interrupt: " << dec << vector << endl;
if (vector == 33) {
log << DEBUG << "Keyboard Interrupt" << endl;
log.debug() << "Keyboard Interrupt" << endl;
}
isr->trigger();

3
c_os/kernel/interrupts/IntDispatcher.h
View File

@ -17,11 +17,10 @@
#include "user/lib/Logger.h"
class IntDispatcher {
private:
IntDispatcher(const IntDispatcher& copy) = delete; // Verhindere Kopieren
Logger log;
NamedLogger log;
enum { size = 256 };
ISR* map[size];