Skip to content

Commit f7d01bd

Browse files
bors[bot]kiffie
andauthored
Merge #574
574: disable the interrupt macro for MIPS as well r=burrbull a=kiffie r? `@burrbull` Yet another small MIPS fix in addition to yesterday's change. Sorry for submitting two separate PR instead of a single one. I did not realize that the interrupt macro can cause name clashes when including multiple device support modules into a single crate. I discovered this problem when trying to build the docs. Co-authored-by: Stephan <[email protected]>
2 parents 0532305 + 6b29af1 commit f7d01bd

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1616
- Use `svd-parser` v0.13.1
1717
- Replace suffix in fields' name before converting to snake case when generating methods #563
1818
- MIPS API now re-exports `mips_rt::interrupt` when the `rt` feature is enabled
19+
but does not generate the `interrupt` macro anymore
1920

2021
### Fixed
2122

src/generate/interrupt.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,11 @@ pub fn render(
277277
_ => "C",
278278
};
279279

280-
if target != Target::CortexM && target != Target::Msp430 && target != Target::XtensaLX {
280+
if target != Target::CortexM
281+
&& target != Target::Msp430
282+
&& target != Target::XtensaLX
283+
&& target != Target::Mips
284+
{
281285
mod_items.extend(quote! {
282286
#[cfg(feature = "rt")]
283287
#[macro_export]

0 commit comments

Comments
 (0)