Bump dependencies

pull/171/head
Andre Richter 2 years ago
parent 2345214367
commit 7014c0cdfd
No known key found for this signature in database
GPG Key ID: 2116C1AB102F615E

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -20,6 +20,6 @@ dependencies = [
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"

@ -24,4 +24,4 @@ path = "src/main.rs"
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }

@ -47,7 +47,7 @@ diff -uNr 01_wait_forever/Cargo.toml 02_runtime_init/Cargo.toml
+ +
+# Platform specific dependencies +# Platform specific dependencies
+[target.'cfg(target_arch = "aarch64")'.dependencies] +[target.'cfg(target_arch = "aarch64")'.dependencies]
+cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" }
diff -uNr 01_wait_forever/Makefile 02_runtime_init/Makefile diff -uNr 01_wait_forever/Makefile 02_runtime_init/Makefile
--- 01_wait_forever/Makefile --- 01_wait_forever/Makefile

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -20,6 +20,6 @@ dependencies = [
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"

@ -24,4 +24,4 @@ path = "src/main.rs"
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -20,6 +20,6 @@ dependencies = [
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"

@ -24,4 +24,4 @@ path = "src/main.rs"
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -21,6 +21,6 @@ dependencies = [
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"

@ -23,8 +23,8 @@ path = "src/main.rs"
[dependencies] [dependencies]
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }

@ -131,11 +131,11 @@ diff -uNr 04_safe_globals/Cargo.toml 05_drivers_gpio_uart/Cargo.toml
[dependencies] [dependencies]
+# Optional dependencies +# Optional dependencies
+tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
+ +
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }
diff -uNr 04_safe_globals/Makefile 05_drivers_gpio_uart/Makefile diff -uNr 04_safe_globals/Makefile 05_drivers_gpio_uart/Makefile
--- 04_safe_globals/Makefile --- 04_safe_globals/Makefile

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -21,6 +21,6 @@ dependencies = [
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"

@ -23,8 +23,8 @@ path = "src/main.rs"
[dependencies] [dependencies]
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -21,6 +21,6 @@ dependencies = [
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"

@ -23,8 +23,8 @@ path = "src/main.rs"
[dependencies] [dependencies]
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }

@ -380,7 +380,7 @@ diff -uNr 06_uart_chainloader/src/_arch/aarch64/time.rs 07_timestamps/src/_arch/
+#[inline(always)] +#[inline(always)]
+fn read_cntpct() -> GenericTimerCounterValue { +fn read_cntpct() -> GenericTimerCounterValue {
+ // Prevent that the counter is read ahead of time due to out-of-order execution. + // Prevent that the counter is read ahead of time due to out-of-order execution.
+ unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY);
+ let cnt = CNTPCT_EL0.get(); + let cnt = CNTPCT_EL0.get();
+ +
+ GenericTimerCounterValue(cnt) + GenericTimerCounterValue(cnt)

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -21,6 +21,6 @@ dependencies = [
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"

@ -23,8 +23,8 @@ path = "src/main.rs"
[dependencies] [dependencies]
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -21,6 +21,6 @@ dependencies = [
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"

@ -23,8 +23,8 @@ path = "src/main.rs"
[dependencies] [dependencies]
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -21,6 +21,6 @@ dependencies = [
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"

@ -23,8 +23,8 @@ path = "src/main.rs"
[dependencies] [dependencies]
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -21,6 +21,6 @@ dependencies = [
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"

@ -23,8 +23,8 @@ path = "src/main.rs"
[dependencies] [dependencies]
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -24,9 +24,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.43" version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -48,9 +48,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.100" version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -73,9 +73,9 @@ version = "0.1.0"
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"

@ -18,12 +18,12 @@ test_build = ["qemu-exit"]
test-types = { path = "../libraries/test-types" } test-types = { path = "../libraries/test-types" }
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
qemu-exit = { version = "3.x.x", optional = true } qemu-exit = { version = "3.x.x", optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }
##-------------------------------------------------------------------------------------------------- ##--------------------------------------------------------------------------------------------------
## Testing ## Testing

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -24,9 +24,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.43" version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -48,9 +48,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.100" version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -73,9 +73,9 @@ version = "0.1.0"
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"

@ -609,9 +609,9 @@ register_structs! {
(0x004 => TYPER: ReadOnly<u32, TYPER::Register>), (0x004 => TYPER: ReadOnly<u32, TYPER::Register>),
(0x008 => _reserved1), (0x008 => _reserved1),
(0x104 => ISENABLER: [ReadWrite<u32>; 31]), (0x104 => ISENABLER: [ReadWrite<u32>; 31]),
(0x108 => _reserved2), (0x180 => _reserved2),
(0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]), (0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]),
(0x824 => @END), (0xC00 => @END),
} }
} }
@ -622,7 +622,7 @@ register_structs! {
(0x100 => ISENABLER: ReadWrite<u32>), (0x100 => ISENABLER: ReadWrite<u32>),
(0x104 => _reserved2), (0x104 => _reserved2),
(0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]), (0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]),
(0x804 => @END), (0x820 => @END),
} }
} }
``` ```
@ -1098,9 +1098,9 @@ diff -uNr 12_integrated_testing/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs 1
+ (0x004 => TYPER: ReadOnly<u32, TYPER::Register>), + (0x004 => TYPER: ReadOnly<u32, TYPER::Register>),
+ (0x008 => _reserved1), + (0x008 => _reserved1),
+ (0x104 => ISENABLER: [ReadWrite<u32>; 31]), + (0x104 => ISENABLER: [ReadWrite<u32>; 31]),
+ (0x108 => _reserved2), + (0x180 => _reserved2),
+ (0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]), + (0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]),
+ (0x824 => @END), + (0xC00 => @END),
+ } + }
+} +}
+ +
@ -1111,7 +1111,7 @@ diff -uNr 12_integrated_testing/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs 1
+ (0x100 => ISENABLER: ReadWrite<u32>), + (0x100 => ISENABLER: ReadWrite<u32>),
+ (0x104 => _reserved2), + (0x104 => _reserved2),
+ (0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]), + (0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]),
+ (0x804 => @END), + (0x820 => @END),
+ } + }
+} +}
+ +

@ -18,12 +18,12 @@ test_build = ["qemu-exit"]
test-types = { path = "../libraries/test-types" } test-types = { path = "../libraries/test-types" }
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
qemu-exit = { version = "3.x.x", optional = true } qemu-exit = { version = "3.x.x", optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }
##-------------------------------------------------------------------------------------------------- ##--------------------------------------------------------------------------------------------------
## Testing ## Testing

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -50,9 +50,9 @@ register_structs! {
(0x004 => TYPER: ReadOnly<u32, TYPER::Register>), (0x004 => TYPER: ReadOnly<u32, TYPER::Register>),
(0x008 => _reserved1), (0x008 => _reserved1),
(0x104 => ISENABLER: [ReadWrite<u32>; 31]), (0x104 => ISENABLER: [ReadWrite<u32>; 31]),
(0x108 => _reserved2), (0x180 => _reserved2),
(0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]), (0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]),
(0x824 => @END), (0xC00 => @END),
} }
} }
@ -63,7 +63,7 @@ register_structs! {
(0x100 => ISENABLER: ReadWrite<u32>), (0x100 => ISENABLER: ReadWrite<u32>),
(0x104 => _reserved2), (0x104 => _reserved2),
(0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]), (0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]),
(0x804 => @END), (0x820 => @END),
} }
} }

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -24,9 +24,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.43" version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -48,9 +48,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.100" version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -73,9 +73,9 @@ version = "0.1.0"
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"

@ -18,12 +18,12 @@ test_build = ["qemu-exit"]
test-types = { path = "../libraries/test-types" } test-types = { path = "../libraries/test-types" }
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
qemu-exit = { version = "3.x.x", optional = true } qemu-exit = { version = "3.x.x", optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }
##-------------------------------------------------------------------------------------------------- ##--------------------------------------------------------------------------------------------------
## Testing ## Testing

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -52,9 +52,9 @@ register_structs! {
(0x004 => TYPER: ReadOnly<u32, TYPER::Register>), (0x004 => TYPER: ReadOnly<u32, TYPER::Register>),
(0x008 => _reserved1), (0x008 => _reserved1),
(0x104 => ISENABLER: [ReadWrite<u32>; 31]), (0x104 => ISENABLER: [ReadWrite<u32>; 31]),
(0x108 => _reserved2), (0x180 => _reserved2),
(0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]), (0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]),
(0x824 => @END), (0xC00 => @END),
} }
} }
@ -65,7 +65,7 @@ register_structs! {
(0x100 => ISENABLER: ReadWrite<u32>), (0x100 => ISENABLER: ReadWrite<u32>),
(0x104 => _reserved2), (0x104 => _reserved2),
(0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]), (0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]),
(0x804 => @END), (0x820 => @END),
} }
} }

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -24,9 +24,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.43" version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -48,9 +48,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.100" version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -73,9 +73,9 @@ version = "0.1.0"
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"

@ -18,12 +18,12 @@ test_build = ["qemu-exit"]
test-types = { path = "../libraries/test-types" } test-types = { path = "../libraries/test-types" }
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
qemu-exit = { version = "3.x.x", optional = true } qemu-exit = { version = "3.x.x", optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }
##-------------------------------------------------------------------------------------------------- ##--------------------------------------------------------------------------------------------------
## Testing ## Testing

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -52,9 +52,9 @@ register_structs! {
(0x004 => TYPER: ReadOnly<u32, TYPER::Register>), (0x004 => TYPER: ReadOnly<u32, TYPER::Register>),
(0x008 => _reserved1), (0x008 => _reserved1),
(0x104 => ISENABLER: [ReadWrite<u32>; 31]), (0x104 => ISENABLER: [ReadWrite<u32>; 31]),
(0x108 => _reserved2), (0x180 => _reserved2),
(0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]), (0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]),
(0x824 => @END), (0xC00 => @END),
} }
} }
@ -65,7 +65,7 @@ register_structs! {
(0x100 => ISENABLER: ReadWrite<u32>), (0x100 => ISENABLER: ReadWrite<u32>),
(0x104 => _reserved2), (0x104 => _reserved2),
(0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]), (0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]),
(0x804 => @END), (0x820 => @END),
} }
} }

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -24,9 +24,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.43" version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -48,9 +48,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.100" version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -73,9 +73,9 @@ version = "0.1.0"
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"

@ -18,12 +18,12 @@ test_build = ["qemu-exit"]
test-types = { path = "../libraries/test-types" } test-types = { path = "../libraries/test-types" }
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
qemu-exit = { version = "3.x.x", optional = true } qemu-exit = { version = "3.x.x", optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }
##-------------------------------------------------------------------------------------------------- ##--------------------------------------------------------------------------------------------------
## Testing ## Testing

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -52,9 +52,9 @@ register_structs! {
(0x004 => TYPER: ReadOnly<u32, TYPER::Register>), (0x004 => TYPER: ReadOnly<u32, TYPER::Register>),
(0x008 => _reserved1), (0x008 => _reserved1),
(0x104 => ISENABLER: [ReadWrite<u32>; 31]), (0x104 => ISENABLER: [ReadWrite<u32>; 31]),
(0x108 => _reserved2), (0x180 => _reserved2),
(0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]), (0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]),
(0x824 => @END), (0xC00 => @END),
} }
} }
@ -65,7 +65,7 @@ register_structs! {
(0x100 => ISENABLER: ReadWrite<u32>), (0x100 => ISENABLER: ReadWrite<u32>),
(0x104 => _reserved2), (0x104 => _reserved2),
(0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]), (0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]),
(0x804 => @END), (0x820 => @END),
} }
} }

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -36,9 +36,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.43" version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -60,9 +60,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.100" version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -85,9 +85,9 @@ version = "0.1.0"
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"

@ -261,7 +261,7 @@ diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel/Cargo.toml 17_kernel_sy
+debug-symbol-types = { path = "../libraries/debug-symbol-types" } +debug-symbol-types = { path = "../libraries/debug-symbol-types" }
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel/src/_arch/aarch64/exception.rs 17_kernel_symbols/kernel/src/_arch/aarch64/exception.rs diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel/src/_arch/aarch64/exception.rs 17_kernel_symbols/kernel/src/_arch/aarch64/exception.rs
--- 16_virtual_mem_part4_higher_half_kernel/kernel/src/_arch/aarch64/exception.rs --- 16_virtual_mem_part4_higher_half_kernel/kernel/src/_arch/aarch64/exception.rs

@ -19,12 +19,12 @@ test-types = { path = "../libraries/test-types" }
debug-symbol-types = { path = "../libraries/debug-symbol-types" } debug-symbol-types = { path = "../libraries/debug-symbol-types" }
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
qemu-exit = { version = "3.x.x", optional = true } qemu-exit = { version = "3.x.x", optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }
##-------------------------------------------------------------------------------------------------- ##--------------------------------------------------------------------------------------------------
## Testing ## Testing

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -52,9 +52,9 @@ register_structs! {
(0x004 => TYPER: ReadOnly<u32, TYPER::Register>), (0x004 => TYPER: ReadOnly<u32, TYPER::Register>),
(0x008 => _reserved1), (0x008 => _reserved1),
(0x104 => ISENABLER: [ReadWrite<u32>; 31]), (0x104 => ISENABLER: [ReadWrite<u32>; 31]),
(0x108 => _reserved2), (0x180 => _reserved2),
(0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]), (0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]),
(0x824 => @END), (0xC00 => @END),
} }
} }
@ -65,7 +65,7 @@ register_structs! {
(0x100 => ISENABLER: ReadWrite<u32>), (0x100 => ISENABLER: ReadWrite<u32>),
(0x104 => _reserved2), (0x104 => _reserved2),
(0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]), (0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]),
(0x804 => @END), (0x820 => @END),
} }
} }

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -36,9 +36,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.43" version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -60,9 +60,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.100" version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -85,9 +85,9 @@ version = "0.1.0"
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"

@ -19,12 +19,12 @@ test-types = { path = "../libraries/test-types" }
debug-symbol-types = { path = "../libraries/debug-symbol-types" } debug-symbol-types = { path = "../libraries/debug-symbol-types" }
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
qemu-exit = { version = "3.x.x", optional = true } qemu-exit = { version = "3.x.x", optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }
##-------------------------------------------------------------------------------------------------- ##--------------------------------------------------------------------------------------------------
## Testing ## Testing

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -52,9 +52,9 @@ register_structs! {
(0x004 => TYPER: ReadOnly<u32, TYPER::Register>), (0x004 => TYPER: ReadOnly<u32, TYPER::Register>),
(0x008 => _reserved1), (0x008 => _reserved1),
(0x104 => ISENABLER: [ReadWrite<u32>; 31]), (0x104 => ISENABLER: [ReadWrite<u32>; 31]),
(0x108 => _reserved2), (0x180 => _reserved2),
(0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]), (0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]),
(0x824 => @END), (0xC00 => @END),
} }
} }
@ -65,7 +65,7 @@ register_structs! {
(0x100 => ISENABLER: ReadWrite<u32>), (0x100 => ISENABLER: ReadWrite<u32>),
(0x104 => _reserved2), (0x104 => _reserved2),
(0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]), (0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]),
(0x804 => @END), (0x820 => @END),
} }
} }

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -43,9 +43,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.43" version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -67,9 +67,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.100" version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -92,9 +92,9 @@ version = "0.1.0"
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"

@ -283,7 +283,7 @@ diff -uNr 18_backtrace/kernel/Cargo.toml 19_kernel_heap/kernel/Cargo.toml
+linked_list_allocator = { version = "0.10.x", default-features = false, features = ["const_mut_refs"] } +linked_list_allocator = { version = "0.10.x", default-features = false, features = ["const_mut_refs"] }
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
diff -uNr 18_backtrace/kernel/src/bsp/device_driver/arm/gicv2.rs 19_kernel_heap/kernel/src/bsp/device_driver/arm/gicv2.rs diff -uNr 18_backtrace/kernel/src/bsp/device_driver/arm/gicv2.rs 19_kernel_heap/kernel/src/bsp/device_driver/arm/gicv2.rs
--- 18_backtrace/kernel/src/bsp/device_driver/arm/gicv2.rs --- 18_backtrace/kernel/src/bsp/device_driver/arm/gicv2.rs

@ -21,12 +21,12 @@ debug-symbol-types = { path = "../libraries/debug-symbol-types" }
linked_list_allocator = { version = "0.10.x", default-features = false, features = ["const_mut_refs"] } linked_list_allocator = { version = "0.10.x", default-features = false, features = ["const_mut_refs"] }
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
qemu-exit = { version = "3.x.x", optional = true } qemu-exit = { version = "3.x.x", optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }
##-------------------------------------------------------------------------------------------------- ##--------------------------------------------------------------------------------------------------
## Testing ## Testing

@ -120,7 +120,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

@ -52,9 +52,9 @@ register_structs! {
(0x004 => TYPER: ReadOnly<u32, TYPER::Register>), (0x004 => TYPER: ReadOnly<u32, TYPER::Register>),
(0x008 => _reserved1), (0x008 => _reserved1),
(0x104 => ISENABLER: [ReadWrite<u32>; 31]), (0x104 => ISENABLER: [ReadWrite<u32>; 31]),
(0x108 => _reserved2), (0x180 => _reserved2),
(0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]), (0x820 => ITARGETSR: [ReadWrite<u32, ITARGETSR::Register>; 248]),
(0x824 => @END), (0xC00 => @END),
} }
} }
@ -65,7 +65,7 @@ register_structs! {
(0x100 => ISENABLER: ReadWrite<u32>), (0x100 => ISENABLER: ReadWrite<u32>),
(0x104 => _reserved2), (0x104 => _reserved2),
(0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]), (0x800 => ITARGETSR: [ReadOnly<u32, ITARGETSR::Register>; 8]),
(0x804 => @END), (0x820 => @END),
} }
} }

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "cortex-a" name = "cortex-a"
version = "7.5.0" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb"
dependencies = [ dependencies = [
"tock-registers", "tock-registers",
] ]
@ -21,6 +21,6 @@ dependencies = [
[[package]] [[package]]
name = "tock-registers" name = "tock-registers"
version = "0.7.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"

@ -23,8 +23,8 @@ path = "src/main.rs"
[dependencies] [dependencies]
# Optional dependencies # Optional dependencies
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true }
# Platform specific dependencies # Platform specific dependencies
[target.'cfg(target_arch = "aarch64")'.dependencies] [target.'cfg(target_arch = "aarch64")'.dependencies]
cortex-a = { version = "7.x.x" } cortex-a = { version = "8.x.x" }

Binary file not shown.

Binary file not shown.

@ -121,7 +121,7 @@ impl TryFrom<Duration> for GenericTimerCounterValue {
#[inline(always)] #[inline(always)]
fn read_cntpct() -> GenericTimerCounterValue { fn read_cntpct() -> GenericTimerCounterValue {
// Prevent that the counter is read ahead of time due to out-of-order execution. // Prevent that the counter is read ahead of time due to out-of-order execution.
unsafe { barrier::isb(barrier::SY) }; barrier::isb(barrier::SY);
let cnt = CNTPCT_EL0.get(); let cnt = CNTPCT_EL0.get();
GenericTimerCounterValue(cnt) GenericTimerCounterValue(cnt)

Loading…
Cancel
Save