aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Adam Greig <adam@adamgreig.com> 2020-02-04 23:38:47 +0000
committerGravatar Adam Greig <adam@adamgreig.com> 2020-02-04 23:38:47 +0000
commit9ad4e10d8a96b283b31b3309a65678513d50e270 (patch)
treee61b7aea8a0cc226b4013cee781311028c14861e /src
parent2608c234067b1da2e9aaf76ff13bbd6ac532edd3 (diff)
downloadcortex-m-9ad4e10d8a96b283b31b3309a65678513d50e270.tar.gz
cortex-m-9ad4e10d8a96b283b31b3309a65678513d50e270.tar.zst
cortex-m-9ad4e10d8a96b283b31b3309a65678513d50e270.zip
Add missing inline(always) and change more initialised->initialized
Diffstat (limited to 'src')
-rw-r--r--src/peripheral/cpuid.rs1
-rw-r--r--src/peripheral/scb.rs16
2 files changed, 9 insertions, 8 deletions
diff --git a/src/peripheral/cpuid.rs b/src/peripheral/cpuid.rs
index 3cb0079..32d0baf 100644
--- a/src/peripheral/cpuid.rs
+++ b/src/peripheral/cpuid.rs
@@ -131,6 +131,7 @@ impl CPUID {
/// caches that are controlled by the processor.
///
/// This is the `IminLine` field of the CTR register.
+ #[inline(always)]
pub fn cache_iminline() -> u32 {
const CTR_IMINLINE_POS: u32 = 0;
const CTR_IMINLINE_MASK: u32 = 0xF << CTR_IMINLINE_POS;
diff --git a/src/peripheral/scb.rs b/src/peripheral/scb.rs
index 4ab1e8f..eb7bb72 100644
--- a/src/peripheral/scb.rs
+++ b/src/peripheral/scb.rs
@@ -531,9 +531,9 @@ impl SCB {
///
/// After invalidating, the next read of invalidated data will be from main memory. This may
/// cause recent writes to be lost, potentially including writes that initialized objects.
- /// Therefore, this method may cause uninitialised memory or invalid values to be read,
+ /// Therefore, this method may cause uninitialized memory or invalid values to be read,
/// resulting in undefined behaviour. You must ensure that main memory contains valid and
- /// initialised values before invalidating.
+ /// initialized values before invalidating.
///
/// `addr` **must** be aligned to the size of the cache lines, and `size` **must** be a
/// multiple of the cache line size, otherwise this function will invalidate other memory,
@@ -598,10 +598,10 @@ impl SCB {
/// # Safety
///
/// After invalidating, `obj` will be read from main memory on next access. This may cause
- /// recent writes to `obj` to be lost, potentially including the write that initialised it.
- /// Therefore, this method may cause uninitialised memory or invalid values to be read,
+ /// recent writes to `obj` to be lost, potentially including the write that initialized it.
+ /// Therefore, this method may cause uninitialized memory or invalid values to be read,
/// resulting in undefined behaviour. You must ensure that main memory contains a valid and
- /// initialised value for T before invalidating `obj`.
+ /// initialized value for T before invalidating `obj`.
///
/// `obj` **must** be aligned to the size of the cache lines, and its size **must** be a
/// multiple of the cache line size, otherwise this function will invalidate other memory,
@@ -636,10 +636,10 @@ impl SCB {
/// # Safety
///
/// After invalidating, `slice` will be read from main memory on next access. This may cause
- /// recent writes to `slice` to be lost, potentially including the write that initialised it.
- /// Therefore, this method may cause uninitialised memory or invalid values to be read,
+ /// recent writes to `slice` to be lost, potentially including the write that initialized it.
+ /// Therefore, this method may cause uninitialized memory or invalid values to be read,
/// resulting in undefined behaviour. You must ensure that main memory contains valid and
- /// initialised values for T before invalidating `slice`.
+ /// initialized values for T before invalidating `slice`.
///
/// `slice` **must** be aligned to the size of the cache lines, and its size **must** be a
/// multiple of the cache line size, otherwise this function will invalidate other memory,