forked from M-Labs/zynq-rs
fixed warnings
This commit is contained in:
parent
2c0b54280c
commit
411ada4d4e
|
@ -189,10 +189,10 @@ impl Config {
|
||||||
if is_str {
|
if is_str {
|
||||||
let mut f = root_dir.create_file("/CONFIG.TXT")?;
|
let mut f = root_dir.create_file("/CONFIG.TXT")?;
|
||||||
f.seek(SeekFrom::End(0))?;
|
f.seek(SeekFrom::End(0))?;
|
||||||
f.write(key.as_bytes());
|
f.write(key.as_bytes())?;
|
||||||
f.write("=".as_bytes());
|
f.write("=".as_bytes())?;
|
||||||
f.write(value.as_slice());
|
f.write(value.as_slice())?;
|
||||||
f.write(NEWLINE);
|
f.write(NEWLINE)?;
|
||||||
} else {
|
} else {
|
||||||
let dir = root_dir.create_dir("/CONFIG")?;
|
let dir = root_dir.create_dir("/CONFIG")?;
|
||||||
let mut f = dir.create_file(&[key, ".BIN"].concat())?;
|
let mut f = dir.create_file(&[key, ".BIN"].concat())?;
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
use bit_field::BitField;
|
use bit_field::BitField;
|
||||||
|
use core::ptr::addr_of_mut;
|
||||||
use super::{regs::*, asm::*, cache::*};
|
use super::{regs::*, asm::*, cache::*};
|
||||||
use libregister::RegisterW;
|
use libregister::RegisterW;
|
||||||
|
|
||||||
|
@ -136,7 +137,7 @@ pub struct L1Table {
|
||||||
impl L1Table {
|
impl L1Table {
|
||||||
pub fn get() -> &'static mut Self {
|
pub fn get() -> &'static mut Self {
|
||||||
unsafe {
|
unsafe {
|
||||||
&mut L1_TABLE
|
&mut *addr_of_mut!(L1_TABLE)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ impl<'a, T> Sender<'a, T> where T: Clone {
|
||||||
notify_spin_lock();
|
notify_spin_lock();
|
||||||
if !prev.is_null() {
|
if !prev.is_null() {
|
||||||
unsafe {
|
unsafe {
|
||||||
Box::from_raw(prev);
|
drop(Box::from_raw(prev));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
|
@ -91,7 +91,7 @@ impl<'a, T> Sender<'a, T> where T: Clone {
|
||||||
for v in self.list.iter() {
|
for v in self.list.iter() {
|
||||||
let original = v.swap(core::ptr::null_mut(), Ordering::Relaxed);
|
let original = v.swap(core::ptr::null_mut(), Ordering::Relaxed);
|
||||||
if !original.is_null() {
|
if !original.is_null() {
|
||||||
Box::from_raw(original);
|
drop(Box::from_raw(original));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
use r0::zero_bss;
|
use r0::zero_bss;
|
||||||
use core::ptr::write_volatile;
|
use core::ptr::{write_volatile, addr_of_mut, addr_of};
|
||||||
use core::arch::asm;
|
use core::arch::asm;
|
||||||
use libregister::{
|
use libregister::{
|
||||||
VolatileCell,
|
VolatileCell,
|
||||||
|
@ -43,7 +43,7 @@ unsafe extern "C" fn boot_core0() -> ! {
|
||||||
let mpcore = mpcore::RegisterBlock::mpcore();
|
let mpcore = mpcore::RegisterBlock::mpcore();
|
||||||
mpcore.scu_invalidate.invalidate_all_cores();
|
mpcore.scu_invalidate.invalidate_all_cores();
|
||||||
|
|
||||||
zero_bss(&mut __bss_start, &mut __bss_end);
|
zero_bss(addr_of_mut!(__bss_start), addr_of_mut!(__bss_end));
|
||||||
|
|
||||||
let mmu_table = mmu::L1Table::get()
|
let mmu_table = mmu::L1Table::get()
|
||||||
.setup_flat_layout();
|
.setup_flat_layout();
|
||||||
|
@ -132,7 +132,9 @@ impl Core1 {
|
||||||
CORE1_ENABLED.set(true);
|
CORE1_ENABLED.set(true);
|
||||||
}
|
}
|
||||||
// Flush cache-line
|
// Flush cache-line
|
||||||
cache::dcc(unsafe { &CORE1_ENABLED });
|
unsafe {
|
||||||
|
cache::dcc(&*addr_of!(CORE1_ENABLED) );
|
||||||
|
}
|
||||||
if sdram {
|
if sdram {
|
||||||
cache::dccmvac(0);
|
cache::dccmvac(0);
|
||||||
asm::dsb();
|
asm::dsb();
|
||||||
|
@ -153,7 +155,7 @@ impl Core1 {
|
||||||
pub fn disable(&self) {
|
pub fn disable(&self) {
|
||||||
unsafe {
|
unsafe {
|
||||||
CORE1_ENABLED.set(false);
|
CORE1_ENABLED.set(false);
|
||||||
cache::dccmvac(&CORE1_ENABLED as *const _ as usize);
|
cache::dccmvac(addr_of!(CORE1_ENABLED) as *const _ as usize);
|
||||||
asm::dsb();
|
asm::dsb();
|
||||||
}
|
}
|
||||||
self.restart();
|
self.restart();
|
||||||
|
|
|
@ -8,6 +8,7 @@ mod netboot;
|
||||||
|
|
||||||
use alloc::rc::Rc;
|
use alloc::rc::Rc;
|
||||||
use core::mem;
|
use core::mem;
|
||||||
|
use core::ptr::{addr_of_mut, addr_of};
|
||||||
use libboard_zynq::{
|
use libboard_zynq::{
|
||||||
self as zynq,
|
self as zynq,
|
||||||
clocks::source::{ArmPll, ClockSource, IoPll},
|
clocks::source::{ArmPll, ClockSource, IoPll},
|
||||||
|
@ -115,18 +116,18 @@ pub fn main_core0() {
|
||||||
|
|
||||||
unsafe {
|
unsafe {
|
||||||
let max_len =
|
let max_len =
|
||||||
&__runtime_end as *const usize as usize - &__runtime_start as *const usize as usize;
|
addr_of!(__runtime_end) as *const usize as usize - addr_of!(__runtime_start) as *const usize as usize;
|
||||||
match slcr::RegisterBlock::unlocked(|slcr| slcr.boot_mode.read().boot_mode_pins()) {
|
match slcr::RegisterBlock::unlocked(|slcr| slcr.boot_mode.read().boot_mode_pins()) {
|
||||||
slcr::BootModePins::Jtag => netboot::netboot(
|
slcr::BootModePins::Jtag => netboot::netboot(
|
||||||
&mut bootgen_file,
|
&mut bootgen_file,
|
||||||
config,
|
config,
|
||||||
&mut __runtime_start as *mut usize as *mut u8,
|
addr_of_mut!(__runtime_start) as *mut usize as *mut u8,
|
||||||
max_len,
|
max_len,
|
||||||
),
|
),
|
||||||
slcr::BootModePins::SdCard => {
|
slcr::BootModePins::SdCard => {
|
||||||
if boot_sd(
|
if boot_sd(
|
||||||
&mut bootgen_file,
|
&mut bootgen_file,
|
||||||
&mut __runtime_start as *mut usize as *mut u8,
|
addr_of_mut!(__runtime_start) as *mut usize as *mut u8,
|
||||||
max_len,
|
max_len,
|
||||||
)
|
)
|
||||||
.is_err()
|
.is_err()
|
||||||
|
@ -136,7 +137,7 @@ pub fn main_core0() {
|
||||||
netboot::netboot(
|
netboot::netboot(
|
||||||
&mut bootgen_file,
|
&mut bootgen_file,
|
||||||
config,
|
config,
|
||||||
&mut __runtime_start as *mut usize as *mut u8,
|
addr_of_mut!(__runtime_start) as *mut usize as *mut u8,
|
||||||
max_len,
|
max_len,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -147,7 +148,7 @@ pub fn main_core0() {
|
||||||
netboot::netboot(
|
netboot::netboot(
|
||||||
&mut bootgen_file,
|
&mut bootgen_file,
|
||||||
config,
|
config,
|
||||||
&mut __runtime_start as *mut usize as *mut u8,
|
addr_of_mut!(__runtime_start) as *mut usize as *mut u8,
|
||||||
max_len,
|
max_len,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue