Skip to content

Commit 87a2fab

Browse files
committed
Naming conflicts for singal_t
1 parent a7ffd76 commit 87a2fab

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/Driver.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,7 @@ class AudioDriverPCM3168Class : public AudioDriver {
13871387
break;
13881388
case BIT_LENGTH_32BITS:
13891389
case BIT_LENGTH_24BITS:
1390-
if (iface.singal_type == TDM) {
1390+
if (iface.singal_type == SIGNAL_TDM) {
13911391
switch (iface.fmt) {
13921392
case I2S_NORMAL:
13931393
fmt = PCM3168::FMT::I2STDM24bit;

src/Driver/cs42448/cs42448.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ class CS42448 {
556556

557557
/// Set I2S format based on codec_config
558558
bool setFormat() {
559-
if (codec_config.i2s.singal_type == singal_t::TDM) {
559+
if (codec_config.i2s.singal_type == SIGNAL_TDM) {
560560
return setFormat(Format::TDM);
561561
} else {
562562
switch (codec_config.i2s.fmt) {

src/Driver/es7210/es7210.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ error_t es7210_adc_init(codec_config_t *codec_cfg, void* i2c)
326326

327327
// set REG12
328328
uint8_t reg12 = 0;
329-
if (i2s_cfg->singal_type == TDM) {
329+
if (i2s_cfg->singal_type == SIGNAL_TDM) {
330330
reg12 = 0x02; // TDM I2S
331331
}
332332
ret |= es7210_write_reg(ES7210_SDP_INTERFACE2_REG12, reg12);

src/DriverCommon.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ typedef enum {
125125
*/
126126

127127
typedef enum {
128-
DIGITAL,
129-
AMALOG,
130-
PDM,
131-
TDM,
128+
SIGNAL_DIGITAL,
129+
SIGNAL_AMALOG,
130+
SIGNAL_PDM,
131+
SIGNAL_TDM,
132132
} singal_t;
133133

134134

0 commit comments

Comments
 (0)