From 3e29e87d3817e8883c3601cde7e93a9b8f1c59f3 Mon Sep 17 00:00:00 2001
From: Dylan McKay <me@dylanmckay.io>
Date: Thu, 14 Dec 2017 02:30:20 +1300
Subject: [PATCH] Rename ADDR to ADDRESS

---
 build.rs        |  2 +-
 src/register.rs | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/build.rs b/build.rs
index 73d9814..b735a9f 100644
--- a/build.rs
+++ b/build.rs
@@ -124,7 +124,7 @@ mod gen {
 
             writeln!(w, "impl Register for {} {{", register.name)?;
             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, "}}")?;
         }
 
diff --git a/src/register.rs b/src/register.rs
index 6442188..7f11221 100644
--- a/src/register.rs
+++ b/src/register.rs
@@ -1,5 +1,6 @@
 use core::{cmp, convert, marker, ops};
 
+/// A value that a register can store.
 pub trait RegisterValue : Copy + Clone +
                ops::BitAnd<Output=Self> +
                ops::BitAndAssign +
@@ -19,20 +20,20 @@ pub trait Register : Sized {
     type Mask = Mask<Self>;
 
     /// The address of the register.
-    const ADDR: *mut Self::T;
+    const ADDRESS: *mut Self::T;
 
     /// Writes a value to the register.
     #[inline(always)]
     fn write<V>(value: V) where V: Into<Self::T> {
         unsafe {
-            *Self::ADDR = value.into();
+            *Self::ADDRESS = value.into();
         }
     }
 
     /// Reads the value of the register.
     #[inline(always)]
     fn read() -> Self::T {
-        unsafe { *Self::ADDR }
+        unsafe { *Self::ADDRESS }
     }
 
     fn set(mask: Mask<Self>) {
@@ -45,7 +46,7 @@ pub trait Register : Sized {
     #[inline(always)]
     fn set_raw(mask: Self::T) {
         unsafe {
-            *Self::ADDR |= mask;
+            *Self::ADDRESS |= mask;
         }
     }
 
@@ -59,7 +60,7 @@ pub trait Register : Sized {
     #[inline(always)]
     fn unset_raw(mask: Self::T) {
         unsafe {
-            *Self::ADDR &= !mask;
+            *Self::ADDRESS &= !mask;
         }
     }
 
@@ -73,7 +74,7 @@ pub trait Register : Sized {
     #[inline(always)]
     fn toggle_raw(mask: Self::T) {
         unsafe {
-            *Self::ADDR ^= mask;
+            *Self::ADDRESS ^= mask;
         }
     }
 
@@ -87,7 +88,7 @@ pub trait Register : Sized {
     #[inline(always)]
     fn is_set_raw(mask: Self::T) -> bool {
         unsafe {
-            (*Self::ADDR & mask) == mask
+            (*Self::ADDRESS & mask) == mask
         }
     }
 
@@ -101,7 +102,7 @@ pub trait Register : Sized {
     #[inline(always)]
     fn is_clear_raw(mask: Self::T) -> bool {
         unsafe {
-            (*Self::ADDR & mask) == Self::T::from(0)
+            (*Self::ADDRESS & mask) == Self::T::from(0)
         }
     }