metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Enable edition 2018

This commit is contained in:
Berkus Decker 2019-01-21 02:00:34 +02:00
parent 5666fcbec9
commit 12765de456
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -10,6 +10,7 @@ readme = "README.md"
license = "BSL-1.0" license = "BSL-1.0"
categories = ["no-std", "embedded", "os"] categories = ["no-std", "embedded", "os"]
publish = false publish = false
edition = "2018"
[package.metadata.cargo-xbuild] [package.metadata.cargo-xbuild]
memcpy = true memcpy = true

4
src/main.rs
View File

@ -28,10 +28,10 @@ pub use arch::*;
pub mod platform; pub mod platform;
mod write_to; mod write_to;
use core::fmt::Write; // use core::fmt::Write;
use platform::{ use platform::{
display::{Color, Size2d}, display::{Color, Size2d},
uart::MiniUart, // uart::MiniUart,
vc::VC, vc::VC,
}; };

2
src/platform/gpio.rs
View File

@ -1,4 +1,4 @@
use platform::rpi3::PERIPHERAL_BASE; use crate::platform::rpi3::PERIPHERAL_BASE;
use register::mmio::*; use register::mmio::*;
const GPIO_BASE: u32 = PERIPHERAL_BASE + 0x20_0000; const GPIO_BASE: u32 = PERIPHERAL_BASE + 0x20_0000;

6
src/platform/mailbox.rs
View File

@ -1,10 +1,10 @@
use arch::*; use crate::arch::*;
use core::{fmt::Write, ops::Deref}; use crate::platform::{
use platform::{
display::Size2d, display::Size2d,
rpi3::{phys2bus, PERIPHERAL_BASE}, rpi3::{phys2bus, PERIPHERAL_BASE},
// uart::MiniUart, // uart::MiniUart,
}; };
use core::ops::Deref;
use register::mmio::*; use register::mmio::*;
// Public interface to the mailbox // Public interface to the mailbox

4
src/platform/uart.rs
View File

@ -1,6 +1,6 @@
use arch::*; use crate::arch::*;
use crate::platform::{gpio, rpi3::PERIPHERAL_BASE};
use core::{fmt, ops}; use core::{fmt, ops};
use platform::{gpio, rpi3::PERIPHERAL_BASE};
use register::mmio::*; use register::mmio::*;
// The base address for UART. // The base address for UART.

10
src/platform/vc.rs
View File

@ -1,7 +1,9 @@
use core::fmt::Write; use crate::platform::{
use platform::display::{Display, PixelOrder, Size2d, CHARSIZE_X, CHARSIZE_Y}; display::{Display, PixelOrder, Size2d, CHARSIZE_X, CHARSIZE_Y},
use platform::mailbox::{self, channel, response::VAL_LEN_FLAG, tag, GpuFb, Mailbox}; mailbox::{self, channel, response::VAL_LEN_FLAG, tag, GpuFb, Mailbox},
use platform::rpi3::bus2phys; rpi3::bus2phys,
};
// use core::fmt::Write;
// use platform::uart::MiniUart; // use platform::uart::MiniUart;
pub struct VC; pub struct VC;