make spl-lowering functions return void.
This commit is contained in:
parent
6c144faa4c
commit
a11660da22
@ -1,4 +1,4 @@
|
|||||||
/* $NetBSD: intr.h,v 1.13 2000/06/04 21:27:40 mycroft Exp $ */
|
/* $NetBSD: intr.h,v 1.14 2000/06/08 23:03:13 cgd Exp $ */
|
||||||
|
|
||||||
/*-
|
/*-
|
||||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||||
@ -76,8 +76,7 @@ int imask[NIPL];
|
|||||||
extern void Xspllower __P((void));
|
extern void Xspllower __P((void));
|
||||||
|
|
||||||
static __inline int splraise __P((int));
|
static __inline int splraise __P((int));
|
||||||
static __inline int spllower __P((int));
|
static __inline void spllower __P((int));
|
||||||
static __inline void splx __P((int));
|
|
||||||
static __inline void softintr __P((int));
|
static __inline void softintr __P((int));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -98,29 +97,13 @@ splraise(ncpl)
|
|||||||
* interrupts are pending, call Xspllower() to process them.
|
* interrupts are pending, call Xspllower() to process them.
|
||||||
*/
|
*/
|
||||||
static __inline void
|
static __inline void
|
||||||
splx(ncpl)
|
|
||||||
register int ncpl;
|
|
||||||
{
|
|
||||||
|
|
||||||
cpl = ncpl;
|
|
||||||
if (ipending & ~ncpl)
|
|
||||||
Xspllower();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Same as splx(), but we return the old value of spl, for the
|
|
||||||
* benefit of some splsoftclock() callers.
|
|
||||||
*/
|
|
||||||
static __inline int
|
|
||||||
spllower(ncpl)
|
spllower(ncpl)
|
||||||
register int ncpl;
|
register int ncpl;
|
||||||
{
|
{
|
||||||
register int ocpl = cpl;
|
|
||||||
|
|
||||||
cpl = ncpl;
|
cpl = ncpl;
|
||||||
if (ipending & ~ncpl)
|
if (ipending & ~ncpl)
|
||||||
Xspllower();
|
Xspllower();
|
||||||
return (ocpl);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -153,6 +136,7 @@ spllower(ncpl)
|
|||||||
#define splimp() splraise(imask[IPL_IMP])
|
#define splimp() splraise(imask[IPL_IMP])
|
||||||
#define splhigh() splraise(imask[IPL_HIGH])
|
#define splhigh() splraise(imask[IPL_HIGH])
|
||||||
#define spl0() spllower(0)
|
#define spl0() spllower(0)
|
||||||
|
#define splx(x) spllower(x)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Software interrupt registration
|
* Software interrupt registration
|
||||||
|
Loading…
Reference in New Issue
Block a user