1 files changed, 11 insertions, 70 deletions

diff --git a/firmware/target/arm/i2s-pp.c b/firmware/target/arm/i2s-pp.c
index e06ee835a6..24d901a4c1 100644
--- a/firmware/target/arm/i2s-pp.c
+++ b/firmware/target/arm/i2s-pp.c
@@ -47,99 +47,40 @@ void i2s_reset(void)
 }
 #else /* PP502X */
 
-/* All I2S formats send MSB first */
-
-/* Data format on the I2S bus */
-#define FORMAT_MASK  (0x3 << 10)
-#define FORMAT_I2S   (0x0 << 10) /* Standard I2S - leading dummy bit */
-#define FORMAT_1     (0x1 << 10)
-#define FORMAT_LJUST (0x2 << 10) /* Left justified - no dummy bit */
-#define FORMAT_3     (0x3 << 10)
-/* Other formats not yet known  */
-
-/* Data size on I2S bus */
-#define SIZE_MASK   (0x3 << 8)
-#define SIZE_16BIT  (0x0 << 8)
-/* Other sizes not yet known */
-
-/* Data size/format on I2S FIFO */
-#define FIFO_FORMAT_MASK    (0x7 << 4)
-#define FIFO_FORMAT_0       (0x0 << 4)
-/* Big-endian formats - data sent to the FIFO must be big endian.
- * I forgot which is which size but did test them. */
-#define FIFO_FORMAT_1       (0x1 << 4)
-#define FIFO_FORMAT_2       (0x2 << 4)
- /* 32bit-MSB-little endian */
-#define FIFO_FORMAT_LE32 (0x3 << 4)
- /* 16bit-MSB-little endian */
-#define FIFO_FORMAT_LE16 (0x4 << 4)
-
-/* FIFO formats 0x5 and above seem equivalent to 0x4 ?? */
-
-/**
- * PP502x
- *
- * IISCONFIG bits:
- * |   31   |   30   |   29   |   28   |   27   |   26   |   25   |   24   |
- * | RESET  |        |TXFIFOEN|RXFIFOEN|        |  ????  |   MS   |  ????  |
- * |   23   |   22   |   21   |   20   |   19   |   18   |   17   |   16   |
- * |        |        |        |        |        |        |        |        |
- * |   15   |   14   |   13   |   12   |   11   |   10   |    9   |    8   |
- * |        |        |        |        | Bus Format[1:0] |     Size[1:0]   |
- * |    7   |    6   |    5   |    4   |    3   |    2   |    1   |    0   |
- * |        |     Size Format[2:0]     |  ????  |  ????  | IRQTX  | IRQRX  |
- *
- * IISFIFO_CFG bits:
- * |   31   |   30   |   29   |   28   |   27   |   26   |   25   |   24   |
- * |        |                         Free[6:0]                            |
- * |   23   |   22   |   21   |   20   |   19   |   18   |   17   |   16   |
- * |        |        |        |        |        |        |        |        |
- * |   15   |   14   |   13   |   12   |   11   |   10   |    9   |    8   |
- * |        |        |        | RXCLR  |        |        |        | TXCLR  |
- * |    7   |    6   |    5   |    4   |    3   |    2   |    1   |    0   |
- * |        |        |   RX_ATN_LEVEL  |        |        |   TX_ATN_LEVEL  |
- */
-
-/* Are we I2S Master or slave? */
-#define I2S_MASTER (1<<25)
-
-#define I2S_RESET (0x1 << 31)
-
 /*
  * Reset the I2S BIT.FORMAT I2S, 16bit, FIFO.FORMAT 32bit
  */
 void i2s_reset(void)
 {
     /* I2S soft reset */
-    IISCONFIG |= I2S_RESET;
-    IISCONFIG &= ~I2S_RESET;
+    IISCONFIG |= IIS_RESET;
+    IISCONFIG &= ~IIS_RESET;
 
     /* BIT.FORMAT */
-    IISCONFIG = ((IISCONFIG & ~FORMAT_MASK) | FORMAT_I2S);
+    IISCONFIG = ((IISCONFIG & ~IIS_FORMAT_MASK) | IIS_FORMAT_IIS);
 
     /* BIT.SIZE */
-    IISCONFIG = ((IISCONFIG & ~SIZE_MASK) | SIZE_16BIT);
+    IISCONFIG = ((IISCONFIG & ~IIS_SIZE_MASK) | IIS_SIZE_16BIT);
 
     /* FIFO.FORMAT */
     /* If BIT.SIZE < FIFO.FORMAT low bits will be 0 */
 #ifdef HAVE_AS3514
     /* AS3514 can only operate as I2S Slave */
-    IISCONFIG |= I2S_MASTER;
+    IISCONFIG |= IIS_MASTER;
     /* Set I2S to 44.1kHz */
     outl((inl(0x70002808) & ~(0x1ff)) | 33, 0x70002808);
     outl(7, 0x60006080);
-
-    IISCONFIG = ((IISCONFIG & ~FIFO_FORMAT_MASK) | FIFO_FORMAT_LE16);
+    IISCONFIG = ((IISCONFIG & ~IIS_FIFO_FORMAT_MASK) | IIS_FIFO_FORMAT_LE16);
 #else
-    IISCONFIG = ((IISCONFIG & ~FIFO_FORMAT_MASK) | FIFO_FORMAT_LE32);
+    IISCONFIG = ((IISCONFIG & ~IIS_FIFO_FORMAT_MASK) | IIS_FIFO_FORMAT_LE32);
 #endif
 
-    /* RX_ATN_LVL=1 == when 12 slots full */
-    /* TX_ATN_LVL=1 == when 12 slots empty */
-    IISFIFO_CFG |= 0x33;
+    /* RX_ATN_LVL = when 12 slots full */
+    /* TX_ATN_LVL = when 12 slots empty */
+    IISFIFO_CFG |= IIS_RX_FULL_LVL_12 | IIS_TX_EMPTY_LVL_12;
 
     /* Rx.CLR = 1, TX.CLR = 1 */
-    IISFIFO_CFG |= 0x1100;
+    IISFIFO_CFG |= IIS_RXCLR | IIS_TXCLR;
 }
 
 #endif /* CONFIG_CPU == */