Skip to content

Commit 2531e68

Browse files
committed
MSRV is now 1.75
1 parent 89a632f commit 2531e68

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

.github/workflows/riscv-peripheral.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
build-riscv:
1212
strategy:
1313
matrix:
14-
# All generated code should be running on stable now, MRSV is 1.61.0
15-
toolchain: [ stable, nightly, 1.61.0 ]
14+
# All generated code should be running on stable now, MRSV is 1.75.0
15+
toolchain: [ stable, nightly, 1.75.0 ]
1616
target:
1717
- riscv32i-unknown-none-elf
1818
- riscv32imc-unknown-none-elf
@@ -33,9 +33,8 @@ jobs:
3333
targets: ${{ matrix.target }}
3434
- name: Build (no features)
3535
run: cargo build --package riscv-peripheral --target ${{ matrix.target }}
36-
# not yet, let's wait for 1.75.0
37-
# - name: Build (all features)
38-
# run: cargo build --package riscv-peripheral --target ${{ matrix.target }} --all-features
36+
- name: Build (all features)
37+
run: cargo build --package riscv-peripheral --target ${{ matrix.target }} --all-features
3938

4039
# On MacOS, Ubuntu, and Windows, we run the tests.
4140
build-others:
@@ -48,9 +47,8 @@ jobs:
4847
- uses: dtolnay/rust-toolchain@stable
4948
- name: Build (no features)
5049
run: cargo test --package riscv-peripheral
51-
# not yet, let's wait for 1.75.0
52-
# - name: Build (all features)
53-
# run: cargo test --package riscv-peripheral --all-features
50+
- name: Build (all features)
51+
run: cargo test --package riscv-peripheral --all-features
5452

5553
# Job to check that all the builds succeeded
5654
build-check:

riscv-pac/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
- Fix crates.io badge links
11+
1012
## [v0.1.0] - 2024-01-14
1113

1214
### Added

riscv-pac/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "riscv-pac"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
edition = "2021"
55
rust-version = "1.60"
66
repository = "https://github.com/rust-embedded/riscv"

riscv-pac/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ compile with older versions but that may change in any new patch release.
1616

1717
## License
1818

19-
Copyright 2023-2024s [RISC-V team][team]
19+
Copyright 2023-2024 [RISC-V team][team]
2020

2121
Permission to use, copy, modify, and/or distribute this software for any purpose
2222
with or without fee is hereby granted, provided that the above copyright notice

riscv-peripheral/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
[dependencies]
99
embedded-hal = "1.0.0"
1010
embedded-hal-async = { version = "1.0.0", optional = true }
11-
riscv = { path = "../riscv", version = "0.10" }
11+
riscv = { path = "../riscv", version = "0.11.0" }
1212
riscv-pac = { path = "../riscv-pac", version = "0.1.0" }
1313

1414
[features]

riscv-peripheral/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ This project is developed and maintained by the [RISC-V team][team].
1111

1212
## Minimum Supported Rust Version (MSRV)
1313

14-
This crate is guaranteed to compile on stable Rust 1.61 and up. It *might*
14+
This crate is guaranteed to compile on stable Rust 1.75 and up. It *might*
1515
compile with older versions but that may change in any new patch release.
1616

1717
## License
1818

19-
Copyright 2023-2024s [RISC-V team][team]
19+
Copyright 2023-2024 [RISC-V team][team]
2020

2121
Permission to use, copy, modify, and/or distribute this software for any purpose
2222
with or without fee is hereby granted, provided that the above copyright notice

riscv-peripheral/src/hal_async/aclint.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ use core::{
2929

3030
extern "Rust" {
3131
/// Returns the `MTIMER` register for the given HART ID.
32-
/// This is necessary for [`MachineExternal`] to obtain the corresponding `MTIMER` register.
32+
/// This is necessary for [`MachineTimer`] to obtain the corresponding `MTIMER` register.
3333
///
3434
/// # Safety
3535
///
36-
/// Do not call this function directly. It is only meant to be called by [`MachineExternal`].
36+
/// Do not call this function directly. It is only meant to be called by [`MachineTimer`].
3737
fn _riscv_peripheral_aclint_mtimer(hart_id: usize) -> MTIMER;
3838

3939
/// Tries to push a new timer to the timer queue assigned to the given HART ID.
@@ -51,15 +51,15 @@ extern "Rust" {
5151
///
5252
/// # Safety
5353
///
54-
/// Do not call this function directly. It is only meant to be called by [`MachineExternal`] and [`DelayAsync`].
54+
/// Do not call this function directly. It is only meant to be called by [`MachineTimer`] and [`DelayAsync`].
5555
fn _riscv_peripheral_aclint_wake_timers(hart_id: usize, current_tick: u64) -> Option<u64>;
5656
}
5757

5858
/// Machine-level timer interrupt handler. This handler is triggered whenever the `MTIME`
5959
/// register reaches the value of the `MTIMECMP` register of the current HART.
6060
#[no_mangle]
6161
#[allow(non_snake_case)]
62-
fn MachineExternal() {
62+
fn MachineTimer() {
6363
// recover the MTIME and MTIMECMP registers for the current HART
6464
let hart_id = riscv::register::mhartid::read();
6565
let mtimer = unsafe { _riscv_peripheral_aclint_mtimer(hart_id) };

0 commit comments

Comments
 (0)