Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanups before isr.c merge with sun3: 

- include <m68k/cpu.h> rather than <m68k/m68k.h> in <sun68k/cpu.h>
- wrap M68K_VAC definition with #ifndef _SUN3X_ in <sun68k/cpu.h>
- move setsoftnet() macro from <sun68k/cpu.h> to <sun68k/intr.h>
- move declarations for isr_soft_request() and isr_soft_clear() from
  sun2/include/intr.h to <sun68k/intr.h>
- remove extern keyword from function declarations
This commit is contained in:
tsutsui 2006-10-05 14:24:09 +00:00
parent 956c3ee3f1
commit f2ea89d23a
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/sun2/include/intr.h
View File

@ -1,7 +1,3 @@
/* $NetBSD: intr.h,v 1.5 2005/12/11 12:19:16 christos Exp $ */
/* These control the software interrupt register. */
extern void isr_soft_request(int);
extern void isr_soft_clear(int);
/* $NetBSD: intr.h,v 1.6 2006/10/05 14:24:09 tsutsui Exp $ */
#include <sun68k/intr.h>

10
sys/arch/sun68k/include/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.10 2005/12/11 12:19:29 christos Exp $ */
/* $NetBSD: cpu.h,v 1.11 2006/10/05 14:24:10 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -86,7 +86,7 @@
#include "opt_lockdebug.h"
#endif
#include <m68k/m68k.h>
#include <m68k/cpu.h>
#ifdef _KERNEL
@ -167,10 +167,6 @@ extern int want_resched; /* resched() was called */
*/
#define signotify(p) aston()
#include <machine/intr.h>
extern void *softnet_cookie;
#define setsoftnet() softintr_schedule(softnet_cookie)
/*
* For some reason the sparc has this prototype in its machine/cpu.h,
* so for now we do the same.
@ -194,7 +190,9 @@ void savectx(struct pcb *);
void switch_exit(struct lwp *);
void switch_lwp_exit(struct lwp *);
#ifndef _SUN3X_
#define M68K_VAC
#endif
#endif /* _KERNEL */

21
sys/arch/sun68k/include/intr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.8 2006/08/07 23:29:38 tsutsui Exp $ */
/* $NetBSD: intr.h,v 1.9 2006/10/05 14:24:10 tsutsui Exp $ */
/*
* Copyright (c) 2001 Matt Fredette.
@ -82,9 +82,13 @@ struct softintr_handler {
int sh_pending;
};
extern void softintr_init(void);
extern void *softintr_establish(int, void (*)(void *), void *);
extern void softintr_disestablish(void *);
void softintr_init(void);
void *softintr_establish(int, void (*)(void *), void *);
void softintr_disestablish(void *);
/* These control the software interrupt register. */
void isr_soft_request(int);
void isr_soft_clear(int);
static __inline void
softintr_schedule(void *arg)
@ -96,11 +100,14 @@ softintr_schedule(void *arg)
}
}
extern void *softnet_cookie;
#define setsoftnet() softintr_schedule(softnet_cookie)
/* These connect interrupt handlers. */
typedef int (*isr_func_t)(void *);
extern void isr_add_autovect(isr_func_t, void *, int);
extern void isr_add_vectored(isr_func_t, void *, int, int);
extern void isr_add_custom(int, void *);
void isr_add_autovect(isr_func_t, void *, int);
void isr_add_vectored(isr_func_t, void *, int, int);
void isr_add_custom(int, void *);
/*
* Define inline functions for PSL manipulation.