curds/boredos_mirror
1
0
Fork 0
mirror of https://github.com/BoredDevNL/BoredOS.git synced 2026-05-15 18:58:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: Replace blocking k_beep with an asynchronous k_beep

Browse source
This commit is contained in:
boreddevnl 2026-03-16 17:22:42 +01:00
parent a4f16b0604
commit d824b4610a
4 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/core/kutils.c
View file

@ -113,14 +113,35 @@ void k_shutdown(void) {
outw(0x4004, 0x3400); // VirtualBox fallback outw(0x4004, 0x3400); // VirtualBox fallback
} }
volatile uint64_t beep_end_tick = 0;
bool beep_active = false;
void k_beep(int freq, int ms) { void k_beep(int freq, int ms) {
if (freq <= 0) return; if (freq <= 0) {
outb(0x61, inb(0x61) & 0xFC);
beep_active = false;
return;
}
int div = 1193180 / freq; int div = 1193180 / freq;
outb(0x43, 0xB6); outb(0x43, 0xB6);
outb(0x42, div & 0xFF); outb(0x42, div & 0xFF);
outb(0x42, (div >> 8) & 0xFF); outb(0x42, (div >> 8) & 0xFF);
outb(0x61, inb(0x61) | 0x03); outb(0x61, inb(0x61) | 0x03);
k_sleep(ms);
outb(0x61, inb(0x61) & 0xFC); uint32_t ticks = ms / 16;
if (ticks == 0 && ms > 0) ticks = 1;
extern volatile uint64_t kernel_ticks;
beep_end_tick = kernel_ticks + ticks;
beep_active = true;
}
void k_beep_process(void) {
if (beep_active) {
extern volatile uint64_t kernel_ticks;
if (kernel_ticks >= beep_end_tick) {
outb(0x61, inb(0x61) & 0xFC);
beep_active = false;
}
}
} }

2
src/core/kutils.h
View file

@ -6,6 +6,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h>
// Kernel string utilities // Kernel string utilities
void k_memset(void *dest, int val, size_t len); void k_memset(void *dest, int val, size_t len);
@ -23,5 +24,6 @@ void k_sleep(int ms);
void k_reboot(void); void k_reboot(void);
void k_shutdown(void); void k_shutdown(void);
void k_beep(int freq, int ms); void k_beep(int freq, int ms);
void k_beep_process(void);
#endif #endif

3
src/dev/ps2.c
View file

@ -18,6 +18,9 @@ uint64_t timer_handler(registers_t *regs) {
wm_timer_tick(); wm_timer_tick();
network_process_frames(); network_process_frames();
extern void k_beep_process(void);
k_beep_process();
outb(0x20, 0x20); // EOI after processing to prevent nested timer interrupts outb(0x20, 0x20); // EOI after processing to prevent nested timer interrupts
extern uint64_t process_schedule(uint64_t current_rsp); extern uint64_t process_schedule(uint64_t current_rsp);
return process_schedule((uint64_t)regs); return process_schedule((uint64_t)regs);

12
src/sys/syscall.c
View file

@ -929,16 +929,8 @@ static uint64_t syscall_handler_inner(registers_t *regs) {
} else if (cmd == 14) { // SYSTEM_CMD_BEEP } else if (cmd == 14) { // SYSTEM_CMD_BEEP
int freq = (int)arg2; int freq = (int)arg2;
int ms = (int)arg3; int ms = (int)arg3;
if (freq > 0) { extern void k_beep(int freq, int ms);
int div = 1193180 / freq; k_beep(freq, ms);
outb(0x43, 0xB6);
outb(0x42, div & 0xFF);
outb(0x42, (div >> 8) & 0xFF);
outb(0x61, inb(0x61) | 0x03);
}
// Sleep - kernel side
k_sleep(ms);
outb(0x61, inb(0x61) & 0xFC);
return 0; return 0;
} else if (cmd == 15) { // SYSTEM_CMD_MEMINFO } else if (cmd == 15) { // SYSTEM_CMD_MEMINFO
uint64_t *out = (uint64_t *)arg2; uint64_t *out = (uint64_t *)arg2;