From 7fbaa23a2edae50e0942cd4963fa80260234167f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 17:24:36 +0000 Subject: [PATCH] cargo: bump the minor group in /src/exercises/bare-metal/rtc with 2 updates (#2835) Bumps the minor group in /src/exercises/bare-metal/rtc with 2 updates: [aarch64-paging](https://github.com/google/aarch64-paging) and [arm-gic](https://github.com/google/arm-gic). --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Walbran --- src/exercises/bare-metal/rtc/Cargo.lock | 8 ++++---- src/exercises/bare-metal/rtc/Cargo.toml | 4 ++-- src/exercises/bare-metal/rtc/src/exceptions.rs | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/exercises/bare-metal/rtc/Cargo.lock b/src/exercises/bare-metal/rtc/Cargo.lock index 6e99dd1e..e2a46054 100644 --- a/src/exercises/bare-metal/rtc/Cargo.lock +++ b/src/exercises/bare-metal/rtc/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "aarch64-paging" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b8f725e9256b2fac2d25e013e22a6a391b8c07e23c4c5eac6e037a78a28801" +checksum = "1f02b5bfa3a481fdade5948a994ce93aa6c76f67fc19f3a9b270565cf7dfc657" dependencies = [ "bitflags", "thiserror", @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "arm-gic" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd58684ee8041735b64d9e731b18c5515397ee4487f56f7cb9a409c8cbd17839" +checksum = "7ef1a9754e7f526d1740ac6bc7db15cd804294917e66fed899f9a94176ac19b9" dependencies = [ "bitflags", "safe-mmio", diff --git a/src/exercises/bare-metal/rtc/Cargo.toml b/src/exercises/bare-metal/rtc/Cargo.toml index ae7d0580..9d795079 100644 --- a/src/exercises/bare-metal/rtc/Cargo.toml +++ b/src/exercises/bare-metal/rtc/Cargo.toml @@ -7,9 +7,9 @@ edition = "2024" publish = false [dependencies] -aarch64-paging = { version = "0.9.1", default-features = false } +aarch64-paging = { version = "0.10.0", default-features = false } aarch64-rt = "0.2.2" -arm-gic = "0.4.0" +arm-gic = "0.6.0" arm-pl011-uart = "0.3.1" bitflags = "2.9.1" chrono = { version = "0.4.41", default-features = false } diff --git a/src/exercises/bare-metal/rtc/src/exceptions.rs b/src/exercises/bare-metal/rtc/src/exceptions.rs index ba9cd225..6c4c3016 100644 --- a/src/exercises/bare-metal/rtc/src/exceptions.rs +++ b/src/exercises/bare-metal/rtc/src/exceptions.rs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use arm_gic::gicv3::GicV3; +use arm_gic::gicv3::{GicV3, InterruptGroup}; use log::{error, info, trace}; use smccc::Hvc; use smccc::psci::system_off; @@ -28,8 +28,8 @@ extern "C" fn sync_exception_current(_elr: u64, _spsr: u64) { #[unsafe(no_mangle)] extern "C" fn irq_current(_elr: u64, _spsr: u64) { trace!("irq_current"); - let intid = - GicV3::get_and_acknowledge_interrupt().expect("No pending interrupt"); + let intid = GicV3::get_and_acknowledge_interrupt(InterruptGroup::Group1) + .expect("No pending interrupt"); info!("IRQ {intid:?}"); }