Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
a8022697
Commit
a8022697
authored
Dec 25, 2008
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/jack-mechanical' into to-push
parents
a6505620
cdc69364
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
include/linux/input.h
include/linux/input.h
+1
-0
include/sound/jack.h
include/sound/jack.h
+1
-0
sound/core/jack.c
sound/core/jack.c
+6
-0
No files found.
include/linux/input.h
View file @
a8022697
...
@@ -660,6 +660,7 @@ struct input_absinfo {
...
@@ -660,6 +660,7 @@ struct input_absinfo {
#define SW_MICROPHONE_INSERT 0x04
/* set = inserted */
#define SW_MICROPHONE_INSERT 0x04
/* set = inserted */
#define SW_DOCK 0x05
/* set = plugged into dock */
#define SW_DOCK 0x05
/* set = plugged into dock */
#define SW_LINEOUT_INSERT 0x06
/* set = inserted */
#define SW_LINEOUT_INSERT 0x06
/* set = inserted */
#define SW_JACK_PHYSICAL_INSERT 0x07
/* set = mechanical switch set */
#define SW_MAX 0x0f
#define SW_MAX 0x0f
#define SW_CNT (SW_MAX+1)
#define SW_CNT (SW_MAX+1)
...
...
include/sound/jack.h
View file @
a8022697
...
@@ -36,6 +36,7 @@ enum snd_jack_types {
...
@@ -36,6 +36,7 @@ enum snd_jack_types {
SND_JACK_MICROPHONE
=
0x0002
,
SND_JACK_MICROPHONE
=
0x0002
,
SND_JACK_HEADSET
=
SND_JACK_HEADPHONE
|
SND_JACK_MICROPHONE
,
SND_JACK_HEADSET
=
SND_JACK_HEADPHONE
|
SND_JACK_MICROPHONE
,
SND_JACK_LINEOUT
=
0x0004
,
SND_JACK_LINEOUT
=
0x0004
,
SND_JACK_MECHANICAL
=
0x0008
,
/* If detected separately */
};
};
struct
snd_jack
{
struct
snd_jack
{
...
...
sound/core/jack.c
View file @
a8022697
...
@@ -109,6 +109,9 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
...
@@ -109,6 +109,9 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
if
(
type
&
SND_JACK_MICROPHONE
)
if
(
type
&
SND_JACK_MICROPHONE
)
input_set_capability
(
jack
->
input_dev
,
EV_SW
,
input_set_capability
(
jack
->
input_dev
,
EV_SW
,
SW_MICROPHONE_INSERT
);
SW_MICROPHONE_INSERT
);
if
(
type
&
SND_JACK_MECHANICAL
)
input_set_capability
(
jack
->
input_dev
,
EV_SW
,
SW_JACK_PHYSICAL_INSERT
);
err
=
snd_device_new
(
card
,
SNDRV_DEV_JACK
,
jack
,
&
ops
);
err
=
snd_device_new
(
card
,
SNDRV_DEV_JACK
,
jack
,
&
ops
);
if
(
err
<
0
)
if
(
err
<
0
)
...
@@ -163,6 +166,9 @@ void snd_jack_report(struct snd_jack *jack, int status)
...
@@ -163,6 +166,9 @@ void snd_jack_report(struct snd_jack *jack, int status)
if
(
jack
->
type
&
SND_JACK_MICROPHONE
)
if
(
jack
->
type
&
SND_JACK_MICROPHONE
)
input_report_switch
(
jack
->
input_dev
,
SW_MICROPHONE_INSERT
,
input_report_switch
(
jack
->
input_dev
,
SW_MICROPHONE_INSERT
,
status
&
SND_JACK_MICROPHONE
);
status
&
SND_JACK_MICROPHONE
);
if
(
jack
->
type
&
SND_JACK_MECHANICAL
)
input_report_switch
(
jack
->
input_dev
,
SW_JACK_PHYSICAL_INSERT
,
status
&
SND_JACK_MECHANICAL
);
input_sync
(
jack
->
input_dev
);
input_sync
(
jack
->
input_dev
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment