M-Labs
/
zynq-rs
11
0
Fork 15
Code Issues 6 Pull Requests 1 Releases Wiki Activity

Compare commits

base: M-Labs:4439a649744d95a015ba8c1fa546f7eee1857fa2
Branches Tags
M-Labs:master
...
compare: M-Labs:9199bb7a1656ad6b7ca4a293918d00fc109ddb52
Branches Tags
M-Labs:master

3 Commits
4439a64974 ... 9199bb7a16

Author SHA1 Message Date
Astro 9199bb7a16 libboard_zynq::flash: use only 32-bit spi words in program() 2019-12-22 03:14:18 +01:00
Astro da60be38b1 libboard_zynq::flash: move man_start_com(true) into wait_tx_fifo_flush() 2019-12-22 03:13:38 +01:00
Astro 6c4b07e0cf libboard_zynq::flash: syntax 2019-12-22 03:12:53 +01:00
2 changed files with 3 additions and 5 deletions
Show Stats Expand all files Collapse all files

6
libboard_zynq/src/flash/mod.rs
View File

@ -28,7 +28,7 @@ const INST_WRDI: u8 = 0x04;
/// Instruction: Write Enable /// Instruction: Write Enable
const INST_WREN: u8 = 0x06; const INST_WREN: u8 = 0x06;
/// Instruction: Program page /// Instruction: Program page
const INST_PP: u8 = 02; const INST_PP: u8 = 0x02;
/// Instruction: Sector Erase /// Instruction: Sector Erase
const INST_SE: u8 = 0xD8; const INST_SE: u8 = 0xD8;
/// Instruction: Erase 4K Block /// Instruction: Erase 4K Block
@ -120,6 +120,7 @@ impl<MODE> Flash<MODE> {
} }
fn wait_tx_fifo_flush(&mut self) { fn wait_tx_fifo_flush(&mut self) {
self.regs.config.modify(|_, w| w.man_start_com(true));
while !self.regs.intr_status.read().tx_fifo_not_full() {} while !self.regs.intr_status.read().tx_fifo_not_full() {}
} }
} }
@ -442,8 +443,7 @@ impl Flash<Manual> {
pub fn program<I: Iterator<Item=u32>>(&mut self, offset: u32, data: I) { pub fn program<I: Iterator<Item=u32>>(&mut self, offset: u32, data: I) {
{ {
let len = 4 + 4 * data.size_hint().0; let len = 4 + 4 * data.size_hint().0;
let args = Some(SpiWord::W32(((INST_PP as u32) << 24) | (offset as u32))) let args = Some(SpiWord::W32(((INST_PP as u32) << 24) | (offset as u32))).into_iter()
.into_iter()
.chain(data.map(SpiWord::W32)); .chain(data.map(SpiWord::W32));
self.transfer(args, len); self.transfer(args, len);
} }

2
libboard_zynq/src/flash/transfer.rs
View File

@ -47,7 +47,6 @@ impl<'a, Args: Iterator<Item = W>, W: Into<SpiWord>> Transfer<'a, Args, W> {
_ => { _ => {
if !self.flash.regs.intr_status.read().tx_fifo_not_full() { if !self.flash.regs.intr_status.read().tx_fifo_not_full() {
// Flush if necessary // Flush if necessary
self.flash.regs.config.modify(|_, w| w.man_start_com(true));
self.flash.wait_tx_fifo_flush(); self.flash.wait_tx_fifo_flush();
} }
@ -74,7 +73,6 @@ impl<'a, Args: Iterator<Item = W>, W: Into<SpiWord>> Transfer<'a, Args, W> {
SpiWord::W32(_) => unreachable!(), SpiWord::W32(_) => unreachable!(),
} }
self.flash.regs.config.modify(|_, w| w.man_start_com(true));
self.flash.wait_tx_fifo_flush(); self.flash.wait_tx_fifo_flush();
} }
} }