Skip to content

Commit

Permalink
point to master svd2rust
Browse files Browse the repository at this point in the history
Upstream finally merged support for SVD features used by the
ATSAMD family of parts, so that we don't need my fork any longer.
They haven't released this to crates.io yet, but we can still pull
it down from master.

This commit is large and hard to review because most of it is visual
noise.  The gist of the changes are:

* Point at svd2rust master rather than my fork
* Remove a doc warning hack
* `is_async_` got renamed to `is_async`...
* ... so update pac and hal version numbers
* Lots of `const`s for MASK and OFFSET got folded into accessors
* `::vcell` got replaced with `vcell` (eg: no colons)
* Lost of constant numbers changed from decimal to easier to grok hex
  • Loading branch information
wez authored and sajattack committed Jul 21, 2019
1 parent 684f0ed commit 183c95a
Show file tree
Hide file tree
Showing 2,855 changed files with 69,919 additions and 134,984 deletions.
5 changes: 0 additions & 5 deletions .rustfmt.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
# Run `rustfmt --config-help` to see available config options.
# Please keep these in alphabetical order.
condense_wildcard_suffixes = true
error_on_line_overflow = false
error_on_unformatted = false
# Too many derives can cause line length limits to be exceeded. rustfmt-nightly
# 0.2.5 doesn't appear to pay attention to this.
merge_derives = false
struct_lit_single_line = true
# Override the Nuclide/Atom default tab spacing.
tab_spaces = 4
use_field_init_shorthand = true
use_try_shorthand = true
wrap_comments = true
12 changes: 6 additions & 6 deletions hal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "atsamd-hal"
version = "0.5.0"
version = "0.6.0"
authors = ["Wez Furlong <[email protected]>", "Paul Sajna <[email protected]>"]
description = "HAL and Peripheral access API for ATSAMD21 and ATSAMD51 microcontrollers"
keywords = ["no-std", "arm", "cortex-m", "embedded-hal"]
Expand Down Expand Up @@ -31,27 +31,27 @@ version = "~1.0"
# We use a feature named "samdFOO" to pull in the dependency named "atsamdFOO"
[dependencies.atsamd21g18a]
path = "../pac/atsamd21g18a"
version = "~0.4"
version = "~0.5"
optional = true

[dependencies.atsamd21e18a]
path = "../pac/atsamd21e18a"
version = "~0.4"
version = "~0.5"
optional = true

[dependencies.atsamd51g19a]
path = "../pac/atsamd51g19a"
version = "~0.4"
version = "~0.5"
optional = true

[dependencies.atsamd51j19a]
path = "../pac/atsamd51j19a"
version = "~0.4"
version = "~0.5"
optional = true

[dependencies.atsamd51j20a]
path = "../pac/atsamd51j20a"
version = "~0.4"
version = "~0.5"
optional = true


Expand Down
2 changes: 1 addition & 1 deletion pac/atsamd21e18a/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "atsamd21e18a"
description = "Peripheral access API for ATSAMD21E18A microcontrollers (generated using svd2rust)"
version = "0.4.0"
version = "0.5.0"
authors = ["Wez Furlong <[email protected]>"]
keywords = ["no-std", "arm", "cortex-m"]
license = "MIT OR Apache-2.0"
Expand Down
24 changes: 12 additions & 12 deletions pac/atsamd21e18a/src/ac.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,73 +32,73 @@ pub struct RegisterBlock {
}
#[doc = "Control A"]
pub struct CTRLA {
register: ::vcell::VolatileCell<u8>,
register: vcell::VolatileCell<u8>,
}
#[doc = "Control A"]
pub mod ctrla;
#[doc = "Control B"]
pub struct CTRLB {
register: ::vcell::VolatileCell<u8>,
register: vcell::VolatileCell<u8>,
}
#[doc = "Control B"]
pub mod ctrlb;
#[doc = "Event Control"]
pub struct EVCTRL {
register: ::vcell::VolatileCell<u16>,
register: vcell::VolatileCell<u16>,
}
#[doc = "Event Control"]
pub mod evctrl;
#[doc = "Interrupt Enable Clear"]
pub struct INTENCLR {
register: ::vcell::VolatileCell<u8>,
register: vcell::VolatileCell<u8>,
}
#[doc = "Interrupt Enable Clear"]
pub mod intenclr;
#[doc = "Interrupt Enable Set"]
pub struct INTENSET {
register: ::vcell::VolatileCell<u8>,
register: vcell::VolatileCell<u8>,
}
#[doc = "Interrupt Enable Set"]
pub mod intenset;
#[doc = "Interrupt Flag Status and Clear"]
pub struct INTFLAG {
register: ::vcell::VolatileCell<u8>,
register: vcell::VolatileCell<u8>,
}
#[doc = "Interrupt Flag Status and Clear"]
pub mod intflag;
#[doc = "Status A"]
pub struct STATUSA {
register: ::vcell::VolatileCell<u8>,
register: vcell::VolatileCell<u8>,
}
#[doc = "Status A"]
pub mod statusa;
#[doc = "Status B"]
pub struct STATUSB {
register: ::vcell::VolatileCell<u8>,
register: vcell::VolatileCell<u8>,
}
#[doc = "Status B"]
pub mod statusb;
#[doc = "Status C"]
pub struct STATUSC {
register: ::vcell::VolatileCell<u8>,
register: vcell::VolatileCell<u8>,
}
#[doc = "Status C"]
pub mod statusc;
#[doc = "Window Control"]
pub struct WINCTRL {
register: ::vcell::VolatileCell<u8>,
register: vcell::VolatileCell<u8>,
}
#[doc = "Window Control"]
pub mod winctrl;
#[doc = "Comparator Control n"]
pub struct COMPCTRL {
register: ::vcell::VolatileCell<u32>,
register: vcell::VolatileCell<u32>,
}
#[doc = "Comparator Control n"]
pub mod compctrl;
#[doc = "Scaler n"]
pub struct SCALER {
register: ::vcell::VolatileCell<u8>,
register: vcell::VolatileCell<u8>,
}
#[doc = "Scaler n"]
pub mod scaler;
Loading

0 comments on commit 183c95a

Please sign in to comment.