Skip to content

Commit ff22137

Browse files
committed
Fix clippy
1 parent 7762939 commit ff22137

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

riscv-peripheral/src/plic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ pub(crate) mod test {
148148

149149
#[pac_enum(unsafe InterruptNumber)]
150150
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
151-
#[repr(u16)]
151+
#[repr(usize)]
152152
pub(crate) enum Interrupt {
153153
I1 = 1,
154154
I2 = 2,

riscv-peripheral/src/plic/enables.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl ENABLES {
3030
/// Checks if an interrupt source is enabled for the PLIC context.
3131
#[inline]
3232
pub fn is_enabled<I: ExternalInterruptNumber>(self, source: I) -> bool {
33-
let source = source.number() as usize;
33+
let source = source.number();
3434
let offset = (source / u32::BITS as usize) as _;
3535
// SAFETY: valid interrupt number
3636
let reg: Reg<u32, RW> = unsafe { Reg::new(self.ptr.offset(offset)) };
@@ -48,7 +48,7 @@ impl ENABLES {
4848
/// * Enabling an interrupt source can break mask-based critical sections.
4949
#[inline]
5050
pub unsafe fn enable<I: ExternalInterruptNumber>(self, source: I) {
51-
let source = source.number() as usize;
51+
let source = source.number();
5252
let offset = (source / u32::BITS as usize) as _;
5353
// SAFETY: valid interrupt number
5454
let reg: Reg<u32, RW> = unsafe { Reg::new(self.ptr.offset(offset)) };
@@ -73,7 +73,7 @@ impl ENABLES {
7373
source: I,
7474
order: core::sync::atomic::Ordering,
7575
) {
76-
let source = source.number() as usize;
76+
let source = source.number();
7777
let offset = (source / u32::BITS as usize) as _;
7878
// SAFETY: valid interrupt number
7979
let reg: Reg<u32, RW> = unsafe { Reg::new(self.ptr.offset(offset)) };
@@ -87,7 +87,7 @@ impl ENABLES {
8787
/// It performs non-atomic read-modify-write operations, which may lead to **wrong** behavior.
8888
#[inline]
8989
pub fn disable<I: ExternalInterruptNumber>(self, source: I) {
90-
let source = source.number() as usize;
90+
let source = source.number();
9191
let offset = (source / u32::BITS as usize) as _;
9292
// SAFETY: valid interrupt number
9393
let reg: Reg<u32, RW> = unsafe { Reg::new(self.ptr.offset(offset)) };
@@ -111,7 +111,7 @@ impl ENABLES {
111111
source: I,
112112
order: core::sync::atomic::Ordering,
113113
) {
114-
let source = source.number() as usize;
114+
let source = source.number();
115115
let offset = (source / u32::BITS as usize) as _;
116116
// SAFETY: valid interrupt number
117117
let reg: Reg<u32, RW> = unsafe { Reg::new(self.ptr.offset(offset)) };

riscv-peripheral/src/plic/pendings.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl PENDINGS {
3030
/// Checks if an interrupt triggered by a given source is pending.
3131
#[inline]
3232
pub fn is_pending<I: ExternalInterruptNumber>(self, source: I) -> bool {
33-
let source = source.number() as usize;
33+
let source = source.number();
3434
let offset = (source / u32::BITS as usize) as _;
3535
// SAFETY: valid interrupt number
3636
let reg: Reg<u32, RO> = unsafe { Reg::new(self.ptr.offset(offset)) };

riscv-peripheral/src/plic/priorities.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ impl PRIORITIES {
3131
#[inline]
3232
pub fn get_priority<I: ExternalInterruptNumber, P: PriorityNumber>(self, source: I) -> P {
3333
// SAFETY: valid interrupt number
34-
let reg: Reg<u32, RW> = unsafe { Reg::new(self.ptr.offset(source.number() as _)) };
34+
let reg: Reg<u32, RW> = unsafe { Reg::new(self.ptr.add(source.number())) };
3535
P::from_number(reg.read() as _).unwrap()
3636
}
3737

@@ -47,7 +47,7 @@ impl PRIORITIES {
4747
priority: P,
4848
) {
4949
// SAFETY: valid interrupt number
50-
let reg: Reg<u32, RW> = unsafe { Reg::new(self.ptr.offset(source.number() as _)) };
50+
let reg: Reg<u32, RW> = unsafe { Reg::new(self.ptr.add(source.number())) };
5151
reg.write(priority.number() as _);
5252
}
5353

0 commit comments

Comments
 (0)