Fixed disordering of *cam* and splsoftvm.

1 files changed, 14 insertions, 14 deletions

diff --git a/sys/i386/isa/ipl_funcs.c b/sys/i386/isa/ipl_funcs.c
index 2a1add3..cd4628c 100644
--- a/sys/i386/isa/ipl_funcs.c
+++ b/sys/i386/isa/ipl_funcs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ipl_funcs.c,v 1.11 1997/09/28 19:34:48 fsmp Exp $
+ *	$Id: ipl_funcs.c,v 1.12 1998/01/15 07:34:01 gibbs Exp $
  */
 
 #include <sys/types.h>
@@ -44,17 +44,17 @@ void name(void)					\
 
 DO_SETBITS(setdelayed,   &ipending, loadandclear((unsigned *)&idelayed))
 DO_SETBITS(setsoftast,   &ipending, SWI_AST_PENDING)
+DO_SETBITS(setsoftcamnet,&ipending, SWI_CAMNET_PENDING)
+DO_SETBITS(setsoftcambio,&ipending, SWI_CAMBIO_PENDING)
 DO_SETBITS(setsoftclock, &ipending, SWI_CLOCK_PENDING)
 DO_SETBITS(setsoftnet,   &ipending, SWI_NET_PENDING)
 DO_SETBITS(setsofttty,   &ipending, SWI_TTY_PENDING)
-DO_SETBITS(setsoftcamnet,&ipending, SWI_CAMNET_PENDING)
-DO_SETBITS(setsoftcambio,&ipending, SWI_CAMBIO_PENDING)
 DO_SETBITS(setsoftvm,	 &ipending, SWI_VM_PENDING)
 
-DO_SETBITS(schedsoftnet, &idelayed, SWI_NET_PENDING)
-DO_SETBITS(schedsofttty, &idelayed, SWI_TTY_PENDING)
 DO_SETBITS(schedsoftcamnet, &idelayed, SWI_CAMNET_PENDING)
 DO_SETBITS(schedsoftcambio, &idelayed, SWI_CAMBIO_PENDING)
+DO_SETBITS(schedsoftnet, &idelayed, SWI_NET_PENDING)
+DO_SETBITS(schedsofttty, &idelayed, SWI_TTY_PENDING)
 DO_SETBITS(schedsoftvm,	&idelayed, SWI_VM_PENDING)
 
 unsigned
@@ -74,20 +74,20 @@ unsigned name(void)				\
 }
 
 GENSPL(splbio, cpl |= bio_imask)
+GENSPL(splcam, cpl |= cam_imask)
 GENSPL(splclock, cpl = HWI_MASK | SWI_MASK)
 GENSPL(splhigh, cpl = HWI_MASK | SWI_MASK)
 GENSPL(splimp, cpl |= net_imask)
 GENSPL(splnet, cpl |= SWI_NET_MASK)
-GENSPL(splcam, cpl |= cam_imask)
 GENSPL(splsoftcam, cpl |= SWI_CAMBIO_MASK | SWI_CAMNET_MASK)
 GENSPL(splsoftcambio, cpl |= SWI_CAMBIO_MASK)
 GENSPL(splsoftcamnet, cpl |= SWI_CAMNET_MASK)
 GENSPL(splsoftclock, cpl = SWI_CLOCK_MASK)
 GENSPL(splsofttty, cpl |= SWI_TTY_MASK)
+GENSPL(splsoftvm, cpl |= SWI_VM_MASK)
 GENSPL(splstatclock, cpl |= stat_imask)
 GENSPL(spltty, cpl |= tty_imask)
 GENSPL(splvm, cpl |= net_imask | bio_imask)
-GENSPL(splsoftvm, cpl |= SWI_VM_MASK)
 
 void
 spl0(void)
@@ -135,17 +135,17 @@ void name(void)					\
 
 DO_SETBITS(setdelayed,   &ipending, loadandclear((unsigned *)&idelayed))
 DO_SETBITS(setsoftast,   &ipending, SWI_AST_PENDING)
+DO_SETBITS(setsoftcamnet,&ipending, SWI_CAMNET_PENDING)
+DO_SETBITS(setsoftcambio,&ipending, SWI_CAMBIO_PENDING)
 DO_SETBITS(setsoftclock, &ipending, SWI_CLOCK_PENDING)
 DO_SETBITS(setsoftnet,   &ipending, SWI_NET_PENDING)
 DO_SETBITS(setsofttty,   &ipending, SWI_TTY_PENDING)
-DO_SETBITS(setsoftcamnet,&ipending, SWI_CAMNET_PENDING)
-DO_SETBITS(setsoftcambio,&ipending, SWI_CAMBIO_PENDING)
 DO_SETBITS(setsoftvm,	 &ipending, SWI_VM_PENDING)
 
-DO_SETBITS(schedsoftnet, &idelayed, SWI_NET_PENDING)
-DO_SETBITS(schedsofttty, &idelayed, SWI_TTY_PENDING)
 DO_SETBITS(schedsoftcamnet, &idelayed, SWI_CAMNET_PENDING)
 DO_SETBITS(schedsoftcambio, &idelayed, SWI_CAMBIO_PENDING)
+DO_SETBITS(schedsoftnet, &idelayed, SWI_NET_PENDING)
+DO_SETBITS(schedsofttty, &idelayed, SWI_TTY_PENDING)
 DO_SETBITS(schedsoftvm,	&idelayed, SWI_VM_PENDING)
 
 unsigned
@@ -235,20 +235,20 @@ unsigned NAME(void)							\
 
 /*    NAME:            OP:     MODIFIER:				PC: */
 GENSPL(splbio,		|=,	bio_imask,				2)
+GENSPL(splcam,		|=,	cam_imask,				7)
 GENSPL(splclock,	 =,	HWI_MASK | SWI_MASK,			3)
 GENSPL(splhigh,		 =,	HWI_MASK | SWI_MASK,			4)
 GENSPL(splimp,		|=,	net_imask,				5)
 GENSPL(splnet,		|=,	SWI_NET_MASK,				6)
-GENSPL(splcam,		|=,	cam_imask,				7)
 GENSPL(splsoftcam,	|=,	SWI_CAMBIO_MASK | SWI_CAMNET_MASK,	8)
 GENSPL(splsoftcambio,	|=,	SWI_CAMBIO_MASK,			9)
 GENSPL(splsoftcamnet, 	|=,	SWI_CAMNET_MASK,			10)
 GENSPL(splsoftclock,	 =,	SWI_CLOCK_MASK,				11)
 GENSPL(splsofttty,	|=,	SWI_TTY_MASK,				12)
+GENSPL(splsoftvm,	|=,	SWI_VM_MASK,				16)
 GENSPL(splstatclock,	|=,	stat_imask,				13)
 GENSPL(spltty,		|=,	tty_imask,				14)
 GENSPL(splvm,		|=,	net_imask | bio_imask,			15)
-GENSPL(splsoftvm,	|=,	SWI_VM_MASK,				16)
 
 #else /* INTR_SPL */
 
@@ -282,10 +282,10 @@ GENSPL(splsoftcambio, cpl |= SWI_CAMBIO_MASK)
 GENSPL(splsoftcamnet, cpl |= SWI_CAMNET_MASK)
 GENSPL(splsoftclock, cpl = SWI_CLOCK_MASK)
 GENSPL(splsofttty, cpl |= SWI_TTY_MASK)
+GENSPL(splsoftvm, cpl |= SWI_VM_MASK)
 GENSPL(splstatclock, cpl |= stat_imask)
 GENSPL(spltty, cpl |= tty_imask)
 GENSPL(splvm, cpl |= net_imask | bio_imask)
-GENSPL(splsoftvm, cpl |= SWI_VM_MASK)
 
 #endif /* INTR_SPL */