From cf99d48ab7255ba8119f4ee157e49b1a567c1643 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Tue, 4 Feb 2014 00:27:06 +0100 Subject: Fix typo Change-Id: Ib9d569886abf66a23f6569b6b44acf155a65009d --- firmware/target/arm/imx233/debug-imx233.c | 2 +- firmware/target/arm/imx233/dma-imx233.c | 6 +++--- firmware/target/arm/imx233/dma-imx233.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'firmware') 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) { struct imx233_dma_info_t info = imx233_dma_get_info(dbg_channels[i].chan, DMA_INFO_ALL); lcd_putsf(0, i + 1, "%c %c %4s %8x %3x %3x %3x", - info.gated ? 'g' : info.freezed ? 'f' : ' ', + info.gated ? 'g' : info.frozen ? 'f' : ' ', !info.int_enabled ? '-' : info.int_error ? 'e' : info.int_cmdcomplt ? 'c' : ' ', dbg_channels[i].name, info.bar, info.apb_bytes, info.ahb_bytes, 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) s.ahb_bytes = apbx ? BF_RDn(APBX_CHn_DEBUG2, dmac, AHB_BYTES) : BF_RDn(APBH_CHn_DEBUG2, dmac, AHB_BYTES); if(flags & DMA_INFO_APB_BYTES) s.apb_bytes = apbx ? BF_RDn(APBX_CHn_DEBUG2, dmac, APB_BYTES) : BF_RDn(APBH_CHn_DEBUG2, dmac, APB_BYTES); - if(flags & DMA_INFO_FREEZED) + if(flags & DMA_INFO_FROZEN) #if IMX233_SUBTARGET < 3780 - s.freezed = !!((apbx ? BF_RD(APBX_CTRL0, FREEZE_CHANNEL) : BF_RD(APBH_CTRL0, FREEZE_CHANNEL)) & bm); + s.frozen = !!((apbx ? BF_RD(APBX_CTRL0, FREEZE_CHANNEL) : BF_RD(APBH_CTRL0, FREEZE_CHANNEL)) & bm); #else - s.freezed = !!((apbx ? BF_RD(APBX_CHANNEL_CTRL, FREEZE_CHANNEL) : BF_RD(APBH_CTRL0, FREEZE_CHANNEL)) & bm); + s.frozen = !!((apbx ? BF_RD(APBX_CHANNEL_CTRL, FREEZE_CHANNEL) : BF_RD(APBH_CTRL0, FREEZE_CHANNEL)) & bm); #endif if(flags & DMA_INFO_GATED) 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 #define DMA_INFO_BAR (1 << 3) #define DMA_INFO_APB_BYTES (1 << 4) #define DMA_INFO_AHB_BYTES (1 << 5) -#define DMA_INFO_FREEZED (1 << 6) +#define DMA_INFO_FROZEN (1 << 6) #define DMA_INFO_GATED (1 << 7) #define DMA_INFO_INTERRUPT (1 << 8) #define DMA_INFO_ALL 0x1ff @@ -88,7 +88,7 @@ struct imx233_dma_info_t unsigned long bar; unsigned apb_bytes; unsigned ahb_bytes; - bool freezed; + bool frozen; bool gated; bool int_enabled; bool int_cmdcomplt; -- cgit v1.2.3