Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
04172c0b
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
04172c0b
编写于
10月 31, 2008
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'topic/fix/asoc' into topic/asoc
上级
5b99e6cc
13d622b3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
9 deletion
+12
-9
include/sound/soc.h
include/sound/soc.h
+2
-1
sound/soc/codecs/wm9713.c
sound/soc/codecs/wm9713.c
+1
-1
sound/soc/fsl/mpc5200_psc_i2s.c
sound/soc/fsl/mpc5200_psc_i2s.c
+8
-6
sound/soc/soc-core.c
sound/soc/soc-core.c
+1
-1
未找到文件。
include/sound/soc.h
浏览文件 @
04172c0b
...
...
@@ -28,7 +28,8 @@
*/
#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \
((unsigned long)&(struct soc_mixer_control) \
{.reg = xreg, .shift = xshift, .max = xmax, .invert = xinvert})
{.reg = xreg, .shift = xshift, .rshift = xshift, .max = xmax, \
.invert = xinvert})
#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \
((unsigned long)&(struct soc_mixer_control) \
{.reg = xreg, .max = xmax, .invert = xinvert})
...
...
sound/soc/codecs/wm9713.c
浏览文件 @
04172c0b
...
...
@@ -140,7 +140,7 @@ SOC_SINGLE("Capture ADC Boost (+20dB) Switch", AC97_VIDEO, 6, 1, 0),
SOC_SINGLE
(
"ALC Target Volume"
,
AC97_CODEC_CLASS_REV
,
12
,
15
,
0
),
SOC_SINGLE
(
"ALC Hold Time"
,
AC97_CODEC_CLASS_REV
,
8
,
15
,
0
),
SOC_SINGLE
(
"ALC Decay Time
"
,
AC97_CODEC_CLASS_REV
,
4
,
15
,
0
),
SOC_SINGLE
(
"ALC Decay Time"
,
AC97_CODEC_CLASS_REV
,
4
,
15
,
0
),
SOC_SINGLE
(
"ALC Attack Time"
,
AC97_CODEC_CLASS_REV
,
0
,
15
,
0
),
SOC_ENUM
(
"ALC Function"
,
wm9713_enum
[
6
]),
SOC_SINGLE
(
"ALC Max Volume"
,
AC97_PCI_SVID
,
11
,
7
,
0
),
...
...
sound/soc/fsl/mpc5200_psc_i2s.c
浏览文件 @
04172c0b
...
...
@@ -277,7 +277,7 @@ static int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd)
struct
mpc52xx_psc
__iomem
*
regs
=
psc_i2s
->
psc_regs
;
u16
imr
;
u8
psc_cmd
;
long
flags
;
unsigned
long
flags
;
if
(
substream
->
pstr
->
stream
==
SNDRV_PCM_STREAM_CAPTURE
)
s
=
&
psc_i2s
->
capture
;
...
...
@@ -699,9 +699,11 @@ static ssize_t psc_i2s_stat_store(struct device *dev,
return
count
;
}
DEVICE_ATTR
(
status
,
0644
,
psc_i2s_status_show
,
NULL
);
DEVICE_ATTR
(
playback_underrun
,
0644
,
psc_i2s_stat_show
,
psc_i2s_stat_store
);
DEVICE_ATTR
(
capture_overrun
,
0644
,
psc_i2s_stat_show
,
psc_i2s_stat_store
);
static
DEVICE_ATTR
(
status
,
0644
,
psc_i2s_status_show
,
NULL
);
static
DEVICE_ATTR
(
playback_underrun
,
0644
,
psc_i2s_stat_show
,
psc_i2s_stat_store
);
static
DEVICE_ATTR
(
capture_overrun
,
0644
,
psc_i2s_stat_show
,
psc_i2s_stat_store
);
/* ---------------------------------------------------------------------
* OF platform bus binding code:
...
...
@@ -819,8 +821,8 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
/* Register the SYSFS files */
rc
=
device_create_file
(
psc_i2s
->
dev
,
&
dev_attr_status
);
rc
=
device_create_file
(
psc_i2s
->
dev
,
&
dev_attr_capture_overrun
);
rc
=
device_create_file
(
psc_i2s
->
dev
,
&
dev_attr_playback_underrun
);
rc
|
=
device_create_file
(
psc_i2s
->
dev
,
&
dev_attr_capture_overrun
);
rc
|
=
device_create_file
(
psc_i2s
->
dev
,
&
dev_attr_playback_underrun
);
if
(
rc
)
dev_info
(
psc_i2s
->
dev
,
"error creating sysfs files
\n
"
);
...
...
sound/soc/soc-core.c
浏览文件 @
04172c0b
...
...
@@ -1555,7 +1555,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,
struct
soc_mixer_control
*
mc
=
(
struct
soc_mixer_control
*
)
kcontrol
->
private_value
;
int
max
=
mc
->
max
;
unsigned
int
shift
=
mc
->
min
;
unsigned
int
shift
=
mc
->
shift
;
unsigned
int
rshift
=
mc
->
rshift
;
if
(
max
==
1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录