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
53ab4d80
Commit
53ab4d80
authored
Feb 20, 2004
by
Russell King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] Fix Acorn VIDC sound driver.
Update the Acorn VIDC sound interrupt handler to return IRQ_HANDLED.
parent
56141cc3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
sound/oss/vidc.c
sound/oss/vidc.c
+2
-1
sound/oss/vidc.h
sound/oss/vidc.h
+1
-1
sound/oss/vidc_fill.S
sound/oss/vidc_fill.S
+1
-4
No files found.
sound/oss/vidc.c
View file @
53ab4d80
...
@@ -324,9 +324,10 @@ static int vidc_audio_prepare_for_input(int dev, int bsize, int bcount)
...
@@ -324,9 +324,10 @@ static int vidc_audio_prepare_for_input(int dev, int bsize, int bcount)
return
-
EINVAL
;
return
-
EINVAL
;
}
}
static
void
vidc_audio_dma_interrupt
(
void
)
static
irqreturn_t
vidc_audio_dma_interrupt
(
void
)
{
{
DMAbuf_outputintr
(
vidc_adev
,
1
);
DMAbuf_outputintr
(
vidc_adev
,
1
);
return
IRQ_HANDLED
;
}
}
/*
/*
...
...
sound/oss/vidc.h
View file @
53ab4d80
...
@@ -50,7 +50,7 @@ extern unsigned long (*vidc_filler) (unsigned long ibuf, unsigned long iend,
...
@@ -50,7 +50,7 @@ extern unsigned long (*vidc_filler) (unsigned long ibuf, unsigned long iend,
* Virtual DMA buffer exhausted
* Virtual DMA buffer exhausted
*/
*/
extern
void
(
*
dma_interrupt
)
(
void
);
extern
irqreturn_t
(
*
dma_interrupt
)
(
void
);
/*
/*
* Virtual DMA buffer addresses
* Virtual DMA buffer addresses
...
...
sound/oss/vidc_fill.S
View file @
53ab4d80
...
@@ -133,10 +133,6 @@ ENTRY(vidc_clear)
...
@@ -133,10 +133,6 @@ ENTRY(vidc_clear)
*
ip
=
corrupted
*
ip
=
corrupted
*/
*/
%%%%%%%%%%%%%%%%%%%
fixme
!
This
funtion
needs
to
return
IRQ_HANDLED
%%%%%%%%%%%%%%%%%%%
ENTRY
(
vidc_sound_dma_irq
)
ENTRY
(
vidc_sound_dma_irq
)
stmfd
sp
!,
{
r4
-
r8
,
lr
}
stmfd
sp
!,
{
r4
-
r8
,
lr
}
ldr
r8
,
=
dma_start
ldr
r8
,
=
dma_start
...
@@ -189,6 +185,7 @@ ENTRY(vidc_sound_dma_irq)
...
@@ -189,6 +185,7 @@ ENTRY(vidc_sound_dma_irq)
mov
r0
,
#
0x10
mov
r0
,
#
0x10
strneb
r0
,
[
ip
,
#
IOMD_SD0CR
]
strneb
r0
,
[
ip
,
#
IOMD_SD0CR
]
ldmfd
sp
!,
{
r4
-
r8
,
lr
}
ldmfd
sp
!,
{
r4
-
r8
,
lr
}
mov
r0
,
#
1
@
IRQ_HANDLED
teq
r1
,
#
0
@
If
we
have
no
more
teq
r1
,
#
0
@
If
we
have
no
more
movne
pc
,
lr
movne
pc
,
lr
teq
r3
,
#
0
teq
r3
,
#
0
...
...
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