mini i2S backend to allow other DAC

2025-12-06 11:36:59 +03:00 · 2020-02-02 23:08:30 -08:00
parent 1ca33a3330
commit 1b5fc137d4
10 changed files with 1003 additions and 270 deletions
--- a/components/squeezelite/output_i2s.c
+++ b/components/squeezelite/output_i2s.c
@@ -47,6 +47,7 @@ sure that using rate_delay would fix that
 #include "driver/gpio.h"
 #include "perf_trace.h"
 #include <signal.h>
+#include "adac.h"
 #include "time.h"
 #include "led.h"
 #include "monitor.h"
@@ -57,36 +58,6 @@ sure that using rate_delay would fix that

 #define FRAME_BLOCK MAX_SILENCE_FRAMES

-// Prevent compile errors if dac output is
-// included in the build and not actually activated in menuconfig
-#ifndef CONFIG_I2S_BCK_IO
-#define CONFIG_I2S_BCK_IO -1
-#endif
-#ifndef CONFIG_I2S_WS_IO
-#define CONFIG_I2S_WS_IO -1
-#endif
-#ifndef CONFIG_I2S_DO_IO
-#define CONFIG_I2S_DO_IO -1
-#endif
-#ifndef CONFIG_I2S_NUM
-#define CONFIG_I2S_NUM -1
-#endif
-
-#ifndef CONFIG_SPDIF_BCK_IO
-#define CONFIG_SPDIF_BCK_IO -1
-#endif
-#ifndef CONFIG_SPDIF_WS_IO
-#define CONFIG_SPDIF_WS_IO -1
-#endif
-#ifndef CONFIG_SPDIF_DO_IO
-#define CONFIG_SPDIF_DO_IO -1
-#endif
-#ifndef CONFIG_SPDIF_NUM
-#define CONFIG_SPDIF_NUM -1
-#endif
-
-typedef enum { DAC_ACTIVE = 0, DAC_STANDBY, DAC_DOWN, DAC_ANALOGUE_OFF, DAC_ANALOGUE_ON, DAC_VOLUME } dac_cmd_e;
-
 // must have an integer ratio with FRAME_BLOCK (see spdif comment)
 #define DMA_BUF_LEN		512	
 #define DMA_BUF_COUNT	12
@@ -112,6 +83,9 @@ extern struct buffer *streambuf;
 extern struct buffer *outputbuf;
 extern u8_t *silencebuf;

+// by default no DAC selected
+struct adac_s *adac = &dac_null;
+
 static log_level loglevel;

 static bool jack_mutes_amp;
@@ -130,24 +104,12 @@ static int _i2s_write_frames(frames_t out_frames, bool silence, s32_t gainL, s32
 								s32_t cross_gain_in, s32_t cross_gain_out, ISAMPLE_T **cross_ptr);
 static void *output_thread_i2s();
 static void *output_thread_i2s_stats();
-static void dac_cmd(dac_cmd_e cmd, ...);
-static int tas57_detect(void);
 static void spdif_convert(ISAMPLE_T *src, size_t frames, u32_t *dst, size_t *count);
 static void (*jack_handler_chain)(bool inserted);

+// force all GPIOs to what we need
 #ifdef CONFIG_SQUEEZEAMP
-
 #define TAS57xx
-
-#undef	CONFIG_I2S_BCK_IO 
-#define CONFIG_I2S_BCK_IO 	33
-#undef 	CONFIG_I2S_WS_IO	
-#define CONFIG_I2S_WS_IO	25
-#undef 	CONFIG_I2S_DO_IO
-#define CONFIG_I2S_DO_IO	32
-#undef 	CONFIG_I2S_NUM
-#define CONFIG_I2S_NUM		0
-
 #undef	CONFIG_SPDIF_BCK_IO 
 #define CONFIG_SPDIF_BCK_IO 33
 #undef 	CONFIG_SPDIF_WS_IO	
@@ -156,51 +118,15 @@ static void (*jack_handler_chain)(bool inserted);
 #define CONFIG_SPDIF_DO_IO	15
 #undef 	CONFIG_SPDIF_NUM
 #define CONFIG_SPDIF_NUM	0
+#undef 	CONFIG_I2S_NUM
+#define CONFIG_I2S_NUM		0
+#elif defined CONFIG_A1S
+#define A1S
+#undef 	CONFIG_I2S_NUM
+#define CONFIG_I2S_NUM		0
+#endif

 #define I2C_PORT	0
-#define VOLUME_GPIO	14
-
-#define TAS575x 0x98
-#define TAS578x	0x90
-
-struct tas57xx_cmd_s {
-	u8_t reg;
-	u8_t value;
-};
-
-u8_t config_spdif_gpio = CONFIG_SPDIF_DO_IO;
-	
-static const struct tas57xx_cmd_s tas57xx_init_sequence[] = {
-    { 0x00, 0x00 },		// select page 0
-    { 0x02, 0x10 },		// standby
-    { 0x0d, 0x10 },		// use SCK for PLL
-	{ 0x25, 0x08 },		// ignore SCK halt 
-	{ 0x08, 0x10 },		// Mute control enable (from TAS5780)
-	{ 0x54, 0x02 },		// Mute output control (from TAS5780)
-	{ 0x02, 0x00 },		// restart
-	{ 0xff, 0xff }		// end of table
-};
-
-static const i2c_config_t i2c_config = {
-        .mode = I2C_MODE_MASTER,
-        .sda_io_num = 27,
-        .sda_pullup_en = GPIO_PULLUP_ENABLE,
-        .scl_io_num = 26,
-        .scl_pullup_en = GPIO_PULLUP_ENABLE,
-        .master.clk_speed = 100000,
-};
-
-static const struct tas57xx_cmd_s tas57xx_cmd[] = {
-	{ 0x02, 0x00 },	// DAC_ACTIVE
-	{ 0x02, 0x10 },	// DAC_STANDBY
-	{ 0x02, 0x01 },	// DAC_DOWN
-	{ 0x56, 0x10 },	// DAC_ANALOGUE_OFF
-	{ 0x56, 0x00 },	// DAC_ANALOGUE_ON
-};
-
-static u8_t tas57_addr;
-
-#endif

 /****************************************************************************************
 * jack insertion handler
@@ -209,9 +135,15 @@ static void jack_handler(bool inserted) {
 	// jack detection bounces a bit but that seems fine
 	if (jack_mutes_amp) {
 		LOG_INFO("switching amplifier %s", inserted ? "OFF" : "ON");
-		if (inserted) dac_cmd(DAC_ANALOGUE_OFF);
-		else dac_cmd(DAC_ANALOGUE_ON);
+		if (inserted) adac->speaker(false);
+		else adac->speaker(true);
 	}
+	
+	// activate headset
+	if (inserted) adac->headset(true);
+	else adac->headset(false);
+	
+	// and chain if any
 	if (jack_handler_chain) (jack_handler_chain)(inserted);
 }

@@ -226,44 +158,6 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
 	jack_mutes_amp = (strcmp(p,"1") == 0 ||strcasecmp(p,"y") == 0);
 	free(p);
 	
-#ifdef TAS57xx
-	LOG_INFO("Initializing TAS57xx ");
-				
-	adc1_config_width(ADC_WIDTH_BIT_12);
-    adc1_config_channel_atten(ADC1_CHANNEL_7, ADC_ATTEN_DB_0);
-    			
-	// init volume & mute
-	gpio_pad_select_gpio(VOLUME_GPIO);
-	gpio_set_direction(VOLUME_GPIO, GPIO_MODE_OUTPUT);
-	gpio_set_level(VOLUME_GPIO, 0);
-	
-	// configure i2c
-	i2c_param_config(I2C_PORT, &i2c_config);
-	i2c_driver_install(I2C_PORT, I2C_MODE_MASTER, false, false, false);
-	
-	// find which TAS we are using
-	tas57_addr = tas57_detect();
-	
-	i2c_cmd_handle_t i2c_cmd = i2c_cmd_link_create();
-	
-	for (int i = 0; tas57xx_init_sequence[i].reg != 0xff; i++) {
-		i2c_master_start(i2c_cmd);
-		i2c_master_write_byte(i2c_cmd, tas57_addr | I2C_MASTER_WRITE, I2C_MASTER_NACK);
-		i2c_master_write_byte(i2c_cmd, tas57xx_init_sequence[i].reg, I2C_MASTER_NACK);
-		i2c_master_write_byte(i2c_cmd, tas57xx_init_sequence[i].value, I2C_MASTER_NACK);
-
-		LOG_DEBUG("i2c write %x at %u", tas57xx_init_sequence[i].reg, tas57xx_init_sequence[i].value);
-	}
-
-	i2c_master_stop(i2c_cmd);	
-	esp_err_t ret = i2c_master_cmd_begin(I2C_PORT, i2c_cmd, 500 / portTICK_RATE_MS);
-    i2c_cmd_link_delete(i2c_cmd);
-	
-	if (ret != ESP_OK) {
-		LOG_ERROR("could not intialize TAS57xx %d", ret);
-	}
-#endif	
-	
 #ifdef CONFIG_I2S_BITS_PER_CHANNEL
 	switch (CONFIG_I2S_BITS_PER_CHANNEL) {
 		case 24:
@@ -287,8 +181,6 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
 	bytes_per_frame = 2*2;
 #endif

-	if (strcasestr(device, "spdif")) spdif = true;
-
 	output.write_cb = &_i2s_write_frames;
 	obuf = malloc(FRAME_BLOCK * bytes_per_frame);
 	if (!obuf) {
@@ -296,12 +188,20 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
 		return;
 	}
 		
-	running=true;
+	running = true;

-	i2s_pin_config_t pin_config;
-	
-	if (spdif) {
-		pin_config = (i2s_pin_config_t) { .bck_io_num = CONFIG_SPDIF_BCK_IO, .ws_io_num = CONFIG_SPDIF_WS_IO, 
+	// common I2S initialization
+	i2s_config.mode = I2S_MODE_MASTER | I2S_MODE_TX;
+	i2s_config.channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT;
+	i2s_config.communication_format = I2S_COMM_FORMAT_I2S| I2S_COMM_FORMAT_I2S_MSB;
+	// in case of overflow, do not replay old buffer
+	i2s_config.tx_desc_auto_clear = true;		
+	i2s_config.use_apll = true;
+	i2s_config.intr_alloc_flags = ESP_INTR_FLAG_LEVEL1; //Interrupt level 1
+
+	if (strcasestr(device, "spdif")) {
+		spdif = true;	
+		i2s_pin_config_t i2s_pin_config = (i2s_pin_config_t) { .bck_io_num = CONFIG_SPDIF_BCK_IO, .ws_io_num = CONFIG_SPDIF_WS_IO, 
 										  .data_out_num = CONFIG_SPDIF_DO_IO, .data_in_num = -1 //Not used
 									};
 		i2s_config.sample_rate = output.current_sample_rate * 2;
@@ -315,48 +215,44 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
 		   audio frame. So the real depth is true frames is (LEN * COUNT / 2)
 		*/   
 		dma_buf_frames = DMA_BUF_COUNT * DMA_BUF_LEN / 2;	
+		i2s_driver_install(CONFIG_I2S_NUM, &i2s_config, 0, NULL);
+		i2s_set_pin(CONFIG_I2S_NUM, &i2s_pin_config);
+		LOG_INFO("SPDIF using I2S bck:%u, ws:%u, do:%u", i2s_pin_config.bck_io_num, i2s_pin_config.ws_io_num, i2s_pin_config.data_out_num);
 	} else {
-		pin_config = (i2s_pin_config_t) { .bck_io_num = CONFIG_I2S_BCK_IO, .ws_io_num = CONFIG_I2S_WS_IO, 
-										.data_out_num = CONFIG_I2S_DO_IO, .data_in_num = -1 //Not used
-									};
+#ifdef TAS57xx
+		gpio_pad_select_gpio(CONFIG_SPDIF_DO_IO);
+		gpio_set_direction(CONFIG_SPDIF_DO_IO, GPIO_MODE_OUTPUT);
+		gpio_set_level(CONFIG_SPDIF_DO_IO, 0);
+		adac = &dac_tas57xx;
+#elif defined(A1S)
+		adac = &dac_a1s;
+#endif	
 		i2s_config.sample_rate = output.current_sample_rate;
 		i2s_config.bits_per_sample = bytes_per_frame * 8 / 2;
 		// Counted in frames (but i2s allocates a buffer <= 4092 bytes)
 		i2s_config.dma_buf_len = DMA_BUF_LEN;	
 		i2s_config.dma_buf_count = DMA_BUF_COUNT;
 		dma_buf_frames = DMA_BUF_COUNT * DMA_BUF_LEN;	
-#ifdef TAS57xx	
-		gpio_pad_select_gpio(CONFIG_SPDIF_DO_IO);
-		gpio_set_direction(CONFIG_SPDIF_DO_IO, GPIO_MODE_OUTPUT);
-		gpio_set_level(CONFIG_SPDIF_DO_IO, 0);
-#endif			
+		
+		// finally let DAC driver initialize I2C and I2S
+		adac->init(I2C_PORT, CONFIG_I2S_NUM, &i2s_config);
 	}

-	i2s_config.mode = I2S_MODE_MASTER | I2S_MODE_TX;
-	i2s_config.channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT;
-	i2s_config.communication_format = I2S_COMM_FORMAT_I2S| I2S_COMM_FORMAT_I2S_MSB;
-	// in case of overflow, do not replay old buffer
-	i2s_config.tx_desc_auto_clear = true;		
-	i2s_config.use_apll = true;
-	i2s_config.intr_alloc_flags = ESP_INTR_FLAG_LEVEL1; //Interrupt level 1
-
 	LOG_INFO("Initializing I2S mode %s with rate: %d, bits per sample: %d, buffer frames: %d, number of buffers: %d ", 
 			spdif ? "S/PDIF" : "normal", 
 			i2s_config.sample_rate, i2s_config.bits_per_sample, i2s_config.dma_buf_len, i2s_config.dma_buf_count);
-
-	i2s_driver_install(CONFIG_I2S_NUM, &i2s_config, 0, NULL);
-	i2s_set_pin(CONFIG_I2S_NUM, &pin_config);
+	
 	i2s_stop(CONFIG_I2S_NUM);
 	i2s_zero_dma_buffer(CONFIG_I2S_NUM);
 	isI2SStarted=false;
 	
-	dac_cmd(DAC_STANDBY);
+	adac->power(ADAC_STANDBY);

 	jack_handler_chain = jack_handler_svc;
 	jack_handler_svc = jack_handler;
 	
-	if (jack_mutes_amp && jack_inserted_svc()) dac_cmd(DAC_ANALOGUE_OFF);
-	else dac_cmd(DAC_ANALOGUE_ON);
+	if (jack_mutes_amp && jack_inserted_svc()) adac->speaker(false);
+	else adac->speaker(true);
 	
 	esp_pthread_cfg_t cfg = esp_pthread_get_default_config();
 	
@@ -388,22 +284,15 @@ void output_close_i2s(void) {
 	i2s_driver_uninstall(CONFIG_I2S_NUM);
 	free(obuf);
 	
-#ifdef TAS57xx	
-	i2c_driver_delete(I2C_PORT);
-#endif	
+	adac->deinit();
 }

 /****************************************************************************************
 * change volume
 */
 bool output_volume_i2s(unsigned left, unsigned right) {
-#ifdef TAS57xx	
-	if (!spdif) {
-		LOG_INFO("TAS57xx volume (L:%u R:%u)", left, right);
-		gpio_set_level(VOLUME_GPIO, left || right);
-	}
-#endif	
- return false;	
+	adac->volume(left, right);
+	return false;	
 } 

 /****************************************************************************************
@@ -482,14 +371,10 @@ static void *output_thread_i2s() {
 			LOG_INFO("Output state is %d", output.state);
 			if (output.state == OUTPUT_OFF) led_blink(LED_GREEN, 100, 2500);
 			else if (output.state == OUTPUT_STOPPED) {
-#ifdef TAS57xx				
-				dac_cmd(DAC_ANALOGUE_OFF);
-#endif				
+				adac->speaker(false);
 				led_blink(LED_GREEN, 200, 1000);
 			} else if (output.state == OUTPUT_RUNNING) {
-#ifdef TAS57xx				
-				if (!jack_mutes_amp || !jack_inserted_svc()) dac_cmd(DAC_ANALOGUE_ON);
-#endif				
+				if (!jack_mutes_amp || !jack_inserted_svc()) adac->speaker(true);
 				led_on(LED_GREEN);
 			}	
 		}
@@ -500,7 +385,7 @@ static void *output_thread_i2s() {
 			if (isI2SStarted) {
 				isI2SStarted = false;
 				i2s_stop(CONFIG_I2S_NUM);
-				if (!spdif) dac_cmd(DAC_STANDBY);
+				adac->power(ADAC_STANDBY);
 				count = 0;
 			}
 			usleep(200000);
@@ -546,7 +431,7 @@ static void *output_thread_i2s() {
 			LOG_INFO("Restarting I2S.");
 			i2s_zero_dma_buffer(CONFIG_I2S_NUM);
 			i2s_start(CONFIG_I2S_NUM);
-			if (!spdif) dac_cmd(DAC_ACTIVE);	
+			adac->power(ADAC_ON);	
 		} 
 		
 		// this does not work well as set_sample_rates resets the fifos (and it's too early)
@@ -592,6 +477,7 @@ static void *output_thread_i2s() {
 * Stats output thread
 */
 static void *output_thread_i2s_stats() {
+	//return;
 	while (running) {
 		LOCK;
 		output_state state = output.state;
@@ -621,72 +507,6 @@ static void *output_thread_i2s_stats() {
 	return NULL;
 }

-/****************************************************************************************
- * DAC specific commands
- */
-void dac_cmd(dac_cmd_e cmd, ...) {
-	va_list args;
-	esp_err_t ret = ESP_OK;
-	
-	va_start(args, cmd);
-#ifdef TAS57xx	
-	i2c_cmd_handle_t i2c_cmd = i2c_cmd_link_create();
-
-	switch(cmd) {
-	case DAC_VOLUME:
-		LOG_ERROR("volume not handled yet");
-		break;
-	default:
-		i2c_master_start(i2c_cmd);
-		i2c_master_write_byte(i2c_cmd, tas57_addr | I2C_MASTER_WRITE, I2C_MASTER_NACK);
-		i2c_master_write_byte(i2c_cmd, tas57xx_cmd[cmd].reg, I2C_MASTER_NACK);
-		i2c_master_write_byte(i2c_cmd, tas57xx_cmd[cmd].value, I2C_MASTER_NACK);
-		i2c_master_stop(i2c_cmd);	
-		ret	= i2c_master_cmd_begin(I2C_PORT, i2c_cmd, 50 / portTICK_RATE_MS);
-	}
-	
-    i2c_cmd_link_delete(i2c_cmd);
-	
-	if (ret != ESP_OK) {
-		LOG_ERROR("could not intialize TAS57xx %d", ret);
-	}
-#endif	
-	va_end(args);
-}
-
-/****************************************************************************************
- * TAS57 detection
- */
-#ifdef TAS57xx
-static int tas57_detect(void) {
-	u8_t data, addr[] = {TAS578x, TAS575x};
-	int ret;
-	
-	for (int i = 0; i < sizeof(addr); i++) {
-		i2c_cmd_handle_t i2c_cmd = i2c_cmd_link_create();
-
-		i2c_master_start(i2c_cmd);
-		i2c_master_write_byte(i2c_cmd, addr[i] | I2C_MASTER_WRITE, I2C_MASTER_NACK);
-		i2c_master_write_byte(i2c_cmd, 00, I2C_MASTER_NACK);
-		
-		i2c_master_start(i2c_cmd);			
-		i2c_master_write_byte(i2c_cmd, addr[i] | I2C_MASTER_READ, I2C_MASTER_NACK);
-		i2c_master_read_byte(i2c_cmd, &data, I2C_MASTER_NACK);
-		
-		i2c_master_stop(i2c_cmd);	
-		ret	= i2c_master_cmd_begin(I2C_PORT, i2c_cmd, 50 / portTICK_RATE_MS);
-		i2c_cmd_link_delete(i2c_cmd);	
-		
-		if (ret == ESP_OK) {
-			LOG_INFO("Detected TAS @0x%x", addr[i]);
-			return addr[i];
-		}	
-	}	
-	
-	return 0;
-}
-#endif
-
 /****************************************************************************************
 * SPDIF support
 */