From d49fb1ec06bcd89fee1fe20cb20ab82da91ce434 Mon Sep 17 00:00:00 2001
From: Finomnis <finomnis@gmail.com>
Date: Sun, 18 Jun 2023 17:10:38 +0200
Subject: Allow trailing commas at register macros

---
 src/lib.rs      |  8 ++++----
 tests/macros.rs | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index bcf0370..70cedf7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -280,7 +280,7 @@ impl<T: Copy> UnsafeWORegister<T> {
 /// and the macro brings such constants into scope and then dereferences the provided reference.
 #[macro_export]
 macro_rules! write_reg {
-    ( $periph:path, $instance:expr, $reg:ident $([$offset:expr])*, $( $field:ident : $value:expr ),+ ) => {{
+    ( $periph:path, $instance:expr, $reg:ident $([$offset:expr])*, $( $field:ident : $value:expr ),+ $(,)? ) => {{
         #[allow(unused_imports)]
         use $periph::{*};
         #[allow(unused_imports)]
@@ -418,7 +418,7 @@ macro_rules! write_reg {
 /// and the macro brings such constants into scope and then dereferences the provided reference.
 #[macro_export]
 macro_rules! modify_reg {
-    ( $periph:path, $instance:expr, $reg:ident $([$offset:expr])*, $( $field:ident : $value:expr ),+ ) => {{
+    ( $periph:path, $instance:expr, $reg:ident $([$offset:expr])*, $( $field:ident : $value:expr ),+ $(,)? ) => {{
         #[allow(unused_imports)]
         use $periph::{*};
         #[allow(unused_imports)]
@@ -542,7 +542,7 @@ macro_rules! modify_reg {
 /// and the macro brings such constants into scope and then dereferences the provided reference.
 #[macro_export]
 macro_rules! read_reg {
-    ( $periph:path, $instance:expr, $reg:ident $([$offset:expr])*, $( $field:ident ),+ ) => {{
+    ( $periph:path, $instance:expr, $reg:ident $([$offset:expr])*, $( $field:ident ),+ $(,)? ) => {{
         #[allow(unused_imports)]
         use $periph::{*};
         let val = ((*$instance).$reg $([$offset])*.read());
@@ -644,7 +644,7 @@ macro_rules! read_reg {
 /// `GPIOA` they are not the same thing.
 #[macro_export]
 macro_rules! reset_reg {
-    ( $periph:path, $instance:expr, $instancemod:path, $reg:ident $([$offset:expr])*, $( $field:ident ),+ ) => {{
+    ( $periph:path, $instance:expr, $instancemod:path, $reg:ident $([$offset:expr])*, $( $field:ident ),+ $(,)? ) => {{
         #[allow(unused_imports)]
         use $periph::{*};
         use $periph::{$instancemod::{reset}};
diff --git a/tests/macros.rs b/tests/macros.rs
index ae33599..7f84221 100644
--- a/tests/macros.rs
+++ b/tests/macros.rs
@@ -101,6 +101,7 @@ macro_rules! read_reg_test_cases {
 
         assert_eq!(ral::read_reg!(periph, $instance, $register $([$offset])*, FIELD_A), 0x7F, "Individual field read (A)");
         assert_eq!(ral::read_reg!(periph, $instance, $register $([$offset])*, FIELD_B), 0b11, "Individual field read (B)");
+        assert_eq!(ral::read_reg!(periph, $instance, $register $([$offset])*, FIELD_A,), 0x7F, "Individual field read with trailing comma");
 
         assert_eq!(
             ral::read_reg!(periph, $instance, $register $([$offset])*, FIELD_A, FIELD_B),
@@ -175,6 +176,8 @@ macro_rules! write_reg_test_cases {
         assert_eq!((*$instance).$register $([$offset])*.read(), 0x7F, "1:1 write:field (A)");
         ral::write_reg!(periph, $instance, $register $([$offset])*, FIELD_B: u32::MAX);
         assert_eq!((*$instance).$register $([$offset])*.read(), 0b11 << 27, "1:1 write:field (B)");
+        ral::write_reg!(periph, $instance, $register $([$offset])*, FIELD_A: u32::MAX,);
+        assert_eq!((*$instance).$register $([$offset])*.read(), 0x7F, "write with trailing comma");
 
         ral::write_reg!(
             periph,
@@ -256,6 +259,8 @@ macro_rules! modify_reg_test_cases {
         assert_eq!((*$instance).$register $([$offset])*.read(), 0x7F, "RMW individual fields (A)");
         ral::modify_reg!(periph, $instance, $register $([$offset])*, FIELD_B: u32::MAX);
         assert_eq!((*$instance).$register $([$offset])*.read(), 0x7F | (0b11 << 27), "RMW individual fields (B)");
+        ral::modify_reg!(periph, $instance, $register $([$offset])*, FIELD_A: u32::MIN,);
+        assert_eq!((*$instance).$register $([$offset])*.read(), (0b11 << 27), "RMW with trailing comma");
 
         ral::modify_reg!(periph, $instance, $register $([$offset])*, FIELD_A: 2, FIELD_B: 2);
         assert_eq!((*$instance).$register $([$offset])*.read(), 2 | (2 << 27), "RMW multiple fields");
@@ -344,6 +349,11 @@ macro_rules! reset_reg_test_cases {
             "Field in register (A)"
         );
 
+        (*$instance).$register $([$offset])*.write(u32::MAX);
+        ral::reset_reg!(periph, $instance, INST, $register $([$offset])*, FIELD_B,);
+        assert_eq!((*$instance).$register $([$offset])*.read(), u32::MAX & !(0b11 << 27), "With trailing comma");
+
+
         (*$instance).$register $([$offset])*.write(u32::MAX);
         ral::reset_reg!(periph, $instance, INST, $register $([$offset])*, FIELD_B, FIELD_A);
         assert_eq!(
-- 
cgit v1.2.3