savanni/ruduino
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename ADDR to ADDRESS

Browse Source
This commit is contained in:
Dylan McKay 2017-12-14 02:30:20 +13:00
parent c5dac9d7c0
commit 3e29e87d38
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.rs
View File

@ -124,7 +124,7 @@ mod gen {
writeln!(w, "impl Register for {} {{", register.name)?; writeln!(w, "impl Register for {} {{", register.name)?;
writeln!(w, " type T = {};", ty)?; writeln!(w, " type T = {};", ty)?;
writeln!(w, " const ADDR: *mut {} = 0x{:x} as *mut {};", ty, register.offset, ty)?; writeln!(w, " const ADDRESS: *mut {} = 0x{:x} as *mut {};", ty, register.offset, ty)?;
writeln!(w, "}}")?; writeln!(w, "}}")?;
} }

17
src/register.rs
View File

@ -1,5 +1,6 @@
use core::{cmp, convert, marker, ops}; use core::{cmp, convert, marker, ops};
/// A value that a register can store.
pub trait RegisterValue : Copy + Clone + pub trait RegisterValue : Copy + Clone +
ops::BitAnd<Output=Self> + ops::BitAnd<Output=Self> +
ops::BitAndAssign + ops::BitAndAssign +
@ -19,20 +20,20 @@ pub trait Register : Sized {
type Mask = Mask<Self>; type Mask = Mask<Self>;
/// The address of the register. /// The address of the register.
const ADDR: *mut Self::T; const ADDRESS: *mut Self::T;
/// Writes a value to the register. /// Writes a value to the register.
#[inline(always)] #[inline(always)]
fn write<V>(value: V) where V: Into<Self::T> { fn write<V>(value: V) where V: Into<Self::T> {
unsafe { unsafe {
*Self::ADDR = value.into(); *Self::ADDRESS = value.into();
} }
} }
/// Reads the value of the register. /// Reads the value of the register.
#[inline(always)] #[inline(always)]
fn read() -> Self::T { fn read() -> Self::T {
unsafe { *Self::ADDR } unsafe { *Self::ADDRESS }
} }
fn set(mask: Mask<Self>) { fn set(mask: Mask<Self>) {
@ -45,7 +46,7 @@ pub trait Register : Sized {
#[inline(always)] #[inline(always)]
fn set_raw(mask: Self::T) { fn set_raw(mask: Self::T) {
unsafe { unsafe {
*Self::ADDR |= mask; *Self::ADDRESS |= mask;
} }
} }
@ -59,7 +60,7 @@ pub trait Register : Sized {
#[inline(always)] #[inline(always)]
fn unset_raw(mask: Self::T) { fn unset_raw(mask: Self::T) {
unsafe { unsafe {
*Self::ADDR &= !mask; *Self::ADDRESS &= !mask;
} }
} }
@ -73,7 +74,7 @@ pub trait Register : Sized {
#[inline(always)] #[inline(always)]
fn toggle_raw(mask: Self::T) { fn toggle_raw(mask: Self::T) {
unsafe { unsafe {
*Self::ADDR ^= mask; *Self::ADDRESS ^= mask;
} }
} }
@ -87,7 +88,7 @@ pub trait Register : Sized {
#[inline(always)] #[inline(always)]
fn is_set_raw(mask: Self::T) -> bool { fn is_set_raw(mask: Self::T) -> bool {
unsafe { unsafe {
(*Self::ADDR & mask) == mask (*Self::ADDRESS & mask) == mask
} }
} }
@ -101,7 +102,7 @@ pub trait Register : Sized {
#[inline(always)] #[inline(always)]
fn is_clear_raw(mask: Self::T) -> bool { fn is_clear_raw(mask: Self::T) -> bool {
unsafe { unsafe {
(*Self::ADDR & mask) == Self::T::from(0) (*Self::ADDRESS & mask) == Self::T::from(0)
} }
} }