M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests Releases Wiki Activity

satman: removed irq::exception ref - no direct replacement

Browse Source
This commit is contained in:
mwojcik 2021-07-23 14:11:05 +02:00
parent 0502737481
commit 415a3be8ce
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/satman/main.rs
View File

@ -5,12 +5,12 @@
extern crate log; extern crate log;
use core::convert::TryFrom; 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; use libboard_zynq::timer::GlobalTimer;
#[cfg(has_si5324)] #[cfg(has_si5324)]
use libboard_artiq::si5324; use libboard_artiq::si5324;
use board_artiq::spi; // <- port?, use libboard_zynq (if spi available/necessary) 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; mod repeater;
@ -531,7 +531,6 @@ pub extern fn main() -> i32 {
#[no_mangle] #[no_mangle]
pub extern fn exception(vect: u32, _regs: *const u32, pc: u32, ea: u32) { 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) { fn hexdump(addr: u32) {
let addr = (addr - addr % 4) as *const 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(pc);
hexdump(ea); 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] #[no_mangle]