ejung/bsb1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zack fertig

Browse Source
This commit is contained in:
Eggert Jung
2025-05-13 17:44:58 +02:00
parent f1e5f17d1f
commit 901eb0bbf5
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
interrupt/handlers.cc
View File

@@ -74,14 +74,12 @@ extern Ticketlock koutlock;
void handle_keyboard() { void handle_keyboard() {
Key key = Key(); Key key = Key();
if (PS2Controller::fetch(key)) { if (PS2Controller::fetch(key)) {
if (key.ctrl() && key.alt() && key.scancode == Key::KEY_DEL)
System::reboot();
koutlock.lock(); koutlock.lock();
kout << key.ascii() << flush ; kout << key.ascii() << endl << flush ;
koutlock.unlock(); koutlock.unlock();
} }
else if (key.ctrl() && key.alt() && key.scancode == Key::KEY_DEL)
System::reboot();
LAPIC::endOfInterrupt(); LAPIC::endOfInterrupt();
} }

6
sync/ticketlock.cc
View File

@@ -1,12 +1,12 @@
#include "sync/ticketlock.h" #include "sync/ticketlock.h"
void Ticketlock::lock() { void Ticketlock::lock() {
uint64_t ticket = __atomic_fetch_add(&ticket_count, 1, __ATOMIC_SEQ_CST); uint64_t ticket = __atomic_fetch_add(&ticket_count, 1, __ATOMIC_RELAXED);
while (ticket != ticket_current) { while (ticket != __atomic_fetch_add(&ticket_current, 0, __ATOMIC_ACQUIRE))) {
Core::pause(); Core::pause();
} }
} }
void Ticketlock::unlock() { void Ticketlock::unlock() {
__atomic_fetch_add(&ticket_current, 1, __ATOMIC_SEQ_CST); __atomic_fetch_add(&ticket_current, 1, __ATOMIC_RELEASE);
} }