bradbqc
/
zynq-rs
forked from M-Labs/zynq-rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

zynq_us/slcr: make `unlocked` method a trait

This commit is contained in:
Brad Bondurant 2022-11-17 15:42:31 -05:00
parent c2455b1cda
commit 2e5f7ec2f7
4 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libboard_zynq_us/src/slcr/common.rs
View File

@ -2,6 +2,10 @@
use libregister::{register, register_bit, register_bits}; use libregister::{register, register_bit, register_bits};
pub trait SlcrRegisterBlock {
fn unlocked<F: FnMut(&mut Self) -> R, R>(f: F) -> R;
}
register!(wprot, WProt, RW, u32); register!(wprot, WProt, RW, u32);
register_bit!(wprot, active, 0); register_bit!(wprot, active, 0);

10
libboard_zynq_us/src/slcr/crf_apb.rs
View File

@ -7,7 +7,7 @@ use libregister::{
RegisterW, RegisterW,
}; };
use super::common::{WProt, PllCfg, PllCtrl, PllFracCfg}; use super::common::{SlcrRegisterBlock, WProt, PllCfg, PllCtrl, PllFracCfg};
#[repr(C)] #[repr(C)]
pub struct RegisterBlock { pub struct RegisterBlock {
@ -57,11 +57,11 @@ pub struct RegisterBlock {
pub rst_fpd_apu: RW<u32>, pub rst_fpd_apu: RW<u32>,
pub rst_ddr_ss: RW<u32>, pub rst_ddr_ss: RW<u32>,
} }
register_at!(RegisterBlock, 0xFD1A_0000, crf_apb); register_at!(RegisterBlock, 0xFD1A_0000, slcr);
impl RegisterBlock { impl SlcrRegisterBlock for RegisterBlock {
pub fn unlocked<F: FnMut(&mut Self) -> R, R>(mut f: F) -> R { fn unlocked<F: FnMut(&mut Self) -> R, R>(mut f: F) -> R {
let mut self_ = Self::crf_apb(); let mut self_ = Self::slcr();
self_.crf_wprot.write(WProt::zeroed().active(false)); self_.crf_wprot.write(WProt::zeroed().active(false));
let r = f(&mut self_); let r = f(&mut self_);
self_.crf_wprot.write(WProt::zeroed().active(true)); self_.crf_wprot.write(WProt::zeroed().active(true));

12
libboard_zynq_us/src/slcr/crl_apb.rs
View File

@ -6,7 +6,7 @@ use libregister::{
register_bit, register_bits, register_bit, register_bits,
}; };
use super::common::{WProt, PllCfg, PllCtrl, PllFracCfg}; use super::common::{SlcrRegisterBlock, WProt, PllCfg, PllCtrl, PllFracCfg};
#[repr(C)] #[repr(C)]
pub struct RegisterBlock { pub struct RegisterBlock {
@ -141,7 +141,15 @@ pub struct RegisterBlock {
pub bank3_slew_ctrl: RW<u32>, pub bank3_slew_ctrl: RW<u32>,
pub bank3_status: RO<u32>, pub bank3_status: RO<u32>,
} }
register_at!(RegisterBlock, 0xFF5E_0000, crl_apb); register_at!(RegisterBlock, 0xFF5E_0000, slcr);
impl SlcrRegisterBlock for RegisterBlock {
// Dummy definition (CRL_APB has no WProt) for consistency with CRF_APB
fn unlocked<F: FnMut(&mut Self) -> R, R>(mut f: F) -> R {
let mut self_ = Self::slcr();
f(&mut self_)
}
}
register!(pll_status, PllStatus, RO, u32); register!(pll_status, PllStatus, RO, u32);
register_bit!(pll_status, rpu_pll_stable, 4); register_bit!(pll_status, rpu_pll_stable, 4);

15
libboard_zynq_us/src/slcr/iou_slcr.rs
View File

@ -3,10 +3,11 @@
use volatile_register::{RO, RW, WO}; use volatile_register::{RO, RW, WO};
use libregister::{ use libregister::{
register, register_at, register, register_at,
register_bit, register_bits, register_bits_typed, register_bit, register_bits,
RegisterW, RegisterRW,
}; };
use super::common::SlcrRegisterBlock;
#[repr(C)] #[repr(C)]
pub struct RegisterBlock { pub struct RegisterBlock {
@ -79,7 +80,15 @@ pub struct RegisterBlock {
pub idr: WO<u32>, pub idr: WO<u32>,
pub itr: WO<u32>, pub itr: WO<u32>,
} }
register_at!(RegisterBlock, 0xFF18_0000, iou_slcr); register_at!(RegisterBlock, 0xFF18_0000, slcr);
impl SlcrRegisterBlock for RegisterBlock {
// Dummy definition for consistency
fn unlocked<F: FnMut(&mut Self) -> R, R>(mut f: F) -> R {
let mut self_ = Self::slcr();
f(&mut self_)
}
}
register!(mio_pin, MioPin, RW, u32); register!(mio_pin, MioPin, RW, u32);