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

make spl0() and spllowersoftclock() return void. Also, move spl0() 

prototype from param.h to intr.h.  (there were some big XXXs in param.h
that said to do that, and intr.h is included by param.h, so...)
This commit is contained in:
cgd 2000-06-09 01:40:12 +00:00
parent b8f4f2be87
commit c2ebb05a74
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/alpha/alpha/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.213 2000/06/05 23:44:55 jhawk Exp $ */ /* $NetBSD: machdep.c,v 1.214 2000/06/09 01:40:13 cgd Exp $ */
/*- /*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.213 2000/06/05 23:44:55 jhawk Exp $"); __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.214 2000/06/09 01:40:13 cgd Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -1762,7 +1762,7 @@ setregs(p, pack, stack)
fpcurproc = NULL; fpcurproc = NULL;
} }
int void
spl0() spl0()
{ {
@ -1771,7 +1771,7 @@ spl0()
softintr_dispatch(); softintr_dispatch();
} }
return (alpha_pal_swpipl(ALPHA_PSL_IPL_0)); (void) alpha_pal_swpipl(ALPHA_PSL_IPL_0);
} }
/* /*

15
sys/arch/alpha/include/intr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.28 2000/06/05 21:47:19 thorpej Exp $ */ /* $NetBSD: intr.h,v 1.29 2000/06/09 01:40:12 cgd Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -115,9 +115,16 @@
#ifdef _KERNEL #ifdef _KERNEL
/* IPL-lowering/restoring macros */ /* IPL-lowering/restoring macros */
#define splx(s) \ void spl0(void);
((s) == ALPHA_PSL_IPL_0 ? spl0() : alpha_pal_swpipl(s)) static __inline void
#define spllowersoftclock() alpha_pal_swpipl(ALPHA_PSL_IPL_SOFT) splx(int s)
{
if (s == ALPHA_PSL_IPL_0)
spl0();
else
alpha_pal_swpipl(s);
}
#define spllowersoftclock() ((void)alpha_pal_swpipl(ALPHA_PSL_IPL_SOFT))
/* IPL-raising functions/macros */ /* IPL-raising functions/macros */
static __inline int static __inline int

6
sys/arch/alpha/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.28 2000/06/08 03:10:06 thorpej Exp $ */ /* $NetBSD: param.h,v 1.29 2000/06/09 01:40:12 cgd Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -162,10 +162,6 @@
void delay(unsigned long); void delay(unsigned long);
#define DELAY(n) delay(n) #define DELAY(n) delay(n)
/* XXX THE FOLLOWING PROTOTYPE BELONGS IN INTR.H */
int spl0(void); /* drop ipl to zero */
/* XXX END INTR.H */
/* XXX THE FOLLOWING PROTOTYPE SHOULD BE A BUS.H INTERFACE */ /* XXX THE FOLLOWING PROTOTYPE SHOULD BE A BUS.H INTERFACE */
paddr_t alpha_XXX_dmamap(vaddr_t); paddr_t alpha_XXX_dmamap(vaddr_t);
/* XXX END BUS.H */ /* XXX END BUS.H */