morgan
/
zynq-rs
forked from M-Labs/zynq-rs
1
0
Fork 0
Code Pull Requests Activity

sdio: turn Adma2Desc32.attribute into a register!

This commit is contained in:
Astro 2020-06-10 00:27:57 +02:00 committed by Gitea
parent 32349e9dec
commit 1586190712
1 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libboard_zynq/src/sdio/adma.rs
View File

@ -2,11 +2,14 @@
use core::mem::MaybeUninit; use core::mem::MaybeUninit;
use super::SDIO; use super::SDIO;
use libcortex_a9::cache; use libcortex_a9::cache;
use libregister::{RegisterR, VolatileCell}; use libregister::{
register, register_bit,
RegisterR, RegisterW, RegisterRW, VolatileCell,
};
#[repr(C, align(4))] #[repr(C, align(4))]
pub struct Adma2Desc32 { pub struct Adma2Desc32 {
attribute: VolatileCell<u16>, attribute: Desc32Attribute,
length: VolatileCell<u16>, length: VolatileCell<u16>,
address: VolatileCell<u32>, address: VolatileCell<u32>,
} }
@ -16,29 +19,12 @@ static mut ADMA2_DESCR32_TABLE: MaybeUninit<[Adma2Desc32; 32]> = MaybeUninit::un
#[allow(unused)] #[allow(unused)]
const DESC_MAX_LENGTH: u32 = 65536; const DESC_MAX_LENGTH: u32 = 65536;
#[allow(unused)]
const DESC_TRANS: u16 = 0x2 << 4;
#[allow(unused)]
const DESC_INT: u16 = 0x1 << 2;
#[allow(unused)]
const DESC_END: u16 = 0x1 << 1;
#[allow(unused)]
const DESC_VALID: u16 = 0x1 << 0;
#[allow(unused)] register!(desc32_attribute, Desc32Attribute, VolatileCell, u16);
impl Adma2Desc32 { register_bit!(desc32_attribute, trans, 5);
pub fn set_attribute(&mut self, attribute: u16) { register_bit!(desc32_attribute, int, 2);
self.attribute.set(attribute) register_bit!(desc32_attribute, end, 1);
} register_bit!(desc32_attribute, valid, 0);
pub fn set_length(&mut self, length: u16) {
self.length.set(length)
}
pub fn set_address(&mut self, address: u32) {
self.address.set(address)
}
}
/// Initialize `ADMA2_DESCR32_TABLE` and setup `adma_system_address` /// Initialize `ADMA2_DESCR32_TABLE` and setup `adma_system_address`
pub fn setup_adma2_descr32(sdio: &mut SDIO, blk_cnt: u32, buffer: &[u8]) { pub fn setup_adma2_descr32(sdio: &mut SDIO, blk_cnt: u32, buffer: &[u8]) {
@ -62,13 +48,17 @@ pub fn setup_adma2_descr32(sdio: &mut SDIO, blk_cnt: u32, buffer: &[u8]) {
let ptr = buffer.as_ptr() as u32; let ptr = buffer.as_ptr() as u32;
for desc_num in 0..total_desc_lines { for desc_num in 0..total_desc_lines {
descr_table[desc_num].set_address(ptr + (desc_num as u32) * DESC_MAX_LENGTH); descr_table[desc_num].address.set(ptr + (desc_num as u32) * DESC_MAX_LENGTH);
descr_table[desc_num].set_attribute(DESC_TRANS | DESC_VALID); descr_table[desc_num].attribute.write(
Desc32Attribute::zeroed()
.trans(true)
.valid(true)
);
// 0 is the max length (65536) // 0 is the max length (65536)
descr_table[desc_num].set_length(0); descr_table[desc_num].length.set(0);
} }
descr_table[total_desc_lines - 1].set_attribute(DESC_TRANS | DESC_VALID | DESC_END); descr_table[total_desc_lines - 1].attribute.modify(|_, w| w.end(true));
descr_table[total_desc_lines - 1].set_length( descr_table[total_desc_lines - 1].length.set(
(blk_cnt * blk_size - ((total_desc_lines as u32) - 1) * DESC_MAX_LENGTH) as u16, (blk_cnt * blk_size - ((total_desc_lines as u32) - 1) * DESC_MAX_LENGTH) as u16,
); );
unsafe { unsafe {