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

sdio: fix unsound MaybeUninit usage

This commit is contained in:
Astro 2020-06-10 16:46:22 +02:00 committed by Gitea
parent 316ea61702
commit 074b3547de
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,16 +22,18 @@ register_bit!(desc32_attribute, int, 2);
register_bit!(desc32_attribute, end, 1); register_bit!(desc32_attribute, end, 1);
register_bit!(desc32_attribute, valid, 0); register_bit!(desc32_attribute, valid, 0);
pub struct Adma2DescTable(MaybeUninit<[Adma2Desc32; 32]>); pub struct Adma2DescTable([Adma2Desc32; 32]);
impl Adma2DescTable { impl Adma2DescTable {
pub fn new() -> Self { pub fn new() -> Self {
Adma2DescTable(MaybeUninit::uninit()) let table = MaybeUninit::zeroed();
let table = unsafe { table.assume_init() };
Adma2DescTable(table)
} }
/// Initialize the table and setup `adma_system_address` /// Initialize the table and setup `adma_system_address`
pub fn setup(&mut self, sdio: &mut SDIO, blk_cnt: u32, buffer: &[u8]) { pub fn setup(&mut self, sdio: &mut SDIO, blk_cnt: u32, buffer: &[u8]) {
let descr_table = unsafe { &mut *self.0.as_mut_ptr() }; let descr_table = &mut self.0;
let blk_size = sdio let blk_size = sdio
.regs .regs
.block_size_block_count .block_size_block_count