Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
54b78608
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
161
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
54b78608
编写于
14年前
作者:
M
Mauro Carvalho Chehab
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
V4L/DVB: tm6000-alsa: rework audio buffer allocation/deallocation
Signed-off-by:
N
Mauro Carvalho Chehab
<
mchehab@redhat.com
>
上级
0e57ff8d
master
alk-4.19.24
alk-4.19.30
alk-4.19.34
alk-4.19.36
alk-4.19.43
alk-4.19.48
alk-4.19.57
ck-4.19.67
ck-4.19.81
ck-4.19.91
github/fork/deepanshu1422/fix-typo-in-comment
github/fork/haosdent/fix-typo
linux-next
v4.19.91
v4.19.90
v4.19.89
v4.19.88
v4.19.87
v4.19.86
v4.19.85
v4.19.84
v4.19.83
v4.19.82
v4.19.81
v4.19.80
v4.19.79
v4.19.78
v4.19.77
v4.19.76
v4.19.75
v4.19.74
v4.19.73
v4.19.72
v4.19.71
v4.19.70
v4.19.69
v4.19.68
v4.19.67
v4.19.66
v4.19.65
v4.19.64
v4.19.63
v4.19.62
v4.19.61
v4.19.60
v4.19.59
v4.19.58
v4.19.57
v4.19.56
v4.19.55
v4.19.54
v4.19.53
v4.19.52
v4.19.51
v4.19.50
v4.19.49
v4.19.48
v4.19.47
v4.19.46
v4.19.45
v4.19.44
v4.19.43
v4.19.42
v4.19.41
v4.19.40
v4.19.39
v4.19.38
v4.19.37
v4.19.36
v4.19.35
v4.19.34
v4.19.33
v4.19.32
v4.19.31
v4.19.30
v4.19.29
v4.19.28
v4.19.27
v4.19.26
v4.19.25
v4.19.24
v4.19.23
v4.19.22
v4.19.21
v4.19.20
v4.19.19
v4.19.18
v4.19.17
v4.19.16
v4.19.15
v4.19.14
v4.19.13
v4.19.12
v4.19.11
v4.19.10
v4.19.9
v4.19.8
v4.19.7
v4.19.6
v4.19.5
v4.19.4
v4.19.3
v4.19.2
v4.19.1
v4.19
v4.19-rc8
v4.19-rc7
v4.19-rc6
v4.19-rc5
v4.19-rc4
v4.19-rc3
v4.19-rc2
v4.19-rc1
ck-release-21
ck-release-20
ck-release-19.2
ck-release-19.1
ck-release-19
ck-release-18
ck-release-17.2
ck-release-17.1
ck-release-17
ck-release-16
ck-release-15.1
ck-release-15
ck-release-14
ck-release-13.2
ck-release-13
ck-release-12
ck-release-11
ck-release-10
ck-release-9
ck-release-7
alk-release-15
alk-release-14
alk-release-13.2
alk-release-13
alk-release-12
alk-release-11
alk-release-10
alk-release-9
alk-release-7
无相关合并请求
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
32 addition
and
31 deletion
+32
-31
drivers/staging/tm6000/tm6000-alsa.c
drivers/staging/tm6000/tm6000-alsa.c
+32
-27
drivers/staging/tm6000/tm6000.h
drivers/staging/tm6000/tm6000.h
+0
-4
未找到文件。
drivers/staging/tm6000/tm6000-alsa.c
浏览文件 @
54b78608
...
...
@@ -16,6 +16,7 @@
#include <linux/interrupt.h>
#include <linux/usb.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <asm/delay.h>
#include <sound/core.h>
...
...
@@ -106,19 +107,39 @@ static int _tm6000_stop_audio_dma(struct snd_tm6000_card *chip)
return
0
;
}
static
int
dsp_buffer_free
(
struct
snd_tm6000_card
*
chip
)
static
void
dsp_buffer_free
(
struct
snd_pcm_substream
*
substream
)
{
BUG_ON
(
!
chip
->
bufsize
);
struct
snd_tm6000_card
*
chip
=
snd_pcm_substream_chip
(
substream
);
dprintk
(
2
,
"Freeing buffer
\n
"
);
/* FIXME: Frees buffer */
vfree
(
substream
->
runtime
->
dma_area
);
substream
->
runtime
->
dma_area
=
NULL
;
substream
->
runtime
->
dma_bytes
=
0
;
}
static
int
dsp_buffer_alloc
(
struct
snd_pcm_substream
*
substream
,
int
size
)
{
struct
snd_tm6000_card
*
chip
=
snd_pcm_substream_chip
(
substream
);
chip
->
bufsize
=
0
;
dprintk
(
2
,
"Allocating buffer
\n
"
);
if
(
substream
->
runtime
->
dma_area
)
{
if
(
substream
->
runtime
->
dma_bytes
>
size
)
return
0
;
dsp_buffer_free
(
substream
);
}
substream
->
runtime
->
dma_area
=
vmalloc
(
size
);
if
(
!
substream
->
runtime
->
dma_area
)
return
-
ENOMEM
;
substream
->
runtime
->
dma_bytes
=
size
;
return
0
;
}
/****************************************************************************
ALSA PCM Interface
****************************************************************************/
...
...
@@ -185,23 +206,13 @@ static int snd_tm6000_close(struct snd_pcm_substream *substream)
static
int
snd_tm6000_hw_params
(
struct
snd_pcm_substream
*
substream
,
struct
snd_pcm_hw_params
*
hw_params
)
{
struct
snd_tm6000_card
*
chip
=
snd_pcm_substream_chip
(
substream
)
;
int
size
,
rc
;
if
(
substream
->
runtime
->
dma_area
)
{
dsp_buffer_free
(
chip
);
substream
->
runtime
->
dma_area
=
NULL
;
}
chip
->
period_size
=
params_period_bytes
(
hw_params
);
chip
->
num_periods
=
params_periods
(
hw_params
);
chip
->
bufsize
=
chip
->
period_size
*
params_periods
(
hw_params
);
BUG_ON
(
!
chip
->
bufsize
);
dprintk
(
1
,
"Setting buffer
\n
"
);
/* FIXME: Allocate buffer for audio */
size
=
params_period_bytes
(
hw_params
)
*
params_periods
(
hw_params
);
rc
=
dsp_buffer_alloc
(
substream
,
size
);
if
(
rc
<
0
)
return
rc
;
return
0
;
}
...
...
@@ -211,13 +222,7 @@ static int snd_tm6000_hw_params(struct snd_pcm_substream *substream,
*/
static
int
snd_tm6000_hw_free
(
struct
snd_pcm_substream
*
substream
)
{
struct
snd_tm6000_card
*
chip
=
snd_pcm_substream_chip
(
substream
);
if
(
substream
->
runtime
->
dma_area
)
{
dsp_buffer_free
(
chip
);
substream
->
runtime
->
dma_area
=
NULL
;
}
dsp_buffer_free
(
substream
);
return
0
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/staging/tm6000/tm6000.h
浏览文件 @
54b78608
...
...
@@ -136,11 +136,7 @@ struct snd_tm6000_card {
struct
snd_card
*
card
;
spinlock_t
reg_lock
;
atomic_t
count
;
unsigned
int
period_size
;
unsigned
int
num_periods
;
struct
tm6000_core
*
core
;
struct
tm6000_buffer
*
buf
;
int
bufsize
;
struct
snd_pcm_substream
*
substream
;
};
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部