From c473fdb537886e5e307623a4eb8f54139fbf2ebd Mon Sep 17 00:00:00 2001
From: rmsyn <github@weathered-steel.dev>
Date: Sun, 20 Oct 2024 23:33:38 +0000
Subject: [PATCH] riscv: use CSR macros for marchid

Uses CSR helper macros to define the `marchid` register.
---
 riscv/CHANGELOG.md            |  8 ++++++++
 riscv/src/register/marchid.rs | 30 +++++-------------------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/riscv/CHANGELOG.md b/riscv/CHANGELOG.md
index e8a64fb8..a662702f 100644
--- a/riscv/CHANGELOG.md
+++ b/riscv/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+
+- CSR helper macro to check for platform implementation
+
+### Changed
+
+- Use CSR helper macros to define `marchid` register
+
 ## [v0.12.1] - 2024-10-20
 
 ### Changed
diff --git a/riscv/src/register/marchid.rs b/riscv/src/register/marchid.rs
index feca296a..fd03d763 100644
--- a/riscv/src/register/marchid.rs
+++ b/riscv/src/register/marchid.rs
@@ -1,28 +1,8 @@
 //! marchid register
 
-use core::num::NonZeroUsize;
-
-/// marchid register
-#[derive(Clone, Copy, Debug)]
-pub struct Marchid {
-    bits: NonZeroUsize,
-}
-
-impl Marchid {
-    /// Returns the contents of the register as raw bits
-    #[inline]
-    pub fn bits(&self) -> usize {
-        self.bits.get()
-    }
-}
-
-read_csr!(0xF12);
-
-/// Reads the CSR
-#[inline]
-pub fn read() -> Option<Marchid> {
-    let r = unsafe { _read() };
-    // When marchid is hardwired to zero it means that the marchid
-    // csr isn't implemented.
-    NonZeroUsize::new(r).map(|bits| Marchid { bits })
+read_only_csr! {
+    /// `marchid` register
+    Marchid: 0xF12,
+    mask: 0xffff_ffff,
+    sentinel: 0,
 }