remove #if 0

Signed-off-by: Serhiy Katsyuba <serhiy.katsyuba@intel.com>

Author: serhiy-katsyuba-intel

src/audio/dai-zephyr.c

@@ -280,147 +280,6 @@ static int dai_get_fifo(struct dai *dai, int direction, int stream_id)
 	return fifo_address;
 }
 
-#if 0
-#ifdef CONFIG_DAI_INTEL_UAOL
-int dai_get_uaol_stream_id(struct dai *dai, int *uaol_link_id, int *uaol_stream_id)
-{
-	const struct dai_properties *props;
-	k_spinlock_key_t key;
-
-	key = k_spin_lock(&dai->lock);
-
-	props = dai_get_properties(dai->dev, 0, 0);
-	*uaol_link_id = props->uaol_link_id;
-	*uaol_stream_id = props->uaol_stream_id;
-
-	k_spin_unlock(&dai->lock, key);
-
-	return 0;
-}
-#endif	/* CONFIG_DAI_INTEL_UAOL */
-
-static void process_uaol_feedback(struct comp_dev *dev, struct dai_data *dd)
-{
-	assert(dd && dd->uaol.fb_chan_idx >= 0 && dd->uaol.fb_dma_buf);
-	///assert(dev->direction == SOF_IPC_STREAM_PLAYBACK);
-
-	struct dma_status stat = {0};
-	int ret = sof_dma_get_status(dd->dma, dd->uaol.fb_chan_idx, &stat);
-	if (ret) {
-		comp_err(dev, "Failed to get UAOL feedback DMA status: %d", ret);
-		return;
-	}
-
-	if (stat.pending_length < 4) {
-		/* TODO: That's a normal case, remove this comp_dbg() ??? */
-		comp_dbg(dev, "Not enough data in UAOL feedback buffer: %d bytes", stat.pending_length);
-		return;
-	}
-
-	assert(dd->uaol.fb_dma_buf_size >= 4);
-	if (stat.read_position < 0 || stat.read_position > dd->uaol.fb_dma_buf_size - 4) {
-		comp_err(dev, "Invalid read position in UAOL feedback buffer: %d", stat.read_position);
-		return;
-	}
-
-	/* Use uncached pointer to read DMA buffer */
-	assert(is_uncached(dd->uaol.fb_dma_buf));
-
-	/* NOTE: Not all DMA drivers populate stat.write_position. Intel ACE HDA does. */
-	assert(stat.write_position & 3 == 0);	/* 4-byte alignment check. */
-	/* Read the last received 4 bytes (ignore older ones if any). */
-	int last_4_bytes_pos = stat.write_position >= 4 ? (stat.write_position - 4) :
-		(dd->uaol.fb_dma_buf_size - 4);
-	uint32_t feedback_value = dd->uaol.fb_dma_buf[last_4_bytes_pos / 4];
-
-	ret = sof_dma_reload(dd->dma, dd->uaol.fb_chan_idx, stat.pending_length);
-	if (ret < 0) {
-		comp_err(dev, "Failed to reload UAOL feedback DMA: %d, pending_length: %d",
-		 ret, stat.pending_length);
-		return;
-	}
-
-	comp_dbg(dev, "UAOL feedback value: %u", feedback_value);
-
-	const struct device *uaol_zdev = get_uaol_zdevice(dd->uaol.link_id);
-	int freq = uaol_interpret_feedback_value(uaol_zdev, dd->uaol.stream_id, feedback_value);
-
-	if (freq < 0) {
-		comp_err(dev, "Bad unexpected feedback freq value: %d", freq);
-		return;
-	}
-
-	/* Let's limit the maximum drift to a reasonable value to prevent significant audio distortion
-	 * when, for some reason, the reported drift is quite big.
-	 */
-	#define MAX_UAOL_DRIFT_HZ 6
-
-	int drift = freq - dd->ipc_config.sampling_frequency;
-	if (drift < -MAX_UAOL_DRIFT_HZ || drift > MAX_UAOL_DRIFT_HZ) {
-		comp_warn(dev, "Too much/unreasonable UAOL feedback freq value: %d, drift: %d", freq, drift);
-		return;
-	}
-
-	dd->uaol.feedback_drift = drift;
-	if (dd->uaol.feedback_drift > 0)
-		dsrc_set_rate(&dd->uaol.dsrc, dd->ipc_config.sampling_frequency, freq);
-}
-
-static void adjust_uaol_rate(const struct dai_data *dd, bool increase)
-{
-	const struct device *uaol_zdev = get_uaol_zdevice(dd->uaol.link_id);
-	int ret = uaol_adjust_rate(uaol_zdev, dd->uaol.stream_id, increase);
-
-	if (ret != 0)
-		comp_err(dd->dai_dev, "Failed to adjust UAOL rate: %d", ret);
-}
-
-static int uaol_dma_buffer_copy_to(struct dai_data *dd, size_t bytes)
-{
-	int ret = 0;
-
-	assert(dd->uaol.feedback_drift != 0);
-
-	if (dd->uaol.feedback_drift > 0) {
-		buffer_stream_invalidate(dd->local_buffer, bytes);
-
-		struct cir_buf_ptr in = { dd->local_buffer->stream.addr,
-			dd->local_buffer->stream.end_addr, dd->local_buffer->stream.r_ptr };
-		assert(dd->uaol.dsrc_buf);
-		struct cir_buf_ptr out = { dd->uaol.dsrc_buf->stream.addr,
-			dd->uaol.dsrc_buf->stream.end_addr, dd->uaol.dsrc_buf->stream.w_ptr };
-		size_t frames = bytes / audio_stream_frame_bytes(&dd->local_buffer->stream);
-
-		size_t added_frames = dsrc_process(&dd->uaol.dsrc, &in, &out, frames);
-		size_t added_bytes = added_frames * audio_stream_frame_bytes(&dd->local_buffer->stream);
-
-		comp_update_buffer_consume(dd->local_buffer, bytes);
-		audio_stream_produce(&dd->uaol.dsrc_buf->stream, bytes + added_bytes);
-
-		if (added_frames)
-			adjust_uaol_rate(dd, true);
-
-		size_t extra_bytes = added_frames * audio_stream_frame_bytes(&dd->dma_buffer->stream);
-		ret = dma_buffer_copy_to(dd->uaol.dsrc_buf, dd->dma_buffer,
-				 dd->process, bytes + extra_bytes, dd->chmap);
-	} else if (dd->uaol.feedback_drift < 0) {
-		assert(dd->uaol.feedback_drift <= -1 && dd->uaol.feedback_drift >= -1000);
-		dd->uaol.ms_since_last_adjustment++;
-		if (-1000 / dd->uaol.feedback_drift >= dd->uaol.ms_since_last_adjustment) {
-			dd->uaol.ms_since_last_adjustment = 0;
-			adjust_uaol_rate(dd, false);
-		}
-
-		ret = dma_buffer_copy_to(dd->local_buffer, dd->dma_buffer,
-				 dd->process, bytes, dd->chmap);
-	} else {
-		return -EINVAL;
-	}
-
-	return ret;
-}
-#endif //0
-
 /* this is called by DMA driver every time descriptor has completed */
 static enum sof_dma_cb_status
 dai_dma_cb(struct dai_data *dd, struct comp_dev *dev, uint32_t bytes,
@@ -787,28 +646,6 @@ static int dai_dma_suspend(struct dai_data *dd)
 	return ret;
 }
 
-#if 0
-static void uaol_free(struct dai_data *dd)
-{
-	if (dd->uaol.fb_z_config) {
-		rfree(dd->uaol.fb_z_config->head_block);
-		rfree(dd->uaol.fb_z_config);
-		dd->uaol.fb_z_config = NULL;
-	}
-
-	if (dd->uaol.fb_dma_buf) {
-		rfree(dd->uaol.fb_dma_buf);
-		dd->uaol.fb_dma_buf = NULL;
-		dd->uaol.fb_dma_buf_size = 0;
-	}
-
-	if (dd->uaol.dsrc_buf) {
-		buffer_free(dd->uaol.dsrc_buf);
-		dd->uaol.dsrc_buf = NULL;
-	}
-}
-#endif //0
-
 __cold static struct comp_dev *dai_new(const struct comp_driver *drv,
 				       const struct comp_ipc_config *config,
 				       const void *spec)
@@ -1396,103 +1233,6 @@ static int dai_params(struct comp_dev *dev, struct sof_ipc_stream_params *params
 	return dai_common_params(dd, dev, params);
 }
 
-#if 0
-static int setup_uaol_feedback_dma(struct dai_data *dd, struct comp_dev *dev)
-{
-	struct ipc_config_dai *dai = &dd->ipc_config;
-	struct dma_config *dma_cfg;
-
-	dd->uaol.fb_chan_idx = -EINVAL;
-	dd->uaol.feedback_drift = 0;
-	dd->uaol.ms_since_last_adjustment = 0;
-
-	if (dai->type != SOF_DAI_INTEL_UAOL || dai->direction != SOF_IPC_STREAM_PLAYBACK)
-		return 0;
-
-	/* UAOL feedback is an optional 2nd DMA link (1st is audio DMA link) */
-	assert(GTW_DMA_DEVICE_MAX_COUNT >= 2);
-	if (!dai->host_dma_config[1] || !dai->host_dma_config[1]->pre_allocated_by_host) {
-		comp_info(dev, "No UAOL feedback DMA link supplied by host!");
-		return 0;
-	}
-
-	int channel = dai->host_dma_config[1]->dma_channel_id;
-	comp_dbg(dev, "UAOL feedback channel = %d", channel);
-
-	/*
-	 * UAOL feedback endpoint payload is 4 bytes.
-	 * Hi-Speed USB microframe period is 125 us (8 per 1 ms).
-	 * Double the buffer size just in case.
-	 */
-	dd->uaol.fb_dma_buf_size = 4 * 8 * 2;
-
-	/* TODO: perhaps get alignment by reading DMA alignment attribute? */
-	dd->uaol.fb_dma_buf = (uint32_t *)rballoc_align(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_DMA,
-						      dd->uaol.fb_dma_buf_size, 64);
-	if (!dd->uaol.fb_dma_buf) {
-		comp_err(dev, "UAOL feedback buffer allocation failed!");
-		return -ENOMEM;
-	}
-	memset(dd->uaol.fb_dma_buf, 0, dd->uaol.fb_dma_buf_size);
-
-	dma_cfg = rballoc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT | SOF_MEM_FLAG_DMA,
-			  sizeof(struct dma_config));
-	if (!dma_cfg) {
-		rfree(dd->uaol.fb_dma_buf);
-		dd->uaol.fb_dma_buf = NULL;
-		comp_err(dev, "dma_cfg allocation failed");
-		return -ENOMEM;
-	}
-
-	memset(dma_cfg, 0, sizeof(struct dma_config));
-	dma_cfg->dma_slot = 0;
-	dma_cfg->channel_direction = PERIPHERAL_TO_MEMORY;
-	dma_cfg->source_data_size = 4;
-	dma_cfg->dest_data_size = 4;
-	dma_cfg->source_burst_length = 4;
-	dma_cfg->dest_burst_length = 4;
-	dma_cfg->cyclic = 1;
-	dma_cfg->block_count = 1;
-
-	dma_cfg->head_block = rballoc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT | SOF_MEM_FLAG_DMA,
-					      sizeof(struct dma_block_config));
-	if (!dma_cfg->head_block) {
-		rfree(dma_cfg);
-		rfree(dd->uaol.fb_dma_buf);
-		dd->uaol.fb_dma_buf = NULL;
-		comp_err(dev, "dma_block_config allocation failed");
-		return -ENOMEM;
-	}
-
-	memset(dma_cfg->head_block, 0, sizeof(struct dma_block_config));
-	dma_cfg->head_block->dest_scatter_en = 0;
-	dma_cfg->head_block->block_size = dd->uaol.fb_dma_buf_size;
-	dma_cfg->head_block->source_addr_adj = DMA_ADDR_ADJ_INCREMENT;
-	dma_cfg->head_block->dest_addr_adj = DMA_ADDR_ADJ_DECREMENT;	/* WHY? IS THIS OK??? */
-	dma_cfg->head_block->source_address = 0;
-	dma_cfg->head_block->dest_address = (uint32_t)local_to_host(dd->uaol.fb_dma_buf);
-	dma_cfg->head_block->next_block = dma_cfg->head_block;
-	dd->uaol.fb_z_config = dma_cfg;
-
-	/* get DMA channel */
-	dd->uaol.fb_chan_idx = sof_dma_request_channel(dd->dma, channel);
-	if (dd->uaol.fb_chan_idx < 0) {
-		rfree(dma_cfg->head_block);
-		rfree(dma_cfg);
-		rfree(dd->uaol.fb_dma_buf);
-		dd->uaol.fb_dma_buf = NULL;
-		comp_err(dev, "dma_request_channel() failed");
-		return -EIO;
-	}
-
-	dsrc_init(&dd->uaol.dsrc, dai->gtw_fmt->channels_count);
-
-	comp_dbg(dev, "New configured UAOL feedback DMA channel index %d", dd->uaol.fb_chan_idx);
-
-	return 0;
-}
-#endif //0
-
 int dai_common_config_prepare(struct dai_data *dd, struct comp_dev *dev)
 {
 	int channel;