Update dependencies + rebuild using svd2rust 0.28.0

.github/workflows/ci.yml

@@ -19,9 +19,9 @@ jobs:
         # Run checks on stable and nightly Rust
         rust: [stable, nightly]
 
-        include:
-          # Run check with MSRV as well
-          - rust: 1.42.0
+        # include:
+        #   # Run check with MSRV as well
+        #   - rust: 1.59.0
 
     steps:
       - uses: actions/checkout@v2
@@ -32,7 +32,7 @@ jobs:
           toolchain: ${{ matrix.rust }}
           override: true
           components: rustfmt
-      
+
       - name: Install xmllint
         run: sudo apt-get install libxml2-utils
       - name: Install Python dependencies
@@ -47,13 +47,13 @@ jobs:
         id: cache-cargo
         with:
           path: ~/cargo-bin
-          key: ${{ runner.os }}-svd2rust-0.17.0
+          key: ${{ runner.os }}-svd2rust-0.28.0
       - name: Install svd2rust
         if: steps.cache-cargo.outputs.cache-hit != 'true'
         uses: actions-rs/install@v0.1
         with:
           crate: svd2rust
-          version: 0.17.0
+          version: 0.28.0
       - name: Copy svd2rust to cache directory
         if: steps.cache-cargo.outputs.cache-hit != 'true'
         run: |
@@ -64,22 +64,16 @@ jobs:
         uses: actions-rs/install@v0.1
         with:
           crate: form
-          version: 0.7.0
+          version: 0.10.0
       - name: Copy form to cache directory
         if: steps.cache-cargo.outputs.cache-hit != 'true'
         run: |
           mkdir -p ~/cargo-bin
           cp ~/.cargo/bin/form ~/cargo-bin
-          
+
       - name: Put new cargo binary directory into path
         run: echo "~/cargo-bin" >> $GITHUB_PATH
 
-      - name: Install and run SVDConv
-        run: |
-          pushd ~/.local/bin
-          wget https://github.com/ARM-software/CMSIS_5/raw/develop/CMSIS/Utilities/Linux64/SVDConv
-          chmod 0770 SVDConv
-          popd      
       - name: Build PAC
         run: ./scripts/regenerate-rust-code.sh soc602_reg.svd src
 

Cargo.toml

@@ -14,13 +14,17 @@ categories = ["embedded", "hardware-support", "no-std"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-riscv = "0.7.0"
+riscv = "0.10.1"
 bare-metal = "1.0.0"
-vcell = "0.1.2"
+vcell = "0.1.3"
+
+[dependencies.critical-section]
+optional = true
+version = "1.1"
 
 [dependencies.riscv-rt]
 optional = true
-version = "0.8.1"
+version = "0.11.0"
 
 [features]
 rt = ["riscv-rt"]

src/aon.rs

@@ -2,174 +2,174 @@
 #[repr(C)]
 pub struct RegisterBlock {
     #[doc = "0x00 - aon."]
-    pub aon: crate::Reg<aon::AON_SPEC>,
+    pub aon: AON,
     #[doc = "0x04 - aon_common."]
-    pub aon_common: crate::Reg<aon_common::AON_COMMON_SPEC>,
+    pub aon_common: AON_COMMON,
     #[doc = "0x08 - aon_misc."]
-    pub aon_misc: crate::Reg<aon_misc::AON_MISC_SPEC>,
-    _reserved3: [u8; 4usize],
+    pub aon_misc: AON_MISC,
+    _reserved3: [u8; 0x04],
     #[doc = "0x10 - bg_sys_top."]
-    pub bg_sys_top: crate::Reg<bg_sys_top::BG_SYS_TOP_SPEC>,
+    pub bg_sys_top: BG_SYS_TOP,
     #[doc = "0x14 - dcdc18_top_0."]
-    pub dcdc18_top_0: crate::Reg<dcdc18_top_0::DCDC18_TOP_0_SPEC>,
+    pub dcdc18_top_0: DCDC18_TOP_0,
     #[doc = "0x18 - dcdc18_top_1."]
-    pub dcdc18_top_1: crate::Reg<dcdc18_top_1::DCDC18_TOP_1_SPEC>,
+    pub dcdc18_top_1: DCDC18_TOP_1,
     #[doc = "0x1c - ldo11soc_and_dctest."]
-    pub ldo11soc_and_dctest: crate::Reg<ldo11soc_and_dctest::LDO11SOC_AND_DCTEST_SPEC>,
+    pub ldo11soc_and_dctest: LDO11SOC_AND_DCTEST,
     #[doc = "0x20 - psw_irrcv."]
-    pub psw_irrcv: crate::Reg<psw_irrcv::PSW_IRRCV_SPEC>,
-    _reserved8: [u8; 92usize],
+    pub psw_irrcv: PSW_IRRCV,
+    _reserved8: [u8; 0x5c],
     #[doc = "0x80 - rf_top_aon."]
-    pub rf_top_aon: crate::Reg<rf_top_aon::RF_TOP_AON_SPEC>,
+    pub rf_top_aon: RF_TOP_AON,
     #[doc = "0x84 - xtal_cfg."]
-    pub xtal_cfg: crate::Reg<xtal_cfg::XTAL_CFG_SPEC>,
+    pub xtal_cfg: XTAL_CFG,
     #[doc = "0x88 - tsen."]
-    pub tsen: crate::Reg<tsen::TSEN_SPEC>,
-    _reserved11: [u8; 116usize],
+    pub tsen: TSEN,
+    _reserved11: [u8; 0x74],
     #[doc = "0x100 - acomp0_ctrl."]
-    pub acomp0_ctrl: crate::Reg<acomp0_ctrl::ACOMP0_CTRL_SPEC>,
+    pub acomp0_ctrl: ACOMP0_CTRL,
     #[doc = "0x104 - acomp1_ctrl."]
-    pub acomp1_ctrl: crate::Reg<acomp1_ctrl::ACOMP1_CTRL_SPEC>,
+    pub acomp1_ctrl: ACOMP1_CTRL,
     #[doc = "0x108 - acomp_ctrl."]
-    pub acomp_ctrl: crate::Reg<acomp_ctrl::ACOMP_CTRL_SPEC>,
+    pub acomp_ctrl: ACOMP_CTRL,
     #[doc = "0x10c - gpadc_reg_cmd."]
-    pub gpadc_reg_cmd: crate::Reg<gpadc_reg_cmd::GPADC_REG_CMD_SPEC>,
+    pub gpadc_reg_cmd: GPADC_REG_CMD,
     #[doc = "0x110 - gpadc_reg_config1."]
-    pub gpadc_reg_config1: crate::Reg<gpadc_reg_config1::GPADC_REG_CONFIG1_SPEC>,
+    pub gpadc_reg_config1: GPADC_REG_CONFIG1,
     #[doc = "0x114 - gpadc_reg_config2."]
-    pub gpadc_reg_config2: crate::Reg<gpadc_reg_config2::GPADC_REG_CONFIG2_SPEC>,
+    pub gpadc_reg_config2: GPADC_REG_CONFIG2,
     #[doc = "0x118 - adc converation sequence 1"]
-    pub gpadc_reg_scn_pos1: crate::Reg<gpadc_reg_scn_pos1::GPADC_REG_SCN_POS1_SPEC>,
+    pub gpadc_reg_scn_pos1: GPADC_REG_SCN_POS1,
     #[doc = "0x11c - adc converation sequence 2"]
-    pub gpadc_reg_scn_pos2: crate::Reg<gpadc_reg_scn_pos2::GPADC_REG_SCN_POS2_SPEC>,
+    pub gpadc_reg_scn_pos2: GPADC_REG_SCN_POS2,
     #[doc = "0x120 - adc converation sequence 3"]
-    pub gpadc_reg_scn_neg1: crate::Reg<gpadc_reg_scn_neg1::GPADC_REG_SCN_NEG1_SPEC>,
+    pub gpadc_reg_scn_neg1: GPADC_REG_SCN_NEG1,
     #[doc = "0x124 - adc converation sequence 4"]
-    pub gpadc_reg_scn_neg2: crate::Reg<gpadc_reg_scn_neg2::GPADC_REG_SCN_NEG2_SPEC>,
+    pub gpadc_reg_scn_neg2: GPADC_REG_SCN_NEG2,
     #[doc = "0x128 - gpadc_reg_status."]
-    pub gpadc_reg_status: crate::Reg<gpadc_reg_status::GPADC_REG_STATUS_SPEC>,
+    pub gpadc_reg_status: GPADC_REG_STATUS,
     #[doc = "0x12c - gpadc_reg_isr."]
-    pub gpadc_reg_isr: crate::Reg<gpadc_reg_isr::GPADC_REG_ISR_SPEC>,
+    pub gpadc_reg_isr: GPADC_REG_ISR,
     #[doc = "0x130 - gpadc_reg_result."]
-    pub gpadc_reg_result: crate::Reg<gpadc_reg_result::GPADC_REG_RESULT_SPEC>,
+    pub gpadc_reg_result: GPADC_REG_RESULT,
     #[doc = "0x134 - gpadc_reg_raw_result."]
-    pub gpadc_reg_raw_result: crate::Reg<gpadc_reg_raw_result::GPADC_REG_RAW_RESULT_SPEC>,
+    pub gpadc_reg_raw_result: GPADC_REG_RAW_RESULT,
     #[doc = "0x138 - gpadc_reg_define."]
-    pub gpadc_reg_define: crate::Reg<gpadc_reg_define::GPADC_REG_DEFINE_SPEC>,
+    pub gpadc_reg_define: GPADC_REG_DEFINE,
     #[doc = "0x13c - hbncore_resv0."]
-    pub hbncore_resv0: crate::Reg<hbncore_resv0::HBNCORE_RESV0_SPEC>,
+    pub hbncore_resv0: HBNCORE_RESV0,
     #[doc = "0x140 - hbncore_resv1."]
-    pub hbncore_resv1: crate::Reg<hbncore_resv1::HBNCORE_RESV1_SPEC>,
+    pub hbncore_resv1: HBNCORE_RESV1,
 }
-#[doc = "aon register accessor: an alias for `Reg<AON_SPEC>`"]
+#[doc = "aon (rw) register accessor: an alias for `Reg<AON_SPEC>`"]
 pub type AON = crate::Reg<aon::AON_SPEC>;
 #[doc = "aon."]
 pub mod aon;
-#[doc = "aon_common register accessor: an alias for `Reg<AON_COMMON_SPEC>`"]
+#[doc = "aon_common (rw) register accessor: an alias for `Reg<AON_COMMON_SPEC>`"]
 pub type AON_COMMON = crate::Reg<aon_common::AON_COMMON_SPEC>;
 #[doc = "aon_common."]
 pub mod aon_common;
-#[doc = "aon_misc register accessor: an alias for `Reg<AON_MISC_SPEC>`"]
+#[doc = "aon_misc (rw) register accessor: an alias for `Reg<AON_MISC_SPEC>`"]
 pub type AON_MISC = crate::Reg<aon_misc::AON_MISC_SPEC>;
 #[doc = "aon_misc."]
 pub mod aon_misc;
-#[doc = "bg_sys_top register accessor: an alias for `Reg<BG_SYS_TOP_SPEC>`"]
+#[doc = "bg_sys_top (rw) register accessor: an alias for `Reg<BG_SYS_TOP_SPEC>`"]
 pub type BG_SYS_TOP = crate::Reg<bg_sys_top::BG_SYS_TOP_SPEC>;
 #[doc = "bg_sys_top."]
 pub mod bg_sys_top;
-#[doc = "dcdc18_top_0 register accessor: an alias for `Reg<DCDC18_TOP_0_SPEC>`"]
+#[doc = "dcdc18_top_0 (rw) register accessor: an alias for `Reg<DCDC18_TOP_0_SPEC>`"]
 pub type DCDC18_TOP_0 = crate::Reg<dcdc18_top_0::DCDC18_TOP_0_SPEC>;
 #[doc = "dcdc18_top_0."]
 pub mod dcdc18_top_0;
-#[doc = "dcdc18_top_1 register accessor: an alias for `Reg<DCDC18_TOP_1_SPEC>`"]
+#[doc = "dcdc18_top_1 (rw) register accessor: an alias for `Reg<DCDC18_TOP_1_SPEC>`"]
 pub type DCDC18_TOP_1 = crate::Reg<dcdc18_top_1::DCDC18_TOP_1_SPEC>;
 #[doc = "dcdc18_top_1."]
 pub mod dcdc18_top_1;
-#[doc = "ldo11soc_and_dctest register accessor: an alias for `Reg<LDO11SOC_AND_DCTEST_SPEC>`"]
+#[doc = "ldo11soc_and_dctest (rw) register accessor: an alias for `Reg<LDO11SOC_AND_DCTEST_SPEC>`"]
 pub type LDO11SOC_AND_DCTEST = crate::Reg<ldo11soc_and_dctest::LDO11SOC_AND_DCTEST_SPEC>;
 #[doc = "ldo11soc_and_dctest."]
 pub mod ldo11soc_and_dctest;
-#[doc = "psw_irrcv register accessor: an alias for `Reg<PSW_IRRCV_SPEC>`"]
+#[doc = "psw_irrcv (rw) register accessor: an alias for `Reg<PSW_IRRCV_SPEC>`"]
 pub type PSW_IRRCV = crate::Reg<psw_irrcv::PSW_IRRCV_SPEC>;
 #[doc = "psw_irrcv."]
 pub mod psw_irrcv;
-#[doc = "rf_top_aon register accessor: an alias for `Reg<RF_TOP_AON_SPEC>`"]
+#[doc = "rf_top_aon (rw) register accessor: an alias for `Reg<RF_TOP_AON_SPEC>`"]
 pub type RF_TOP_AON = crate::Reg<rf_top_aon::RF_TOP_AON_SPEC>;
 #[doc = "rf_top_aon."]
 pub mod rf_top_aon;
-#[doc = "xtal_cfg register accessor: an alias for `Reg<XTAL_CFG_SPEC>`"]
+#[doc = "xtal_cfg (rw) register accessor: an alias for `Reg<XTAL_CFG_SPEC>`"]
 pub type XTAL_CFG = crate::Reg<xtal_cfg::XTAL_CFG_SPEC>;
 #[doc = "xtal_cfg."]
 pub mod xtal_cfg;
-#[doc = "tsen register accessor: an alias for `Reg<TSEN_SPEC>`"]
+#[doc = "tsen (rw) register accessor: an alias for `Reg<TSEN_SPEC>`"]
 pub type TSEN = crate::Reg<tsen::TSEN_SPEC>;
 #[doc = "tsen."]
 pub mod tsen;
-#[doc = "acomp0_ctrl register accessor: an alias for `Reg<ACOMP0_CTRL_SPEC>`"]
+#[doc = "acomp0_ctrl (rw) register accessor: an alias for `Reg<ACOMP0_CTRL_SPEC>`"]
 pub type ACOMP0_CTRL = crate::Reg<acomp0_ctrl::ACOMP0_CTRL_SPEC>;
 #[doc = "acomp0_ctrl."]
 pub mod acomp0_ctrl;
-#[doc = "acomp1_ctrl register accessor: an alias for `Reg<ACOMP1_CTRL_SPEC>`"]
+#[doc = "acomp1_ctrl (rw) register accessor: an alias for `Reg<ACOMP1_CTRL_SPEC>`"]
 pub type ACOMP1_CTRL = crate::Reg<acomp1_ctrl::ACOMP1_CTRL_SPEC>;
 #[doc = "acomp1_ctrl."]
 pub mod acomp1_ctrl;
-#[doc = "acomp_ctrl register accessor: an alias for `Reg<ACOMP_CTRL_SPEC>`"]
+#[doc = "acomp_ctrl (rw) register accessor: an alias for `Reg<ACOMP_CTRL_SPEC>`"]
 pub type ACOMP_CTRL = crate::Reg<acomp_ctrl::ACOMP_CTRL_SPEC>;
 #[doc = "acomp_ctrl."]
 pub mod acomp_ctrl;
-#[doc = "gpadc_reg_cmd register accessor: an alias for `Reg<GPADC_REG_CMD_SPEC>`"]
+#[doc = "gpadc_reg_cmd (rw) register accessor: an alias for `Reg<GPADC_REG_CMD_SPEC>`"]
 pub type GPADC_REG_CMD = crate::Reg<gpadc_reg_cmd::GPADC_REG_CMD_SPEC>;
 #[doc = "gpadc_reg_cmd."]
 pub mod gpadc_reg_cmd;
-#[doc = "gpadc_reg_config1 register accessor: an alias for `Reg<GPADC_REG_CONFIG1_SPEC>`"]
+#[doc = "gpadc_reg_config1 (rw) register accessor: an alias for `Reg<GPADC_REG_CONFIG1_SPEC>`"]
 pub type GPADC_REG_CONFIG1 = crate::Reg<gpadc_reg_config1::GPADC_REG_CONFIG1_SPEC>;
 #[doc = "gpadc_reg_config1."]
 pub mod gpadc_reg_config1;
-#[doc = "gpadc_reg_config2 register accessor: an alias for `Reg<GPADC_REG_CONFIG2_SPEC>`"]
+#[doc = "gpadc_reg_config2 (rw) register accessor: an alias for `Reg<GPADC_REG_CONFIG2_SPEC>`"]
 pub type GPADC_REG_CONFIG2 = crate::Reg<gpadc_reg_config2::GPADC_REG_CONFIG2_SPEC>;
 #[doc = "gpadc_reg_config2."]
 pub mod gpadc_reg_config2;
-#[doc = "gpadc_reg_scn_pos1 register accessor: an alias for `Reg<GPADC_REG_SCN_POS1_SPEC>`"]
+#[doc = "gpadc_reg_scn_pos1 (rw) register accessor: an alias for `Reg<GPADC_REG_SCN_POS1_SPEC>`"]
 pub type GPADC_REG_SCN_POS1 = crate::Reg<gpadc_reg_scn_pos1::GPADC_REG_SCN_POS1_SPEC>;
 #[doc = "adc converation sequence 1"]
 pub mod gpadc_reg_scn_pos1;
-#[doc = "gpadc_reg_scn_pos2 register accessor: an alias for `Reg<GPADC_REG_SCN_POS2_SPEC>`"]
+#[doc = "gpadc_reg_scn_pos2 (rw) register accessor: an alias for `Reg<GPADC_REG_SCN_POS2_SPEC>`"]
 pub type GPADC_REG_SCN_POS2 = crate::Reg<gpadc_reg_scn_pos2::GPADC_REG_SCN_POS2_SPEC>;
 #[doc = "adc converation sequence 2"]
 pub mod gpadc_reg_scn_pos2;
-#[doc = "gpadc_reg_scn_neg1 register accessor: an alias for `Reg<GPADC_REG_SCN_NEG1_SPEC>`"]
+#[doc = "gpadc_reg_scn_neg1 (rw) register accessor: an alias for `Reg<GPADC_REG_SCN_NEG1_SPEC>`"]
 pub type GPADC_REG_SCN_NEG1 = crate::Reg<gpadc_reg_scn_neg1::GPADC_REG_SCN_NEG1_SPEC>;
 #[doc = "adc converation sequence 3"]
 pub mod gpadc_reg_scn_neg1;
-#[doc = "gpadc_reg_scn_neg2 register accessor: an alias for `Reg<GPADC_REG_SCN_NEG2_SPEC>`"]
+#[doc = "gpadc_reg_scn_neg2 (rw) register accessor: an alias for `Reg<GPADC_REG_SCN_NEG2_SPEC>`"]
 pub type GPADC_REG_SCN_NEG2 = crate::Reg<gpadc_reg_scn_neg2::GPADC_REG_SCN_NEG2_SPEC>;
 #[doc = "adc converation sequence 4"]
 pub mod gpadc_reg_scn_neg2;
-#[doc = "gpadc_reg_status register accessor: an alias for `Reg<GPADC_REG_STATUS_SPEC>`"]
+#[doc = "gpadc_reg_status (rw) register accessor: an alias for `Reg<GPADC_REG_STATUS_SPEC>`"]
 pub type GPADC_REG_STATUS = crate::Reg<gpadc_reg_status::GPADC_REG_STATUS_SPEC>;
 #[doc = "gpadc_reg_status."]
 pub mod gpadc_reg_status;
-#[doc = "gpadc_reg_isr register accessor: an alias for `Reg<GPADC_REG_ISR_SPEC>`"]
+#[doc = "gpadc_reg_isr (rw) register accessor: an alias for `Reg<GPADC_REG_ISR_SPEC>`"]
 pub type GPADC_REG_ISR = crate::Reg<gpadc_reg_isr::GPADC_REG_ISR_SPEC>;
 #[doc = "gpadc_reg_isr."]
 pub mod gpadc_reg_isr;
-#[doc = "gpadc_reg_result register accessor: an alias for `Reg<GPADC_REG_RESULT_SPEC>`"]
+#[doc = "gpadc_reg_result (rw) register accessor: an alias for `Reg<GPADC_REG_RESULT_SPEC>`"]
 pub type GPADC_REG_RESULT = crate::Reg<gpadc_reg_result::GPADC_REG_RESULT_SPEC>;
 #[doc = "gpadc_reg_result."]
 pub mod gpadc_reg_result;
-#[doc = "gpadc_reg_raw_result register accessor: an alias for `Reg<GPADC_REG_RAW_RESULT_SPEC>`"]
+#[doc = "gpadc_reg_raw_result (rw) register accessor: an alias for `Reg<GPADC_REG_RAW_RESULT_SPEC>`"]
 pub type GPADC_REG_RAW_RESULT = crate::Reg<gpadc_reg_raw_result::GPADC_REG_RAW_RESULT_SPEC>;
 #[doc = "gpadc_reg_raw_result."]
 pub mod gpadc_reg_raw_result;
-#[doc = "gpadc_reg_define register accessor: an alias for `Reg<GPADC_REG_DEFINE_SPEC>`"]
+#[doc = "gpadc_reg_define (rw) register accessor: an alias for `Reg<GPADC_REG_DEFINE_SPEC>`"]
 pub type GPADC_REG_DEFINE = crate::Reg<gpadc_reg_define::GPADC_REG_DEFINE_SPEC>;
 #[doc = "gpadc_reg_define."]
 pub mod gpadc_reg_define;
-#[doc = "hbncore_resv0 register accessor: an alias for `Reg<HBNCORE_RESV0_SPEC>`"]
+#[doc = "hbncore_resv0 (rw) register accessor: an alias for `Reg<HBNCORE_RESV0_SPEC>`"]
 pub type HBNCORE_RESV0 = crate::Reg<hbncore_resv0::HBNCORE_RESV0_SPEC>;
 #[doc = "hbncore_resv0."]
 pub mod hbncore_resv0;
-#[doc = "hbncore_resv1 register accessor: an alias for `Reg<HBNCORE_RESV1_SPEC>`"]
+#[doc = "hbncore_resv1 (rw) register accessor: an alias for `Reg<HBNCORE_RESV1_SPEC>`"]
 pub type HBNCORE_RESV1 = crate::Reg<hbncore_resv1::HBNCORE_RESV1_SPEC>;
 #[doc = "hbncore_resv1."]
 pub mod hbncore_resv1;