alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2025-01-11 17:41:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

don't expose interrupts at module level

Browse source
This commit is contained in:
Corwin Kuiper 2021-03-07 01:06:34 +00:00
parent a034b2b83c
commit 2b0d92cb62
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/interrupt.rs
View file

@ -1,6 +1,6 @@
use crate::memory_mapped::MemoryMapped; use crate::memory_mapped::MemoryMapped;
pub(crate) enum Interrupt { pub enum Interrupt {
VBlank, VBlank,
HBlank, HBlank,
VCounter, VCounter,
@ -20,21 +20,21 @@ pub(crate) enum Interrupt {
const ENABLED_INTERRUPTS: MemoryMapped<u16> = unsafe { MemoryMapped::new(0x04000200) }; const ENABLED_INTERRUPTS: MemoryMapped<u16> = unsafe { MemoryMapped::new(0x04000200) };
const INTERRUPTS_ENABLED: MemoryMapped<u16> = unsafe { MemoryMapped::new(0x04000208) }; const INTERRUPTS_ENABLED: MemoryMapped<u16> = unsafe { MemoryMapped::new(0x04000208) };
pub(crate) fn enable(interrupt: Interrupt) { pub fn enable(interrupt: Interrupt) {
let _interrupt_token = temporary_interrupt_disable(); let _interrupt_token = temporary_interrupt_disable();
let interrupt = interrupt as usize; let interrupt = interrupt as usize;
let enabled = ENABLED_INTERRUPTS.get() | (1 << (interrupt as u16)); let enabled = ENABLED_INTERRUPTS.get() | (1 << (interrupt as u16));
ENABLED_INTERRUPTS.set(enabled); ENABLED_INTERRUPTS.set(enabled);
} }
pub(crate) fn disable(interrupt: Interrupt) { pub fn disable(interrupt: Interrupt) {
let _interrupt_token = temporary_interrupt_disable(); let _interrupt_token = temporary_interrupt_disable();
let interrupt = interrupt as usize; let interrupt = interrupt as usize;
let enabled = ENABLED_INTERRUPTS.get() & !(1 << (interrupt as u16)); let enabled = ENABLED_INTERRUPTS.get() & !(1 << (interrupt as u16));
ENABLED_INTERRUPTS.set(enabled); ENABLED_INTERRUPTS.set(enabled);
} }
pub(crate) struct Disable {} pub struct Disable {}
impl Drop for Disable { impl Drop for Disable {
fn drop(&mut self) { 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_interrupts();
Disable {} Disable {}
} }
pub(crate) fn enable_interrupts() { pub fn enable_interrupts() {
INTERRUPTS_ENABLED.set(1); INTERRUPTS_ENABLED.set(1);
} }