Skip to content

Commit

Permalink
Deactivate old fix for Tyrian 2000 setup
Browse files Browse the repository at this point in the history
  • Loading branch information
FeralChild64 committed Jun 16, 2024
1 parent 680f211 commit 3845460
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions src/hardware/input/intel8042.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ static void execute_command(const Command command)
buffer_add(0);
break;
case Command::ReadFwRevision: // 0xa1
// Reads the keybaord copntroller firmware
// Reads the keyboard controller firmware
// revision, always one byte
flush_buffer();
buffer_add(FirmwareRevision);
Expand Down Expand Up @@ -830,7 +830,7 @@ static void execute_command(const Command command)
buffer_add(get_input_port());
break;
case Command::ReadControllerMode: // 0xca
// Reads keybaord controller mode
// Reads keyboard controller mode
// 0x00: ISA (AT)
// 0x01: PS/2 (MCA)
flush_buffer();
Expand Down Expand Up @@ -910,10 +910,6 @@ static void execute_command(const Command command, const uint8_t param)
// firmware allow everything? writing bits 4,5 and 6
// should be safe in real implementation, how about here?
sanitize_config_byte();
// Make sure only the needed IRQs are activated
PIC_DeActivateIRQ(get_irq_mouse());
PIC_DeActivateIRQ(get_irq_keyboard());
activate_irqs_if_needed();
break;
case Command::WriteControllerMode: // 0xcb
// Changes controller mode to PS/2 or AT
Expand Down Expand Up @@ -997,7 +993,6 @@ static uint8_t read_data_port(io_port_t, io_width_t) // port 0x60
}

if (is_data_from_aux) {
PIC_DeActivateIRQ(get_irq_mouse());
assert(waiting_bytes_from_aux);
--waiting_bytes_from_aux;
if (I8042_IsReadyForAuxFrame()) {
Expand All @@ -1006,7 +1001,6 @@ static uint8_t read_data_port(io_port_t, io_width_t) // port 0x60
}

if (is_data_from_kbd) {
PIC_DeActivateIRQ(get_irq_keyboard());
assert(waiting_bytes_from_kbd);
--waiting_bytes_from_kbd;
if (I8042_IsReadyForKbdFrame()) {
Expand Down

0 comments on commit 3845460

Please sign in to comment.