|
|
@ -1130,7 +1130,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/exception.rs 13_integrated_testing/
|
|
|
|
diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/lib.rs
|
|
|
|
diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/lib.rs
|
|
|
|
--- 12_exceptions_part1_groundwork/src/lib.rs
|
|
|
|
--- 12_exceptions_part1_groundwork/src/lib.rs
|
|
|
|
+++ 13_integrated_testing/src/lib.rs
|
|
|
|
+++ 13_integrated_testing/src/lib.rs
|
|
|
|
@@ -0,0 +1,169 @@
|
|
|
|
@@ -0,0 +1,170 @@
|
|
|
|
+// SPDX-License-Identifier: MIT OR Apache-2.0
|
|
|
|
+// SPDX-License-Identifier: MIT OR Apache-2.0
|
|
|
|
+//
|
|
|
|
+//
|
|
|
|
+// Copyright (c) 2018-2020 Andre Richter <andre.o.richter@gmail.com>
|
|
|
|
+// Copyright (c) 2018-2020 Andre Richter <andre.o.richter@gmail.com>
|
|
|
@ -1240,6 +1240,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/li
|
|
|
|
+//! - `crate::bsp::memory::*`
|
|
|
|
+//! - `crate::bsp::memory::*`
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#![allow(incomplete_features)]
|
|
|
|
+#![allow(incomplete_features)]
|
|
|
|
|
|
|
|
+#![feature(const_fn_fn_ptr_basics)]
|
|
|
|
+#![feature(const_generics)]
|
|
|
|
+#![feature(const_generics)]
|
|
|
|
+#![feature(const_panic)]
|
|
|
|
+#![feature(const_panic)]
|
|
|
|
+#![feature(format_args_nl)]
|
|
|
|
+#![feature(format_args_nl)]
|
|
|
@ -1304,7 +1305,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/li
|
|
|
|
diff -uNr 12_exceptions_part1_groundwork/src/main.rs 13_integrated_testing/src/main.rs
|
|
|
|
diff -uNr 12_exceptions_part1_groundwork/src/main.rs 13_integrated_testing/src/main.rs
|
|
|
|
--- 12_exceptions_part1_groundwork/src/main.rs
|
|
|
|
--- 12_exceptions_part1_groundwork/src/main.rs
|
|
|
|
+++ 13_integrated_testing/src/main.rs
|
|
|
|
+++ 13_integrated_testing/src/main.rs
|
|
|
|
@@ -6,129 +6,12 @@
|
|
|
|
@@ -6,130 +6,12 @@
|
|
|
|
#![doc(html_logo_url = "https://git.io/JeGIp")]
|
|
|
|
#![doc(html_logo_url = "https://git.io/JeGIp")]
|
|
|
|
|
|
|
|
|
|
|
|
//! The `kernel` binary.
|
|
|
|
//! The `kernel` binary.
|
|
|
@ -1407,6 +1408,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/main.rs 13_integrated_testing/src/m
|
|
|
|
-//! - `crate::bsp::memory::*`
|
|
|
|
-//! - `crate::bsp::memory::*`
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-#![allow(incomplete_features)]
|
|
|
|
-#![allow(incomplete_features)]
|
|
|
|
|
|
|
|
-#![feature(const_fn_fn_ptr_basics)]
|
|
|
|
-#![feature(const_generics)]
|
|
|
|
-#![feature(const_generics)]
|
|
|
|
-#![feature(const_panic)]
|
|
|
|
-#![feature(const_panic)]
|
|
|
|
+
|
|
|
|
+
|
|
|
@ -1436,7 +1438,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/main.rs 13_integrated_testing/src/m
|
|
|
|
|
|
|
|
|
|
|
|
/// Early init code.
|
|
|
|
/// Early init code.
|
|
|
|
///
|
|
|
|
///
|
|
|
|
@@ -140,6 +23,7 @@
|
|
|
|
@@ -141,6 +23,7 @@
|
|
|
|
/// - Without it, any atomic operations, e.g. the yet-to-be-introduced spinlocks in the device
|
|
|
|
/// - Without it, any atomic operations, e.g. the yet-to-be-introduced spinlocks in the device
|
|
|
|
/// drivers (which currently employ NullLocks instead of spinlocks), will fail to work on
|
|
|
|
/// drivers (which currently employ NullLocks instead of spinlocks), will fail to work on
|
|
|
|
/// the RPi SoCs.
|
|
|
|
/// the RPi SoCs.
|
|
|
@ -1444,7 +1446,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/main.rs 13_integrated_testing/src/m
|
|
|
|
unsafe fn kernel_init() -> ! {
|
|
|
|
unsafe fn kernel_init() -> ! {
|
|
|
|
use driver::interface::DriverManager;
|
|
|
|
use driver::interface::DriverManager;
|
|
|
|
use memory::mmu::interface::MMU;
|
|
|
|
use memory::mmu::interface::MMU;
|
|
|
|
@@ -165,9 +49,7 @@
|
|
|
|
@@ -166,9 +49,7 @@
|
|
|
|
/// The main function running after the early init.
|
|
|
|
/// The main function running after the early init.
|
|
|
|
fn kernel_main() -> ! {
|
|
|
|
fn kernel_main() -> ! {
|
|
|
|
use console::interface::All;
|
|
|
|
use console::interface::All;
|
|
|
@ -1454,7 +1456,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/main.rs 13_integrated_testing/src/m
|
|
|
|
|
|
|
|
|
|
|
|
info!("Booting on: {}", bsp::board_name());
|
|
|
|
info!("Booting on: {}", bsp::board_name());
|
|
|
|
|
|
|
|
|
|
|
|
@@ -194,31 +76,6 @@
|
|
|
|
@@ -195,31 +76,6 @@
|
|
|
|
info!(" {}. {}", i + 1, driver.compatible());
|
|
|
|
info!(" {}. {}", i + 1, driver.compatible());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|