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

zynq::flash: enable/disable spi for every transfer

master
Astro 2019-12-07 02:11:50 +01:00
parent e37659e4b3
commit 1e465250f5
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/zynq/flash/mod.rs
View File

@ -12,6 +12,11 @@ pub use bytes::{BytesTransferExt, BytesTransfer};
const FLASH_BAUD_RATE: u32 = 50_000_000; const FLASH_BAUD_RATE: u32 = 50_000_000;
const SINGLE_CAPACITY: u32 = 16 * 1024 * 1024; const SINGLE_CAPACITY: u32 = 16 * 1024 * 1024;
///Instruction: Read Configure Register
const INST_RDCR: u8 = 0x3f;
/// Instruction Read Identification
const INST_RDID: u8 = 0x9F;
pub struct LinearAddressing; pub struct LinearAddressing;
pub struct Manual; pub struct Manual;
@ -275,15 +280,12 @@ impl Flash<()> {
.mode_en(true) .mode_en(true)
// 2 devices // 2 devices
.two_mem(true) .two_mem(true)
// .sep_bus(true)
.u_page(chip_index != 0) .u_page(chip_index != 0)
// Manual I/O mode // Manual I/O mode
.lq_mode(false) .lq_mode(false)
); );
self.regs.enable.write(
regs::Enable::zeroed()
.spi_en(true)
);
self.transition() self.transition()
} }
} }
@ -312,14 +314,16 @@ impl Flash<Manual> {
self.transition() self.transition()
} }
/// Read Configuration Register
pub fn rdcr(&mut self) -> u8 { pub fn rdcr(&mut self) -> u8 {
self.transfer(0x35, core::iter::empty()) self.transfer(INST_RDCR, core::iter::empty())
.bytes_transfer().skip(1) .bytes_transfer().skip(1)
.next().unwrap() as u8 .next().unwrap() as u8
} }
/// Read Identifiaction
pub fn rdid(&mut self) -> core::iter::Skip<BytesTransfer<Transfer<core::iter::Empty<u32>>>> { pub fn rdid(&mut self) -> core::iter::Skip<BytesTransfer<Transfer<core::iter::Empty<u32>>>> {
self.transfer(0x9f, core::iter::empty()) self.transfer(INST_RDID, core::iter::empty())
.bytes_transfer().skip(1) .bytes_transfer().skip(1)
} }
@ -334,8 +338,8 @@ impl Flash<Manual> {
// TODO: // TODO:
let args = Some(0u32); let args = Some(0u32);
// Quad Read // Read
self.transfer(0xEB, args.into_iter()) self.transfer(0x03, args.into_iter())
.bytes_transfer().skip(1).take(len) .bytes_transfer().skip(1).take(len)
} }
} }
@ -350,6 +354,11 @@ impl<'a, Args: Iterator<Item = u32>> Transfer<'a, Args> {
where where
Args: Iterator<Item = u32>, Args: Iterator<Item = u32>,
{ {
flash.regs.config.modify(|_, w| w.pcs(false));
flash.regs.enable.write(
regs::Enable::zeroed()
.spi_en(true)
);
while flash.regs.intr_status.read().rx_fifo_not_empty() { while flash.regs.intr_status.read().rx_fifo_not_empty() {
flash.regs.rx_data.read(); flash.regs.rx_data.read();
} }
@ -364,10 +373,7 @@ impl<'a, Args: Iterator<Item = u32>> Transfer<'a, Args> {
} }
} }
flash.regs.config.modify(|_, w| w flash.regs.config.modify(|_, w| w.man_start_com(true));
.pcs(false)
.man_start_com(true)
);
Transfer { Transfer {
flash, flash,
args, args,
@ -377,9 +383,19 @@ impl<'a, Args: Iterator<Item = u32>> Transfer<'a, Args> {
impl<'a, Args: Iterator<Item = u32>> Drop for Transfer<'a, Args> { impl<'a, Args: Iterator<Item = u32>> Drop for Transfer<'a, Args> {
fn drop(&mut self) { fn drop(&mut self) {
// Discard remaining rx_data
while self.flash.regs.intr_status.read().rx_fifo_not_empty() {
self.flash.regs.rx_data.read();
}
// Stop
self.flash.regs.enable.write(
regs::Enable::zeroed()
.spi_en(false)
);
self.flash.regs.config.modify(|_, w| w self.flash.regs.config.modify(|_, w| w
.pcs(false) .pcs(true)
.man_start_com(true) .man_start_com(false)
); );
} }
} }