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
606cd232
Commit
606cd232
authored
May 24, 2003
by
Geert Uytterhoeven
Committed by
Linus Torvalds
May 24, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] M68k IRQ API updates [4/20]
M68k Atari: Update to the new irq API (from Roman Zippel and me) [4/20]
parent
701e7483
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
13 deletions
+18
-13
arch/m68k/atari/ataints.c
arch/m68k/atari/ataints.c
+4
-3
arch/m68k/atari/config.c
arch/m68k/atari/config.c
+2
-2
arch/m68k/atari/stdma.c
arch/m68k/atari/stdma.c
+7
-5
arch/m68k/atari/time.c
arch/m68k/atari/time.c
+1
-1
include/asm-m68k/atari_stdma.h
include/asm-m68k/atari_stdma.h
+2
-1
include/asm-m68k/ide.h
include/asm-m68k/ide.h
+2
-1
No files found.
arch/m68k/atari/ataints.c
View file @
606cd232
...
...
@@ -110,7 +110,7 @@
typedef
void
(
*
asm_irq_handler
)(
void
);
struct
irqhandler
{
void
(
*
handler
)(
int
,
void
*
,
struct
pt_regs
*
);
irqreturn_t
(
*
handler
)(
int
,
void
*
,
struct
pt_regs
*
);
void
*
dev_id
;
};
...
...
@@ -404,12 +404,13 @@ void __init atari_init_IRQ(void)
}
static
void
atari_call_irq_list
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
fp
)
static
irqreturn_t
atari_call_irq_list
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
fp
)
{
irq_node_t
*
node
;
for
(
node
=
(
irq_node_t
*
)
dev_id
;
node
;
node
=
node
->
next
)
node
->
handler
(
irq
,
node
->
dev_id
,
fp
);
return
IRQ_HANDLED
;
}
...
...
@@ -419,7 +420,7 @@ static void atari_call_irq_list( int irq, void *dev_id, struct pt_regs *fp )
* If the addition was successful, it returns 0.
*/
int
atari_request_irq
(
unsigned
int
irq
,
void
(
*
handler
)(
int
,
void
*
,
struct
pt_regs
*
),
int
atari_request_irq
(
unsigned
int
irq
,
irqreturn_t
(
*
handler
)(
int
,
void
*
,
struct
pt_regs
*
),
unsigned
long
flags
,
const
char
*
devname
,
void
*
dev_id
)
{
int
vector
;
...
...
arch/m68k/atari/config.c
View file @
606cd232
...
...
@@ -60,7 +60,7 @@ static int atari_get_hardware_list(char *buffer);
/* atari specific irq functions */
extern
void
atari_init_IRQ
(
void
);
extern
int
atari_request_irq
(
unsigned
int
irq
,
void
(
*
handler
)(
int
,
void
*
,
struct
pt_regs
*
),
extern
int
atari_request_irq
(
unsigned
int
irq
,
irqreturn_t
(
*
handler
)(
int
,
void
*
,
struct
pt_regs
*
),
unsigned
long
flags
,
const
char
*
devname
,
void
*
dev_id
);
extern
void
atari_free_irq
(
unsigned
int
irq
,
void
*
dev_id
);
extern
void
atari_enable_irq
(
unsigned
int
);
...
...
@@ -72,7 +72,7 @@ static void atari_heartbeat( int on );
#endif
/* atari specific timer functions (in time.c) */
extern
void
atari_sched_init
(
void
(
*
)(
int
,
void
*
,
struct
pt_regs
*
));
extern
void
atari_sched_init
(
irqreturn_t
(
*
)(
int
,
void
*
,
struct
pt_regs
*
));
extern
unsigned
long
atari_gettimeoffset
(
void
);
extern
int
atari_mste_hwclk
(
int
,
struct
rtc_time
*
);
extern
int
atari_tt_hwclk
(
int
,
struct
rtc_time
*
);
...
...
arch/m68k/atari/stdma.c
View file @
606cd232
...
...
@@ -43,8 +43,8 @@
static
int
stdma_locked
=
0
;
/* the semaphore */
/* int func to be called */
static
void
(
*
stdma_isr
)(
int
,
void
*
,
struct
pt_regs
*
)
=
NULL
;
static
void
*
stdma_isr_data
=
NULL
;
/* data passed to isr */
static
irqreturn_t
(
*
stdma_isr
)(
int
,
void
*
,
struct
pt_regs
*
)
=
NULL
;
static
void
*
stdma_isr_data
=
NULL
;
/* data passed to isr */
static
DECLARE_WAIT_QUEUE_HEAD
(
stdma_wait
);
/* wait queue for ST-DMA */
...
...
@@ -52,7 +52,7 @@ static DECLARE_WAIT_QUEUE_HEAD(stdma_wait); /* wait queue for ST-DMA */
/***************************** Prototypes *****************************/
static
void
stdma_int
(
int
irq
,
void
*
dummy
,
struct
pt_regs
*
fp
);
static
irqreturn_t
stdma_int
(
int
irq
,
void
*
dummy
,
struct
pt_regs
*
fp
);
/************************* End of Prototypes **************************/
...
...
@@ -74,7 +74,8 @@ static void stdma_int (int irq, void *dummy, struct pt_regs *fp);
*
*/
void
stdma_lock
(
void
(
*
handler
)(
int
,
void
*
,
struct
pt_regs
*
),
void
*
data
)
void
stdma_lock
(
irqreturn_t
(
*
handler
)(
int
,
void
*
,
struct
pt_regs
*
),
void
*
data
)
{
unsigned
long
flags
;
...
...
@@ -187,8 +188,9 @@ void __init stdma_init(void)
*
*/
static
void
stdma_int
(
int
irq
,
void
*
dummy
,
struct
pt_regs
*
fp
)
static
irqreturn_t
stdma_int
(
int
irq
,
void
*
dummy
,
struct
pt_regs
*
fp
)
{
if
(
stdma_isr
)
(
*
stdma_isr
)(
irq
,
stdma_isr_data
,
fp
);
return
IRQ_HANDLED
;
}
arch/m68k/atari/time.c
View file @
606cd232
...
...
@@ -20,7 +20,7 @@
#include <asm/rtc.h>
void
__init
atari_sched_init
(
void
(
*
timer_routine
)(
int
,
void
*
,
struct
pt_regs
*
))
atari_sched_init
(
irqreturn_t
(
*
timer_routine
)(
int
,
void
*
,
struct
pt_regs
*
))
{
/* set Timer C data Register */
mfp
.
tim_dt_c
=
INT_TICKS
;
...
...
include/asm-m68k/atari_stdma.h
View file @
606cd232
...
...
@@ -8,7 +8,8 @@
/***************************** Prototypes *****************************/
void
stdma_lock
(
void
(
*
handler
)(
int
,
void
*
,
struct
pt_regs
*
),
void
*
data
);
void
stdma_lock
(
irqreturn_t
(
*
handler
)(
int
,
void
*
,
struct
pt_regs
*
),
void
*
data
);
void
stdma_release
(
void
);
int
stdma_others_waiting
(
void
);
int
stdma_islocked
(
void
);
...
...
include/asm-m68k/ide.h
View file @
606cd232
...
...
@@ -161,7 +161,8 @@ static __inline__ void ide_release_lock (void)
}
}
static
__inline__
void
ide_get_lock
(
void
(
*
handler
)(
int
,
void
*
,
struct
pt_regs
*
),
void
*
data
)
static
__inline__
void
ide_get_lock
(
irqreturn_t
(
*
handler
)(
int
,
void
*
,
struct
pt_regs
*
),
void
*
data
)
{
if
(
MACH_IS_ATARI
)
{
if
(
falconide_intr_lock
==
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