[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH qemu.git v3 2/8] hw/timer/imx_epit: cleanup CR defines
From: |
~axelheider |
Subject: |
[PATCH qemu.git v3 2/8] hw/timer/imx_epit: cleanup CR defines |
Date: |
Thu, 01 Dec 2022 15:42:05 -0000 |
From: Axel Heider <axel.heider@hensoldt.net>
remove unused defines, add needed defines
Signed-off-by: Axel Heider <axel.heider@hensoldt.net>
---
hw/timer/imx_epit.c | 4 ++--
include/hw/timer/imx_epit.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c
index 2841fbaa1c..661e9158e3 100644
--- a/hw/timer/imx_epit.c
+++ b/hw/timer/imx_epit.c
@@ -82,8 +82,8 @@ static void imx_epit_set_freq(IMXEPITState *s)
uint32_t clksrc;
uint32_t prescaler;
- clksrc = extract32(s->cr, CR_CLKSRC_SHIFT, 2);
- prescaler = 1 + extract32(s->cr, CR_PRESCALE_SHIFT, 12);
+ clksrc = extract32(s->cr, CR_CLKSRC_SHIFT, CR_CLKSRC_BITS);
+ prescaler = 1 + extract32(s->cr, CR_PRESCALE_SHIFT, CR_PRESCALE_BITS);
s->freq = imx_ccm_get_clock_frequency(s->ccm,
imx_epit_clocks[clksrc]) / prescaler;
diff --git a/include/hw/timer/imx_epit.h b/include/hw/timer/imx_epit.h
index 2acc41e982..e2cb96229b 100644
--- a/include/hw/timer/imx_epit.h
+++ b/include/hw/timer/imx_epit.h
@@ -43,7 +43,7 @@
#define CR_OCIEN (1 << 2)
#define CR_RLD (1 << 3)
#define CR_PRESCALE_SHIFT (4)
-#define CR_PRESCALE_MASK (0xfff)
+#define CR_PRESCALE_BITS (12)
#define CR_SWR (1 << 16)
#define CR_IOVW (1 << 17)
#define CR_DBGEN (1 << 18)
@@ -51,7 +51,7 @@
#define CR_DOZEN (1 << 20)
#define CR_STOPEN (1 << 21)
#define CR_CLKSRC_SHIFT (24)
-#define CR_CLKSRC_MASK (0x3 << CR_CLKSRC_SHIFT)
+#define CR_CLKSRC_BITS (2)
#define EPIT_TIMER_MAX 0XFFFFFFFFUL
--
2.34.5
- [PATCH qemu.git v3 0/8] hw/timer/imx_epit: improve and fix EPIT compare timer, ~axelheider, 2022/12/01
- [PATCH qemu.git v3 4/8] hw/timer/imx_epit: update interrupt state on CR write access, ~axelheider, 2022/12/01
- [PATCH qemu.git v3 3/8] hw/timer/imx_epit: define SR_OCIF, ~axelheider, 2022/12/01
- [PATCH qemu.git v3 8/8] hw/timer/imx_epit: fix compare timer handling, ~axelheider, 2022/12/01
- [PATCH qemu.git v3 5/8] hw/timer/imx_epit: hard reset initializes CR with 0, ~axelheider, 2022/12/01
- [PATCH qemu.git v3 6/8] hw/timer/imx_epit: factor out register write handlers, ~axelheider, 2022/12/01
- [PATCH qemu.git v3 2/8] hw/timer/imx_epit: cleanup CR defines,
~axelheider <=
- [PATCH qemu.git v3 1/8] hw/timer/imx_epit: improve comments, ~axelheider, 2022/12/01
- [PATCH qemu.git v3 7/8] hw/timer/imx_epit: remove explicit fields cnt and freq, ~axelheider, 2022/12/01