Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
6b425660
K
Kernel
项目概览
openeuler
/
Kernel
12 个月 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6b425660
编写于
11月 10, 2008
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus
上级
7aeb6d7d
0f101fa6
25424831
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
35 addition
and
9 deletion
+35
-9
include/sound/core.h
include/sound/core.h
+7
-3
sound/isa/Kconfig
sound/isa/Kconfig
+1
-1
sound/pci/hda/hda_proc.c
sound/pci/hda/hda_proc.c
+2
-0
sound/pci/hda/patch_analog.c
sound/pci/hda/patch_analog.c
+2
-0
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c
+1
-0
sound/pci/rme9652/hdsp.c
sound/pci/rme9652/hdsp.c
+22
-5
未找到文件。
include/sound/core.h
浏览文件 @
6b425660
...
...
@@ -385,9 +385,13 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
#else
/* !CONFIG_SND_DEBUG */
#define snd_printd(fmt, args...)
/* nothing */
#define snd_BUG()
/* nothing */
#define snd_BUG_ON(cond) ({
/*(void)(cond);*/
0;})
/* always false */
#define snd_printd(fmt, args...) do { } while (0)
#define snd_BUG() do { } while (0)
static
inline
int
__snd_bug_on
(
void
)
{
return
0
;
}
#define snd_BUG_ON(cond) __snd_bug_on()
/* always false */
#endif
/* CONFIG_SND_DEBUG */
...
...
sound/isa/Kconfig
浏览文件 @
6b425660
...
...
@@ -211,7 +211,7 @@ config SND_GUSCLASSIC
config SND_GUSEXTREME
tristate "Gravis UltraSound Extreme"
select SND_
HWDEP
select SND_
OPL3_LIB
select SND_MPU401_UART
select SND_PCM
help
...
...
sound/pci/hda/hda_proc.c
浏览文件 @
6b425660
...
...
@@ -483,6 +483,8 @@ static void print_gpio(struct snd_info_buffer *buffer,
(
gpio
&
AC_GPIO_UNSOLICITED
)
?
1
:
0
,
(
gpio
&
AC_GPIO_WAKE
)
?
1
:
0
);
max
=
gpio
&
AC_GPIO_IO_COUNT
;
if
(
!
max
||
max
>
8
)
return
;
enable
=
snd_hda_codec_read
(
codec
,
nid
,
0
,
AC_VERB_GET_GPIO_MASK
,
0
);
direction
=
snd_hda_codec_read
(
codec
,
nid
,
0
,
...
...
sound/pci/hda/patch_analog.c
浏览文件 @
6b425660
...
...
@@ -3861,6 +3861,8 @@ static const char *ad1884a_models[AD1884A_MODELS] = {
static
struct
snd_pci_quirk
ad1884a_cfg_tbl
[]
=
{
SND_PCI_QUIRK
(
0x103c
,
0x3030
,
"HP"
,
AD1884A_MOBILE
),
SND_PCI_QUIRK
(
0x103c
,
0x3056
,
"HP"
,
AD1884A_MOBILE
),
SND_PCI_QUIRK
(
0x103c
,
0x30e7
,
"HP EliteBook 8530p"
,
AD1884A_LAPTOP
),
SND_PCI_QUIRK
(
0x103c
,
0x3614
,
"HP 6730s"
,
AD1884A_LAPTOP
),
SND_PCI_QUIRK
(
0x17aa
,
0x20ac
,
"Thinkpad X300"
,
AD1884A_THINKPAD
),
{}
};
...
...
sound/pci/hda/patch_realtek.c
浏览文件 @
6b425660
...
...
@@ -8469,6 +8469,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
SND_PCI_QUIRK(0x17aa, 0x3bfd, "Lenovo NB0763", ALC883_LENOVO_NB0763),
SND_PCI_QUIRK(0x17aa, 0x101d, "Lenovo Sky", ALC888_LENOVO_SKY),
SND_PCI_QUIRK(0x17c0, 0x4071, "MEDION MD2", ALC883_MEDION_MD2),
SND_PCI_QUIRK(0x17c0, 0x4085, "MEDION MD96630", ALC888_LENOVO_MS7195_DIG),
SND_PCI_QUIRK(0x17f2, 0x5000, "Albatron KI690-AM2", ALC883_6ST_DIG),
SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),
SND_PCI_QUIRK(0x8086, 0x0001, "DG33BUC", ALC883_3ST_6ch_INTEL),
...
...
sound/pci/rme9652/hdsp.c
浏览文件 @
6b425660
...
...
@@ -4548,11 +4548,20 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
{
struct
hdsp
*
hdsp
=
(
struct
hdsp
*
)
hw
->
private_data
;
void
__user
*
argp
=
(
void
__user
*
)
arg
;
int
err
;
switch
(
cmd
)
{
case
SNDRV_HDSP_IOCTL_GET_PEAK_RMS
:
{
struct
hdsp_peak_rms
__user
*
peak_rms
=
(
struct
hdsp_peak_rms
__user
*
)
arg
;
err
=
hdsp_check_for_iobox
(
hdsp
);
if
(
err
<
0
)
return
err
;
err
=
hdsp_check_for_firmware
(
hdsp
,
1
);
if
(
err
<
0
)
return
err
;
if
(
!
(
hdsp
->
state
&
HDSP_FirmwareLoaded
))
{
snd_printk
(
KERN_ERR
"Hammerfall-DSP: firmware needs to be uploaded to the card.
\n
"
);
return
-
EINVAL
;
...
...
@@ -4572,10 +4581,14 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
unsigned
long
flags
;
int
i
;
if
(
!
(
hdsp
->
state
&
HDSP_FirmwareLoaded
))
{
snd_printk
(
KERN_ERR
"Hammerfall-DSP: Firmware needs to be uploaded to the card.
\n
"
);
return
-
EINVAL
;
}
err
=
hdsp_check_for_iobox
(
hdsp
);
if
(
err
<
0
)
return
err
;
err
=
hdsp_check_for_firmware
(
hdsp
,
1
);
if
(
err
<
0
)
return
err
;
spin_lock_irqsave
(
&
hdsp
->
lock
,
flags
);
info
.
pref_sync_ref
=
(
unsigned
char
)
hdsp_pref_sync_ref
(
hdsp
);
info
.
wordclock_sync_check
=
(
unsigned
char
)
hdsp_wc_sync_check
(
hdsp
);
...
...
@@ -5045,6 +5058,10 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
/* we wait 2 seconds to let freshly inserted cardbus cards do their hardware init */
ssleep
(
2
);
err
=
hdsp_check_for_iobox
(
hdsp
);
if
(
err
<
0
)
return
err
;
if
((
hdsp_read
(
hdsp
,
HDSP_statusRegister
)
&
HDSP_DllError
)
!=
0
)
{
#ifdef HDSP_FW_LOADER
if
((
err
=
hdsp_request_fw_loader
(
hdsp
))
<
0
)
...
...
@@ -5057,7 +5074,7 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
/* init is complete, we return */
return
0
;
#endif
/*
no iobox connected,
we defer initialization */
/* we defer initialization */
snd_printk
(
KERN_INFO
"Hammerfall-DSP: card initialization pending : waiting for firmware
\n
"
);
if
((
err
=
snd_hdsp_create_hwdep
(
card
,
hdsp
))
<
0
)
return
err
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录