Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
1440566f
Commit
1440566f
authored
Feb 25, 2009
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/misc' into for-linus
parents
308b892c
1f9da554
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
8 deletions
+9
-8
sound/core/oss/rate.c
sound/core/oss/rate.c
+1
-1
sound/pci/aw2/aw2-alsa.c
sound/pci/aw2/aw2-alsa.c
+1
-1
sound/pci/emu10k1/emu10k1_main.c
sound/pci/emu10k1/emu10k1_main.c
+1
-0
sound/pci/pcxhr/pcxhr.h
sound/pci/pcxhr/pcxhr.h
+6
-6
No files found.
sound/core/oss/rate.c
View file @
1440566f
...
@@ -157,7 +157,7 @@ static void resample_shrink(struct snd_pcm_plugin *plugin,
...
@@ -157,7 +157,7 @@ static void resample_shrink(struct snd_pcm_plugin *plugin,
while
(
dst_frames1
>
0
)
{
while
(
dst_frames1
>
0
)
{
S1
=
S2
;
S1
=
S2
;
if
(
src_frames1
--
>
0
)
{
if
(
src_frames1
--
>
0
)
{
S
1
=
*
src
;
S
2
=
*
src
;
src
+=
src_step
;
src
+=
src_step
;
}
}
if
(
pos
&
~
R_MASK
)
{
if
(
pos
&
~
R_MASK
)
{
...
...
sound/pci/aw2/aw2-alsa.c
View file @
1440566f
...
@@ -165,7 +165,7 @@ module_param_array(enable, bool, NULL, 0444);
...
@@ -165,7 +165,7 @@ module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC
(
enable
,
"Enable Audiowerk2 soundcard."
);
MODULE_PARM_DESC
(
enable
,
"Enable Audiowerk2 soundcard."
);
static
struct
pci_device_id
snd_aw2_ids
[]
=
{
static
struct
pci_device_id
snd_aw2_ids
[]
=
{
{
PCI_VENDOR_ID_SAA7146
,
PCI_DEVICE_ID_SAA7146
,
PCI_ANY_ID
,
PCI_ANY_ID
,
{
PCI_VENDOR_ID_SAA7146
,
PCI_DEVICE_ID_SAA7146
,
0
,
0
,
0
,
0
,
0
},
0
,
0
,
0
},
{
0
}
{
0
}
};
};
...
...
sound/pci/emu10k1/emu10k1_main.c
View file @
1440566f
...
@@ -1528,6 +1528,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
...
@@ -1528,6 +1528,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
.
ca0151_chip
=
1
,
.
ca0151_chip
=
1
,
.
spk71
=
1
,
.
spk71
=
1
,
.
spdif_bug
=
1
,
.
spdif_bug
=
1
,
.
invert_shared_spdif
=
1
,
/* digital/analog switch swapped */
.
ac97_chip
=
1
}
,
.
ac97_chip
=
1
}
,
{.
vendor
=
0x1102
,
.
device
=
0x0004
,
.
subsystem
=
0x10021102
,
{.
vendor
=
0x1102
,
.
device
=
0x0004
,
.
subsystem
=
0x10021102
,
.
driver
=
"Audigy2"
,
.
name
=
"SB Audigy 2 Platinum [SB0240P]"
,
.
driver
=
"Audigy2"
,
.
name
=
"SB Audigy 2 Platinum [SB0240P]"
,
...
...
sound/pci/pcxhr/pcxhr.h
View file @
1440566f
...
@@ -97,12 +97,12 @@ struct pcxhr_mgr {
...
@@ -97,12 +97,12 @@ struct pcxhr_mgr {
int
capture_chips
;
int
capture_chips
;
int
fw_file_set
;
int
fw_file_set
;
int
firmware_num
;
int
firmware_num
;
int
is_hr_stereo
:
1
;
unsigned
int
is_hr_stereo
:
1
;
int
board_has_aes1
:
1
;
/* if 1 board has AES1 plug and SRC */
unsigned
int
board_has_aes1
:
1
;
/* if 1 board has AES1 plug and SRC */
int
board_has_analog
:
1
;
/* if 0 the board is digital only */
unsigned
int
board_has_analog
:
1
;
/* if 0 the board is digital only */
int
board_has_mic
:
1
;
/* if 1 the board has microphone input */
unsigned
int
board_has_mic
:
1
;
/* if 1 the board has microphone input */
int
board_aes_in_192k
:
1
;
/* if 1 the aes input plugs do support 192kHz */
unsigned
int
board_aes_in_192k
:
1
;
/* if 1 the aes input plugs do support 192kHz */
int
mono_capture
:
1
;
/* if 1 the board does mono capture */
unsigned
int
mono_capture
:
1
;
/* if 1 the board does mono capture */
struct
snd_dma_buffer
hostport
;
struct
snd_dma_buffer
hostport
;
...
...
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