From 2b0d92cb62eecbeb197ae55588c333c447cfca17 Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Sun, 7 Mar 2021 01:06:34 +0000 Subject: [PATCH] don't expose interrupts at module level --- src/interrupt.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/interrupt.rs b/src/interrupt.rs index 766f9170..ab7d4916 100644 --- a/src/interrupt.rs +++ b/src/interrupt.rs @@ -1,6 +1,6 @@ use crate::memory_mapped::MemoryMapped; -pub(crate) enum Interrupt { +pub enum Interrupt { VBlank, HBlank, VCounter, @@ -20,21 +20,21 @@ pub(crate) enum Interrupt { const ENABLED_INTERRUPTS: MemoryMapped = unsafe { MemoryMapped::new(0x04000200) }; const INTERRUPTS_ENABLED: MemoryMapped = unsafe { MemoryMapped::new(0x04000208) }; -pub(crate) fn enable(interrupt: Interrupt) { +pub fn enable(interrupt: Interrupt) { let _interrupt_token = temporary_interrupt_disable(); let interrupt = interrupt as usize; let enabled = ENABLED_INTERRUPTS.get() | (1 << (interrupt as u16)); ENABLED_INTERRUPTS.set(enabled); } -pub(crate) fn disable(interrupt: Interrupt) { +pub fn disable(interrupt: Interrupt) { let _interrupt_token = temporary_interrupt_disable(); let interrupt = interrupt as usize; let enabled = ENABLED_INTERRUPTS.get() & !(1 << (interrupt as u16)); ENABLED_INTERRUPTS.set(enabled); } -pub(crate) struct Disable {} +pub struct Disable {} impl Drop for Disable { fn drop(&mut self) { @@ -42,12 +42,12 @@ impl Drop for Disable { } } -pub(crate) fn temporary_interrupt_disable() -> Disable { +pub fn temporary_interrupt_disable() -> Disable { disable_interrupts(); Disable {} } -pub(crate) fn enable_interrupts() { +pub fn enable_interrupts() { INTERRUPTS_ENABLED.set(1); }