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
nexedi
linux
Commits
98e2d5a8
Commit
98e2d5a8
authored
Nov 04, 2010
by
Ben Collins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
solo6x10: Spaces to tabs
Signed-off-by:
Ben Collins
<
bcollins@bluecherry.net
>
parent
ff8b16d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
drivers/staging/solo6x10/solo6010-enc.c
drivers/staging/solo6x10/solo6010-enc.c
+2
-2
drivers/staging/solo6x10/solo6010-g723.c
drivers/staging/solo6x10/solo6010-g723.c
+7
-7
No files found.
drivers/staging/solo6x10/solo6010-enc.c
View file @
98e2d5a8
...
@@ -145,8 +145,8 @@ int solo_osd_print(struct solo_enc_dev *solo_enc)
...
@@ -145,8 +145,8 @@ int solo_osd_print(struct solo_enc_dev *solo_enc)
solo_p2m_dma
(
solo_dev
,
0
,
1
,
buf
,
SOLO_EOSD_EXT_ADDR
(
solo_dev
)
+
solo_p2m_dma
(
solo_dev
,
0
,
1
,
buf
,
SOLO_EOSD_EXT_ADDR
(
solo_dev
)
+
(
solo_enc
->
ch
*
SOLO_EOSD_EXT_SIZE
),
SOLO_EOSD_EXT_SIZE
);
(
solo_enc
->
ch
*
SOLO_EOSD_EXT_SIZE
),
SOLO_EOSD_EXT_SIZE
);
reg
|=
(
1
<<
solo_enc
->
ch
);
reg
|=
(
1
<<
solo_enc
->
ch
);
solo_reg_write
(
solo_dev
,
SOLO_VE_OSD_CH
,
reg
);
solo_reg_write
(
solo_dev
,
SOLO_VE_OSD_CH
,
reg
);
kfree
(
buf
);
kfree
(
buf
);
...
...
drivers/staging/solo6x10/solo6010-g723.c
View file @
98e2d5a8
...
@@ -158,7 +158,7 @@ static int snd_solo_pcm_close(struct snd_pcm_substream *ss)
...
@@ -158,7 +158,7 @@ static int snd_solo_pcm_close(struct snd_pcm_substream *ss)
snd_pcm_substream_chip
(
ss
)
=
solo_pcm
->
solo_dev
;
snd_pcm_substream_chip
(
ss
)
=
solo_pcm
->
solo_dev
;
kfree
(
solo_pcm
);
kfree
(
solo_pcm
);
return
0
;
return
0
;
}
}
static
int
snd_solo_pcm_trigger
(
struct
snd_pcm_substream
*
ss
,
int
cmd
)
static
int
snd_solo_pcm_trigger
(
struct
snd_pcm_substream
*
ss
,
int
cmd
)
...
@@ -197,7 +197,7 @@ static int snd_solo_pcm_trigger(struct snd_pcm_substream *ss, int cmd)
...
@@ -197,7 +197,7 @@ static int snd_solo_pcm_trigger(struct snd_pcm_substream *ss, int cmd)
static
int
snd_solo_pcm_prepare
(
struct
snd_pcm_substream
*
ss
)
static
int
snd_solo_pcm_prepare
(
struct
snd_pcm_substream
*
ss
)
{
{
return
0
;
return
0
;
}
}
static
snd_pcm_uframes_t
snd_solo_pcm_pointer
(
struct
snd_pcm_substream
*
ss
)
static
snd_pcm_uframes_t
snd_solo_pcm_pointer
(
struct
snd_pcm_substream
*
ss
)
...
@@ -271,7 +271,7 @@ static int snd_solo_capture_volume_get(struct snd_kcontrol *kcontrol,
...
@@ -271,7 +271,7 @@ static int snd_solo_capture_volume_get(struct snd_kcontrol *kcontrol,
value
->
value
.
integer
.
value
[
0
]
=
tw28_get_audio_gain
(
solo_dev
,
ch
);
value
->
value
.
integer
.
value
[
0
]
=
tw28_get_audio_gain
(
solo_dev
,
ch
);
return
0
;
return
0
;
}
}
static
int
snd_solo_capture_volume_put
(
struct
snd_kcontrol
*
kcontrol
,
static
int
snd_solo_capture_volume_put
(
struct
snd_kcontrol
*
kcontrol
,
...
@@ -279,15 +279,15 @@ static int snd_solo_capture_volume_put(struct snd_kcontrol *kcontrol,
...
@@ -279,15 +279,15 @@ static int snd_solo_capture_volume_put(struct snd_kcontrol *kcontrol,
{
{
struct
solo6010_dev
*
solo_dev
=
snd_kcontrol_chip
(
kcontrol
);
struct
solo6010_dev
*
solo_dev
=
snd_kcontrol_chip
(
kcontrol
);
u8
ch
=
value
->
id
.
numid
-
1
;
u8
ch
=
value
->
id
.
numid
-
1
;
u8
old_val
;
u8
old_val
;
old_val
=
tw28_get_audio_gain
(
solo_dev
,
ch
);
old_val
=
tw28_get_audio_gain
(
solo_dev
,
ch
);
if
(
old_val
==
value
->
value
.
integer
.
value
[
0
])
if
(
old_val
==
value
->
value
.
integer
.
value
[
0
])
return
0
;
return
0
;
tw28_set_audio_gain
(
solo_dev
,
ch
,
value
->
value
.
integer
.
value
[
0
]);
tw28_set_audio_gain
(
solo_dev
,
ch
,
value
->
value
.
integer
.
value
[
0
]);
return
1
;
return
1
;
}
}
static
struct
snd_kcontrol_new
snd_solo_capture_volume
=
{
static
struct
snd_kcontrol_new
snd_solo_capture_volume
=
{
...
@@ -368,7 +368,7 @@ int solo_g723_init(struct solo6010_dev *solo_dev)
...
@@ -368,7 +368,7 @@ int solo_g723_init(struct solo6010_dev *solo_dev)
strcpy
(
card
->
mixername
,
"SOLO-6010"
);
strcpy
(
card
->
mixername
,
"SOLO-6010"
);
kctl
=
snd_solo_capture_volume
;
kctl
=
snd_solo_capture_volume
;
kctl
.
count
=
solo_dev
->
nr_chans
;
kctl
.
count
=
solo_dev
->
nr_chans
;
ret
=
snd_ctl_add
(
card
,
snd_ctl_new1
(
&
kctl
,
solo_dev
));
ret
=
snd_ctl_add
(
card
,
snd_ctl_new1
(
&
kctl
,
solo_dev
));
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
...
...
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