From 415a3be8ceb61a7fe08073908c135cd377629b42 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Fri, 23 Jul 2021 14:11:05 +0200 Subject: [PATCH] satman: removed irq::exception ref - no direct replacement --- src/satman/main.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/satman/main.rs b/src/satman/main.rs index 57d65a00..c1179e08 100644 --- a/src/satman/main.rs +++ b/src/satman/main.rs @@ -5,12 +5,12 @@ extern crate log; use core::convert::TryFrom; -use board_misoc::{csr, irq, ident, i2c}; // <- port, use libboard_zynq +use board_misoc::{ident, i2c}; // <- port, use libboard_zynq use libboard_zynq::timer::GlobalTimer; #[cfg(has_si5324)] use libboard_artiq::si5324; use board_artiq::spi; // <- port?, use libboard_zynq (if spi available/necessary) -use libboard_artiq::{drtio_routing, drtioaux, logger}; +use libboard_artiq::{pl::csr, drtio_routing, drtioaux, logger}; mod repeater; @@ -531,7 +531,6 @@ pub extern fn main() -> i32 { #[no_mangle] pub extern fn exception(vect: u32, _regs: *const u32, pc: u32, ea: u32) { - let vect = irq::Exception::try_from(vect).expect("unknown exception"); fn hexdump(addr: u32) { let addr = (addr - addr % 4) as *const u32; @@ -548,7 +547,7 @@ pub extern fn exception(vect: u32, _regs: *const u32, pc: u32, ea: u32) { hexdump(pc); hexdump(ea); - panic!("exception {:?} at PC 0x{:x}, EA 0x{:x}", vect, pc, ea) + panic!("exception at PC 0x{:x}, EA 0x{:x}", pc, ea) } #[no_mangle]