From 8eaf9b0d75cd5286cccc55f8eff79df1c707a553 Mon Sep 17 00:00:00 2001 From: zenglifeng Date: Wed, 30 Mar 2022 10:32:51 +0800 Subject: [PATCH] fix:audio Log optimization Signed-off-by: zenglifeng --- model/audio/common/src/audio_accessory_base.c | 2 +- model/audio/common/src/audio_codec_base.c | 2 +- model/audio/common/src/audio_dai_base.c | 2 ++ model/audio/common/src/audio_dma_base.c | 2 ++ model/audio/common/src/audio_dsp_base.c | 2 +- model/audio/common/src/audio_platform_base.c | 3 ++- model/audio/core/src/audio_core.c | 2 +- model/audio/core/src/audio_host.c | 2 +- model/audio/core/src/audio_parse.c | 2 +- model/audio/dispatch/src/audio_control_dispatch.c | 2 +- model/audio/dispatch/src/audio_stream_dispatch.c | 2 +- model/audio/sapm/src/audio_sapm.c | 2 +- 12 files changed, 15 insertions(+), 10 deletions(-) diff --git a/model/audio/common/src/audio_accessory_base.c b/model/audio/common/src/audio_accessory_base.c index c2cde677..9abc2a54 100644 --- a/model/audio/common/src/audio_accessory_base.c +++ b/model/audio/common/src/audio_accessory_base.c @@ -11,7 +11,7 @@ #include "i2c_if.h" #include "osal_time.h" -#define HDF_LOG_TAG "audio_accessory_base" +#define HDF_LOG_TAG HDF_AUDIO_KADM #define COMM_SHIFT_8BIT (8) #define COMM_MASK_FF (0xFF) diff --git a/model/audio/common/src/audio_codec_base.c b/model/audio/common/src/audio_codec_base.c index 11340075..9d6e03f7 100644 --- a/model/audio/common/src/audio_codec_base.c +++ b/model/audio/common/src/audio_codec_base.c @@ -11,7 +11,7 @@ #include "audio_parse.h" #include "audio_sapm.h" -#define HDF_LOG_TAG audio_codec_base +#define HDF_LOG_TAG HDF_AUDIO_KADM static char *g_audioSapmCompNameList[AUDIO_SAPM_COMP_NAME_LIST_MAX] = { "ADCL", "ADCR", "DACL", "DACR", "LPGA", "RPGA", "SPKL", "SPKR", "MIC" diff --git a/model/audio/common/src/audio_dai_base.c b/model/audio/common/src/audio_dai_base.c index 4c06019d..952d5080 100644 --- a/model/audio/common/src/audio_dai_base.c +++ b/model/audio/common/src/audio_dai_base.c @@ -9,6 +9,8 @@ #include "audio_core.h" #include "audio_driver_log.h" +#define HDF_LOG_TAG HDF_AUDIO_KADM + static const char *g_audioDaiControlsList[AUDIO_CTRL_LIST_MAX] = { "Main Playback Volume", "Main Capture Volume", "Playback Mute", "Capture Mute", "Mic Left Gain", diff --git a/model/audio/common/src/audio_dma_base.c b/model/audio/common/src/audio_dma_base.c index b4b40859..bfe2df19 100644 --- a/model/audio/common/src/audio_dma_base.c +++ b/model/audio/common/src/audio_dma_base.c @@ -7,6 +7,8 @@ */ #include "audio_platform_if.h" +#define HDF_LOG_TAG HDF_AUDIO_KADM + int32_t AudioDmaBufAlloc(struct PlatformData *data, enum AudioStreamType streamType) { if (data != NULL && data->ops != NULL && data->ops->DmaBufAlloc != NULL) { diff --git a/model/audio/common/src/audio_dsp_base.c b/model/audio/common/src/audio_dsp_base.c index 3fb0c38c..447538fd 100644 --- a/model/audio/common/src/audio_dsp_base.c +++ b/model/audio/common/src/audio_dsp_base.c @@ -9,7 +9,7 @@ #include "audio_dsp_base.h" #include "audio_driver_log.h" -#define HDF_LOG_TAG audio_dsp_base +#define HDF_LOG_TAG HDF_AUDIO_KADM int32_t DspGetServiceName(const struct HdfDeviceObject *device, const char **drvDspName) { diff --git a/model/audio/common/src/audio_platform_base.c b/model/audio/common/src/audio_platform_base.c index d0b9a867..b509996d 100755 --- a/model/audio/common/src/audio_platform_base.c +++ b/model/audio/common/src/audio_platform_base.c @@ -15,7 +15,8 @@ #include "osal_uaccess.h" #include "hdf_device_object.h" -#define HDF_LOG_TAG audio_platform_base +#define HDF_LOG_TAG HDF_AUDIO_KADM + const int MAX_PERIOD_SIZE = (1024 * 8); const int PERIOD_COUNT = 4; const int RENDER_TRAF_BUF_SIZE = 1024; diff --git a/model/audio/core/src/audio_core.c b/model/audio/core/src/audio_core.c index d28185e4..b0eff42d 100644 --- a/model/audio/core/src/audio_core.c +++ b/model/audio/core/src/audio_core.c @@ -10,7 +10,7 @@ #include "audio_driver_log.h" #include "osal_io.h" -#define HDF_LOG_TAG audio_core +#define HDF_LOG_TAG HDF_AUDIO_KADM #define CHANNEL_MAX_NUM 2 #define CHANNEL_MIN_NUM 1 diff --git a/model/audio/core/src/audio_host.c b/model/audio/core/src/audio_host.c index d5a91287..59f09a2e 100644 --- a/model/audio/core/src/audio_host.c +++ b/model/audio/core/src/audio_host.c @@ -13,7 +13,7 @@ #include "audio_driver_log.h" #include "audio_parse.h" -#define HDF_LOG_TAG audio_host +#define HDF_LOG_TAG HDF_AUDIO_KADM AUDIO_LIST_HEAD(cardManager); diff --git a/model/audio/core/src/audio_parse.c b/model/audio/core/src/audio_parse.c index a6988dcc..224bcbee 100644 --- a/model/audio/core/src/audio_parse.c +++ b/model/audio/core/src/audio_parse.c @@ -9,7 +9,7 @@ #include "audio_parse.h" #include "audio_driver_log.h" -#define HDF_LOG_TAG audio_parse +#define HDF_LOG_TAG HDF_AUDIO_KADM enum AudioRegCfgIndex { AUDIO_REG_CFG_REG_INDEX = 0, diff --git a/model/audio/dispatch/src/audio_control_dispatch.c b/model/audio/dispatch/src/audio_control_dispatch.c index 5ed50442..ee897dc7 100644 --- a/model/audio/dispatch/src/audio_control_dispatch.c +++ b/model/audio/dispatch/src/audio_control_dispatch.c @@ -10,7 +10,7 @@ #include "audio_control.h" #include "audio_driver_log.h" -#define HDF_LOG_TAG audio_control_dispatch +#define HDF_LOG_TAG HDF_AUDIO_KADM static struct AudioKcontrol *AudioGetKctrlInstance(const struct AudioCtrlElemId *ctrlElemId) { diff --git a/model/audio/dispatch/src/audio_stream_dispatch.c b/model/audio/dispatch/src/audio_stream_dispatch.c index 620f0c50..a8cc9b1f 100644 --- a/model/audio/dispatch/src/audio_stream_dispatch.c +++ b/model/audio/dispatch/src/audio_stream_dispatch.c @@ -10,7 +10,7 @@ #include "audio_driver_log.h" #include "audio_platform_base.h" -#define HDF_LOG_TAG audio_stream_dispatch +#define HDF_LOG_TAG HDF_AUDIO_KADM #define BUFF_SIZE_MAX 64 diff --git a/model/audio/sapm/src/audio_sapm.c b/model/audio/sapm/src/audio_sapm.c index 4400a025..ed586c27 100644 --- a/model/audio/sapm/src/audio_sapm.c +++ b/model/audio/sapm/src/audio_sapm.c @@ -12,7 +12,7 @@ #include "osal_time.h" #include "osal_timer.h" -#define HDF_LOG_TAG audio_sapm +#define HDF_LOG_TAG HDF_AUDIO_SAPM #define SAPM_POLL_TIME 10000 /* 10s */ #define SAPM_SLEEP_TIME (3 * 60000) /* 3min */