Enable edition 2018
This commit is contained in:
		
							parent
							
								
									5666fcbec9
								
							
						
					
					
						commit
						12765de456
					
				| 
						 | 
				
			
			@ -10,6 +10,7 @@ readme = "README.md"
 | 
			
		|||
license = "BSL-1.0"
 | 
			
		||||
categories = ["no-std", "embedded", "os"]
 | 
			
		||||
publish = false
 | 
			
		||||
edition = "2018"
 | 
			
		||||
 | 
			
		||||
[package.metadata.cargo-xbuild]
 | 
			
		||||
memcpy = true
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,10 +28,10 @@ pub use arch::*;
 | 
			
		|||
pub mod platform;
 | 
			
		||||
mod write_to;
 | 
			
		||||
 | 
			
		||||
use core::fmt::Write;
 | 
			
		||||
// use core::fmt::Write;
 | 
			
		||||
use platform::{
 | 
			
		||||
    display::{Color, Size2d},
 | 
			
		||||
    uart::MiniUart,
 | 
			
		||||
    // uart::MiniUart,
 | 
			
		||||
    vc::VC,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
use platform::rpi3::PERIPHERAL_BASE;
 | 
			
		||||
use crate::platform::rpi3::PERIPHERAL_BASE;
 | 
			
		||||
use register::mmio::*;
 | 
			
		||||
 | 
			
		||||
const GPIO_BASE: u32 = PERIPHERAL_BASE + 0x20_0000;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,10 +1,10 @@
 | 
			
		|||
use arch::*;
 | 
			
		||||
use core::{fmt::Write, ops::Deref};
 | 
			
		||||
use platform::{
 | 
			
		||||
use crate::arch::*;
 | 
			
		||||
use crate::platform::{
 | 
			
		||||
    display::Size2d,
 | 
			
		||||
    rpi3::{phys2bus, PERIPHERAL_BASE},
 | 
			
		||||
    // uart::MiniUart,
 | 
			
		||||
};
 | 
			
		||||
use core::ops::Deref;
 | 
			
		||||
use register::mmio::*;
 | 
			
		||||
 | 
			
		||||
// Public interface to the mailbox
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
use arch::*;
 | 
			
		||||
use crate::arch::*;
 | 
			
		||||
use crate::platform::{gpio, rpi3::PERIPHERAL_BASE};
 | 
			
		||||
use core::{fmt, ops};
 | 
			
		||||
use platform::{gpio, rpi3::PERIPHERAL_BASE};
 | 
			
		||||
use register::mmio::*;
 | 
			
		||||
 | 
			
		||||
// The base address for UART.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,9 @@
 | 
			
		|||
use core::fmt::Write;
 | 
			
		||||
use platform::display::{Display, PixelOrder, Size2d, CHARSIZE_X, CHARSIZE_Y};
 | 
			
		||||
use platform::mailbox::{self, channel, response::VAL_LEN_FLAG, tag, GpuFb, Mailbox};
 | 
			
		||||
use platform::rpi3::bus2phys;
 | 
			
		||||
use crate::platform::{
 | 
			
		||||
    display::{Display, PixelOrder, Size2d, CHARSIZE_X, CHARSIZE_Y},
 | 
			
		||||
    mailbox::{self, channel, response::VAL_LEN_FLAG, tag, GpuFb, Mailbox},
 | 
			
		||||
    rpi3::bus2phys,
 | 
			
		||||
};
 | 
			
		||||
// use core::fmt::Write;
 | 
			
		||||
// use platform::uart::MiniUart;
 | 
			
		||||
 | 
			
		||||
pub struct VC;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue