From 1e07d94381fc46018bfb9bce354df873a16e3fc8 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Sun, 16 Jul 2023 15:33:40 +0800 Subject: [PATCH] codec: install interrupt handler after `::new()` Signed-off-by: Sean Cross --- services/codec/src/backend/tlv320aic3100.rs | 35 +++++++++++---------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/services/codec/src/backend/tlv320aic3100.rs b/services/codec/src/backend/tlv320aic3100.rs index 0139d05aa..5a541e5df 100644 --- a/services/codec/src/backend/tlv320aic3100.rs +++ b/services/codec/src/backend/tlv320aic3100.rs @@ -124,7 +124,7 @@ impl Codec { let llio = llio::Llio::new(xns); let i2c = llio::I2c::new(xns); - let mut codec = Codec { + Codec { csr: CSR::new(csr.as_mut_ptr() as *mut u32), susres_manager: RegManager::new(csr.as_mut_ptr() as *mut u32), fifo, @@ -145,23 +145,9 @@ impl Codec { speaker_gain: -6.0, headphone_left_gain: -15.0, headphone_right_gain: -15.0, - }; - - xous::claim_interrupt( - utra::audio::AUDIO_IRQ, - audio_handler, - (&mut codec) as *mut Codec as *mut usize, - ) - .expect("couldn't claim audio irq"); - codec.csr.wfo(utra::audio::EV_PENDING_RX_READY, 1); - - codec.susres_manager.push(RegOrField::Reg(utra::audio::RX_CTL), None); - codec.susres_manager.push(RegOrField::Reg(utra::audio::TX_CTL), None); - codec.susres_manager.push_fixed_value(RegOrField::Reg(utra::audio::EV_PENDING), 0xFFFF_FFFF); - codec.susres_manager.push(RegOrField::Reg(utra::audio::EV_ENABLE), None); - - codec + } } + fn trace(&mut self) { if self.tx_stat_errors > 0 || self.rx_stat_errors > 0 { log::trace!("drop p:{} r:{} | staterr tx:{} rx:{}", self.play_frames_dropped, self.rec_frames_dropped, self.tx_stat_errors, self.rx_stat_errors); @@ -195,6 +181,21 @@ impl Codec { } pub fn init(&mut self) { + if ! self.initialized { + xous::claim_interrupt( + utra::audio::AUDIO_IRQ, + audio_handler, + self as *mut Codec as *mut usize, + ) + .expect("couldn't claim audio irq"); + self.csr.wfo(utra::audio::EV_PENDING_RX_READY, 1); + + self.susres_manager.push(RegOrField::Reg(utra::audio::RX_CTL), None); + self.susres_manager.push(RegOrField::Reg(utra::audio::TX_CTL), None); + self.susres_manager.push_fixed_value(RegOrField::Reg(utra::audio::EV_PENDING), 0xFFFF_FFFF); + self.susres_manager.push(RegOrField::Reg(utra::audio::EV_ENABLE), None); + } + log::trace!("audio_clocks"); self.audio_clocks(); log::trace!("audio_ports");