psx/irq: Make NUM_IRQS public

ayrtonm · Feb 17, 2023 · 35f41da · 35f41da
1 parent cacbdd8
commit 35f41da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/psx/src/hw/irq.rs b/psx/src/hw/irq.rs
@@ -1,14 +1,12 @@
 //! Interrupt request and acknowledge
 use crate::hw::{MemRegister, Register};
-use crate::irq::{ALL_IRQS, IRQ};
-use core::mem::variant_count;
+use crate::irq::{ALL_IRQS, IRQ, NUM_IRQS};
 
 /// Interrupt status register
 pub type Status = MemRegister<u16, 0x1F80_1070>;
 /// Interrupt mask register
 pub type Mask = MemRegister<u16, 0x1F80_1074>;
 
-const NUM_IRQS: usize = variant_count::<IRQ>();
 const ALL_IRQS_BITS: u16 = (1 << NUM_IRQS) - 1;
 
 impl Status {

diff --git a/psx/src/lib.rs b/psx/src/lib.rs
@@ -128,7 +128,13 @@ pub mod constants {
 
 /// Interrupt request types
 pub mod irq {
+    use core::mem::variant_count;
+
+    /// The number of different interrupt requests
+    pub const NUM_IRQS: usize = variant_count::<IRQ>();
+
     /// An interrupt request
+    #[repr(u16)]
     #[derive(Clone, Copy, Debug, PartialEq, Eq)]
     pub enum IRQ {
         /// vertical blank interrupt request (NTSC = 60Hz, PAL = 50Hz)