diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2016-05-24 20:29:56 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2016-05-28 16:49:22 +0200 |
commit | eac1ca22bd4a6c1849880d0f8b6764befb60bc21 (patch) | |
tree | 681da66d77b9edcb33b868cf94886440d61997cc /firmware/target/arm/imx233/samsung-ypz5 | |
parent | 28920ec5cc994dff19bec100a57de4557f72a7f5 (diff) | |
download | rockbox-eac1ca22bd4a6c1849880d0f8b6764befb60bc21.tar.gz 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/samsung-ypz5')
-rw-r--r-- | firmware/target/arm/imx233/samsung-ypz5/button-ypz5.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/imx233/samsung-ypz5/lcd-ypz5.c | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/firmware/target/arm/imx233/samsung-ypz5/button-ypz5.c b/firmware/target/arm/imx233/samsung-ypz5/button-ypz5.c index cee82e2e9f..c2e53117e5 100644 --- a/firmware/target/arm/imx233/samsung-ypz5/button-ypz5.c +++ b/firmware/target/arm/imx233/samsung-ypz5/button-ypz5.c @@ -21,6 +21,7 @@ #include "system.h" #include "lcd.h" #include "string.h" +#include "kernel.h" #include "pinctrl-imx233.h" #include "power-imx233.h" #include "button-lradc-imx233.h" diff --git a/firmware/target/arm/imx233/samsung-ypz5/lcd-ypz5.c b/firmware/target/arm/imx233/samsung-ypz5/lcd-ypz5.c index 4f7d9b88b5..99fe0b2aef 100644 --- a/firmware/target/arm/imx233/samsung-ypz5/lcd-ypz5.c +++ b/firmware/target/arm/imx233/samsung-ypz5/lcd-ypz5.c @@ -34,8 +34,9 @@ #include "action.h" #endif #include "dma-imx233.h" +#include "kernel.h" -#include "regs/regs-lcdif.h" +#include "regs/lcdif.h" /** * NOTE @@ -208,7 +209,7 @@ static void setup_parameters(void) imx233_lcdif_set_word_length(16); imx233_lcdif_set_data_swizzle(false); imx233_lcdif_set_timings(2, 1, 1, 1); - BF_WR_V(LCDIF_CTRL, MODE86, 8080_MODE); + BF_WR(LCDIF_CTRL, MODE86_V(8080_MODE)); imx233_lcdif_reset_lcd(true); udelay(50); @@ -243,9 +244,9 @@ void lcd_update(void) /* We can safely do the transfer in a single shot, since 160 * 128 * 2 < 65k, * the maximum transfer size! */ - lcdif_dma.dma.cmd |= BF_OR3(APB_CHx_CMD, CMDWORDS(1), XFER_COUNT(size), COMMAND(2)); + lcdif_dma.dma.cmd |= BF_OR(APB_CHx_CMD, CMDWORDS(1), XFER_COUNT(size), COMMAND(2)); lcdif_dma.ctrl0 = HW_LCDIF_CTRL & ~BM_LCDIF_CTRL_COUNT; - lcdif_dma.ctrl0 |= BF_OR2(LCDIF_CTRL, COUNT(size/2), DATA_SELECT(1)); + lcdif_dma.ctrl0 |= BF_OR(LCDIF_CTRL, COUNT(size/2), DATA_SELECT(1)); lcdif_dma.dma.buffer = FBADDR(0,0); lcdif_dma.dma.cmd |= BM_APB_CHx_CMD_SEMAPHORE; |