Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
resolver = "2"
members = [
"riscv",
"riscv-pac",
"riscv-types",
"riscv-peripheral",
"riscv-rt",
"riscv-semihosting",
Expand All @@ -13,7 +13,7 @@ members = [

default-members = [
"riscv",
"riscv-pac",
"riscv-types",
"riscv-peripheral",
"riscv-rt",
"riscv-semihosting",
Expand Down
2 changes: 1 addition & 1 deletion riscv-peripheral/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ license = "ISC"
embedded-hal = "1.0.0"
paste = "1.0"
riscv = { path = "../riscv", version = "0.15.0" }
riscv-pac = { path = "../riscv-pac", version = "0.2.0" }
riscv-types = { path = "../riscv-types", version = "0.2.0" }

[package.metadata.docs.rs]
all-features = true
Expand Down
2 changes: 1 addition & 1 deletion riscv-peripheral/src/aclint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pub mod mswi;
pub mod mtimer;
pub mod sswi;

pub use riscv_pac::HartIdNumber; // re-export useful riscv-pac traits
pub use riscv_pac::HartIdNumber; // re-export useful riscv-types traits

/// Trait for a CLINT peripheral.
///
Expand Down
2 changes: 1 addition & 1 deletion riscv-peripheral/src/plic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub mod pendings;
pub mod priorities;
pub mod threshold;

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

use riscv::register::{mhartid, mie, mip};
Expand Down
2 changes: 1 addition & 1 deletion riscv-rt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ riscv-target-parser = { path = "../riscv-target-parser", version = "0.1.2" }

[dependencies]
riscv = { path = "../riscv", version = "0.15.0" }
riscv-pac = { path = "../riscv-pac", version = "0.2.0" }
riscv-types = { path = "../riscv-types", version = "0.2.0" }
riscv-rt-macros = { path = "macros", version = "0.6.0" }

defmt = { version = "1.0.1", optional = true }
Expand Down
2 changes: 2 additions & 0 deletions riscv-pac/CHANGELOG.md → riscv-types/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

- Rename `riscv-pac` to `riscv-types`

## [v0.2.0] - 2024-10-19

### Added
Expand Down
2 changes: 1 addition & 1 deletion riscv-pac/Cargo.toml → riscv-types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "riscv-pac"
name = "riscv-types"
version = "0.2.0"
edition = "2021"
rust-version = "1.60"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion riscv/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ critical-section-single-hart = ["critical-section/restore-state-bool"]
[dependencies]
critical-section = "1.2.0"
embedded-hal = "1.0.0"
riscv-pac = { path = "../riscv-pac", version = "0.2.0" }
riscv-types = { path = "../riscv-types", version = "0.2.0" }
riscv-macros = { path = "macros", version = "0.3.0", optional = true }
paste = "1.0.15"
4 changes: 2 additions & 2 deletions riscv/macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ impl InterruptType {
}
}

/// Struct containing the information needed to implement the `riscv-pac` traits for an enum
/// Struct containing the information needed to implement the `riscv-types` traits for an enum
struct PacEnumItem {
/// The name of the enum
name: Ident,
Expand Down Expand Up @@ -408,7 +408,7 @@ core::arch::global_asm!("
}
}

/// Attribute-like macro that implements the traits of the `riscv-pac` crate for a given enum.
/// Attribute-like macro that implements the traits of the `riscv-types` crate for a given enum.
///
/// As these traits are unsafe, the macro must be called with the `unsafe` keyword followed by the trait name.
/// In this way, we warn callers that they must comply with the requirements of the trait.
Expand Down
2 changes: 1 addition & 1 deletion riscv/src/interrupt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use crate::result::Result;

// re-export useful riscv-pac traits
pub use riscv_pac::{CoreInterruptNumber, ExceptionNumber, InterruptNumber};
pub use riscv_types::{CoreInterruptNumber, ExceptionNumber, InterruptNumber};

pub mod machine;
pub mod supervisor;
Expand Down
2 changes: 1 addition & 1 deletion riscv/src/register/scause.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! scause register

pub use crate::interrupt::Trap;
pub use riscv_pac::{CoreInterruptNumber, ExceptionNumber, InterruptNumber}; // re-export useful riscv-pac traits
pub use riscv_pac::{CoreInterruptNumber, ExceptionNumber, InterruptNumber}; // re-export useful riscv-types traits

read_write_csr! {
/// scause register
Expand Down
Loading