From 33756b5afc6bf1ffe3257314b5ade5b2969b5704 Mon Sep 17 00:00:00 2001 From: wuxinzheng Date: Fri, 22 Apr 2022 17:59:37 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E5=A3=B0=E5=8D=A1=E5=88=9D=E5=A7=8B=E5=8C=96=201.=20=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E5=A4=9A=E4=B8=AAreplay=E5=A3=B0=E5=8D=A1=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96mp,mutex=EF=BC=8C=E7=94=B1=E4=BA=8E=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E5=90=8D=E5=AD=97"adu=5Fmp,replay"=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=86=B2=E7=AA=81=E8=80=8C=E5=BC=95=E8=B5=B7?= =?UTF-8?q?=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96=E5=A4=B1=E8=B4=A5=202.=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=9A=E4=B8=AArecord=E5=A3=B0=E5=8D=A1?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96pipe=20=E7=94=B1=E4=BA=8E=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E5=90=8D=E5=AD=97"pipe"=E9=87=8D=E5=A4=8D=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E5=86=B2=E7=AA=81=E8=80=8C=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/audio/audio.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/components/drivers/audio/audio.c b/components/drivers/audio/audio.c index edef7d0eeb..601563cfec 100644 --- a/components/drivers/audio/audio.c +++ b/components/drivers/audio/audio.c @@ -217,6 +217,7 @@ static rt_err_t _audio_dev_init(struct rt_device *dev) RT_ASSERT(dev != RT_NULL); audio = (struct rt_audio_device *) dev; + char rt_name[RT_NAME_MAX * 2]; /* initialize replay & record */ audio->replay = RT_NULL; @@ -232,7 +233,8 @@ static rt_err_t _audio_dev_init(struct rt_device *dev) rt_memset(replay, 0, sizeof(struct rt_audio_replay)); /* init memory pool for replay */ - replay->mp = rt_mp_create("adu_mp", RT_AUDIO_REPLAY_MP_BLOCK_COUNT, RT_AUDIO_REPLAY_MP_BLOCK_SIZE); + rt_snprintf(rt_name, sizeof(rt_name), "%s_adu_mp", audio->parent.parent.name); + replay->mp = rt_mp_create(rt_name, RT_AUDIO_REPLAY_MP_BLOCK_COUNT, RT_AUDIO_REPLAY_MP_BLOCK_SIZE); if (replay->mp == RT_NULL) { rt_free(replay); @@ -244,7 +246,8 @@ static rt_err_t _audio_dev_init(struct rt_device *dev) rt_data_queue_init(&replay->queue, CFG_AUDIO_REPLAY_QUEUE_COUNT, 0, RT_NULL); /* init mutex lock for audio replay */ - rt_mutex_init(&replay->lock, "replay", RT_IPC_FLAG_PRIO); + rt_snprintf(rt_name, sizeof(rt_name), "%s_replay", audio->parent.parent.name); + rt_mutex_init(&replay->lock, rt_name, RT_IPC_FLAG_PRIO); replay->activated = RT_FALSE; audio->replay = replay; @@ -268,7 +271,8 @@ static rt_err_t _audio_dev_init(struct rt_device *dev) LOG_E("malloc memory for for record pipe failed"); return -RT_ENOMEM; } - rt_audio_pipe_init(&record->pipe, "record", + rt_snprintf(rt_name, sizeof(rt_name), "%s_record", audio->parent.parent.name); + rt_audio_pipe_init(&record->pipe, rt_name, (rt_int32_t)(RT_PIPE_FLAG_FORCE_WR | RT_PIPE_FLAG_BLOCK_RD), buffer, RT_AUDIO_RECORD_PIPE_SIZE); -- Gitee