diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2019-07-29 20:22:11 +0000 |
|---|---|---|
| committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2019-07-29 20:22:11 +0000 |
| commit | 1aa7d5dba9f3a50d1568bcfddc4073ac08d4ee1e (patch) | |
| tree | 09e8c83bc0e843c20e5f1589f702e945d335d4a8 /src/register | |
| parent | 6a213910f7f8920906c2f8882cbc1f1a3ebc3627 (diff) | |
| parent | 9987c6f9e77d50feb6b77be4c9eae84a988e1fdf (diff) | |
| download | cortex-m-1aa7d5dba9f3a50d1568bcfddc4073ac08d4ee1e.tar.gz cortex-m-1aa7d5dba9f3a50d1568bcfddc4073ac08d4ee1e.tar.zst cortex-m-1aa7d5dba9f3a50d1568bcfddc4073ac08d4ee1e.zip | |
Merge #160
160: Update for 2018 edition r=korken89 a=adamgreig
Co-authored-by: Adam Greig <adam@adamgreig.com>
Diffstat (limited to 'src/register')
| -rw-r--r-- | src/register/basepri.rs | 2 | ||||
| -rw-r--r-- | src/register/basepri_max.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/register/basepri.rs b/src/register/basepri.rs index a9cd6ef..a09e34b 100644 --- a/src/register/basepri.rs +++ b/src/register/basepri.rs @@ -39,7 +39,7 @@ pub unsafe fn write(_basepri: u8) { #[cfg(not(feature = "cm7-r0p1"))] () => asm!("msr BASEPRI, $0" :: "r"(_basepri) : "memory" : "volatile"), #[cfg(feature = "cm7-r0p1")] - () => ::interrupt::free( + () => crate::interrupt::free( |_| asm!("msr BASEPRI, $0" :: "r"(_basepri) : "memory" : "volatile"), ), }, diff --git a/src/register/basepri_max.rs b/src/register/basepri_max.rs index 59ddb44..694fd75 100644 --- a/src/register/basepri_max.rs +++ b/src/register/basepri_max.rs @@ -16,7 +16,7 @@ pub fn write(_basepri: u8) { #[cfg(not(feature = "cm7-r0p1"))] () => asm!("msr BASEPRI_MAX, $0" :: "r"(_basepri) : "memory" : "volatile"), #[cfg(feature = "cm7-r0p1")] - () => ::interrupt::free( + () => crate::interrupt::free( |_| asm!("msr BASEPRI_MAX, $0" :: "r"(_basepri) : "memory" : "volatile"), ), } |