1 files changed, 29 insertions, 50 deletions

diff --git a/firmware/target/arm/imx233/lcdif-imx233.c b/firmware/target/arm/imx233/lcdif-imx233.c
index ad0931de40..f947fa69f1 100644
--- a/firmware/target/arm/imx233/lcdif-imx233.c
+++ b/firmware/target/arm/imx233/lcdif-imx233.c
@@ -21,30 +21,29 @@
 #include "lcdif-imx233.h"
 
 static unsigned lcdif_word_length = 0;
-static unsigned lcdif_byte_packing = 0;
 
 void imx233_lcdif_enable_underflow_recover(bool enable)
 {
     if(enable)
-        __REG_SET(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RECOVER_ON_UNDERFLOW;
+        BF_SET(LCDIF_CTRL1, RECOVER_ON_UNDERFLOW);
     else
-        __REG_CLR(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__RECOVER_ON_UNDERFLOW;
+        BF_CLR(LCDIF_CTRL1, RECOVER_ON_UNDERFLOW);
 }
 
 void imx233_lcdif_enable_bus_master(bool enable)
 {
     if(enable)
-        __REG_SET(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__LCDIF_MASTER;
+        BF_SET(LCDIF_CTRL, LCDIF_MASTER);
     else
-        __REG_CLR(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__LCDIF_MASTER;
+        BF_CLR(LCDIF_CTRL, LCDIF_MASTER);
 }
 
 void imx233_lcdif_enable(bool enable)
 {
     if(enable)
-        __REG_CLR(HW_LCDIF_CTRL) = __BLOCK_CLKGATE;
+        BF_CLR(LCDIF_CTRL, CLKGATE);
     else
-        __REG_SET(HW_LCDIF_CTRL) = __BLOCK_CLKGATE;
+        BF_SET(LCDIF_CTRL, CLKGATE);
 }
 
 void imx233_lcdif_reset(void)
@@ -55,64 +54,45 @@ void imx233_lcdif_reset(void)
 void imx233_lcdif_set_timings(unsigned data_setup, unsigned data_hold,
     unsigned cmd_setup, unsigned cmd_hold)
 {
-    HW_LCDIF_TIMING = (data_setup << HW_LCDIF_TIMING__DATA_SETUP_BP) |
-        (data_hold << HW_LCDIF_TIMING__DATA_HOLD_BP) |
-        (cmd_setup << HW_LCDIF_TIMING__CMD_SETUP_BP) |
-        (cmd_hold << HW_LCDIF_TIMING__CMD_HOLD_BP);
+    HW_LCDIF_TIMING = BF_OR4(LCDIF_TIMING, DATA_SETUP(data_setup),
+        DATA_HOLD(data_hold), CMD_SETUP(cmd_setup), CMD_HOLD(cmd_hold));
 }
 
 void imx233_lcdif_set_lcd_databus_width(unsigned width)
 {
-    __REG_CLR(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__LCD_DATABUS_WIDTH_BM;
-    __REG_SET(HW_LCDIF_CTRL) = width;
+    BF_WR(LCDIF_CTRL, LCD_DATABUS_WIDTH, width);
 }
 
 void imx233_lcdif_set_word_length(unsigned word_length)
 {
-    __REG_CLR(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__WORD_LENGTH_BM;
-    __REG_SET(HW_LCDIF_CTRL) = word_length;
+    BF_WR(LCDIF_CTRL, WORD_LENGTH, word_length);
     lcdif_word_length = word_length;
 }
 
-unsigned imx233_lcdif_enable_irqs(unsigned irq_bm)
-{
-    unsigned old_msk = __XTRACT(HW_LCDIF_CTRL1, IRQ_EN);
-    /* clear irq status */
-    __REG_CLR(HW_LCDIF_CTRL1) = irq_bm << HW_LCDIF_CTRL1__IRQ_BP;
-    /* disable irqs */
-    __REG_CLR(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__IRQ_EN_BM;
-    /* enable irqs */
-    __REG_SET(HW_LCDIF_CTRL1) = irq_bm << HW_LCDIF_CTRL1__IRQ_EN_BP;
-
-    return old_msk;
-}
-
 void imx233_lcdif_set_byte_packing_format(unsigned byte_packing)
 {
-    __REG_CLR(HW_LCDIF_CTRL1) = HW_LCDIF_CTRL1__BYTE_PACKING_FORMAT_BM;
-    __REG_SET(HW_LCDIF_CTRL1) = byte_packing << HW_LCDIF_CTRL1__BYTE_PACKING_FORMAT_BP;
-    lcdif_byte_packing = byte_packing;
+    BF_WR(LCDIF_CTRL1, BYTE_PACKING_FORMAT, byte_packing);
 }
 
 void imx233_lcdif_set_data_format(bool data_fmt_16, bool data_fmt_18, bool data_fmt_24)
 {
     if(data_fmt_16)
-        __REG_SET(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__DATA_FORMAT_16_BIT;
+        BF_SET(LCDIF_CTRL, DATA_FORMAT_16_BIT);
     else
-        __REG_CLR(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__DATA_FORMAT_16_BIT;
+        BF_CLR(LCDIF_CTRL, DATA_FORMAT_16_BIT);
     if(data_fmt_18)
-        __REG_SET(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__DATA_FORMAT_18_BIT;
+        BF_SET(LCDIF_CTRL, DATA_FORMAT_18_BIT);
     else
-        __REG_CLR(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__DATA_FORMAT_18_BIT;
+        BF_CLR(LCDIF_CTRL, DATA_FORMAT_18_BIT);
     if(data_fmt_24)
-        __REG_SET(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__DATA_FORMAT_24_BIT;
+        BF_SET(LCDIF_CTRL, DATA_FORMAT_24_BIT);
     else
-        __REG_CLR(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__DATA_FORMAT_24_BIT;
+        BF_CLR(LCDIF_CTRL, DATA_FORMAT_24_BIT);
 }
 
 void imx233_lcdif_wait_ready(void)
 {
-    while(HW_LCDIF_CTRL & HW_LCDIF_CTRL__RUN);
+    while(BF_RD(LCDIF_CTRL, RUN));
 }
 
 void imx233_lcdif_pio_send(bool data_mode, unsigned len, uint32_t *buf)
@@ -120,10 +100,9 @@ void imx233_lcdif_pio_send(bool data_mode, unsigned len, uint32_t *buf)
     unsigned max_xfer_size = 0xffff;
     if(len == 0)
         return;
-    if(lcdif_word_length == HW_LCDIF_CTRL__WORD_LENGTH_16_BIT)
+    if(lcdif_word_length == BV_LCDIF_CTRL_WORD_LENGTH__16_BIT)
         max_xfer_size = 0x1fffe;
     imx233_lcdif_wait_ready();
-    unsigned msk = imx233_lcdif_enable_irqs(0);
     imx233_lcdif_enable_bus_master(false);
 
     do
@@ -131,7 +110,7 @@ void imx233_lcdif_pio_send(bool data_mode, unsigned len, uint32_t *buf)
         unsigned burst = MIN(len, max_xfer_size);
         len -= burst;
         unsigned count = burst;
-        if(lcdif_word_length != HW_LCDIF_CTRL__WORD_LENGTH_8_BIT)
+        if(lcdif_word_length != BV_LCDIF_CTRL_WORD_LENGTH__8_BIT)
         {
             if(burst & 1)
                 burst++;
@@ -141,20 +120,20 @@ void imx233_lcdif_pio_send(bool data_mode, unsigned len, uint32_t *buf)
             count = burst;
         HW_LCDIF_TRANSFER_COUNT = 0;
         HW_LCDIF_TRANSFER_COUNT = 0x10000 | count;
-        __REG_CLR(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__DATA_SELECT | HW_LCDIF_CTRL__RUN;
+        BF_CLR(LCDIF_CTRL, DATA_SELECT);
+        BF_CLR(LCDIF_CTRL, RUN);
         if(data_mode)
-            __REG_SET(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__DATA_SELECT;
-        __REG_SET(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__RUN;
+            BF_SET(LCDIF_CTRL, DATA_SELECT);
+        BF_SET(LCDIF_CTRL, RUN);
         burst = (burst + 3) / 4;
         while(burst-- > 0)
         {
-            while(HW_LCDIF_STAT & HW_LCDIF_STAT__LFIFO_FULL);
+            while(BF_RD(LCDIF_STAT, LFIFO_FULL));
             HW_LCDIF_DATA = *buf++;
         }
-        while(HW_LCDIF_CTRL & HW_LCDIF_CTRL__RUN);
+        imx233_lcdif_wait_ready();
     }while(len > 0);
     imx233_lcdif_enable_bus_master(true);
-    imx233_lcdif_enable_irqs(msk);
 }
 
 void imx233_lcdif_dma_send(void *buf, unsigned width, unsigned height)
@@ -162,7 +141,7 @@ void imx233_lcdif_dma_send(void *buf, unsigned width, unsigned height)
     HW_LCDIF_CUR_BUF = (uint32_t)buf;
     HW_LCDIF_TRANSFER_COUNT = 0;
     HW_LCDIF_TRANSFER_COUNT = (height << 16) | width;
-    __REG_CLR(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__RUN;
-    __REG_SET(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__DATA_SELECT;
-    __REG_SET(HW_LCDIF_CTRL) = HW_LCDIF_CTRL__RUN;
+    BF_CLR(LCDIF_CTRL, RUN);
+    BF_SET(LCDIF_CTRL, DATA_SELECT);
+    BF_SET(LCDIF_CTRL, RUN);
 }