Merge branch 'master' into feature/ich2

This commit is contained in:
Jasmine Iwanek
2023-10-11 16:59:13 -04:00
42 changed files with 1431 additions and 666 deletions

View File

@@ -54,7 +54,6 @@ static pc_timer_t pic_timer;
static int shadow = 0;
static int elcr_enabled = 0;
static int tmr_inited = 0;
static int latched = 0;
static int pic_pci = 0;
static int kbd_latch = 0;
static int mouse_latch = 0;