summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/target/arm/imx233/debug-imx233.c2
-rw-r--r--firmware/target/arm/imx233/dma-imx233.c6
-rw-r--r--firmware/target/arm/imx233/dma-imx233.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/firmware/target/arm/imx233/debug-imx233.c b/firmware/target/arm/imx233/debug-imx233.c
index 9ca33ff715..2b07d7af52 100644
--- a/firmware/target/arm/imx233/debug-imx233.c
+++ b/firmware/target/arm/imx233/debug-imx233.c
@@ -176,7 +176,7 @@ bool dbg_hw_info_dma(void)
176 { 176 {
177 struct imx233_dma_info_t info = imx233_dma_get_info(dbg_channels[i].chan, DMA_INFO_ALL); 177 struct imx233_dma_info_t info = imx233_dma_get_info(dbg_channels[i].chan, DMA_INFO_ALL);
178 lcd_putsf(0, i + 1, "%c %c %4s %8x %3x %3x %3x", 178 lcd_putsf(0, i + 1, "%c %c %4s %8x %3x %3x %3x",
179 info.gated ? 'g' : info.freezed ? 'f' : ' ', 179 info.gated ? 'g' : info.frozen ? 'f' : ' ',
180 !info.int_enabled ? '-' : info.int_error ? 'e' : info.int_cmdcomplt ? 'c' : ' ', 180 !info.int_enabled ? '-' : info.int_error ? 'e' : info.int_cmdcomplt ? 'c' : ' ',
181 dbg_channels[i].name, info.bar, info.apb_bytes, info.ahb_bytes, 181 dbg_channels[i].name, info.bar, info.apb_bytes, info.ahb_bytes,
182 info.nr_unaligned); 182 info.nr_unaligned);
diff --git a/firmware/target/arm/imx233/dma-imx233.c b/firmware/target/arm/imx233/dma-imx233.c
index 6727e9b95b..8e55e5dc5d 100644
--- a/firmware/target/arm/imx233/dma-imx233.c
+++ b/firmware/target/arm/imx233/dma-imx233.c
@@ -266,11 +266,11 @@ struct imx233_dma_info_t imx233_dma_get_info(unsigned chan, unsigned flags)
266 s.ahb_bytes = apbx ? BF_RDn(APBX_CHn_DEBUG2, dmac, AHB_BYTES) : BF_RDn(APBH_CHn_DEBUG2, dmac, AHB_BYTES); 266 s.ahb_bytes = apbx ? BF_RDn(APBX_CHn_DEBUG2, dmac, AHB_BYTES) : BF_RDn(APBH_CHn_DEBUG2, dmac, AHB_BYTES);
267 if(flags & DMA_INFO_APB_BYTES) 267 if(flags & DMA_INFO_APB_BYTES)
268 s.apb_bytes = apbx ? BF_RDn(APBX_CHn_DEBUG2, dmac, APB_BYTES) : BF_RDn(APBH_CHn_DEBUG2, dmac, APB_BYTES); 268 s.apb_bytes = apbx ? BF_RDn(APBX_CHn_DEBUG2, dmac, APB_BYTES) : BF_RDn(APBH_CHn_DEBUG2, dmac, APB_BYTES);
269 if(flags & DMA_INFO_FREEZED) 269 if(flags & DMA_INFO_FROZEN)
270#if IMX233_SUBTARGET < 3780 270#if IMX233_SUBTARGET < 3780
271 s.freezed = !!((apbx ? BF_RD(APBX_CTRL0, FREEZE_CHANNEL) : BF_RD(APBH_CTRL0, FREEZE_CHANNEL)) & bm); 271 s.frozen = !!((apbx ? BF_RD(APBX_CTRL0, FREEZE_CHANNEL) : BF_RD(APBH_CTRL0, FREEZE_CHANNEL)) & bm);
272#else 272#else
273 s.freezed = !!((apbx ? BF_RD(APBX_CHANNEL_CTRL, FREEZE_CHANNEL) : BF_RD(APBH_CTRL0, FREEZE_CHANNEL)) & bm); 273 s.frozen = !!((apbx ? BF_RD(APBX_CHANNEL_CTRL, FREEZE_CHANNEL) : BF_RD(APBH_CTRL0, FREEZE_CHANNEL)) & bm);
274#endif 274#endif
275 if(flags & DMA_INFO_GATED) 275 if(flags & DMA_INFO_GATED)
276 s.gated = apbx ? false : !!(BF_RD(APBH_CTRL0, CLKGATE_CHANNEL) & bm); 276 s.gated = apbx ? false : !!(BF_RD(APBH_CTRL0, CLKGATE_CHANNEL) & bm);
diff --git a/firmware/target/arm/imx233/dma-imx233.h b/firmware/target/arm/imx233/dma-imx233.h
index 5caff740a8..8e15b4cb49 100644
--- a/firmware/target/arm/imx233/dma-imx233.h
+++ b/firmware/target/arm/imx233/dma-imx233.h
@@ -75,7 +75,7 @@ struct apb_dma_command_t
75#define DMA_INFO_BAR (1 << 3) 75#define DMA_INFO_BAR (1 << 3)
76#define DMA_INFO_APB_BYTES (1 << 4) 76#define DMA_INFO_APB_BYTES (1 << 4)
77#define DMA_INFO_AHB_BYTES (1 << 5) 77#define DMA_INFO_AHB_BYTES (1 << 5)
78#define DMA_INFO_FREEZED (1 << 6) 78#define DMA_INFO_FROZEN (1 << 6)
79#define DMA_INFO_GATED (1 << 7) 79#define DMA_INFO_GATED (1 << 7)
80#define DMA_INFO_INTERRUPT (1 << 8) 80#define DMA_INFO_INTERRUPT (1 << 8)
81#define DMA_INFO_ALL 0x1ff 81#define DMA_INFO_ALL 0x1ff
@@ -88,7 +88,7 @@ struct imx233_dma_info_t
88 unsigned long bar; 88 unsigned long bar;
89 unsigned apb_bytes; 89 unsigned apb_bytes;
90 unsigned ahb_bytes; 90 unsigned ahb_bytes;
91 bool freezed; 91 bool frozen;
92 bool gated; 92 bool gated;
93 bool int_enabled; 93 bool int_enabled;
94 bool int_cmdcomplt; 94 bool int_cmdcomplt;