Update code to current post-10 branch

This commit is contained in:
Philipp Oppermann
2019-02-05 10:47:51 +01:00
parent 403e67a795
commit 87d542f7a1
2 changed files with 4 additions and 0 deletions

2
Cargo.lock generated
View File

@@ -1,3 +1,5 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]] [[package]]
name = "array-init" name = "array-init"
version = "0.0.3" version = "0.0.3"

View File

@@ -39,6 +39,7 @@ pub enum Color {
/// A combination of a foreground and a background color. /// A combination of a foreground and a background color.
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[repr(transparent)]
struct ColorCode(u8); struct ColorCode(u8);
impl ColorCode { impl ColorCode {
@@ -62,6 +63,7 @@ const BUFFER_HEIGHT: usize = 25;
const BUFFER_WIDTH: usize = 80; const BUFFER_WIDTH: usize = 80;
/// A structure representing the VGA text buffer. /// A structure representing the VGA text buffer.
#[repr(transparent)]
struct Buffer { struct Buffer {
chars: [[Volatile<ScreenChar>; BUFFER_WIDTH]; BUFFER_HEIGHT], chars: [[Volatile<ScreenChar>; BUFFER_WIDTH]; BUFFER_HEIGHT],
} }