Run cargo fmt

Signed-off-by: Harry Chen <i@harrychen.xyz>
master
Harry Chen 6 years ago
parent 5b53e86c41
commit 887a207c8b

@ -75,10 +75,7 @@ static mut __page_table_with_mode: bool = false;
impl ActivePageTable {
pub unsafe fn new() -> Self {
ActivePageTable(
get_root_page_table_ptr(),
::core::mem::uninitialized(),
)
ActivePageTable(get_root_page_table_ptr(), ::core::mem::uninitialized())
}
unsafe fn get_raw_table(&mut self) -> *mut MIPSPageTable {
@ -90,9 +87,7 @@ impl ActivePageTable {
}
fn get_table(&mut self) -> TwoLevelPageTable<'static> {
unsafe {
TwoLevelPageTable::new(&mut *self.get_raw_table())
}
unsafe { TwoLevelPageTable::new(&mut *self.get_raw_table()) }
}
}
@ -208,13 +203,12 @@ impl InactivePageTable for InactivePageTable0 {
clear_all_tlb();
}
debug!("edit table {:x?} -> {:x?}", Self::active_token(), self.token());
let mut active = unsafe {
ActivePageTable(
self.token(),
::core::mem::uninitialized(),
)
};
debug!(
"edit table {:x?} -> {:x?}",
Self::active_token(),
self.token()
);
let mut active = unsafe { ActivePageTable(self.token(), ::core::mem::uninitialized()) };
let ret = f(&mut active);
debug!("finish table");

@ -19,7 +19,6 @@ pub unsafe fn init_external_interrupt() {
// enable all interrupts
AXI_INTC_IER.write_volatile(0xffffffff);
}
/// Claim and complete external interrupt by reading and writing to

@ -30,7 +30,6 @@ pub extern "C" fn rust_main(hartid: usize, device_tree_paddr: usize) -> ! {
unsafe {
cpu::set_cpu_id(hartid);
}
#[cfg(feature = "board_rocket_chip")]

@ -1,3 +1,6 @@
#[cfg(any(target_arch = "x86_64", all(target_arch = "mips", feature = "board_malta")))]
#[cfg(any(
target_arch = "x86_64",
all(target_arch = "mips", feature = "board_malta")
))]
pub mod pci;
pub mod virtio_mmio;

@ -13,19 +13,19 @@
//! mipssim/malta(MIPS) -- 10MB
use super::HEAP_ALLOCATOR;
use core::mem;
pub use crate::arch::paging::*;
use crate::consts::{KERNEL_OFFSET, MEMORY_OFFSET};
use crate::process::current_thread;
use crate::sync::SpinNoIrqLock;
use alloc::boxed::Box;
use bitmap_allocator::BitAlloc;
use buddy_system_allocator::Heap;
use core::mem;
use lazy_static::*;
use log::*;
pub use rcore_memory::memory_set::{handler::*, MemoryArea, MemoryAttr};
use rcore_memory::paging::PageTable;
use rcore_memory::*;
use crate::process::current_thread;
pub type MemorySet = rcore_memory::memory_set::MemorySet<InactivePageTable0>;

@ -185,7 +185,11 @@ impl Syscall<'_> {
iovs.write_all_from_slice(&buf[..len]);
let sockaddr_in = SockAddr::from(endpoint);
unsafe {
sockaddr_in.write_to(&mut self.vm(), hdr.msg_name, &mut hdr.msg_namelen as *mut u32)?;
sockaddr_in.write_to(
&mut self.vm(),
hdr.msg_name,
&mut hdr.msg_namelen as *mut u32,
)?;
}
}
result
@ -427,17 +431,13 @@ fn sockaddr_to_endpoint(
Ok(Endpoint::Ip((addr, port).into()))
}
AddressFamily::Unix => Err(SysError::EINVAL),
AddressFamily::Packet => {
Ok(Endpoint::LinkLevel(LinkLevelEndpoint::new(
addr.addr_ll.sll_ifindex as usize,
)))
}
AddressFamily::Netlink => {
Ok(Endpoint::Netlink(NetlinkEndpoint::new(
addr.addr_nl.nl_pid,
addr.addr_nl.nl_groups,
)))
}
AddressFamily::Packet => Ok(Endpoint::LinkLevel(LinkLevelEndpoint::new(
addr.addr_ll.sll_ifindex as usize,
))),
AddressFamily::Netlink => Ok(Endpoint::Netlink(NetlinkEndpoint::new(
addr.addr_nl.nl_pid,
addr.addr_nl.nl_groups,
))),
_ => Err(SysError::EINVAL),
}
}
@ -456,12 +456,7 @@ impl SockAddr {
/// Write to user sockaddr
/// Check mutability for user
unsafe fn write_to(
self,
vm: &MemorySet,
addr: *mut SockAddr,
addr_len: *mut u32,
) -> SysResult {
unsafe fn write_to(self, vm: &MemorySet, addr: *mut SockAddr, addr_len: *mut u32) -> SysResult {
// Ignore NULL
if addr.is_null() {
return Ok(0);

@ -7,7 +7,6 @@ use super::color::ConsoleColor;
use heapless::consts::U8;
use heapless::Vec;
#[derive(Debug, Clone, Copy, PartialEq)]
#[repr(align(4))]
pub struct CharacterAttribute {

Loading…
Cancel
Save