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

master wrpll: remove nested mmcm module

Browse Source
This commit is contained in:
morgan 2024-02-29 16:25:03 +08:00
parent 7300ecce25
commit 5aade6abb2
1 changed files with 94 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libboard_artiq/src/si549.rs
View File

@ -552,10 +552,6 @@ pub mod wrpll {
pub mod sma_pll { pub mod sma_pll {
use super::*; use super::*;
mod mmcm {
use super::*;
pub struct MmcmSetting { pub struct MmcmSetting {
pub clkout0_reg1: u16, //0x08 pub clkout0_reg1: u16, //0x08
pub clkout0_reg2: u16, //0x09 pub clkout0_reg2: u16, //0x09
@ -613,7 +609,7 @@ pub mod sma_pll {
unsafe { csr::sma_pll::drp_ready_read() == 1 } unsafe { csr::sma_pll::drp_ready_read() == 1 }
} }
pub fn read(timer: &mut GlobalTimer, address: u8) -> u16 { fn read(timer: &mut GlobalTimer, address: u8) -> u16 {
set_addr(address); set_addr(address);
set_enable(true); set_enable(true);
// Set DADDR on the MMCM and assert DEN for one clock cycle // Set DADDR on the MMCM and assert DEN for one clock cycle
@ -627,7 +623,7 @@ pub mod sma_pll {
get_data() get_data()
} }
pub fn write(timer: &mut GlobalTimer, address: u8, value: u16) { fn write(timer: &mut GlobalTimer, address: u8, value: u16) {
set_addr(address); set_addr(address);
set_data(value); set_data(value);
set_write_enable(true); set_write_enable(true);
@ -643,7 +639,7 @@ pub mod sma_pll {
} }
} }
pub fn reset(rst: bool) { fn reset(rst: bool) {
unsafe { unsafe {
let val = if rst { 1 } else { 0 }; let val = if rst { 1 } else { 0 };
csr::sma_pll::mmcm_reset_write(val) csr::sma_pll::mmcm_reset_write(val)
@ -677,7 +673,6 @@ pub mod sma_pll {
} }
Ok(()) Ok(())
} }
}
pub fn setup(timer: &mut GlobalTimer) { pub fn setup(timer: &mut GlobalTimer) {
for addr in 7..12 { for addr in 7..12 {