From b1e54883ac48e1a13df01648158eecd497f91d10 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Thu, 25 May 2017 16:39:26 -0500 Subject: [PATCH] make the register_block field optional in the peripherals! macro with svd2rust 0.8.x peripheral types are written in UPPERCASE and match their names so specifying the type in the register_block field is no longer necessary. --- src/lib.rs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index de7fd1949e..81078d4e5f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -765,6 +765,9 @@ pub unsafe trait LessThanOrEqual {} /// /// # Example /// +/// NOTE With device crates generated using svd2rust 0.8+ you can omit the +/// register_block field. +/// /// ``` ignore /// #[macro_use] /// extern crate cortex_m_rtfm; @@ -797,6 +800,19 @@ macro_rules! peripherals { $crate::Peripheral<::$device::$RegisterBlock, $crate::$C> = unsafe { $crate::Peripheral::_new(::$device::$PERIPHERAL) }; )+ + }; + ($device:ident, { + $($PERIPHERAL:ident: Peripheral { + ceiling: $C:ident, + },)+ + }) => { + $( + #[allow(private_no_mangle_statics)] + #[no_mangle] + static $PERIPHERAL: + $crate::Peripheral<::$device::$PERIPHERAL, $crate::$C> = + unsafe { $crate::Peripheral::_new(::$device::$PERIPHERAL) }; + )+ } }