diff options
| author | Adam Greig <adam@adamgreig.com> | 2023-06-18 16:27:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-18 16:27:13 +0100 |
| commit | 301dff58b1684bca10983fe8c524aa278a09b4c2 (patch) | |
| tree | 40a9a8a67e14a6a99e0716061c8faf74008c600e /tests/macros.rs | |
| parent | 1b5e99297f6303fc20da2622ae815b3a4987dbb1 (diff) | |
| parent | d49fb1ec06bcd89fee1fe20cb20ab82da91ce434 (diff) | |
Merge pull request #7 from Finomnis/trailing_commas
Allow trailing commas at register macros
Diffstat (limited to 'tests/macros.rs')
| -rw-r--r-- | tests/macros.rs | 10 |
1 files changed, 10 insertions, 0 deletions
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"); @@ -345,6 +350,11 @@ macro_rules! reset_reg_test_cases { ); (*$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!( (*$instance).$register $([$offset])*.read(), |