summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/imx233/timrot-imx233.c
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2016-05-24 20:29:56 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2016-05-28 16:49:22 +0200
commiteac1ca22bd4a6c1849880d0f8b6764befb60bc21 (patch)
tree681da66d77b9edcb33b868cf94886440d61997cc /firmware/target/arm/imx233/timrot-imx233.c
parent28920ec5cc994dff19bec100a57de4557f72a7f5 (diff)
downloadrockbox-eac1ca22bd4a6c1849880d0f8b6764befb60bc21.tar.gz
rockbox-eac1ca22bd4a6c1849880d0f8b6764befb60bc21.tar.bz2
rockbox-eac1ca22bd4a6c1849880d0f8b6764befb60bc21.zip
imx233: generate register headers using headergen_v2 and update code for it
NOTE: this commit does not introduce any change, ideally even the binary should be almost the same. I checked the disassembly by hand and there are only a few differences here and there, mostly the compiler decides to compile very close expressions slightly differently. I tried to run the new code on several targets to make sure and saw no difference. The major syntax changes of the new headers are as follows: - BF_{WR,SET,CLR} are now superpowerful and allows to set several fileds at once: BF_WR(reg, field1(value1), field2(value2), ...) - BF_CS (use like BF_WR) does a write to reg_CLR and then reg_SET instead of RMW - there is no more need for macros like BF_{WR_,SET,CLR}_V, since one can simply BF_WR with field_V(name) - the old BF_SETV macro has no trivial equivalent and is replaced with its its equivalent for BF_WR(reg_SET, ...) I also rename the register headers: "regs/regs-x.h" -> "regs/x.h" to avoid the redundant "regs". Final note: the registers were generated using the following command: ./headergen_v2 -g imx -o ../../firmware/target/arm/imx233/regs/ desc/regs-stmp3{600,700,780}.xml Change-Id: I7485e8b4315a0929a8edb63e7fa1edcaa54b1edc
Diffstat (limited to 'firmware/target/arm/imx233/timrot-imx233.c')
-rw-r--r--firmware/target/arm/imx233/timrot-imx233.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/firmware/target/arm/imx233/timrot-imx233.c b/firmware/target/arm/imx233/timrot-imx233.c
index 22f9853051..7c5e60c30e 100644
--- a/firmware/target/arm/imx233/timrot-imx233.c
+++ b/firmware/target/arm/imx233/timrot-imx233.c
@@ -22,6 +22,8 @@
#include "clkctrl-imx233.h"
#include "string.h"
+#include "regs/timrot.h"
+
static imx233_timer_fn_t timer_fns[4];
#define define_timer_irq(nr) \
@@ -29,7 +31,7 @@ void INT_TIMER##nr(void) \
{ \
if(timer_fns[nr]) \
timer_fns[nr](); \
- BF_CLRn(TIMROT_TIMCTRLn, nr, IRQ); \
+ BF_CLR(TIMROT_TIMCTRLn(nr), IRQ); \
}
define_timer_irq(0)
@@ -46,15 +48,13 @@ void imx233_timrot_setup(unsigned timer_nr, bool reload, unsigned count,
timer_fns[timer_nr] = fn;
/* make sure we start from stop state */
- HW_TIMROT_TIMCTRLn(timer_nr) = BF_OR2(TIMROT_TIMCTRLn,
- SELECT(BV_TIMROT_TIMCTRLn_SELECT__NEVER_TICK), UPDATE(1));
+ BF_WR_ALL(TIMROT_TIMCTRLn(timer_nr), SELECT_V(NEVER_TICK), UPDATE(1));
/* write count and take effect immediately with UPDATE
* manual says count-1 for reload timers */
HW_TIMROT_TIMCOUNTn(timer_nr) = reload ? count - 1 : count;
/* start timer */
- HW_TIMROT_TIMCTRLn(timer_nr) = BF_OR6(TIMROT_TIMCTRLn, SELECT(src),
- PRESCALE(prescale), POLARITY(polarity), RELOAD(reload), IRQ(irq),
- IRQ_EN(irq));
+ BF_WR_ALL(TIMROT_TIMCTRLn(timer_nr), SELECT(src), PRESCALE(prescale),
+ POLARITY(polarity), RELOAD(reload), IRQ(irq), IRQ_EN(irq));
imx233_icoll_enable_interrupt(INT_SRC_TIMER(timer_nr), irq);
restore_interrupt(oldstatus);
@@ -69,12 +69,12 @@ struct imx233_timrot_info_t imx233_timrot_get_info(unsigned timer_nr)
{
struct imx233_timrot_info_t info;
memset(&info, 0, sizeof(info));
- info.src = BF_RDn(TIMROT_TIMCTRLn, timer_nr, SELECT);
- info.prescale = BF_RDn(TIMROT_TIMCTRLn, timer_nr, PRESCALE);
- info.reload = BF_RDn(TIMROT_TIMCTRLn, timer_nr, RELOAD);
- info.polarity = BF_RDn(TIMROT_TIMCTRLn, timer_nr, POLARITY);
- info.fixed_count = BF_RDn(TIMROT_TIMCOUNTn, timer_nr, FIXED_COUNT);
- info.run_count = BF_RDn(TIMROT_TIMCOUNTn, timer_nr, RUNNING_COUNT);
+ info.src = BF_RD(TIMROT_TIMCTRLn(timer_nr), SELECT);
+ info.prescale = BF_RD(TIMROT_TIMCTRLn(timer_nr), PRESCALE);
+ info.reload = BF_RD(TIMROT_TIMCTRLn(timer_nr), RELOAD);
+ info.polarity = BF_RD(TIMROT_TIMCTRLn(timer_nr), POLARITY);
+ info.fixed_count = BF_RD(TIMROT_TIMCOUNTn(timer_nr), FIXED_COUNT);
+ info.run_count = BF_RD(TIMROT_TIMCOUNTn(timer_nr), RUNNING_COUNT);
return info;
}