Skip to content

Commit 7fbaa23

Browse files
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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Walbran <[email protected]>
1 parent bb1f564 commit 7fbaa23

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/exercises/bare-metal/rtc/Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/exercises/bare-metal/rtc/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ edition = "2024"
77
publish = false
88

99
[dependencies]
10-
aarch64-paging = { version = "0.9.1", default-features = false }
10+
aarch64-paging = { version = "0.10.0", default-features = false }
1111
aarch64-rt = "0.2.2"
12-
arm-gic = "0.4.0"
12+
arm-gic = "0.6.0"
1313
arm-pl011-uart = "0.3.1"
1414
bitflags = "2.9.1"
1515
chrono = { version = "0.4.41", default-features = false }

src/exercises/bare-metal/rtc/src/exceptions.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
use arm_gic::gicv3::GicV3;
15+
use arm_gic::gicv3::{GicV3, InterruptGroup};
1616
use log::{error, info, trace};
1717
use smccc::Hvc;
1818
use smccc::psci::system_off;
@@ -28,8 +28,8 @@ extern "C" fn sync_exception_current(_elr: u64, _spsr: u64) {
2828
#[unsafe(no_mangle)]
2929
extern "C" fn irq_current(_elr: u64, _spsr: u64) {
3030
trace!("irq_current");
31-
let intid =
32-
GicV3::get_and_acknowledge_interrupt().expect("No pending interrupt");
31+
let intid = GicV3::get_and_acknowledge_interrupt(InterruptGroup::Group1)
32+
.expect("No pending interrupt");
3333
info!("IRQ {intid:?}");
3434
}
3535

0 commit comments

Comments
 (0)