bumped PAC to v0.3.0 #43

Merged
muellerr merged 1 commits from bump-pac into main 2025-02-13 17:38:13 +01:00
10 changed files with 24 additions and 25 deletions

View File

@ -165,7 +165,7 @@ impl TimerDriverEmbassy {
.cnt_value() .cnt_value()
.write(|w| unsafe { w.bits(remaining_ticks as u32) }); .write(|w| unsafe { w.bits(remaining_ticks as u32) });
alarm_tim.ctrl().modify(|_, w| w.irq_enb().set_bit()); alarm_tim.ctrl().modify(|_, w| w.irq_enb().set_bit());
alarm_tim.enable().write(|w| unsafe { w.bits(1) }) alarm_tim.enable().write(|w| unsafe { w.bits(1) });
} }
} }
} }

View File

@ -25,14 +25,11 @@ bitfield = "0.17"
defmt = { version = "0.3", optional = true } defmt = { version = "0.3", optional = true }
fugit = "0.3" fugit = "0.3"
delegate = "0.12" delegate = "0.12"
void = { version = "1", default-features = false }
[dependencies.void]
version = "1"
default-features = false
[dependencies.va416xx] [dependencies.va416xx]
default-features = false default-features = false
version = "0.2" version = "0.3"
features = ["critical-section"] features = ["critical-section"]
[features] [features]

View File

@ -431,7 +431,9 @@ impl ClkgenCfgr {
} }
} }
} }
None => self.clkgen.ctrl0().modify(|_, w| w.pll_pwdn().set_bit()), None => {
self.clkgen.ctrl0().modify(|_, w| w.pll_pwdn().set_bit());
}
} }
if self.clk_lost_detection { if self.clk_lost_detection {

View File

@ -4,21 +4,21 @@ use crate::{enable_interrupt, pac};
pub fn enable_rom_scrub(syscfg: &mut pac::Sysconfig, counter_reset: u16) { pub fn enable_rom_scrub(syscfg: &mut pac::Sysconfig, counter_reset: u16) {
syscfg syscfg
.rom_scrub() .rom_scrub()
.write(|w| unsafe { w.bits(counter_reset as u32) }) .write(|w| unsafe { w.bits(counter_reset as u32) });
} }
#[inline(always)] #[inline(always)]
pub fn enable_ram0_scrub(syscfg: &mut pac::Sysconfig, counter_reset: u16) { pub fn enable_ram0_scrub(syscfg: &mut pac::Sysconfig, counter_reset: u16) {
syscfg syscfg
.ram0_scrub() .ram0_scrub()
.write(|w| unsafe { w.bits(counter_reset as u32) }) .write(|w| unsafe { w.bits(counter_reset as u32) });
} }
#[inline(always)] #[inline(always)]
pub fn enable_ram1_scrub(syscfg: &mut pac::Sysconfig, counter_reset: u16) { pub fn enable_ram1_scrub(syscfg: &mut pac::Sysconfig, counter_reset: u16) {
syscfg syscfg
.ram1_scrub() .ram1_scrub()
.write(|w| unsafe { w.bits(counter_reset as u32) }) .write(|w| unsafe { w.bits(counter_reset as u32) });
} }
/// This function enables the SBE related interrupts. The user should also provide a /// This function enables the SBE related interrupts. The user should also provide a

View File

@ -308,7 +308,7 @@ pub(super) unsafe trait RegisterInterface {
unsafe { unsafe {
portreg portreg
.datamask() .datamask()
.modify(|r, w| w.bits(r.bits() | self.mask_32())) .modify(|r, w| w.bits(r.bits() | self.mask_32()));
} }
} }
@ -320,7 +320,7 @@ pub(super) unsafe trait RegisterInterface {
unsafe { unsafe {
portreg portreg
.datamask() .datamask()
.modify(|r, w| w.bits(r.bits() & !self.mask_32())) .modify(|r, w| w.bits(r.bits() & !self.mask_32()));
} }
} }

View File

@ -396,12 +396,12 @@ impl<I2c: Instance> I2cBase<I2c> {
let (addr, addr_mode_mask) = Self::unwrap_addr(addr_b); let (addr, addr_mode_mask) = Self::unwrap_addr(addr_b);
self.i2c self.i2c
.s0_addressb() .s0_addressb()
.write(|w| unsafe { w.bits((addr << 1) as u32 | addr_mode_mask) }) .write(|w| unsafe { w.bits((addr << 1) as u32 | addr_mode_mask) });
} }
if let Some(addr_b_mask) = sl_cfg.addr_b_mask { if let Some(addr_b_mask) = sl_cfg.addr_b_mask {
self.i2c self.i2c
.s0_addressmaskb() .s0_addressmaskb()
.write(|w| unsafe { w.bits((addr_b_mask << 1) as u32) }) .write(|w| unsafe { w.bits((addr_b_mask << 1) as u32) });
} }
} }

View File

@ -136,14 +136,14 @@ impl Nvm {
#[inline(always)] #[inline(always)]
pub fn write_single(&self, word: u8) { pub fn write_single(&self, word: u8) {
self.spi().data().write(|w| unsafe { w.bits(word as u32) }) self.spi().data().write(|w| unsafe { w.bits(word as u32) });
} }
#[inline(always)] #[inline(always)]
pub fn write_with_bmstop(&self, word: u8) { pub fn write_with_bmstop(&self, word: u8) {
self.spi() self.spi()
.data() .data()
.write(|w| unsafe { w.bits(BMSTART_BMSTOP_MASK | word as u32) }) .write(|w| unsafe { w.bits(BMSTART_BMSTOP_MASK | word as u32) });
} }
#[inline(always)] #[inline(always)]
@ -162,7 +162,7 @@ impl Nvm {
self.spi().fifo_clr().write(|w| { self.spi().fifo_clr().write(|w| {
w.rxfifo().set_bit(); w.rxfifo().set_bit();
w.txfifo().set_bit() w.txfifo().set_bit()
}) });
} }
#[inline(always)] #[inline(always)]

View File

@ -817,7 +817,7 @@ where
// initialization. Returns the amount of written bytes. // initialization. Returns the amount of written bytes.
fn initial_send_fifo_pumping_with_words(&self, words: &[Word]) -> usize { fn initial_send_fifo_pumping_with_words(&self, words: &[Word]) -> usize {
if self.blockmode { if self.blockmode {
self.spi.ctrl1().modify(|_, w| w.mtxpause().set_bit()) self.spi.ctrl1().modify(|_, w| w.mtxpause().set_bit());
} }
// Fill the first half of the write FIFO // Fill the first half of the write FIFO
let mut current_write_idx = 0; let mut current_write_idx = 0;
@ -831,7 +831,7 @@ where
current_write_idx += 1; current_write_idx += 1;
} }
if self.blockmode { if self.blockmode {
self.spi.ctrl1().modify(|_, w| w.mtxpause().clear_bit()) self.spi.ctrl1().modify(|_, w| w.mtxpause().clear_bit());
} }
current_write_idx current_write_idx
} }
@ -840,7 +840,7 @@ where
// initialization. // initialization.
fn initial_send_fifo_pumping_with_fill_words(&self, send_len: usize) -> usize { fn initial_send_fifo_pumping_with_fill_words(&self, send_len: usize) -> usize {
if self.blockmode { if self.blockmode {
self.spi.ctrl1().modify(|_, w| w.mtxpause().set_bit()) self.spi.ctrl1().modify(|_, w| w.mtxpause().set_bit());
} }
// Fill the first half of the write FIFO // Fill the first half of the write FIFO
let mut current_write_idx = 0; let mut current_write_idx = 0;
@ -854,7 +854,7 @@ where
current_write_idx += 1; current_write_idx += 1;
} }
if self.blockmode { if self.blockmode {
self.spi.ctrl1().modify(|_, w| w.mtxpause().clear_bit()) self.spi.ctrl1().modify(|_, w| w.mtxpause().clear_bit());
} }
current_write_idx current_write_idx
} }

View File

@ -340,14 +340,14 @@ valid_pin_and_tims!(
pub fn assert_tim_reset(syscfg: &mut pac::Sysconfig, tim_id: u8) { pub fn assert_tim_reset(syscfg: &mut pac::Sysconfig, tim_id: u8) {
syscfg syscfg
.tim_reset() .tim_reset()
.modify(|r, w| unsafe { w.bits(r.bits() & !(1 << tim_id as u32)) }) .modify(|r, w| unsafe { w.bits(r.bits() & !(1 << tim_id as u32)) });
} }
#[inline] #[inline]
pub fn deassert_tim_reset(syscfg: &mut pac::Sysconfig, tim_id: u8) { pub fn deassert_tim_reset(syscfg: &mut pac::Sysconfig, tim_id: u8) {
syscfg syscfg
.tim_reset() .tim_reset()
.modify(|r, w| unsafe { w.bits(r.bits() | (1 << tim_id as u32)) }) .modify(|r, w| unsafe { w.bits(r.bits() | (1 << tim_id as u32)) });
} }
#[inline] #[inline]

View File

@ -80,12 +80,12 @@ impl Wdt {
#[inline] #[inline]
pub fn disable_reset(&mut self) { pub fn disable_reset(&mut self) {
self.wdt.wdogcontrol().modify(|_, w| w.resen().clear_bit()) self.wdt.wdogcontrol().modify(|_, w| w.resen().clear_bit());
} }
#[inline] #[inline]
pub fn enable_reset(&mut self) { pub fn enable_reset(&mut self) {
self.wdt.wdogcontrol().modify(|_, w| w.resen().set_bit()) self.wdt.wdogcontrol().modify(|_, w| w.resen().set_bit());
} }
#[inline] #[inline]