clean riscv-peripheral tests

rust-embedded · May 6, 2024 · 0ac9b6b · 0ac9b6b
1 parent 1263126
commit 0ac9b6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 60 deletions.
diff --git a/riscv-pac/macros/src/lib.rs b/riscv-pac/macros/src/lib.rs
@@ -39,7 +39,6 @@ impl PacNumberEnum {
                 },
                 _ => panic!("Variant must have a discriminant"),
             };
-            // check for duplicate discriminant values
             var_map.insert(value, ident);
             numbers.push(value);
         }

diff --git a/riscv-peripheral/src/plic.rs b/riscv-peripheral/src/plic.rs
@@ -156,6 +156,8 @@ pub(crate) mod test {
         I4 = 4,
     }
 
+    unsafe impl ExternalInterruptNumber for Interrupt {}
+
     #[pac_enum(unsafe PriorityNumber)]
     #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     #[repr(u8)]
@@ -175,65 +177,6 @@ pub(crate) mod test {
         C2 = 2,
     }
 
-    // unsafe impl InterruptNumber for Interrupt {
-    //     const MAX_INTERRUPT_NUMBER: u16 = 4;
-
-    //     #[inline]
-    //     fn number(self) -> u16 {
-    //         self as _
-    //     }
-
-    //     #[inline]
-    //     fn from_number(number: u16) -> Result<Self, u16> {
-    //         if number > Self::MAX_INTERRUPT_NUMBER || number == 0 {
-    //             Err(number)
-    //         } else {
-    //             // SAFETY: valid interrupt number
-    //             Ok(unsafe { core::mem::transmute(number) })
-    //         }
-    //     }
-    // }
-
-    unsafe impl ExternalInterruptNumber for Interrupt {}
-
-    // unsafe impl PriorityNumber for Priority {
-    //     const MAX_PRIORITY_NUMBER: u8 = 3;
-
-    //     #[inline]
-    //     fn number(self) -> u8 {
-    //         self as _
-    //     }
-
-    //     #[inline]
-    //     fn from_number(number: u8) -> Result<Self, u8> {
-    //         if number > Self::MAX_PRIORITY_NUMBER {
-    //             Err(number)
-    //         } else {
-    //             // SAFETY: valid priority number
-    //             Ok(unsafe { core::mem::transmute(number) })
-    //         }
-    //     }
-    // }
-
-    // unsafe impl HartIdNumber for Context {
-    //     const MAX_HART_ID_NUMBER: u16 = 2;
-
-    //     #[inline]
-    //     fn number(self) -> u16 {
-    //         self as _
-    //     }
-
-    //     #[inline]
-    //     fn from_number(number: u16) -> Result<Self, u16> {
-    //         if number > Self::MAX_HART_ID_NUMBER {
-    //             Err(number)
-    //         } else {
-    //             // SAFETY: valid context number
-    //             Ok(unsafe { core::mem::transmute(number) })
-    //         }
-    //     }
-    // }
-
     #[test]
     fn check_interrupt_enum() {
         assert_eq!(Interrupt::I1.number(), 1);