|
|
@ -1325,7 +1325,7 @@ diff -uNr 11_exceptions_part1_groundwork/src/exception.rs 12_integrated_testing/
|
|
|
|
diff -uNr 11_exceptions_part1_groundwork/src/lib.rs 12_integrated_testing/src/lib.rs
|
|
|
|
diff -uNr 11_exceptions_part1_groundwork/src/lib.rs 12_integrated_testing/src/lib.rs
|
|
|
|
--- 11_exceptions_part1_groundwork/src/lib.rs
|
|
|
|
--- 11_exceptions_part1_groundwork/src/lib.rs
|
|
|
|
+++ 12_integrated_testing/src/lib.rs
|
|
|
|
+++ 12_integrated_testing/src/lib.rs
|
|
|
|
@@ -0,0 +1,184 @@
|
|
|
|
@@ -0,0 +1,183 @@
|
|
|
|
+// SPDX-License-Identifier: MIT OR Apache-2.0
|
|
|
|
+// SPDX-License-Identifier: MIT OR Apache-2.0
|
|
|
|
+//
|
|
|
|
+//
|
|
|
|
+// Copyright (c) 2018-2022 Andre Richter <andre.o.richter@gmail.com>
|
|
|
|
+// Copyright (c) 2018-2022 Andre Richter <andre.o.richter@gmail.com>
|
|
|
@ -1436,7 +1436,6 @@ diff -uNr 11_exceptions_part1_groundwork/src/lib.rs 12_integrated_testing/src/li
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#![allow(clippy::upper_case_acronyms)]
|
|
|
|
+#![allow(clippy::upper_case_acronyms)]
|
|
|
|
+#![allow(incomplete_features)]
|
|
|
|
+#![allow(incomplete_features)]
|
|
|
|
+#![feature(const_fn_fn_ptr_basics)]
|
|
|
|
|
|
|
|
+#![feature(core_intrinsics)]
|
|
|
|
+#![feature(core_intrinsics)]
|
|
|
|
+#![feature(format_args_nl)]
|
|
|
|
+#![feature(format_args_nl)]
|
|
|
|
+#![feature(linkage)]
|
|
|
|
+#![feature(linkage)]
|
|
|
@ -1514,7 +1513,7 @@ diff -uNr 11_exceptions_part1_groundwork/src/lib.rs 12_integrated_testing/src/li
|
|
|
|
diff -uNr 11_exceptions_part1_groundwork/src/main.rs 12_integrated_testing/src/main.rs
|
|
|
|
diff -uNr 11_exceptions_part1_groundwork/src/main.rs 12_integrated_testing/src/main.rs
|
|
|
|
--- 11_exceptions_part1_groundwork/src/main.rs
|
|
|
|
--- 11_exceptions_part1_groundwork/src/main.rs
|
|
|
|
+++ 12_integrated_testing/src/main.rs
|
|
|
|
+++ 12_integrated_testing/src/main.rs
|
|
|
|
@@ -6,124 +6,12 @@
|
|
|
|
@@ -6,123 +6,12 @@
|
|
|
|
#![doc(html_logo_url = "https://git.io/JeGIp")]
|
|
|
|
#![doc(html_logo_url = "https://git.io/JeGIp")]
|
|
|
|
|
|
|
|
|
|
|
|
//! The `kernel` binary.
|
|
|
|
//! The `kernel` binary.
|
|
|
@ -1618,7 +1617,6 @@ diff -uNr 11_exceptions_part1_groundwork/src/main.rs 12_integrated_testing/src/m
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-#![allow(clippy::upper_case_acronyms)]
|
|
|
|
-#![allow(clippy::upper_case_acronyms)]
|
|
|
|
-#![allow(incomplete_features)]
|
|
|
|
-#![allow(incomplete_features)]
|
|
|
|
-#![feature(const_fn_fn_ptr_basics)]
|
|
|
|
|
|
|
|
-#![feature(core_intrinsics)]
|
|
|
|
-#![feature(core_intrinsics)]
|
|
|
|
+
|
|
|
|
+
|
|
|
|
#![feature(format_args_nl)]
|
|
|
|
#![feature(format_args_nl)]
|
|
|
@ -1641,7 +1639,7 @@ diff -uNr 11_exceptions_part1_groundwork/src/main.rs 12_integrated_testing/src/m
|
|
|
|
|
|
|
|
|
|
|
|
/// Early init code.
|
|
|
|
/// Early init code.
|
|
|
|
///
|
|
|
|
///
|
|
|
|
@@ -134,6 +22,7 @@
|
|
|
|
@@ -133,6 +22,7 @@
|
|
|
|
/// - MMU + Data caching must be activated at the earliest. Without it, any atomic operations,
|
|
|
|
/// - MMU + Data caching must be activated at the earliest. Without it, any atomic operations,
|
|
|
|
/// e.g. the yet-to-be-introduced spinlocks in the device drivers (which currently employ
|
|
|
|
/// e.g. the yet-to-be-introduced spinlocks in the device drivers (which currently employ
|
|
|
|
/// NullLocks instead of spinlocks), will fail to work (properly) on the RPi SoCs.
|
|
|
|
/// NullLocks instead of spinlocks), will fail to work (properly) on the RPi SoCs.
|
|
|
@ -1649,7 +1647,7 @@ diff -uNr 11_exceptions_part1_groundwork/src/main.rs 12_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;
|
|
|
|
@@ -160,15 +49,9 @@
|
|
|
|
@@ -159,15 +49,9 @@
|
|
|
|
fn kernel_main() -> ! {
|
|
|
|
fn kernel_main() -> ! {
|
|
|
|
use bsp::console::console;
|
|
|
|
use bsp::console::console;
|
|
|
|
use console::interface::All;
|
|
|
|
use console::interface::All;
|
|
|
@ -1666,7 +1664,7 @@ diff -uNr 11_exceptions_part1_groundwork/src/main.rs 12_integrated_testing/src/m
|
|
|
|
info!("Booting on: {}", bsp::board_name());
|
|
|
|
info!("Booting on: {}", bsp::board_name());
|
|
|
|
|
|
|
|
|
|
|
|
info!("MMU online. Special regions:");
|
|
|
|
info!("MMU online. Special regions:");
|
|
|
|
@@ -194,31 +77,6 @@
|
|
|
|
@@ -193,31 +77,6 @@
|
|
|
|
info!(" {}. {}", i + 1, driver.compatible());
|
|
|
|
info!(" {}. {}", i + 1, driver.compatible());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|