Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
17db0486
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看板
提交
17db0486
编写于
15年前
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'topic/core-id-check' into topic/caiaq
上级
1a1df6f0
10a8ebbb
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
40 addition
and
23 deletion
+40
-23
include/sound/core.h
include/sound/core.h
+1
-0
sound/core/init.c
sound/core/init.c
+39
-23
未找到文件。
include/sound/core.h
浏览文件 @
17db0486
...
...
@@ -313,6 +313,7 @@ struct snd_card *snd_card_new(int idx, const char *id,
int
snd_card_disconnect
(
struct
snd_card
*
card
);
int
snd_card_free
(
struct
snd_card
*
card
);
int
snd_card_free_when_closed
(
struct
snd_card
*
card
);
void
snd_card_set_id
(
struct
snd_card
*
card
,
const
char
*
id
);
int
snd_card_register
(
struct
snd_card
*
card
);
int
snd_card_info_init
(
void
);
int
snd_card_info_done
(
void
);
...
...
This diff is collapsed.
Click to expand it.
sound/core/init.c
浏览文件 @
17db0486
...
...
@@ -152,15 +152,8 @@ int snd_card_create(int idx, const char *xid,
card
=
kzalloc
(
sizeof
(
*
card
)
+
extra_size
,
GFP_KERNEL
);
if
(
!
card
)
return
-
ENOMEM
;
if
(
xid
)
{
if
(
!
snd_info_check_reserved_words
(
xid
))
{
snd_printk
(
KERN_ERR
"given id string '%s' is reserved.
\n
"
,
xid
);
err
=
-
EBUSY
;
goto
__error
;
}
strlcpy
(
card
->
id
,
xid
,
sizeof
(
card
->
id
));
}
if
(
xid
)
snd_card_set_id
(
card
,
xid
);
err
=
0
;
mutex_lock
(
&
snd_card_mutex
);
if
(
idx
<
0
)
{
...
...
@@ -483,22 +476,39 @@ int snd_card_free(struct snd_card *card)
EXPORT_SYMBOL
(
snd_card_free
);
static
void
choose_default_id
(
struct
snd_card
*
card
)
/**
* snd_card_set_id - set card identification name
* @card: soundcard structure
* @nid: new identification string
*
* This function sets the card identification and checks for name
* collisions.
*/
void
snd_card_set_id
(
struct
snd_card
*
card
,
const
char
*
nid
)
{
int
i
,
len
,
idx_flag
=
0
,
loops
=
SNDRV_CARDS
;
char
*
id
,
*
spos
;
const
char
*
spos
,
*
src
;
char
*
id
;
id
=
spos
=
card
->
shortname
;
while
(
*
id
!=
'\0'
)
{
if
(
*
id
==
' '
)
spos
=
id
+
1
;
id
++
;
/* check if user specified own card->id */
if
(
card
->
id
[
0
]
!=
'\0'
)
return
;
if
(
nid
==
NULL
)
{
id
=
card
->
shortname
;
spos
=
src
=
id
;
while
(
*
id
!=
'\0'
)
{
if
(
*
id
==
' '
)
spos
=
id
+
1
;
id
++
;
}
}
else
{
spos
=
src
=
nid
;
}
id
=
card
->
id
;
while
(
*
spos
!=
'\0'
&&
!
isalnum
(
*
spos
))
spos
++
;
if
(
isdigit
(
*
spos
))
*
id
++
=
isalpha
(
card
->
shortname
[
0
])
?
card
->
shortname
[
0
]
:
'D'
;
*
id
++
=
isalpha
(
src
[
0
])
?
src
[
0
]
:
'D'
;
while
(
*
spos
!=
'\0'
&&
(
size_t
)(
id
-
card
->
id
)
<
sizeof
(
card
->
id
)
-
1
)
{
if
(
isalnum
(
*
spos
))
*
id
++
=
*
spos
;
...
...
@@ -513,16 +523,20 @@ static void choose_default_id(struct snd_card *card)
while
(
1
)
{
if
(
loops
--
==
0
)
{
snd_printk
(
KERN_ERR
"unable to choose defaul
t card id (%s)
\n
"
,
id
);
snd_printk
(
KERN_ERR
"unable to se
t card id (%s)
\n
"
,
id
);
strcpy
(
card
->
id
,
card
->
proc_root
->
name
);
return
;
}
if
(
!
snd_info_check_reserved_words
(
id
))
goto
__change
;
mutex_lock
(
&
snd_card_mutex
);
for
(
i
=
0
;
i
<
snd_ecards_limit
;
i
++
)
{
if
(
snd_cards
[
i
]
&&
!
strcmp
(
snd_cards
[
i
]
->
id
,
id
))
if
(
snd_cards
[
i
]
&&
!
strcmp
(
snd_cards
[
i
]
->
id
,
id
))
{
mutex_unlock
(
&
snd_card_mutex
);
goto
__change
;
}
}
mutex_unlock
(
&
snd_card_mutex
);
break
;
__change:
...
...
@@ -539,14 +553,16 @@ static void choose_default_id(struct snd_card *card)
spos
=
id
+
len
-
2
;
if
((
size_t
)
len
<=
sizeof
(
card
->
id
)
-
2
)
spos
++
;
*
spos
++
=
'_'
;
*
spos
++
=
'1'
;
*
spos
++
=
'\0'
;
*
(
char
*
)
spos
++
=
'_'
;
*
(
char
*
)
spos
++
=
'1'
;
*
(
char
*
)
spos
++
=
'\0'
;
idx_flag
++
;
}
}
}
EXPORT_SYMBOL
(
snd_card_set_id
);
#ifndef CONFIG_SYSFS_DEPRECATED
static
ssize_t
card_id_show_attr
(
struct
device
*
dev
,
...
...
@@ -641,7 +657,7 @@ int snd_card_register(struct snd_card *card)
return
0
;
}
if
(
card
->
id
[
0
]
==
'\0'
)
choose_default_id
(
card
);
snd_card_set_id
(
card
,
NULL
);
snd_cards
[
card
->
number
]
=
card
;
mutex_unlock
(
&
snd_card_mutex
);
init_info_for_card
(
card
);
...
...
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部