Skip to content

Update arm-gic to 0.8 #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonathanpallant wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update arm-gic to 0.8 #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/mps3-an536-el2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version = "0.0.0"
[dependencies]
aarch32-cpu = { path = "../../aarch32-cpu", features = ["critical-section-multi-core"] }
aarch32-rt = { path = "../../aarch32-rt", features = ["el2-mode"] }
arm-gic = { version = "0.7.1" }
arm-gic = "0.8.1"
critical-section = "1.2.0"
heapless = "0.9.1"
libm = "0.2.15"
Expand Down
5 changes: 4 additions & 1 deletion examples/mps3-an536-el2/src/bin/generic-timer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ use core::sync::atomic::{AtomicU32, Ordering::Relaxed};

use aarch32_cpu::generic_timer::GenericTimer;
use aarch32_rt::{entry, exception, irq};
use arm_gic::gicv3::{GicCpuInterface, Group, InterruptGroup};
use arm_gic::{
InterruptGroup,
gicv3::{GicCpuInterface, Group},
};
use semihosting::println;

use mps3_an536_el2::HYP_TIMER_PPI;
Expand Down
2 changes: 1 addition & 1 deletion examples/mps3-an536-smp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version = "0.0.0"
[dependencies]
aarch32-cpu = { path = "../../aarch32-cpu", features = ["critical-section-multi-core"] }
aarch32-rt = { path = "../../aarch32-rt" }
arm-gic = { version = "0.7.1" }
arm-gic = "0.8.1"
critical-section = "1.2.0"
heapless = "0.9.1"
libm = "0.2.15"
Expand Down
4 changes: 2 additions & 2 deletions examples/mps3-an536-smp/src/bin/gic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use core::cell::RefCell;
use core::sync::atomic::{AtomicBool, Ordering};

use arm_gic::{
IntId,
gicv3::{GicCpuInterface, Group, InterruptGroup, SgiTarget, SgiTargetGroup},
gicv3::{GicCpuInterface, Group, SgiTarget, SgiTargetGroup},
{IntId, InterruptGroup},
};
use critical_section::Mutex;
use semihosting::println;
Expand Down
2 changes: 1 addition & 1 deletion examples/mps3-an536/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ version = "0.0.0"
[dependencies]
aarch32-cpu = { path = "../../aarch32-cpu", features = ["critical-section-multi-core"] }
aarch32-rt = { path = "../../aarch32-rt" }
arm-gic = { version = "0.7.1" }
arm-gic = "0.8.1"
critical-section = "1.2.0"
heapless = "0.9.1"
libm = "0.2.15"
Expand Down
5 changes: 4 additions & 1 deletion examples/mps3-an536/src/bin/generic_timer_irq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@

use aarch32_cpu::generic_timer::{El1VirtualTimer, GenericTimer};
use aarch32_rt::{entry, irq};
use arm_gic::gicv3::{GicCpuInterface, Group, InterruptGroup};
use arm_gic::{
InterruptGroup,
gicv3::{GicCpuInterface, Group},
};
use mps3_an536::VIRTUAL_TIMER_PPI;
use semihosting::println;

Expand Down
4 changes: 2 additions & 2 deletions examples/mps3-an536/src/bin/gic-map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use core::cell::RefCell;

use aarch32_rt::{entry, irq};
use arm_gic::{
IntId,
gicv3::{GicCpuInterface, Group, InterruptGroup, SgiTarget, SgiTargetGroup},
gicv3::{GicCpuInterface, Group, SgiTarget, SgiTargetGroup},
{IntId, InterruptGroup},
};
use heapless::linear_map::LinearMap;
use mps3_an536::InterruptHandler;
Expand Down
4 changes: 2 additions & 2 deletions examples/mps3-an536/src/bin/gic-priority-ceiling.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

use aarch32_rt::{entry, irq};
use arm_gic::{
IntId,
gicv3::{GicCpuInterface, Group, InterruptGroup, SgiTarget, SgiTargetGroup},
gicv3::{GicCpuInterface, Group, SgiTarget, SgiTargetGroup},
{IntId, InterruptGroup},
};
use mps3_an536 as _;
use semihosting::println;
Expand Down
4 changes: 2 additions & 2 deletions examples/mps3-an536/src/bin/gic-static-section-irq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

use aarch32_rt::{entry, irq};
use arm_gic::{
IntId,
gicv3::{GicCpuInterface, Group, InterruptGroup, SgiTarget, SgiTargetGroup},
gicv3::{GicCpuInterface, Group, SgiTarget, SgiTargetGroup},
{IntId, InterruptGroup},
};
use mps3_an536::InterruptHandler;
use semihosting::println;
Expand Down
4 changes: 2 additions & 2 deletions examples/mps3-an536/src/bin/gic-unified-irq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

use aarch32_rt::{entry, irq};
use arm_gic::{
IntId,
gicv3::{GicCpuInterface, Group, InterruptGroup, SgiTarget, SgiTargetGroup},
gicv3::{GicCpuInterface, Group, SgiTarget, SgiTargetGroup},
{IntId, InterruptGroup},
};
use mps3_an536 as _;
use semihosting::println;
Expand Down
Loading