Skip to content

Commit 4d988ab

Browse files
bors[bot]Dirbaio
andauthored
Merge #9
9: Update to critical-section 1.0 r=jonas-schievink a=Dirbaio This is a breaking change, because 1.0 no longer supplies any critical section implementation by default. The user has to opt-in to one instead (for example, by enabling the `critical-section-single-core` feature in `cortex-m`: rust-embedded/cortex-m#447 (comment)). TODO before merging: - [x] Wait for `critical-section 1.0` release rust-embedded/critical-section#19 Co-authored-by: Dario Nieuwenhuis <[email protected]>
2 parents d6db4c2 + a82c125 commit 4d988ab

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ repository = "https://github.com/nrf-rs/nrf-usbd"
1818
cortex-m = "0.7.2"
1919
usb-device = "0.2.8"
2020
vcell = "0.1.3"
21-
critical-section = "0.2.4"
22-
bare-metal = "1.0.0"
21+
critical-section = "1.0.0"
2322

2423
[profile.dev]
2524
codegen-units = 1

src/usbd.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
//! * Different events are used to initiate transfers.
77
//! * No notification when the status stage is ACK'd.
88
9-
use bare_metal::Mutex;
109
use core::cell::Cell;
1110
use core::mem::MaybeUninit;
1211
use core::sync::atomic::{compiler_fence, Ordering};
13-
use critical_section::CriticalSection;
12+
use critical_section::{CriticalSection, Mutex};
1413
use usb_device::{
1514
bus::{PollResult, UsbBus, UsbBusAllocator},
1615
endpoint::{EndpointAddress, EndpointType},

0 commit comments

Comments
 (0)