aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bors[bot] <bors[bot]@users.noreply.github.com> 2019-03-12 20:45:06 +0000
committerGravatar bors[bot] <bors[bot]@users.noreply.github.com> 2019-03-12 20:45:06 +0000
commit04ee333b63e10d1471e4c4c07c523b8ab111577b (patch)
tree40a80455649965cef053403dd79e056b647c6d8a /src
parent33d19098627bf9c718accc147ec6bd0fc9421010 (diff)
parentd8bf195b1d2634bef0fcac00e68ff64b2be0754c (diff)
downloadcortex-m-04ee333b63e10d1471e4c4c07c523b8ab111577b.tar.gz
cortex-m-04ee333b63e10d1471e4c4c07c523b8ab111577b.tar.zst
cortex-m-04ee333b63e10d1471e4c4c07c523b8ab111577b.zip
Merge #126
126: Upgrade to aligned 0.3 r=adamgreig a=rnestler Co-authored-by: Raphael Nestler <raphael.nestler@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/itm.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/itm.rs b/src/itm.rs
index 0e32e3c..4f8dcf8 100644
--- a/src/itm.rs
+++ b/src/itm.rs
@@ -4,7 +4,7 @@
use core::{fmt, mem, ptr, slice};
-use aligned::Aligned;
+use aligned::{Aligned, A4};
use peripheral::itm::Stim;
@@ -77,7 +77,7 @@ pub fn write_all(port: &mut Stim, buffer: &[u8]) {
/// # Examples
///
/// ``` ignore
-/// let mut buffer: Aligned<u32, _> = Aligned([0; 14]);
+/// let mut buffer: Aligned<A4, _> = Aligned([0; 14]);
///
/// buffer.copy_from_slice(b"Hello, world!\n");
///
@@ -86,7 +86,7 @@ pub fn write_all(port: &mut Stim, buffer: &[u8]) {
/// // Or equivalently
/// itm::write_aligned(&itm.stim[0], &Aligned(*b"Hello, world!\n"));
/// ```
-pub fn write_aligned(port: &mut Stim, buffer: &Aligned<u32, [u8]>) {
+pub fn write_aligned(port: &mut Stim, buffer: &Aligned<A4, [u8]>) {
unsafe {
let len = buffer.len();