Update svd2rust

src/adc.rs

@@ -20,7 +20,7 @@ pub struct RegisterBlock {
     pub inte: INTE,
     #[doc = "0x1c - Interrupt Force"]
     pub intf: INTF,
-    #[doc = "0x20 - Interrupt status after masking & forcing"]
+    #[doc = "0x20 - Interrupt status after masking & forcing"]
     pub ints: INTS,
 }
 #[doc = "CS (rw) register accessor: an alias for `Reg<CS_SPEC>`"]
@@ -60,5 +60,5 @@ pub type INTF = crate::Reg<intf::INTF_SPEC>;
 pub mod intf;
 #[doc = "INTS (r) register accessor: an alias for `Reg<INTS_SPEC>`"]
 pub type INTS = crate::Reg<ints::INTS_SPEC>;
-#[doc = "Interrupt status after masking & forcing"]
+#[doc = "Interrupt status after masking &amp; forcing"]
 pub mod ints;

src/adc/cs.rs

@@ -36,45 +36,45 @@ impl From<crate::W<CS_SPEC>> for W {
 }
 #[doc = "Field `EN` reader - Power on ADC and enable its clock.  
  1 - enabled. 0 - disabled."]
-pub type EN_R = crate::BitReader<bool>;
+pub type EN_R = crate::BitReader;
 #[doc = "Field `EN` writer - Power on ADC and enable its clock.  
  1 - enabled. 0 - disabled."]
-pub type EN_W<'a, const O: u8> = crate::BitWriter<'a, u32, CS_SPEC, bool, O>;
+pub type EN_W<'a, const O: u8> = crate::BitWriter<'a, CS_SPEC, O>;
 #[doc = "Field `TS_EN` reader - Power on temperature sensor. 1 - enabled. 0 - disabled."]
-pub type TS_EN_R = crate::BitReader<bool>;
+pub type TS_EN_R = crate::BitReader;
 #[doc = "Field `TS_EN` writer - Power on temperature sensor. 1 - enabled. 0 - disabled."]
-pub type TS_EN_W<'a, const O: u8> = crate::BitWriter<'a, u32, CS_SPEC, bool, O>;
+pub type TS_EN_W<'a, const O: u8> = crate::BitWriter<'a, CS_SPEC, O>;
 #[doc = "Field `START_ONCE` reader - Start a single conversion. Self-clearing. Ignored if start_many is asserted."]
-pub type START_ONCE_R = crate::BitReader<bool>;
+pub type START_ONCE_R = crate::BitReader;
 #[doc = "Field `START_ONCE` writer - Start a single conversion. Self-clearing. Ignored if start_many is asserted."]
-pub type START_ONCE_W<'a, const O: u8> = crate::BitWriter<'a, u32, CS_SPEC, bool, O>;
+pub type START_ONCE_W<'a, const O: u8> = crate::BitWriter<'a, CS_SPEC, O>;
 #[doc = "Field `START_MANY` reader - Continuously perform conversions whilst this bit is 1. A new conversion will start immediately after the previous finishes."]
-pub type START_MANY_R = crate::BitReader<bool>;
+pub type START_MANY_R = crate::BitReader;
 #[doc = "Field `START_MANY` writer - Continuously perform conversions whilst this bit is 1. A new conversion will start immediately after the previous finishes."]
-pub type START_MANY_W<'a, const O: u8> = crate::BitWriter<'a, u32, CS_SPEC, bool, O>;
+pub type START_MANY_W<'a, const O: u8> = crate::BitWriter<'a, CS_SPEC, O>;
 #[doc = "Field `READY` reader - 1 if the ADC is ready to start a new conversion. Implies any previous conversion has completed.  
  0 whilst conversion in progress."]
-pub type READY_R = crate::BitReader<bool>;
+pub type READY_R = crate::BitReader;
 #[doc = "Field `ERR` reader - The most recent ADC conversion encountered an error; result is undefined or noisy."]
-pub type ERR_R = crate::BitReader<bool>;
+pub type ERR_R = crate::BitReader;
 #[doc = "Field `ERR_STICKY` reader - Some past ADC conversion encountered an error. Write 1 to clear."]
-pub type ERR_STICKY_R = crate::BitReader<bool>;
+pub type ERR_STICKY_R = crate::BitReader;
 #[doc = "Field `ERR_STICKY` writer - Some past ADC conversion encountered an error. Write 1 to clear."]
-pub type ERR_STICKY_W<'a, const O: u8> = crate::BitWriter1C<'a, u32, CS_SPEC, bool, O>;
+pub type ERR_STICKY_W<'a, const O: u8> = crate::BitWriter1C<'a, CS_SPEC, O>;
 #[doc = "Field `AINSEL` reader - Select analog mux input. Updated automatically in round-robin mode."]
-pub type AINSEL_R = crate::FieldReader<u8, u8>;
+pub type AINSEL_R = crate::FieldReader;
 #[doc = "Field `AINSEL` writer - Select analog mux input. Updated automatically in round-robin mode."]
-pub type AINSEL_W<'a, const O: u8> = crate::FieldWriter<'a, u32, CS_SPEC, u8, u8, 3, O>;
+pub type AINSEL_W<'a, const O: u8> = crate::FieldWriter<'a, CS_SPEC, 3, O>;
 #[doc = "Field `RROBIN` reader - Round-robin sampling. 1 bit per channel. Set all bits to 0 to disable.  
  Otherwise, the ADC will cycle through each enabled channel in a round-robin fashion.  
  The first channel to be sampled will be the one currently indicated by AINSEL.  
  AINSEL will be updated after each conversion with the newly-selected channel."]
-pub type RROBIN_R = crate::FieldReader<u8, u8>;
+pub type RROBIN_R = crate::FieldReader;
 #[doc = "Field `RROBIN` writer - Round-robin sampling. 1 bit per channel. Set all bits to 0 to disable.  
  Otherwise, the ADC will cycle through each enabled channel in a round-robin fashion.  
  The first channel to be sampled will be the one currently indicated by AINSEL.  
  AINSEL will be updated after each conversion with the newly-selected channel."]
-pub type RROBIN_W<'a, const O: u8> = crate::FieldWriter<'a, u32, CS_SPEC, u8, u8, 5, O>;
+pub type RROBIN_W<'a, const O: u8> = crate::FieldWriter<'a, CS_SPEC, 5, O>;
 impl R {
     #[doc = "Bit 0 - Power on ADC and enable its clock.  
  1 - enabled. 0 - disabled."]

src/adc/div.rs

@@ -35,13 +35,13 @@ impl From<crate::W<DIV_SPEC>> for W {
     }
 }
 #[doc = "Field `FRAC` reader - Fractional part of clock divisor. First-order delta-sigma."]
-pub type FRAC_R = crate::FieldReader<u8, u8>;
+pub type FRAC_R = crate::FieldReader;
 #[doc = "Field `FRAC` writer - Fractional part of clock divisor. First-order delta-sigma."]
-pub type FRAC_W<'a, const O: u8> = crate::FieldWriter<'a, u32, DIV_SPEC, u8, u8, 8, O>;
+pub type FRAC_W<'a, const O: u8> = crate::FieldWriter<'a, DIV_SPEC, 8, O>;
 #[doc = "Field `INT` reader - Integer part of clock divisor."]
-pub type INT_R = crate::FieldReader<u16, u16>;
+pub type INT_R = crate::FieldReader<u16>;
 #[doc = "Field `INT` writer - Integer part of clock divisor."]
-pub type INT_W<'a, const O: u8> = crate::FieldWriter<'a, u32, DIV_SPEC, u16, u16, 16, O>;
+pub type INT_W<'a, const O: u8> = crate::FieldWriter<'a, DIV_SPEC, 16, O, u16>;
 impl R {
     #[doc = "Bits 0:7 - Fractional part of clock divisor. First-order delta-sigma."]
     #[inline(always)]

src/adc/fcs.rs

@@ -35,39 +35,39 @@ impl From<crate::W<FCS_SPEC>> for W {
     }
 }
 #[doc = "Field `EN` reader - If 1: write result to the FIFO after each conversion."]
-pub type EN_R = crate::BitReader<bool>;
+pub type EN_R = crate::BitReader;
 #[doc = "Field `EN` writer - If 1: write result to the FIFO after each conversion."]
-pub type EN_W<'a, const O: u8> = crate::BitWriter<'a, u32, FCS_SPEC, bool, O>;
+pub type EN_W<'a, const O: u8> = crate::BitWriter<'a, FCS_SPEC, O>;
 #[doc = "Field `SHIFT` reader - If 1: FIFO results are right-shifted to be one byte in size. Enables DMA to byte buffers."]
-pub type SHIFT_R = crate::BitReader<bool>;
+pub type SHIFT_R = crate::BitReader;
 #[doc = "Field `SHIFT` writer - If 1: FIFO results are right-shifted to be one byte in size. Enables DMA to byte buffers."]
-pub type SHIFT_W<'a, const O: u8> = crate::BitWriter<'a, u32, FCS_SPEC, bool, O>;
+pub type SHIFT_W<'a, const O: u8> = crate::BitWriter<'a, FCS_SPEC, O>;
 #[doc = "Field `ERR` reader - If 1: conversion error bit appears in the FIFO alongside the result"]
-pub type ERR_R = crate::BitReader<bool>;
+pub type ERR_R = crate::BitReader;
 #[doc = "Field `ERR` writer - If 1: conversion error bit appears in the FIFO alongside the result"]
-pub type ERR_W<'a, const O: u8> = crate::BitWriter<'a, u32, FCS_SPEC, bool, O>;
+pub type ERR_W<'a, const O: u8> = crate::BitWriter<'a, FCS_SPEC, O>;
 #[doc = "Field `DREQ_EN` reader - If 1: assert DMA requests when FIFO contains data"]
-pub type DREQ_EN_R = crate::BitReader<bool>;
+pub type DREQ_EN_R = crate::BitReader;
 #[doc = "Field `DREQ_EN` writer - If 1: assert DMA requests when FIFO contains data"]
-pub type DREQ_EN_W<'a, const O: u8> = crate::BitWriter<'a, u32, FCS_SPEC, bool, O>;
+pub type DREQ_EN_W<'a, const O: u8> = crate::BitWriter<'a, FCS_SPEC, O>;
 #[doc = "Field `EMPTY` reader - "]
-pub type EMPTY_R = crate::BitReader<bool>;
+pub type EMPTY_R = crate::BitReader;
 #[doc = "Field `FULL` reader - "]
-pub type FULL_R = crate::BitReader<bool>;
+pub type FULL_R = crate::BitReader;
 #[doc = "Field `UNDER` reader - 1 if the FIFO has been underflowed. Write 1 to clear."]
-pub type UNDER_R = crate::BitReader<bool>;
+pub type UNDER_R = crate::BitReader;
 #[doc = "Field `UNDER` writer - 1 if the FIFO has been underflowed. Write 1 to clear."]
-pub type UNDER_W<'a, const O: u8> = crate::BitWriter1C<'a, u32, FCS_SPEC, bool, O>;
+pub type UNDER_W<'a, const O: u8> = crate::BitWriter1C<'a, FCS_SPEC, O>;
 #[doc = "Field `OVER` reader - 1 if the FIFO has been overflowed. Write 1 to clear."]
-pub type OVER_R = crate::BitReader<bool>;
+pub type OVER_R = crate::BitReader;
 #[doc = "Field `OVER` writer - 1 if the FIFO has been overflowed. Write 1 to clear."]
-pub type OVER_W<'a, const O: u8> = crate::BitWriter1C<'a, u32, FCS_SPEC, bool, O>;
+pub type OVER_W<'a, const O: u8> = crate::BitWriter1C<'a, FCS_SPEC, O>;
 #[doc = "Field `LEVEL` reader - The number of conversion results currently waiting in the FIFO"]
-pub type LEVEL_R = crate::FieldReader<u8, u8>;
+pub type LEVEL_R = crate::FieldReader;
 #[doc = "Field `THRESH` reader - DREQ/IRQ asserted when level >= threshold"]
-pub type THRESH_R = crate::FieldReader<u8, u8>;
+pub type THRESH_R = crate::FieldReader;
 #[doc = "Field `THRESH` writer - DREQ/IRQ asserted when level >= threshold"]
-pub type THRESH_W<'a, const O: u8> = crate::FieldWriter<'a, u32, FCS_SPEC, u8, u8, 4, O>;
+pub type THRESH_W<'a, const O: u8> = crate::FieldWriter<'a, FCS_SPEC, 4, O>;
 impl R {
     #[doc = "Bit 0 - If 1: write result to the FIFO after each conversion."]
     #[inline(always)]

src/adc/fifo.rs

@@ -14,9 +14,9 @@ impl From<crate::R<FIFO_SPEC>> for R {
     }
 }
 #[doc = "Field `VAL` reader - "]
-pub type VAL_R = crate::FieldReader<u16, u16>;
+pub type VAL_R = crate::FieldReader<u16>;
 #[doc = "Field `ERR` reader - 1 if this particular sample experienced a conversion error. Remains in the same location if the sample is shifted."]
-pub type ERR_R = crate::BitReader<bool>;
+pub type ERR_R = crate::BitReader;
 impl R {
     #[doc = "Bits 0:11"]
     #[inline(always)]

src/adc/inte.rs

@@ -36,10 +36,10 @@ impl From<crate::W<INTE_SPEC>> for W {
 }
 #[doc = "Field `FIFO` reader - Triggered when the sample FIFO reaches a certain level.  
  This level can be programmed via the FCS_THRESH field."]
-pub type FIFO_R = crate::BitReader<bool>;
+pub type FIFO_R = crate::BitReader;
 #[doc = "Field `FIFO` writer - Triggered when the sample FIFO reaches a certain level.  
  This level can be programmed via the FCS_THRESH field."]
-pub type FIFO_W<'a, const O: u8> = crate::BitWriter<'a, u32, INTE_SPEC, bool, O>;
+pub type FIFO_W<'a, const O: u8> = crate::BitWriter<'a, INTE_SPEC, O>;
 impl R {
     #[doc = "Bit 0 - Triggered when the sample FIFO reaches a certain level.  
  This level can be programmed via the FCS_THRESH field."]

src/adc/intf.rs

@@ -36,10 +36,10 @@ impl From<crate::W<INTF_SPEC>> for W {
 }
 #[doc = "Field `FIFO` reader - Triggered when the sample FIFO reaches a certain level.  
  This level can be programmed via the FCS_THRESH field."]
-pub type FIFO_R = crate::BitReader<bool>;
+pub type FIFO_R = crate::BitReader;
 #[doc = "Field `FIFO` writer - Triggered when the sample FIFO reaches a certain level.  
  This level can be programmed via the FCS_THRESH field."]
-pub type FIFO_W<'a, const O: u8> = crate::BitWriter<'a, u32, INTF_SPEC, bool, O>;
+pub type FIFO_W<'a, const O: u8> = crate::BitWriter<'a, INTF_SPEC, O>;
 impl R {
     #[doc = "Bit 0 - Triggered when the sample FIFO reaches a certain level.  
  This level can be programmed via the FCS_THRESH field."]

src/adc/intr.rs

@@ -15,7 +15,7 @@ impl From<crate::R<INTR_SPEC>> for R {
 }
 #[doc = "Field `FIFO` reader - Triggered when the sample FIFO reaches a certain level.  
  This level can be programmed via the FCS_THRESH field."]
-pub type FIFO_R = crate::BitReader<bool>;
+pub type FIFO_R = crate::BitReader;
 impl R {
     #[doc = "Bit 0 - Triggered when the sample FIFO reaches a certain level.  
  This level can be programmed via the FCS_THRESH field."]

src/adc/ints.rs

@@ -15,7 +15,7 @@ impl From<crate::R<INTS_SPEC>> for R {
 }
 #[doc = "Field `FIFO` reader - Triggered when the sample FIFO reaches a certain level.  
  This level can be programmed via the FCS_THRESH field."]
-pub type FIFO_R = crate::BitReader<bool>;
+pub type FIFO_R = crate::BitReader;
 impl R {
     #[doc = "Bit 0 - Triggered when the sample FIFO reaches a certain level.  
  This level can be programmed via the FCS_THRESH field."]
@@ -24,7 +24,7 @@ impl R {
         FIFO_R::new((self.bits & 1) != 0)
     }
 }
-#[doc = "Interrupt status after masking & forcing  
+#[doc = "Interrupt status after masking &amp; forcing  
 
 This register you can [`read`](crate::generic::Reg::read). See [API](https://docs.rs/svd2rust/#read--modify--write-api).  
 

src/adc/result.rs

@@ -14,7 +14,7 @@ impl From<crate::R<RESULT_SPEC>> for R {
     }
 }
 #[doc = "Field `RESULT` reader - "]
-pub type RESULT_R = crate::FieldReader<u16, u16>;
+pub type RESULT_R = crate::FieldReader<u16>;
 impl R {
     #[doc = "Bits 0:11"]
     #[inline(always)]

src/busctrl/bus_priority.rs

@@ -35,21 +35,21 @@ impl From<crate::W<BUS_PRIORITY_SPEC>> for W {
     }
 }
 #[doc = "Field `PROC0` reader - 0 - low priority, 1 - high priority"]
-pub type PROC0_R = crate::BitReader<bool>;
+pub type PROC0_R = crate::BitReader;
 #[doc = "Field `PROC0` writer - 0 - low priority, 1 - high priority"]
-pub type PROC0_W<'a, const O: u8> = crate::BitWriter<'a, u32, BUS_PRIORITY_SPEC, bool, O>;
+pub type PROC0_W<'a, const O: u8> = crate::BitWriter<'a, BUS_PRIORITY_SPEC, O>;
 #[doc = "Field `PROC1` reader - 0 - low priority, 1 - high priority"]
-pub type PROC1_R = crate::BitReader<bool>;
+pub type PROC1_R = crate::BitReader;
 #[doc = "Field `PROC1` writer - 0 - low priority, 1 - high priority"]
-pub type PROC1_W<'a, const O: u8> = crate::BitWriter<'a, u32, BUS_PRIORITY_SPEC, bool, O>;
+pub type PROC1_W<'a, const O: u8> = crate::BitWriter<'a, BUS_PRIORITY_SPEC, O>;
 #[doc = "Field `DMA_R` reader - 0 - low priority, 1 - high priority"]
-pub type DMA_R_R = crate::BitReader<bool>;
+pub type DMA_R_R = crate::BitReader;
 #[doc = "Field `DMA_R` writer - 0 - low priority, 1 - high priority"]
-pub type DMA_R_W<'a, const O: u8> = crate::BitWriter<'a, u32, BUS_PRIORITY_SPEC, bool, O>;
+pub type DMA_R_W<'a, const O: u8> = crate::BitWriter<'a, BUS_PRIORITY_SPEC, O>;
 #[doc = "Field `DMA_W` reader - 0 - low priority, 1 - high priority"]
-pub type DMA_W_R = crate::BitReader<bool>;
+pub type DMA_W_R = crate::BitReader;
 #[doc = "Field `DMA_W` writer - 0 - low priority, 1 - high priority"]
-pub type DMA_W_W<'a, const O: u8> = crate::BitWriter<'a, u32, BUS_PRIORITY_SPEC, bool, O>;
+pub type DMA_W_W<'a, const O: u8> = crate::BitWriter<'a, BUS_PRIORITY_SPEC, O>;
 impl R {
     #[doc = "Bit 0 - 0 - low priority, 1 - high priority"]
     #[inline(always)]

src/busctrl/bus_priority_ack.rs

@@ -16,7 +16,7 @@ impl From<crate::R<BUS_PRIORITY_ACK_SPEC>> for R {
 #[doc = "Field `BUS_PRIORITY_ACK` reader - Goes to 1 once all arbiters have registered the new global priority levels.  
  Arbiters update their local priority when servicing a new nonsequential access.  
  In normal circumstances this will happen almost immediately."]
-pub type BUS_PRIORITY_ACK_R = crate::BitReader<bool>;
+pub type BUS_PRIORITY_ACK_R = crate::BitReader;
 impl R {
     #[doc = "Bit 0 - Goes to 1 once all arbiters have registered the new global priority levels.  
  Arbiters update their local priority when servicing a new nonsequential access.  

src/busctrl/perfctr0.rs

@@ -37,11 +37,11 @@ impl From<crate::W<PERFCTR0_SPEC>> for W {
 #[doc = "Field `PERFCTR0` reader - Busfabric saturating performance counter 0  
  Count some event signal from the busfabric arbiters.  
  Write any value to clear. Select an event to count using PERFSEL0"]
-pub type PERFCTR0_R = crate::FieldReader<u32, u32>;
+pub type PERFCTR0_R = crate::FieldReader<u32>;
 #[doc = "Field `PERFCTR0` writer - Busfabric saturating performance counter 0  
  Count some event signal from the busfabric arbiters.  
  Write any value to clear. Select an event to count using PERFSEL0"]
-pub type PERFCTR0_W<'a, const O: u8> = crate::FieldWriter<'a, u32, PERFCTR0_SPEC, u32, u32, 24, O>;
+pub type PERFCTR0_W<'a, const O: u8> = crate::FieldWriter<'a, PERFCTR0_SPEC, 24, O, u32>;
 impl R {
     #[doc = "Bits 0:23 - Busfabric saturating performance counter 0  
  Count some event signal from the busfabric arbiters.  

src/busctrl/perfctr1.rs

@@ -37,11 +37,11 @@ impl From<crate::W<PERFCTR1_SPEC>> for W {
 #[doc = "Field `PERFCTR1` reader - Busfabric saturating performance counter 1  
  Count some event signal from the busfabric arbiters.  
  Write any value to clear. Select an event to count using PERFSEL1"]
-pub type PERFCTR1_R = crate::FieldReader<u32, u32>;
+pub type PERFCTR1_R = crate::FieldReader<u32>;
 #[doc = "Field `PERFCTR1` writer - Busfabric saturating performance counter 1  
  Count some event signal from the busfabric arbiters.  
  Write any value to clear. Select an event to count using PERFSEL1"]
-pub type PERFCTR1_W<'a, const O: u8> = crate::FieldWriter<'a, u32, PERFCTR1_SPEC, u32, u32, 24, O>;
+pub type PERFCTR1_W<'a, const O: u8> = crate::FieldWriter<'a, PERFCTR1_SPEC, 24, O, u32>;
 impl R {
     #[doc = "Bits 0:23 - Busfabric saturating performance counter 1  
  Count some event signal from the busfabric arbiters.  

src/busctrl/perfctr2.rs

@@ -37,11 +37,11 @@ impl From<crate::W<PERFCTR2_SPEC>> for W {
 #[doc = "Field `PERFCTR2` reader - Busfabric saturating performance counter 2  
  Count some event signal from the busfabric arbiters.  
  Write any value to clear. Select an event to count using PERFSEL2"]
-pub type PERFCTR2_R = crate::FieldReader<u32, u32>;
+pub type PERFCTR2_R = crate::FieldReader<u32>;
 #[doc = "Field `PERFCTR2` writer - Busfabric saturating performance counter 2  
  Count some event signal from the busfabric arbiters.  
  Write any value to clear. Select an event to count using PERFSEL2"]
-pub type PERFCTR2_W<'a, const O: u8> = crate::FieldWriter<'a, u32, PERFCTR2_SPEC, u32, u32, 24, O>;
+pub type PERFCTR2_W<'a, const O: u8> = crate::FieldWriter<'a, PERFCTR2_SPEC, 24, O, u32>;
 impl R {
     #[doc = "Bits 0:23 - Busfabric saturating performance counter 2  
  Count some event signal from the busfabric arbiters.  

src/busctrl/perfctr3.rs

@@ -37,11 +37,11 @@ impl From<crate::W<PERFCTR3_SPEC>> for W {
 #[doc = "Field `PERFCTR3` reader - Busfabric saturating performance counter 3  
  Count some event signal from the busfabric arbiters.  
  Write any value to clear. Select an event to count using PERFSEL3"]
-pub type PERFCTR3_R = crate::FieldReader<u32, u32>;
+pub type PERFCTR3_R = crate::FieldReader<u32>;
 #[doc = "Field `PERFCTR3` writer - Busfabric saturating performance counter 3  
  Count some event signal from the busfabric arbiters.  
  Write any value to clear. Select an event to count using PERFSEL3"]
-pub type PERFCTR3_W<'a, const O: u8> = crate::FieldWriter<'a, u32, PERFCTR3_SPEC, u32, u32, 24, O>;
+pub type PERFCTR3_W<'a, const O: u8> = crate::FieldWriter<'a, PERFCTR3_SPEC, 24, O, u32>;
 impl R {
     #[doc = "Bits 0:23 - Busfabric saturating performance counter 3  
  Count some event signal from the busfabric arbiters.  

src/busctrl/perfsel0.rs

@@ -35,7 +35,7 @@ impl From<crate::W<PERFSEL0_SPEC>> for W {
     }
 }
 #[doc = "Field `PERFSEL0` reader - Select an event for PERFCTR0. Count either contested accesses, or all accesses, on a downstream port of the main crossbar."]
-pub type PERFSEL0_R = crate::FieldReader<u8, PERFSEL0_A>;
+pub type PERFSEL0_R = crate::FieldReader<PERFSEL0_A>;
 #[doc = "Select an event for PERFCTR0. Count either contested accesses, or all accesses, on a downstream port of the main crossbar.  
 
 Value on reset: 31"]
@@ -89,6 +89,9 @@ impl From<PERFSEL0_A> for u8 {
         variant as _
     }
 }
+impl crate::FieldSpec for PERFSEL0_A {
+    type Ux = u8;
+}
 impl PERFSEL0_R {
     #[doc = "Get enumerated values variant"]
     #[inline(always)]
@@ -219,8 +222,7 @@ impl PERFSEL0_R {
     }
 }
 #[doc = "Field `PERFSEL0` writer - Select an event for PERFCTR0. Count either contested accesses, or all accesses, on a downstream port of the main crossbar."]
-pub type PERFSEL0_W<'a, const O: u8> =
-    crate::FieldWriter<'a, u32, PERFSEL0_SPEC, u8, PERFSEL0_A, 5, O>;
+pub type PERFSEL0_W<'a, const O: u8> = crate::FieldWriter<'a, PERFSEL0_SPEC, 5, O, PERFSEL0_A>;
 impl<'a, const O: u8> PERFSEL0_W<'a, O> {
     #[doc = "`0`"]
     #[inline(always)]