summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/imx233/pcm-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/pcm-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/pcm-imx233.c')
-rw-r--r--firmware/target/arm/imx233/pcm-imx233.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/imx233/pcm-imx233.c b/firmware/target/arm/imx233/pcm-imx233.c
index 139717df5e..de0e1aabf5 100644
--- a/firmware/target/arm/imx233/pcm-imx233.c
+++ b/firmware/target/arm/imx233/pcm-imx233.c
@@ -71,7 +71,7 @@ static void play(void)
dac_dma.dma.next = NULL;
dac_dma.dma.buffer = (void *)dac_buf;
- dac_dma.dma.cmd = BF_OR4(APB_CHx_CMD, COMMAND_V(READ),
+ dac_dma.dma.cmd = BF_OR(APB_CHx_CMD, COMMAND_V(READ),
IRQONCMPLT(1), SEMAPHORE(1), XFER_COUNT(xfer));
/* dma subsystem will make sure cached stuff is written to memory */
dac_state = DAC_PLAYING;
@@ -252,7 +252,7 @@ static void rec(void)
adc_dma.dma.next = NULL;
adc_dma.dma.buffer = (void *)adc_buf;
- adc_dma.dma.cmd = BF_OR4(APB_CHx_CMD, COMMAND_V(WRITE),
+ adc_dma.dma.cmd = BF_OR(APB_CHx_CMD, COMMAND_V(WRITE),
IRQONCMPLT(1), SEMAPHORE(1), XFER_COUNT(xfer));
/* dma subsystem will make sure cached stuff is written to memory */
adc_state = ADC_RECORDING;