From b6fd3b1bc989ebdffdbd971dcef917a25b03141a Mon Sep 17 00:00:00 2001 From: eZio Pan Date: Wed, 3 Jan 2024 21:34:09 +0800 Subject: [PATCH 1/2] hrtim-cleanup --- data/registers/hrtim_v1.yaml | 14 -------------- data/registers/hrtim_v2.yaml | 14 -------------- transforms/HRTIM.yaml | 2 ++ 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/data/registers/hrtim_v1.yaml b/data/registers/hrtim_v1.yaml index e521c50..0dbb35b 100644 --- a/data/registers/hrtim_v1.yaml +++ b/data/registers/hrtim_v1.yaml @@ -1532,12 +1532,10 @@ fieldset/TIMXDT: description: Deadtime Rising Sign Lock bit_offset: 14 bit_size: 1 - enum: LOCKED - name: DTRLK description: Deadtime Rising Lock bit_offset: 15 bit_size: 1 - enum: LOCKED - name: DTF description: Deadtime Falling value bit_offset: 16 @@ -1551,12 +1549,10 @@ fieldset/TIMXDT: description: Deadtime Falling Sign Lock bit_offset: 30 bit_size: 1 - enum: LOCKED - name: DTFLK description: Deadtime Falling Lock bit_offset: 31 bit_size: 1 - enum: LOCKED fieldset/TIMXEEF: description: Timer X External Event Filtering Register fields: @@ -1590,7 +1586,6 @@ fieldset/TIMXFLT: description: Fault sources Lock bit_offset: 31 bit_size: 1 - enum: LOCKED fieldset/TIMXICR: description: Timerx Interrupt Clear Register fields: @@ -2191,15 +2186,6 @@ enum/IPPSTAT: - name: Output2Active description: Protection occurred when the output 2 was active and output 1 forced inactive value: 1 -enum/LOCKED: - bit_size: 1 - variants: - - name: Unlocked - description: Bits are writeable - value: 0 - - name: Locked - description: Bits are read-only - value: 1 enum/OUTPUTSTATE: bit_size: 1 variants: diff --git a/data/registers/hrtim_v2.yaml b/data/registers/hrtim_v2.yaml index c265c11..71adac4 100644 --- a/data/registers/hrtim_v2.yaml +++ b/data/registers/hrtim_v2.yaml @@ -1529,12 +1529,10 @@ fieldset/TIMXDT: description: Deadtime Rising Sign Lock bit_offset: 14 bit_size: 1 - enum: LOCKED - name: DTRLK description: Deadtime Rising Lock bit_offset: 15 bit_size: 1 - enum: LOCKED - name: DTF description: Deadtime Falling value bit_offset: 16 @@ -1548,12 +1546,10 @@ fieldset/TIMXDT: description: Deadtime Falling Sign Lock bit_offset: 30 bit_size: 1 - enum: LOCKED - name: DTFLK description: Deadtime Falling Lock bit_offset: 31 bit_size: 1 - enum: LOCKED fieldset/TIMXEEF: description: Timer X External Event Filtering Register fields: @@ -1587,7 +1583,6 @@ fieldset/TIMXFLT: description: Fault sources Lock bit_offset: 31 bit_size: 1 - enum: LOCKED fieldset/TIMXICR: description: Timerx Interrupt Clear Register fields: @@ -2190,15 +2185,6 @@ enum/IPPSTAT: - name: Output2Active description: Protection occurred when the output 2 was active and output 1 forced inactive value: 1 -enum/LOCKED: - bit_size: 1 - variants: - - name: Unlocked - description: Bits are writeable - value: 0 - - name: Locked - description: Bits are read-only - value: 1 enum/OUTPUTSTATE: bit_size: 1 variants: diff --git a/transforms/HRTIM.yaml b/transforms/HRTIM.yaml index 59dda03..c86e38b 100644 --- a/transforms/HRTIM.yaml +++ b/transforms/HRTIM.yaml @@ -11,6 +11,8 @@ transforms: - !DeleteEnums from: (REPDE|RETRIG|RSTDE|EE6LTCH) bit_size: 1 + - !DeleteEnums + from: ^(LOCKED)$ - !MergeEnums from: CPT(\d)[A-Z]CR_(.*) to: CAPTUREEFFECT From cc37af8bdc75fad15b5427c1645422a2704933cf Mon Sep 17 00:00:00 2001 From: eZio Pan Date: Wed, 3 Jan 2024 23:00:46 +0800 Subject: [PATCH 2/2] remove EVENT enum --- data/registers/hrtim_v1.yaml | 20 -------------------- data/registers/hrtim_v2.yaml | 20 -------------------- transforms/HRTIM.yaml | 2 +- 3 files changed, 1 insertion(+), 41 deletions(-) diff --git a/data/registers/hrtim_v1.yaml b/data/registers/hrtim_v1.yaml index 0dbb35b..6d97499 100644 --- a/data/registers/hrtim_v1.yaml +++ b/data/registers/hrtim_v1.yaml @@ -1158,22 +1158,18 @@ fieldset/MISR: array: len: 4 stride: 1 - enum: EVENT - name: MREP description: Master Repetition Interrupt Flag bit_offset: 4 bit_size: 1 - enum: EVENT - name: SYNC description: Sync Input Interrupt Flag bit_offset: 5 bit_size: 1 - enum: EVENT - name: MUPD description: Master Update Interrupt Flag bit_offset: 6 bit_size: 1 - enum: EVENT fieldset/MPER: description: Master Timer Period Register fields: @@ -1645,17 +1641,14 @@ fieldset/TIMXISR: array: len: 4 stride: 1 - enum: EVENT - name: REP description: Repetition Interrupt Flag bit_offset: 4 bit_size: 1 - enum: EVENT - name: UPD description: Update Interrupt Flag bit_offset: 6 bit_size: 1 - enum: EVENT - name: CPT description: Capture X Interrupt Flag bit_offset: 7 @@ -1663,7 +1656,6 @@ fieldset/TIMXISR: array: len: 2 stride: 1 - enum: EVENT - name: SETR description: Output X Set Interrupt Flag bit_offset: 9 @@ -1672,7 +1664,6 @@ fieldset/TIMXISR: offsets: - 0 - 2 - enum: EVENT - name: RSTR description: Output X Reset Interrupt Flag bit_offset: 10 @@ -1681,12 +1672,10 @@ fieldset/TIMXISR: offsets: - 0 - 2 - enum: EVENT - name: RST description: Reset Interrupt Flag bit_offset: 13 bit_size: 1 - enum: EVENT - name: DLYPRT description: Delayed Protection Flag bit_offset: 14 @@ -2135,15 +2124,6 @@ enum/EEFLTR: - name: WindowTIMWIN description: 'Windowing from another timing unit: TIMWIN source' value: 15 -enum/EVENT: - bit_size: 1 - variants: - - name: NoEvent - description: No compare interrupt occurred - value: 0 - - name: Event - description: Compare interrupt occurred - value: 1 enum/FAULT: bit_size: 2 variants: diff --git a/data/registers/hrtim_v2.yaml b/data/registers/hrtim_v2.yaml index 71adac4..530e983 100644 --- a/data/registers/hrtim_v2.yaml +++ b/data/registers/hrtim_v2.yaml @@ -1155,22 +1155,18 @@ fieldset/MISR: array: len: 4 stride: 1 - enum: EVENT - name: MREP description: Master Repetition Interrupt Flag bit_offset: 4 bit_size: 1 - enum: EVENT - name: SYNC description: Sync Input Interrupt Flag bit_offset: 5 bit_size: 1 - enum: EVENT - name: MUPD description: Master Update Interrupt Flag bit_offset: 6 bit_size: 1 - enum: EVENT fieldset/MPER: description: Master Timer Period Register fields: @@ -1642,17 +1638,14 @@ fieldset/TIMXISR: array: len: 4 stride: 1 - enum: EVENT - name: REP description: Repetition Interrupt Flag bit_offset: 4 bit_size: 1 - enum: EVENT - name: UPD description: Update Interrupt Flag bit_offset: 6 bit_size: 1 - enum: EVENT - name: CPT description: Capture X Interrupt Flag bit_offset: 7 @@ -1660,7 +1653,6 @@ fieldset/TIMXISR: array: len: 2 stride: 1 - enum: EVENT - name: SETR description: Output X Set Interrupt Flag bit_offset: 9 @@ -1669,7 +1661,6 @@ fieldset/TIMXISR: offsets: - 0 - 2 - enum: EVENT - name: RSTR description: Output X Reset Interrupt Flag bit_offset: 10 @@ -1678,12 +1669,10 @@ fieldset/TIMXISR: offsets: - 0 - 2 - enum: EVENT - name: RST description: Reset Interrupt Flag bit_offset: 13 bit_size: 1 - enum: EVENT - name: DLYPRT description: Delayed Protection Flag bit_offset: 14 @@ -2134,15 +2123,6 @@ enum/EEFLTR: - name: WindowTIMWIN description: 'Windowing from another timing unit: TIMWIN source' value: 15 -enum/EVENT: - bit_size: 1 - variants: - - name: NoEvent - description: No compare interrupt occurred - value: 0 - - name: Event - description: Compare interrupt occurred - value: 1 enum/FAULT: bit_size: 2 variants: diff --git a/transforms/HRTIM.yaml b/transforms/HRTIM.yaml index c86e38b..c03e18f 100644 --- a/transforms/HRTIM.yaml +++ b/transforms/HRTIM.yaml @@ -12,7 +12,7 @@ transforms: from: (REPDE|RETRIG|RSTDE|EE6LTCH) bit_size: 1 - !DeleteEnums - from: ^(LOCKED)$ + from: ^(LOCKED|EVENT)$ - !MergeEnums from: CPT(\d)[A-Z]CR_(.*) to: CAPTUREEFFECT