mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 16:15:11 +00:00
ASoC: SOF: ipc3: Remove the ipc3-ops.h header file
Only the main IPC ops struct should be visible outside of IPC3 code to make sure that the code is correctly abstracted. Instead of keeping the ipc3-ops.h with only the high level ops struct declaration, put the ipc3_ops to sof-priv.h and move all other ops struct declaration into ipc3-priv.h New IPC implementation should follow this route: the main IPC ops should be declared in sof-priv.h and no other IPC version related header be used for generic code. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20220504102831.10071-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
c0b38be14f
commit
f80beaf6f2
9 changed files with 9 additions and 27 deletions
|
@ -17,7 +17,6 @@
|
||||||
#include "sof-priv.h"
|
#include "sof-priv.h"
|
||||||
#include "sof-audio.h"
|
#include "sof-audio.h"
|
||||||
#include "ops.h"
|
#include "ops.h"
|
||||||
#include "ipc3-ops.h"
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sof_ipc_send_msg - generic function to prepare and send one IPC message
|
* sof_ipc_send_msg - generic function to prepare and send one IPC message
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
#include "sof-priv.h"
|
#include "sof-priv.h"
|
||||||
#include "sof-audio.h"
|
#include "sof-audio.h"
|
||||||
#include "ipc3-ops.h"
|
#include "ipc3-priv.h"
|
||||||
|
|
||||||
/* IPC set()/get() for kcontrols. */
|
/* IPC set()/get() for kcontrols. */
|
||||||
static int sof_ipc3_set_get_kcontrol_data(struct snd_sof_control *scontrol, bool set)
|
static int sof_ipc3_set_get_kcontrol_data(struct snd_sof_control *scontrol, bool set)
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#include "sof-priv.h"
|
#include "sof-priv.h"
|
||||||
#include "sof-audio.h"
|
#include "sof-audio.h"
|
||||||
#include "ipc3-priv.h"
|
#include "ipc3-priv.h"
|
||||||
#include "ipc3-ops.h"
|
|
||||||
#include "ops.h"
|
#include "ops.h"
|
||||||
|
|
||||||
static int ipc3_fw_ext_man_get_version(struct snd_sof_dev *sdev,
|
static int ipc3_fw_ext_man_get_version(struct snd_sof_dev *sdev,
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */
|
|
||||||
/*
|
|
||||||
* This file is provided under a dual BSD/GPLv2 license. When using or
|
|
||||||
* redistributing this file, you may do so under either license.
|
|
||||||
*
|
|
||||||
* Copyright(c) 2021 Intel Corporation. All rights reserved.
|
|
||||||
*
|
|
||||||
* Author: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __SOUND_SOC_SOF_IPC3_OPS_H
|
|
||||||
#define __SOUND_SOC_SOF_IPC3_OPS_H
|
|
||||||
|
|
||||||
#include "sof-priv.h"
|
|
||||||
|
|
||||||
extern const struct sof_ipc_tplg_ops ipc3_tplg_ops;
|
|
||||||
extern const struct sof_ipc_ops ipc3_ops;
|
|
||||||
extern const struct sof_ipc_tplg_control_ops tplg_ipc3_control_ops;
|
|
||||||
extern const struct sof_ipc_pcm_ops ipc3_pcm_ops;
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -8,7 +8,7 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <sound/pcm_params.h>
|
#include <sound/pcm_params.h>
|
||||||
#include "ipc3-ops.h"
|
#include "ipc3-priv.h"
|
||||||
#include "ops.h"
|
#include "ops.h"
|
||||||
#include "sof-priv.h"
|
#include "sof-priv.h"
|
||||||
#include "sof-audio.h"
|
#include "sof-audio.h"
|
||||||
|
|
|
@ -12,6 +12,9 @@
|
||||||
#include "sof-priv.h"
|
#include "sof-priv.h"
|
||||||
|
|
||||||
/* IPC3 specific ops */
|
/* IPC3 specific ops */
|
||||||
|
extern const struct sof_ipc_pcm_ops ipc3_pcm_ops;
|
||||||
|
extern const struct sof_ipc_tplg_ops ipc3_tplg_ops;
|
||||||
|
extern const struct sof_ipc_tplg_control_ops tplg_ipc3_control_ops;
|
||||||
extern const struct sof_ipc_fw_loader_ops ipc3_loader_ops;
|
extern const struct sof_ipc_fw_loader_ops ipc3_loader_ops;
|
||||||
|
|
||||||
/* helpers for fw_ready and ext_manifest parsing */
|
/* helpers for fw_ready and ext_manifest parsing */
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#include <sound/pcm_params.h>
|
#include <sound/pcm_params.h>
|
||||||
#include "sof-priv.h"
|
#include "sof-priv.h"
|
||||||
#include "sof-audio.h"
|
#include "sof-audio.h"
|
||||||
#include "ipc3-ops.h"
|
#include "ipc3-priv.h"
|
||||||
#include "ops.h"
|
#include "ops.h"
|
||||||
|
|
||||||
/* Full volume for default values */
|
/* Full volume for default values */
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
#include "sof-priv.h"
|
#include "sof-priv.h"
|
||||||
#include "sof-audio.h"
|
#include "sof-audio.h"
|
||||||
#include "ipc3-priv.h"
|
#include "ipc3-priv.h"
|
||||||
#include "ipc3-ops.h"
|
|
||||||
#include "ops.h"
|
#include "ops.h"
|
||||||
|
|
||||||
typedef void (*ipc3_rx_callback)(struct snd_sof_dev *sdev, void *msg_buf);
|
typedef void (*ipc3_rx_callback)(struct snd_sof_dev *sdev, void *msg_buf);
|
||||||
|
|
|
@ -763,4 +763,7 @@ static inline int sof_resume_clients(struct snd_sof_dev *sdev)
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_SND_SOC_SOF_CLIENT */
|
#endif /* CONFIG_SND_SOC_SOF_CLIENT */
|
||||||
|
|
||||||
|
/* Main ops for IPC implementations */
|
||||||
|
extern const struct sof_ipc_ops ipc3_ops;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue