This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch pr59
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/pr59 by this push:
new edfcbc0 boards/arm/cxd56xx/drivers/audio: Missing commas in in
enumeration. Fix compilation error found in build testing due to missing
commas in an enumeration type. Correct ordering of definitions and section
block comments to follow coding standard.
edfcbc0 is described below
commit edfcbc0840aac27de25c9862290535d254c6ef44
Author: Gregory Nutt <[email protected]>
AuthorDate: Wed Jan 8 11:49:32 2020 -0600
boards/arm/cxd56xx/drivers/audio: Missing commas in in enumeration. Fix
compilation error found in build testing due to missing commas in an
enumeration type. Correct ordering of definitions and section block comments
to follow coding standard.
---
.../cxd56xx/drivers/audio/cxd56_audio_bca_reg.h | 66 ++++++++++------------
1 file changed, 29 insertions(+), 37 deletions(-)
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_bca_reg.h
b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_bca_reg.h
index bfb9382..03ba387 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_bca_reg.h
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_bca_reg.h
@@ -46,6 +46,31 @@
* Pre-processor Definitions
****************************************************************************/
+#define DMA_STATE_BIT_AC_DONE 1
+#define DMA_STATE_BIT_AC_ERR 2
+#define DMA_STATE_BIT_AC_CMB 8
+#define DMA_STATE_BIT_I2S_OUT_DONE 1
+#define DMA_STATE_BIT_I2S_OUT_ERR 2
+#define DMA_STATE_BIT_I2S_IN_DONE 4
+#define DMA_STATE_BIT_I2S_IN_ERR 8
+#define DMA_STATE_BIT_I2S_CMB 32
+
+#define DMA_MSTATE_START 1
+#define DMA_MSTART_READY 0
+
+#define DMA_MSTATE_ERR_OK
+#define DMA_MSTATE_ERR_NO_ENABLE_CH 1
+#define DMA_MSTATE_ERR_CH1_4_INVALID 2
+#define DMA_MSTATE_ERR_CH5_8_INVALID 4
+
+#define DMA_MSTATE_BUF_EMPTY 3
+
+#define DMA_CMD_FIFO_NOT_FULL 1
+
+/***************************************************************************
+ * Public Types
+ ****************************************************************************/
+
typedef enum
{
BCA_MIC_IN_START_ADR,
@@ -118,13 +143,13 @@ typedef enum
BCA_I2S1_INT_CTRL_ERR_I2SO,
BCA_I2S1_INT_CTRL_DONE_I2SI,
BCA_I2S1_INT_CTRL_ERR_I2SI,
- BCA_I2S1_INT_CTRL_SMP_I2S
+ BCA_I2S1_INT_CTRL_SMP_I2S,
BCA_I2S1_INT_CTRL_CMB_I2S,
BCA_I2S2_INT_CTRL_DONE_I2SO,
BCA_I2S2_INT_CTRL_ERR_I2SO,
BCA_I2S2_INT_CTRL_DONE_I2SI,
BCA_I2S2_INT_CTRL_ERR_I2SI,
- BCA_I2S2_INT_CTRL_SMP_I2S
+ BCA_I2S2_INT_CTRL_SMP_I2S,
BCA_I2S2_INT_CTRL_CMB_I2S,
BCA_MIC_INT_MASK_DONE_MIC,
BCA_MIC_INT_MASK_ERR_MIC,
@@ -136,7 +161,7 @@ typedef enum
BCA_I2S1_INT_MASK_ERR_I2SO,
BCA_I2S1_INT_MASK_DONE_I2SI,
BCA_I2S1_INT_MASK_ERR_I2SI,
- BCA_I2S1_INT_MASK_SMP_I2S
+ BCA_I2S1_INT_MASK_SMP_I2S,
BCA_I2S1_INT_MASK_CMB_I2S,
BCA_I2S1_INT_MASK_NOSTPMSK,
BCA_I2S1_INT_MASK_SRST_I2S,
@@ -144,7 +169,7 @@ typedef enum
BCA_I2S2_INT_MASK_ERR_I2SO,
BCA_I2S2_INT_MASK_DONE_I2SI,
BCA_I2S2_INT_MASK_ERR_I2SI,
- BCA_I2S2_INT_MASK_SMP_I2S
+ BCA_I2S2_INT_MASK_SMP_I2S,
BCA_I2S2_INT_MASK_CMB_I2S,
BCA_I2S2_INT_MASK_NOSTPMSK,
BCA_I2S2_INT_MASK_SRST_I2S,
@@ -209,39 +234,6 @@ typedef enum
BCA_REG_MAX_ENTRY
} BCA_REG_ID;
-#define DMA_STATE_BIT_AC_DONE 1
-#define DMA_STATE_BIT_AC_ERR 2
-#define DMA_STATE_BIT_AC_CMB 8
-#define DMA_STATE_BIT_I2S_OUT_DONE 1
-#define DMA_STATE_BIT_I2S_OUT_ERR 2
-#define DMA_STATE_BIT_I2S_IN_DONE 4
-#define DMA_STATE_BIT_I2S_IN_ERR 8
-#define DMA_STATE_BIT_I2S_CMB 32
-
-#define DMA_MSTATE_START 1
-#define DMA_MSTART_READY 0
-
-#define DMA_MSTATE_ERR_OK
-#define DMA_MSTATE_ERR_NO_ENABLE_CH 1
-#define DMA_MSTATE_ERR_CH1_4_INVALID 2
-#define DMA_MSTATE_ERR_CH5_8_INVALID 4
-
-#define DMA_MSTATE_BUF_EMPTY 3
-
-#define DMA_CMD_FIFO_NOT_FULL 1
-
-/***************************************************************************
- * Public Types
- ****************************************************************************/
-
-/***************************************************************************
- * Public Data
- ****************************************************************************/
-
-/***************************************************************************
- * Inline Functions
- ****************************************************************************/
-
/***************************************************************************
* Public Function Prototypes
****************************************************************************/
