Skip to content

Commit 9c98956

Browse files
Rename all instances of riscv-pac to riscv-types besides docs
1 parent 257c3d6 commit 9c98956

File tree

26 files changed

+397
-31
lines changed

26 files changed

+397
-31
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
resolver = "2"
33
members = [
44
"riscv",
5-
"riscv-pac",
5+
"riscv-types",
66
"riscv-peripheral",
77
"riscv-rt",
88
"riscv-semihosting",
@@ -13,7 +13,7 @@ members = [
1313

1414
default-members = [
1515
"riscv",
16-
"riscv-pac",
16+
"riscv-types",
1717
"riscv-peripheral",
1818
"riscv-rt",
1919
"riscv-semihosting",

riscv-peripheral/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ license = "ISC"
1717
embedded-hal = "1.0.0"
1818
paste = "1.0"
1919
riscv = { path = "../riscv", version = "0.15.0" }
20-
riscv-pac = { path = "../riscv-pac", version = "0.2.0" }
20+
riscv-types = { path = "../riscv-types", version = "0.2.0" }
2121

2222
[package.metadata.docs.rs]
2323
all-features = true

riscv-peripheral/src/aclint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub mod mswi;
77
pub mod mtimer;
88
pub mod sswi;
99

10-
pub use riscv_pac::HartIdNumber; // re-export useful riscv-pac traits
10+
pub use riscv_types::HartIdNumber; // re-export useful riscv-types traits
1111

1212
/// Trait for a CLINT peripheral.
1313
///

riscv-peripheral/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#![deny(missing_docs)]
44
#![no_std]
55

6-
pub use riscv_pac::result; // re-export the result module
6+
pub use riscv_types::result; // re-export the result module
77

88
pub mod common; // common definitions for all peripherals
99
pub mod hal; // trait implementations for embedded-hal

riscv-peripheral/src/macros.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub use paste::paste;
3131
/// ## Base address and per-HART mtimecmp registers, private `fn new()` function
3232
///
3333
/// ```
34-
/// use riscv_pac::result::{Error, Result};
34+
/// use riscv_types::result::{Error, Result};
3535
///
3636
/// /// HART IDs for the target CLINT peripheral
3737
/// #[derive(Clone, Copy, Debug, Eq, PartialEq)]
@@ -142,7 +142,7 @@ macro_rules! clint_codegen {
142142
/// ## Base address and per-HART context proxies, private `fn new()` function
143143
///
144144
/// ```
145-
/// use riscv_pac::result::{Error, Result};
145+
/// use riscv_types::result::{Error, Result};
146146
///
147147
/// /// HART IDs for the target CLINT peripheral
148148
/// #[derive(Clone, Copy, Debug, Eq, PartialEq)]

riscv-peripheral/src/plic.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ pub mod pendings;
88
pub mod priorities;
99
pub mod threshold;
1010

11-
// re-export useful riscv-pac traits
12-
pub use riscv_pac::{HartIdNumber, InterruptNumber, PriorityNumber};
11+
// re-export useful riscv-types traits
12+
pub use riscv_types::{HartIdNumber, InterruptNumber, PriorityNumber};
1313

1414
use riscv::register::{mhartid, mie, mip};
1515

@@ -200,7 +200,7 @@ impl<P: Plic> CTX<P> {
200200
#[cfg(test)]
201201
pub(crate) mod test {
202202
use crate::test::HartId;
203-
use riscv_pac::HartIdNumber;
203+
use riscv_types::HartIdNumber;
204204

205205
#[allow(dead_code)]
206206
#[test]

riscv-peripheral/src/plic/claim.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Interrupt claim/complete register
22
33
use crate::common::unsafe_peripheral;
4-
use riscv_pac::ExternalInterruptNumber;
4+
use riscv_types::ExternalInterruptNumber;
55

66
unsafe_peripheral!(CLAIM, u32, RW);
77

@@ -32,7 +32,7 @@ impl CLAIM {
3232
mod test {
3333
use super::*;
3434
use crate::test::Interrupt;
35-
use riscv_pac::InterruptNumber;
35+
use riscv_types::InterruptNumber;
3636

3737
#[test]
3838
fn test_claim() {

riscv-peripheral/src/plic/enables.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Interrupt enables register of a PLIC context.
22
33
use crate::common::{Reg, RW};
4-
use riscv_pac::ExternalInterruptNumber;
4+
use riscv_types::ExternalInterruptNumber;
55

66
/// Enables register of a PLIC context.
77
#[derive(Clone, Copy, Debug, Eq, PartialEq)]

riscv-peripheral/src/plic/pendings.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Interrupt pending bits register.
22
33
use crate::common::{Reg, RO};
4-
use riscv_pac::ExternalInterruptNumber;
4+
use riscv_types::ExternalInterruptNumber;
55

66
/// Interrupts pending bits register.
77
#[derive(Clone, Copy, Debug, Eq, PartialEq)]

riscv-peripheral/src/plic/priorities.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Interrupts Priorities register.
22
33
use crate::common::{Reg, RW};
4-
use riscv_pac::{ExternalInterruptNumber, PriorityNumber};
4+
use riscv_types::{ExternalInterruptNumber, PriorityNumber};
55

66
/// Interrupts priorities register.
77
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
@@ -71,7 +71,7 @@ impl PRIORITIES {
7171
mod test {
7272
use super::*;
7373
use crate::test::{Interrupt, Priority};
74-
use riscv_pac::InterruptNumber;
74+
use riscv_types::InterruptNumber;
7575

7676
#[test]
7777
fn test_priorities() {

0 commit comments

Comments
 (0)