2 files changed, 2 insertions(+), 13 deletions(-)

M patch/timer/dev/8bit-async-mega8.yaml
M vendor/atmega8.atdf

@@ 2,8 2,6 @@ TCCR?:
   _modify:
     COM?:
       _write_constraint: enum
-    WGM?:
-      _write_constraint: enum
     FOC?:
       access: write-only
   COM?:


@@ 11,16 9,6 @@ TCCR?:
       DISCONNECTED:  [0, "Normal port operation, OC2 disconnected"]
       MATCH_CLEAR:   [2, "Clear OC2 on Compare Match (If PWM is enabled, OC2 is set at BOTTOM)"]
       MATCH_SET:     [3, "Set OC2 on Compare Match (If PWM is enabled, OC2 is cleared at BOTTOM)"]
-  WGM?:
-    _replace_enum:
-      # NOTE that the WGMs are in reverse order in the reigster
-      # (WGM20 is at position 6, WGM21 is at position 3), thus
-      # the numbering here is not the same as in datasheet
-      # where it is specified for WGM21 WGM20
-      NORMAL_TOP:    [0, "Normal, Top: `0xff`, Update: *Immediate*, Flag: *MAX*"]
-      PWM_PHASE:     [2, "Phase Correct PWM, Top: `0xff`, Update: *TOP*, Flag: *BOTTOM*"]
-      CTC:           [1, "CTC, Top: *OCR2*, Update: *Immediate*, Flag: *MAX*"]
-      PWM_FAST:      [3, "Fast PWM, Top: `0xff`, Update: *BOTTOM*, Flag: *MAX*"]
   CS?:
     _replace_enum:
       NO_CLOCK:      [0, "No clock source (Timer/Counter stopped)"]

@@ 629,8 629,9 @@
         </register>
         <register caption="Timer/Counter2 Control Register" name="TCCR2" offset="0x45" size="1">
           <bitfield caption="Force Output Compare" mask="0x80" name="FOC2"/>
-          <bitfield caption="Waveform Genration Mode" mask="0x48" name="WGM2" values="WAVEFORM_GEN_MODE"/>
+          <bitfield caption="Waveform Genration Mode" mask="0x40" name="WGM20" values="WAVEFORM_GEN_MODE"/>
           <bitfield caption="Compare Output Mode bits" mask="0x30" name="COM2"/>
+          <bitfield caption="Waveform Generation Mode" mask="0x08" name="WGM21"/>
           <bitfield caption="Clock Select bits" mask="0x07" name="CS2" values="CLK_SEL_3BIT"/>
         </register>
         <register caption="Timer/Counter2" name="TCNT2" offset="0x44" size="1" mask="0xFF"/>