From 0a31875a19396e78d27ceabc51b2a6f52bf7a4df Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 3 Mar 2024 02:38:55 +0800 Subject: [PATCH] add snap to quantum and extclock select to BIO --- utralib/cramium/core.svd | 56 ++++---- utralib/cramium/daric.svd | 44 ++++++ utralib/cramium/soc.svd | 2 +- utralib/src/generated/cramium_soc.rs | 200 +++++++++++++++++---------- 4 files changed, 201 insertions(+), 101 deletions(-) diff --git a/utralib/cramium/core.svd b/utralib/cramium/core.svd index f4acdba1a..9f0010588 100644 --- a/utralib/cramium/core.svd +++ b/utralib/cramium/core.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -1532,18 +1532,18 @@ of triggering]]> - nc_b10s5 + pioirq2 5 [5:5] 5 - + - nc_b10s6 + pioirq3 6 [6:6] 6 - + nc_b10s7 @@ -1659,19 +1659,19 @@ triggering]]> triggering]]> - nc_b10s5 + pioirq2 5 [5:5] 5 - - nc_b10s6 + pioirq3 6 [6:6] 6 - @@ -1792,18 +1792,18 @@ of triggering]]> - nc_b10s5 + pioirq2 5 [5:5] 5 - + - nc_b10s6 + pioirq3 6 [6:6] 6 - + nc_b10s7 @@ -5151,18 +5151,18 @@ of triggering]]> - nc_b18s2 + pioirq2_dupe 2 [2:2] 2 - + - nc_b18s3 + pioirq3_dupe 3 [3:3] 3 - + nc_b18s4 @@ -5275,20 +5275,20 @@ form of triggering]]> form of triggering]]> - nc_b18s2 + pioirq2_dupe 2 [2:2] 2 - + - nc_b18s3 + pioirq3_dupe 3 [3:3] 3 - + nc_b18s4 @@ -5411,18 +5411,18 @@ of triggering]]> - nc_b18s2 + pioirq2_dupe 2 [2:2] 2 - + - nc_b18s3 + pioirq3_dupe 3 [3:3] 3 - + nc_b18s4 @@ -10422,6 +10422,8 @@ register to disable individual events.]]> + + diff --git a/utralib/cramium/daric.svd b/utralib/cramium/daric.svd index 02ef94b13..ca29735b6 100644 --- a/utralib/cramium/daric.svd +++ b/utralib/cramium/daric.svd @@ -14419,6 +14419,50 @@ soc/candidate/pio/rp_pio.sv]]> + + SFR_EXTCLOCK + + 0x0048 + 0x00 + 32 + + + use_extclk + 3 + [3:0] + 0 + + + + extclk_gpio_0 + 8 + [8:4] + 4 + + + + extclk_gpio_1 + 13 + [13:9] + 9 + + + + extclk_gpio_2 + 18 + [18:14] + 14 + + + + extclk_gpio_3 + 23 + [23:19] + 19 + + + + SFR_QDIV0 diff --git a/utralib/cramium/soc.svd b/utralib/cramium/soc.svd index 178b8e7f4..a3aee5a74 100644 --- a/utralib/cramium/soc.svd +++ b/utralib/cramium/soc.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 diff --git a/utralib/src/generated/cramium_soc.rs b/utralib/src/generated/cramium_soc.rs index 0bee99887..103ca6fcb 100644 --- a/utralib/src/generated/cramium_soc.rs +++ b/utralib/src/generated/cramium_soc.rs @@ -668,8 +668,8 @@ pub mod utra { pub const EV_STATUS_SDDCIRQ: crate::Field = crate::Field::new(1, 2, EV_STATUS); pub const EV_STATUS_PIOIRQ0: crate::Field = crate::Field::new(1, 3, EV_STATUS); pub const EV_STATUS_PIOIRQ1: crate::Field = crate::Field::new(1, 4, EV_STATUS); - pub const EV_STATUS_NC_B10S5: crate::Field = crate::Field::new(1, 5, EV_STATUS); - pub const EV_STATUS_NC_B10S6: crate::Field = crate::Field::new(1, 6, EV_STATUS); + pub const EV_STATUS_PIOIRQ2: crate::Field = crate::Field::new(1, 5, EV_STATUS); + pub const EV_STATUS_PIOIRQ3: crate::Field = crate::Field::new(1, 6, EV_STATUS); pub const EV_STATUS_NC_B10S7: crate::Field = crate::Field::new(1, 7, EV_STATUS); pub const EV_STATUS_NC_B10S8: crate::Field = crate::Field::new(1, 8, EV_STATUS); pub const EV_STATUS_NC_B10S9: crate::Field = crate::Field::new(1, 9, EV_STATUS); @@ -686,8 +686,8 @@ pub mod utra { pub const EV_PENDING_SDDCIRQ: crate::Field = crate::Field::new(1, 2, EV_PENDING); pub const EV_PENDING_PIOIRQ0: crate::Field = crate::Field::new(1, 3, EV_PENDING); pub const EV_PENDING_PIOIRQ1: crate::Field = crate::Field::new(1, 4, EV_PENDING); - pub const EV_PENDING_NC_B10S5: crate::Field = crate::Field::new(1, 5, EV_PENDING); - pub const EV_PENDING_NC_B10S6: crate::Field = crate::Field::new(1, 6, EV_PENDING); + pub const EV_PENDING_PIOIRQ2: crate::Field = crate::Field::new(1, 5, EV_PENDING); + pub const EV_PENDING_PIOIRQ3: crate::Field = crate::Field::new(1, 6, EV_PENDING); pub const EV_PENDING_NC_B10S7: crate::Field = crate::Field::new(1, 7, EV_PENDING); pub const EV_PENDING_NC_B10S8: crate::Field = crate::Field::new(1, 8, EV_PENDING); pub const EV_PENDING_NC_B10S9: crate::Field = crate::Field::new(1, 9, EV_PENDING); @@ -704,8 +704,8 @@ pub mod utra { pub const EV_ENABLE_SDDCIRQ: crate::Field = crate::Field::new(1, 2, EV_ENABLE); pub const EV_ENABLE_PIOIRQ0: crate::Field = crate::Field::new(1, 3, EV_ENABLE); pub const EV_ENABLE_PIOIRQ1: crate::Field = crate::Field::new(1, 4, EV_ENABLE); - pub const EV_ENABLE_NC_B10S5: crate::Field = crate::Field::new(1, 5, EV_ENABLE); - pub const EV_ENABLE_NC_B10S6: crate::Field = crate::Field::new(1, 6, EV_ENABLE); + pub const EV_ENABLE_PIOIRQ2: crate::Field = crate::Field::new(1, 5, EV_ENABLE); + pub const EV_ENABLE_PIOIRQ3: crate::Field = crate::Field::new(1, 6, EV_ENABLE); pub const EV_ENABLE_NC_B10S7: crate::Field = crate::Field::new(1, 7, EV_ENABLE); pub const EV_ENABLE_NC_B10S8: crate::Field = crate::Field::new(1, 8, EV_ENABLE); pub const EV_ENABLE_NC_B10S9: crate::Field = crate::Field::new(1, 9, EV_ENABLE); @@ -1225,8 +1225,8 @@ pub mod utra { pub const EV_STATUS: crate::Register = crate::Register::new(3, 0xffff); pub const EV_STATUS_PIOIRQ0_DUPE: crate::Field = crate::Field::new(1, 0, EV_STATUS); pub const EV_STATUS_PIOIRQ1_DUPE: crate::Field = crate::Field::new(1, 1, EV_STATUS); - pub const EV_STATUS_NC_B18S2: crate::Field = crate::Field::new(1, 2, EV_STATUS); - pub const EV_STATUS_NC_B18S3: crate::Field = crate::Field::new(1, 3, EV_STATUS); + pub const EV_STATUS_PIOIRQ2_DUPE: crate::Field = crate::Field::new(1, 2, EV_STATUS); + pub const EV_STATUS_PIOIRQ3_DUPE: crate::Field = crate::Field::new(1, 3, EV_STATUS); pub const EV_STATUS_NC_B18S4: crate::Field = crate::Field::new(1, 4, EV_STATUS); pub const EV_STATUS_NC_B18S5: crate::Field = crate::Field::new(1, 5, EV_STATUS); pub const EV_STATUS_NC_B18S6: crate::Field = crate::Field::new(1, 6, EV_STATUS); @@ -1243,8 +1243,8 @@ pub mod utra { pub const EV_PENDING: crate::Register = crate::Register::new(4, 0xffff); pub const EV_PENDING_PIOIRQ0_DUPE: crate::Field = crate::Field::new(1, 0, EV_PENDING); pub const EV_PENDING_PIOIRQ1_DUPE: crate::Field = crate::Field::new(1, 1, EV_PENDING); - pub const EV_PENDING_NC_B18S2: crate::Field = crate::Field::new(1, 2, EV_PENDING); - pub const EV_PENDING_NC_B18S3: crate::Field = crate::Field::new(1, 3, EV_PENDING); + pub const EV_PENDING_PIOIRQ2_DUPE: crate::Field = crate::Field::new(1, 2, EV_PENDING); + pub const EV_PENDING_PIOIRQ3_DUPE: crate::Field = crate::Field::new(1, 3, EV_PENDING); pub const EV_PENDING_NC_B18S4: crate::Field = crate::Field::new(1, 4, EV_PENDING); pub const EV_PENDING_NC_B18S5: crate::Field = crate::Field::new(1, 5, EV_PENDING); pub const EV_PENDING_NC_B18S6: crate::Field = crate::Field::new(1, 6, EV_PENDING); @@ -1261,8 +1261,8 @@ pub mod utra { pub const EV_ENABLE: crate::Register = crate::Register::new(5, 0xffff); pub const EV_ENABLE_PIOIRQ0_DUPE: crate::Field = crate::Field::new(1, 0, EV_ENABLE); pub const EV_ENABLE_PIOIRQ1_DUPE: crate::Field = crate::Field::new(1, 1, EV_ENABLE); - pub const EV_ENABLE_NC_B18S2: crate::Field = crate::Field::new(1, 2, EV_ENABLE); - pub const EV_ENABLE_NC_B18S3: crate::Field = crate::Field::new(1, 3, EV_ENABLE); + pub const EV_ENABLE_PIOIRQ2_DUPE: crate::Field = crate::Field::new(1, 2, EV_ENABLE); + pub const EV_ENABLE_PIOIRQ3_DUPE: crate::Field = crate::Field::new(1, 3, EV_ENABLE); pub const EV_ENABLE_NC_B18S4: crate::Field = crate::Field::new(1, 4, EV_ENABLE); pub const EV_ENABLE_NC_B18S5: crate::Field = crate::Field::new(1, 5, EV_ENABLE); pub const EV_ENABLE_NC_B18S6: crate::Field = crate::Field::new(1, 6, EV_ENABLE); @@ -4666,7 +4666,7 @@ pub mod utra { } pub mod bio { - pub const BIO_NUMREGS: usize = 32; + pub const BIO_NUMREGS: usize = 34; pub const SFR_CTRL: crate::Register = crate::Register::new(0, 0xfff); pub const SFR_CTRL_EN: crate::Field = crate::Field::new(4, 0, SFR_CTRL); @@ -4678,6 +4678,10 @@ pub mod utra { pub const SFR_CFGINFO_CONSTANT1: crate::Field = crate::Field::new(8, 8, SFR_CFGINFO); pub const SFR_CFGINFO_CONSTANT2: crate::Field = crate::Field::new(16, 16, SFR_CFGINFO); + pub const SFR_CONFIG: crate::Register = crate::Register::new(2, 0x7); + pub const SFR_CONFIG_SNAP_TO_WHICH: crate::Field = crate::Field::new(2, 0, SFR_CONFIG); + pub const SFR_CONFIG_SNAP_TO_QUANTUM: crate::Field = crate::Field::new(1, 2, SFR_CONFIG); + pub const SFR_FLEVEL: crate::Register = crate::Register::new(3, 0xffff); pub const SFR_FLEVEL_PCLK_REGFIFO_LEVEL0: crate::Field = crate::Field::new(4, 0, SFR_FLEVEL); pub const SFR_FLEVEL_PCLK_REGFIFO_LEVEL1: crate::Field = crate::Field::new(4, 4, SFR_FLEVEL); @@ -4734,6 +4738,13 @@ pub mod utra { pub const SFR_EVENT_STATUS: crate::Register = crate::Register::new(17, 0xffffffff); pub const SFR_EVENT_STATUS_SFR_EVENT_STATUS: crate::Field = crate::Field::new(32, 0, SFR_EVENT_STATUS); + pub const SFR_EXTCLOCK: crate::Register = crate::Register::new(18, 0xffffff); + pub const SFR_EXTCLOCK_USE_EXTCLK: crate::Field = crate::Field::new(4, 0, SFR_EXTCLOCK); + pub const SFR_EXTCLOCK_EXTCLK_GPIO_0: crate::Field = crate::Field::new(5, 4, SFR_EXTCLOCK); + pub const SFR_EXTCLOCK_EXTCLK_GPIO_1: crate::Field = crate::Field::new(5, 9, SFR_EXTCLOCK); + pub const SFR_EXTCLOCK_EXTCLK_GPIO_2: crate::Field = crate::Field::new(5, 14, SFR_EXTCLOCK); + pub const SFR_EXTCLOCK_EXTCLK_GPIO_3: crate::Field = crate::Field::new(5, 19, SFR_EXTCLOCK); + pub const SFR_QDIV0: crate::Register = crate::Register::new(20, 0xffffffff); pub const SFR_QDIV0_UNUSED_DIV: crate::Field = crate::Field::new(8, 0, SFR_QDIV0); pub const SFR_QDIV0_DIV_FRAC: crate::Field = crate::Field::new(8, 8, SFR_QDIV0); @@ -5089,6 +5100,8 @@ pub const LITEX_IFSUB_EV_USBC: usize = 161; pub const LITEX_IFSUB_EV_SDDCIRQ: usize = 162; pub const LITEX_IFSUB_EV_PIOIRQ0: usize = 163; pub const LITEX_IFSUB_EV_PIOIRQ1: usize = 164; +pub const LITEX_IFSUB_EV_PIOIRQ2: usize = 165; +pub const LITEX_IFSUB_EV_PIOIRQ3: usize = 166; pub const LITEX_IFSUB_EV_I2C0_NACK: usize = 200; pub const LITEX_IFSUB_EV_I2C1_NACK: usize = 201; pub const LITEX_IFSUB_EV_I2C2_NACK: usize = 202; @@ -6017,16 +6030,16 @@ mod tests { let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_STATUS_PIOIRQ1, bar); baz |= irqarray10_csr.ms(utra::irqarray10::EV_STATUS_PIOIRQ1, 1); irqarray10_csr.wfo(utra::irqarray10::EV_STATUS_PIOIRQ1, baz); - let bar = irqarray10_csr.rf(utra::irqarray10::EV_STATUS_NC_B10S5); - irqarray10_csr.rmwf(utra::irqarray10::EV_STATUS_NC_B10S5, bar); - let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_STATUS_NC_B10S5, bar); - baz |= irqarray10_csr.ms(utra::irqarray10::EV_STATUS_NC_B10S5, 1); - irqarray10_csr.wfo(utra::irqarray10::EV_STATUS_NC_B10S5, baz); - let bar = irqarray10_csr.rf(utra::irqarray10::EV_STATUS_NC_B10S6); - irqarray10_csr.rmwf(utra::irqarray10::EV_STATUS_NC_B10S6, bar); - let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_STATUS_NC_B10S6, bar); - baz |= irqarray10_csr.ms(utra::irqarray10::EV_STATUS_NC_B10S6, 1); - irqarray10_csr.wfo(utra::irqarray10::EV_STATUS_NC_B10S6, baz); + let bar = irqarray10_csr.rf(utra::irqarray10::EV_STATUS_PIOIRQ2); + irqarray10_csr.rmwf(utra::irqarray10::EV_STATUS_PIOIRQ2, bar); + let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_STATUS_PIOIRQ2, bar); + baz |= irqarray10_csr.ms(utra::irqarray10::EV_STATUS_PIOIRQ2, 1); + irqarray10_csr.wfo(utra::irqarray10::EV_STATUS_PIOIRQ2, baz); + let bar = irqarray10_csr.rf(utra::irqarray10::EV_STATUS_PIOIRQ3); + irqarray10_csr.rmwf(utra::irqarray10::EV_STATUS_PIOIRQ3, bar); + let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_STATUS_PIOIRQ3, bar); + baz |= irqarray10_csr.ms(utra::irqarray10::EV_STATUS_PIOIRQ3, 1); + irqarray10_csr.wfo(utra::irqarray10::EV_STATUS_PIOIRQ3, baz); let bar = irqarray10_csr.rf(utra::irqarray10::EV_STATUS_NC_B10S7); irqarray10_csr.rmwf(utra::irqarray10::EV_STATUS_NC_B10S7, bar); let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_STATUS_NC_B10S7, bar); @@ -6100,16 +6113,16 @@ mod tests { let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_PENDING_PIOIRQ1, bar); baz |= irqarray10_csr.ms(utra::irqarray10::EV_PENDING_PIOIRQ1, 1); irqarray10_csr.wfo(utra::irqarray10::EV_PENDING_PIOIRQ1, baz); - let bar = irqarray10_csr.rf(utra::irqarray10::EV_PENDING_NC_B10S5); - irqarray10_csr.rmwf(utra::irqarray10::EV_PENDING_NC_B10S5, bar); - let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_PENDING_NC_B10S5, bar); - baz |= irqarray10_csr.ms(utra::irqarray10::EV_PENDING_NC_B10S5, 1); - irqarray10_csr.wfo(utra::irqarray10::EV_PENDING_NC_B10S5, baz); - let bar = irqarray10_csr.rf(utra::irqarray10::EV_PENDING_NC_B10S6); - irqarray10_csr.rmwf(utra::irqarray10::EV_PENDING_NC_B10S6, bar); - let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_PENDING_NC_B10S6, bar); - baz |= irqarray10_csr.ms(utra::irqarray10::EV_PENDING_NC_B10S6, 1); - irqarray10_csr.wfo(utra::irqarray10::EV_PENDING_NC_B10S6, baz); + let bar = irqarray10_csr.rf(utra::irqarray10::EV_PENDING_PIOIRQ2); + irqarray10_csr.rmwf(utra::irqarray10::EV_PENDING_PIOIRQ2, bar); + let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_PENDING_PIOIRQ2, bar); + baz |= irqarray10_csr.ms(utra::irqarray10::EV_PENDING_PIOIRQ2, 1); + irqarray10_csr.wfo(utra::irqarray10::EV_PENDING_PIOIRQ2, baz); + let bar = irqarray10_csr.rf(utra::irqarray10::EV_PENDING_PIOIRQ3); + irqarray10_csr.rmwf(utra::irqarray10::EV_PENDING_PIOIRQ3, bar); + let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_PENDING_PIOIRQ3, bar); + baz |= irqarray10_csr.ms(utra::irqarray10::EV_PENDING_PIOIRQ3, 1); + irqarray10_csr.wfo(utra::irqarray10::EV_PENDING_PIOIRQ3, baz); let bar = irqarray10_csr.rf(utra::irqarray10::EV_PENDING_NC_B10S7); irqarray10_csr.rmwf(utra::irqarray10::EV_PENDING_NC_B10S7, bar); let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_PENDING_NC_B10S7, bar); @@ -6183,16 +6196,16 @@ mod tests { let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_ENABLE_PIOIRQ1, bar); baz |= irqarray10_csr.ms(utra::irqarray10::EV_ENABLE_PIOIRQ1, 1); irqarray10_csr.wfo(utra::irqarray10::EV_ENABLE_PIOIRQ1, baz); - let bar = irqarray10_csr.rf(utra::irqarray10::EV_ENABLE_NC_B10S5); - irqarray10_csr.rmwf(utra::irqarray10::EV_ENABLE_NC_B10S5, bar); - let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_ENABLE_NC_B10S5, bar); - baz |= irqarray10_csr.ms(utra::irqarray10::EV_ENABLE_NC_B10S5, 1); - irqarray10_csr.wfo(utra::irqarray10::EV_ENABLE_NC_B10S5, baz); - let bar = irqarray10_csr.rf(utra::irqarray10::EV_ENABLE_NC_B10S6); - irqarray10_csr.rmwf(utra::irqarray10::EV_ENABLE_NC_B10S6, bar); - let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_ENABLE_NC_B10S6, bar); - baz |= irqarray10_csr.ms(utra::irqarray10::EV_ENABLE_NC_B10S6, 1); - irqarray10_csr.wfo(utra::irqarray10::EV_ENABLE_NC_B10S6, baz); + let bar = irqarray10_csr.rf(utra::irqarray10::EV_ENABLE_PIOIRQ2); + irqarray10_csr.rmwf(utra::irqarray10::EV_ENABLE_PIOIRQ2, bar); + let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_ENABLE_PIOIRQ2, bar); + baz |= irqarray10_csr.ms(utra::irqarray10::EV_ENABLE_PIOIRQ2, 1); + irqarray10_csr.wfo(utra::irqarray10::EV_ENABLE_PIOIRQ2, baz); + let bar = irqarray10_csr.rf(utra::irqarray10::EV_ENABLE_PIOIRQ3); + irqarray10_csr.rmwf(utra::irqarray10::EV_ENABLE_PIOIRQ3, bar); + let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_ENABLE_PIOIRQ3, bar); + baz |= irqarray10_csr.ms(utra::irqarray10::EV_ENABLE_PIOIRQ3, 1); + irqarray10_csr.wfo(utra::irqarray10::EV_ENABLE_PIOIRQ3, baz); let bar = irqarray10_csr.rf(utra::irqarray10::EV_ENABLE_NC_B10S7); irqarray10_csr.rmwf(utra::irqarray10::EV_ENABLE_NC_B10S7, bar); let mut baz = irqarray10_csr.zf(utra::irqarray10::EV_ENABLE_NC_B10S7, bar); @@ -8242,16 +8255,16 @@ mod tests { let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_STATUS_PIOIRQ1_DUPE, bar); baz |= irqarray18_csr.ms(utra::irqarray18::EV_STATUS_PIOIRQ1_DUPE, 1); irqarray18_csr.wfo(utra::irqarray18::EV_STATUS_PIOIRQ1_DUPE, baz); - let bar = irqarray18_csr.rf(utra::irqarray18::EV_STATUS_NC_B18S2); - irqarray18_csr.rmwf(utra::irqarray18::EV_STATUS_NC_B18S2, bar); - let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_STATUS_NC_B18S2, bar); - baz |= irqarray18_csr.ms(utra::irqarray18::EV_STATUS_NC_B18S2, 1); - irqarray18_csr.wfo(utra::irqarray18::EV_STATUS_NC_B18S2, baz); - let bar = irqarray18_csr.rf(utra::irqarray18::EV_STATUS_NC_B18S3); - irqarray18_csr.rmwf(utra::irqarray18::EV_STATUS_NC_B18S3, bar); - let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_STATUS_NC_B18S3, bar); - baz |= irqarray18_csr.ms(utra::irqarray18::EV_STATUS_NC_B18S3, 1); - irqarray18_csr.wfo(utra::irqarray18::EV_STATUS_NC_B18S3, baz); + let bar = irqarray18_csr.rf(utra::irqarray18::EV_STATUS_PIOIRQ2_DUPE); + irqarray18_csr.rmwf(utra::irqarray18::EV_STATUS_PIOIRQ2_DUPE, bar); + let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_STATUS_PIOIRQ2_DUPE, bar); + baz |= irqarray18_csr.ms(utra::irqarray18::EV_STATUS_PIOIRQ2_DUPE, 1); + irqarray18_csr.wfo(utra::irqarray18::EV_STATUS_PIOIRQ2_DUPE, baz); + let bar = irqarray18_csr.rf(utra::irqarray18::EV_STATUS_PIOIRQ3_DUPE); + irqarray18_csr.rmwf(utra::irqarray18::EV_STATUS_PIOIRQ3_DUPE, bar); + let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_STATUS_PIOIRQ3_DUPE, bar); + baz |= irqarray18_csr.ms(utra::irqarray18::EV_STATUS_PIOIRQ3_DUPE, 1); + irqarray18_csr.wfo(utra::irqarray18::EV_STATUS_PIOIRQ3_DUPE, baz); let bar = irqarray18_csr.rf(utra::irqarray18::EV_STATUS_NC_B18S4); irqarray18_csr.rmwf(utra::irqarray18::EV_STATUS_NC_B18S4, bar); let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_STATUS_NC_B18S4, bar); @@ -8325,16 +8338,16 @@ mod tests { let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_PENDING_PIOIRQ1_DUPE, bar); baz |= irqarray18_csr.ms(utra::irqarray18::EV_PENDING_PIOIRQ1_DUPE, 1); irqarray18_csr.wfo(utra::irqarray18::EV_PENDING_PIOIRQ1_DUPE, baz); - let bar = irqarray18_csr.rf(utra::irqarray18::EV_PENDING_NC_B18S2); - irqarray18_csr.rmwf(utra::irqarray18::EV_PENDING_NC_B18S2, bar); - let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_PENDING_NC_B18S2, bar); - baz |= irqarray18_csr.ms(utra::irqarray18::EV_PENDING_NC_B18S2, 1); - irqarray18_csr.wfo(utra::irqarray18::EV_PENDING_NC_B18S2, baz); - let bar = irqarray18_csr.rf(utra::irqarray18::EV_PENDING_NC_B18S3); - irqarray18_csr.rmwf(utra::irqarray18::EV_PENDING_NC_B18S3, bar); - let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_PENDING_NC_B18S3, bar); - baz |= irqarray18_csr.ms(utra::irqarray18::EV_PENDING_NC_B18S3, 1); - irqarray18_csr.wfo(utra::irqarray18::EV_PENDING_NC_B18S3, baz); + let bar = irqarray18_csr.rf(utra::irqarray18::EV_PENDING_PIOIRQ2_DUPE); + irqarray18_csr.rmwf(utra::irqarray18::EV_PENDING_PIOIRQ2_DUPE, bar); + let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_PENDING_PIOIRQ2_DUPE, bar); + baz |= irqarray18_csr.ms(utra::irqarray18::EV_PENDING_PIOIRQ2_DUPE, 1); + irqarray18_csr.wfo(utra::irqarray18::EV_PENDING_PIOIRQ2_DUPE, baz); + let bar = irqarray18_csr.rf(utra::irqarray18::EV_PENDING_PIOIRQ3_DUPE); + irqarray18_csr.rmwf(utra::irqarray18::EV_PENDING_PIOIRQ3_DUPE, bar); + let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_PENDING_PIOIRQ3_DUPE, bar); + baz |= irqarray18_csr.ms(utra::irqarray18::EV_PENDING_PIOIRQ3_DUPE, 1); + irqarray18_csr.wfo(utra::irqarray18::EV_PENDING_PIOIRQ3_DUPE, baz); let bar = irqarray18_csr.rf(utra::irqarray18::EV_PENDING_NC_B18S4); irqarray18_csr.rmwf(utra::irqarray18::EV_PENDING_NC_B18S4, bar); let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_PENDING_NC_B18S4, bar); @@ -8408,16 +8421,16 @@ mod tests { let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_ENABLE_PIOIRQ1_DUPE, bar); baz |= irqarray18_csr.ms(utra::irqarray18::EV_ENABLE_PIOIRQ1_DUPE, 1); irqarray18_csr.wfo(utra::irqarray18::EV_ENABLE_PIOIRQ1_DUPE, baz); - let bar = irqarray18_csr.rf(utra::irqarray18::EV_ENABLE_NC_B18S2); - irqarray18_csr.rmwf(utra::irqarray18::EV_ENABLE_NC_B18S2, bar); - let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_ENABLE_NC_B18S2, bar); - baz |= irqarray18_csr.ms(utra::irqarray18::EV_ENABLE_NC_B18S2, 1); - irqarray18_csr.wfo(utra::irqarray18::EV_ENABLE_NC_B18S2, baz); - let bar = irqarray18_csr.rf(utra::irqarray18::EV_ENABLE_NC_B18S3); - irqarray18_csr.rmwf(utra::irqarray18::EV_ENABLE_NC_B18S3, bar); - let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_ENABLE_NC_B18S3, bar); - baz |= irqarray18_csr.ms(utra::irqarray18::EV_ENABLE_NC_B18S3, 1); - irqarray18_csr.wfo(utra::irqarray18::EV_ENABLE_NC_B18S3, baz); + let bar = irqarray18_csr.rf(utra::irqarray18::EV_ENABLE_PIOIRQ2_DUPE); + irqarray18_csr.rmwf(utra::irqarray18::EV_ENABLE_PIOIRQ2_DUPE, bar); + let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_ENABLE_PIOIRQ2_DUPE, bar); + baz |= irqarray18_csr.ms(utra::irqarray18::EV_ENABLE_PIOIRQ2_DUPE, 1); + irqarray18_csr.wfo(utra::irqarray18::EV_ENABLE_PIOIRQ2_DUPE, baz); + let bar = irqarray18_csr.rf(utra::irqarray18::EV_ENABLE_PIOIRQ3_DUPE); + irqarray18_csr.rmwf(utra::irqarray18::EV_ENABLE_PIOIRQ3_DUPE, bar); + let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_ENABLE_PIOIRQ3_DUPE, bar); + baz |= irqarray18_csr.ms(utra::irqarray18::EV_ENABLE_PIOIRQ3_DUPE, 1); + irqarray18_csr.wfo(utra::irqarray18::EV_ENABLE_PIOIRQ3_DUPE, baz); let bar = irqarray18_csr.rf(utra::irqarray18::EV_ENABLE_NC_B18S4); irqarray18_csr.rmwf(utra::irqarray18::EV_ENABLE_NC_B18S4, bar); let mut baz = irqarray18_csr.zf(utra::irqarray18::EV_ENABLE_NC_B18S4, bar); @@ -18934,6 +18947,19 @@ mod tests { baz |= bio_csr.ms(utra::bio::SFR_CFGINFO_CONSTANT2, 1); bio_csr.wfo(utra::bio::SFR_CFGINFO_CONSTANT2, baz); + let foo = bio_csr.r(utra::bio::SFR_CONFIG); + bio_csr.wo(utra::bio::SFR_CONFIG, foo); + let bar = bio_csr.rf(utra::bio::SFR_CONFIG_SNAP_TO_WHICH); + bio_csr.rmwf(utra::bio::SFR_CONFIG_SNAP_TO_WHICH, bar); + let mut baz = bio_csr.zf(utra::bio::SFR_CONFIG_SNAP_TO_WHICH, bar); + baz |= bio_csr.ms(utra::bio::SFR_CONFIG_SNAP_TO_WHICH, 1); + bio_csr.wfo(utra::bio::SFR_CONFIG_SNAP_TO_WHICH, baz); + let bar = bio_csr.rf(utra::bio::SFR_CONFIG_SNAP_TO_QUANTUM); + bio_csr.rmwf(utra::bio::SFR_CONFIG_SNAP_TO_QUANTUM, bar); + let mut baz = bio_csr.zf(utra::bio::SFR_CONFIG_SNAP_TO_QUANTUM, bar); + baz |= bio_csr.ms(utra::bio::SFR_CONFIG_SNAP_TO_QUANTUM, 1); + bio_csr.wfo(utra::bio::SFR_CONFIG_SNAP_TO_QUANTUM, baz); + let foo = bio_csr.r(utra::bio::SFR_FLEVEL); bio_csr.wo(utra::bio::SFR_FLEVEL, foo); let bar = bio_csr.rf(utra::bio::SFR_FLEVEL_PCLK_REGFIFO_LEVEL0); @@ -19109,6 +19135,34 @@ mod tests { baz |= bio_csr.ms(utra::bio::SFR_EVENT_STATUS_SFR_EVENT_STATUS, 1); bio_csr.wfo(utra::bio::SFR_EVENT_STATUS_SFR_EVENT_STATUS, baz); + let foo = bio_csr.r(utra::bio::SFR_EXTCLOCK); + bio_csr.wo(utra::bio::SFR_EXTCLOCK, foo); + let bar = bio_csr.rf(utra::bio::SFR_EXTCLOCK_USE_EXTCLK); + bio_csr.rmwf(utra::bio::SFR_EXTCLOCK_USE_EXTCLK, bar); + let mut baz = bio_csr.zf(utra::bio::SFR_EXTCLOCK_USE_EXTCLK, bar); + baz |= bio_csr.ms(utra::bio::SFR_EXTCLOCK_USE_EXTCLK, 1); + bio_csr.wfo(utra::bio::SFR_EXTCLOCK_USE_EXTCLK, baz); + let bar = bio_csr.rf(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_0); + bio_csr.rmwf(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_0, bar); + let mut baz = bio_csr.zf(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_0, bar); + baz |= bio_csr.ms(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_0, 1); + bio_csr.wfo(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_0, baz); + let bar = bio_csr.rf(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_1); + bio_csr.rmwf(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_1, bar); + let mut baz = bio_csr.zf(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_1, bar); + baz |= bio_csr.ms(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_1, 1); + bio_csr.wfo(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_1, baz); + let bar = bio_csr.rf(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_2); + bio_csr.rmwf(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_2, bar); + let mut baz = bio_csr.zf(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_2, bar); + baz |= bio_csr.ms(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_2, 1); + bio_csr.wfo(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_2, baz); + let bar = bio_csr.rf(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_3); + bio_csr.rmwf(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_3, bar); + let mut baz = bio_csr.zf(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_3, bar); + baz |= bio_csr.ms(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_3, 1); + bio_csr.wfo(utra::bio::SFR_EXTCLOCK_EXTCLK_GPIO_3, baz); + let foo = bio_csr.r(utra::bio::SFR_QDIV0); bio_csr.wo(utra::bio::SFR_QDIV0, foo); let bar = bio_csr.rf(utra::bio::SFR_QDIV0_UNUSED_DIV);