From c26623ecefaadab9d0d8d92f06be329d7517ecbc Mon Sep 17 00:00:00 2001 From: Jaby Date: Thu, 9 May 2024 19:31:28 +0200 Subject: [PATCH] Clean-up code a bit --- src/Library/internal-include/CD/cd_internal.hpp | 5 ++--- src/Library/src/CD/cd.cpp | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Library/internal-include/CD/cd_internal.hpp b/src/Library/internal-include/CD/cd_internal.hpp index 79e9efcc..71ce373c 100644 --- a/src/Library/internal-include/CD/cd_internal.hpp +++ b/src/Library/internal-include/CD/cd_internal.hpp @@ -4,9 +4,8 @@ namespace JabyEngine { namespace CD { namespace internal { - extern State current_state; - extern CD_IO::Interrupt::Type last_interrupt; - extern uint8_t cmd_interrupt_bit; + extern State current_state; + extern uint8_t cmd_interrupt_bit; struct Command { static void wait_completed() { diff --git a/src/Library/src/CD/cd.cpp b/src/Library/src/CD/cd.cpp index 6205ca71..49e4874f 100644 --- a/src/Library/src/CD/cd.cpp +++ b/src/Library/src/CD/cd.cpp @@ -16,7 +16,6 @@ namespace JabyEngine { static uint32_t cur_lba; static uint32_t dst_lba; - CD_IO::Interrupt::Type last_interrupt = CD_IO::Interrupt::Type::None; uint8_t cmd_interrupt_bit = 0; State current_state = State::Free; SysCall::InterrupCallback callback = { @@ -84,7 +83,6 @@ namespace JabyEngine { CD_IO::PortIndex1::change_to(); const auto cur_irq = CD_IO::Interrupt::get_type(CD_IO::PortIndex1::InterruptFlag); - last_interrupt = cur_irq; CD_IO::Interrupt::ack_extended(CD_IO::PortIndex1::InterruptFlag); cmd_interrupt_bit = bit::clear(cmd_interrupt_bit, cur_irq);