summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sparc/dev')
-rw-r--r--sys/arch/sparc/dev/amd7930.c6
-rw-r--r--sys/arch/sparc/dev/cs4231.c4
-rw-r--r--sys/arch/sparc/dev/fd.c10
-rw-r--r--sys/arch/sparc/dev/magma.c14
-rw-r--r--sys/arch/sparc/dev/spif.c14
-rw-r--r--sys/arch/sparc/dev/zs.c16
6 files changed, 32 insertions, 32 deletions
diff --git a/sys/arch/sparc/dev/amd7930.c b/sys/arch/sparc/dev/amd7930.c
index 549eabb3669..5bc0871aaee 100644
--- a/sys/arch/sparc/dev/amd7930.c
+++ b/sys/arch/sparc/dev/amd7930.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amd7930.c,v 1.20 2002/03/14 03:15:59 millert Exp $ */
+/* $OpenBSD: amd7930.c,v 1.21 2002/04/28 03:51:19 art Exp $ */
/* $NetBSD: amd7930.c,v 1.37 1998/03/30 14:23:40 pk Exp $ */
/*
@@ -283,7 +283,7 @@ amd7930attach(parent, self, args)
return;
}
pri = ra->ra_intr[0].int_pri;
- printf(" pri %d, softpri %d\n", pri, PIL_AUSOFT);
+ printf(" pri %d, softpri %d\n", pri, IPL_AUSOFT);
amd = (volatile struct amd7930 *)(ra->ra_vaddr ?
ra->ra_vaddr : mapiodev(ra->ra_reg, 0, sizeof (*amd)));
@@ -308,7 +308,7 @@ amd7930attach(parent, self, args)
#endif
sc->sc_swih.ih_fun = amd7930swintr;
sc->sc_swih.ih_arg = sc;
- intr_establish(PIL_AUSOFT, &sc->sc_swih);
+ intr_establish(IPL_AUSOFT, &sc->sc_swih);
evcnt_attach(&sc->sc_dev, "intr", &sc->sc_intrcnt);
diff --git a/sys/arch/sparc/dev/cs4231.c b/sys/arch/sparc/dev/cs4231.c
index f3f4d924ada..b8199ad859b 100644
--- a/sys/arch/sparc/dev/cs4231.c
+++ b/sys/arch/sparc/dev/cs4231.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4231.c,v 1.13 2002/03/14 03:15:59 millert Exp $ */
+/* $OpenBSD: cs4231.c,v 1.14 2002/04/28 03:51:19 art Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -241,7 +241,7 @@ cs4231_attach(parent, self, aux)
sc->sc_ih.ih_arg = sc;
intr_establish(ca->ca_ra.ra_intr[0].int_pri, &sc->sc_ih);
- printf(" pri %d, softpri %d\n", pri, PIL_AUSOFT);
+ printf(" pri %d, softpri %d\n", pri, IPL_AUSOFT);
evcnt_attach(&sc->sc_dev, "intr", &sc->sc_intrcnt);
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 29af5b3073b..11ee021ee3c 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.26 2002/03/14 01:26:42 millert Exp $ */
+/* $OpenBSD: fd.c,v 1.27 2002/04/28 03:51:19 art Exp $ */
/* $NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $ */
/*-
@@ -250,7 +250,7 @@ void fd_do_eject(struct fd_softc *);
void fd_mountroot_hook(struct device *);
static void fdconf(struct fdc_softc *);
-#if PIL_FDSOFT == 4
+#if IPL_FDSOFT == 4
#define IE_FDSOFT IE_L4
#else
#error 4
@@ -260,7 +260,7 @@ static void fdconf(struct fdc_softc *);
#if defined(SUN4M)
#define FD_SET_SWINTR do { \
if (CPU_ISSUN4M) \
- raise(0, PIL_FDSOFT); \
+ raise(0, IPL_FDSOFT); \
else \
ienab_bis(IE_L4); \
} while(0)
@@ -395,7 +395,7 @@ fdcattach(parent, self, aux)
#endif
fdc->sc_sih.ih_fun = (void *)fdcswintr;
fdc->sc_sih.ih_arg = fdc;
- intr_establish(PIL_FDSOFT, &fdc->sc_sih);
+ intr_establish(IPL_FDSOFT, &fdc->sc_sih);
/* Assume a 82077 */
fdc->sc_reg_msr = &((struct fdreg_77 *)fdc->sc_reg)->fd_msr;
@@ -446,7 +446,7 @@ fdcattach(parent, self, aux)
evcnt_attach(&fdc->sc_dev, "intr", &fdc->sc_intrcnt);
- printf(" pri %d, softpri %d: chip 8207%c\n", pri, PIL_FDSOFT, code);
+ printf(" pri %d, softpri %d: chip 8207%c\n", pri, IPL_FDSOFT, code);
/*
* Controller and drives are represented by one and the same
diff --git a/sys/arch/sparc/dev/magma.c b/sys/arch/sparc/dev/magma.c
index 9a1ffefdb3c..be53eae701f 100644
--- a/sys/arch/sparc/dev/magma.c
+++ b/sys/arch/sparc/dev/magma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: magma.c,v 1.11 2002/03/14 03:48:56 jason Exp $ */
+/* $OpenBSD: magma.c,v 1.12 2002/04/28 03:51:19 art Exp $ */
/*
* magma.c
*
@@ -71,11 +71,11 @@
/*
* Select tty soft interrupt bit based on TTY ipl. (stole from zs.c)
*/
-#if PIL_TTY == 1
+#if IPL_TTY == 1
# define IE_MSOFT IE_L1
-#elif PIL_TTY == 4
+#elif IPL_TTY == 4
# define IE_MSOFT IE_L4
-#elif PIL_TTY == 6
+#elif IPL_TTY == 6
# define IE_MSOFT IE_L6
#else
# error "no suitable software interrupt bit"
@@ -396,7 +396,7 @@ void *base;
}
dprintf((" addr 0x%x", sc));
- printf(" pri %d softpri %d:", ra->ra_intr[0].int_pri, PIL_TTY);
+ printf(" pri %d softpri %d:", ra->ra_intr[0].int_pri, IPL_TTY);
printf(" %s\n", card->mb_realname);
sc->ms_board = card;
@@ -469,7 +469,7 @@ void *base;
sc->ms_softint.ih_fun = magma_soft;
sc->ms_softint.ih_arg = sc;
- intr_establish(PIL_TTY, &sc->ms_softint);
+ intr_establish(IPL_TTY, &sc->ms_softint);
}
/*
@@ -686,7 +686,7 @@ int needsoftint = 0;
if( needsoftint ) { /* trigger the soft interrupt */
#if defined(SUN4M)
if( CPU_ISSUN4M )
- raise(0, PIL_TTY);
+ raise(0, IPL_TTY);
else
#endif
ienab_bis(IE_MSOFT);
diff --git a/sys/arch/sparc/dev/spif.c b/sys/arch/sparc/dev/spif.c
index 99e06b56e32..9d5dbc018f7 100644
--- a/sys/arch/sparc/dev/spif.c
+++ b/sys/arch/sparc/dev/spif.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spif.c,v 1.10 2002/03/14 01:26:43 millert Exp $ */
+/* $OpenBSD: spif.c,v 1.11 2002/04/28 03:51:19 art Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -58,11 +58,11 @@
#include <sparc/dev/spifreg.h>
#include <sparc/dev/spifvar.h>
-#if PIL_TTY == 1
+#if IPL_TTY == 1
# define IE_MSOFT IE_L1
-#elif PIL_TTY == 4
+#elif IPL_TTY == 4
# define IE_MSOFT IE_L4
-#elif PIL_TTY == 6
+#elif IPL_TTY == 6
# define IE_MSOFT IE_L6
#else
# error "no suitable software interrupt bit"
@@ -205,7 +205,7 @@ spifattach(parent, self, aux)
sc->sc_regs->stc.gscr3 = 0;
printf(": rev %x chiprev %x osc %sMhz stcpri %d ppcpri %d softpri %d\n",
sc->sc_rev, sc->sc_rev2, clockfreq(sc->sc_osc),
- stcpri, ppcpri, PIL_TTY);
+ stcpri, ppcpri, IPL_TTY);
(void)config_found(self, sttymatch, NULL);
(void)config_found(self, sbppmatch, NULL);
@@ -220,7 +220,7 @@ spifattach(parent, self, aux)
sc->sc_softih.ih_fun = spifsoftintr;
sc->sc_softih.ih_arg = sc;
- intr_establish(PIL_TTY, &sc->sc_softih);
+ intr_establish(IPL_TTY, &sc->sc_softih);
sbus_establish(&sc->sc_sd, &sc->sc_dev);
}
@@ -885,7 +885,7 @@ spifstcintr(vsc)
if (needsoft) {
#if defined(SUN4M)
if (CPU_ISSUN4M)
- raise(0, PIL_TTY);
+ raise(0, IPL_TTY);
else
#endif
ienab_bis(IE_MSOFT);
diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c
index 5cbda3bb015..d535aa8ae39 100644
--- a/sys/arch/sparc/dev/zs.c
+++ b/sys/arch/sparc/dev/zs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs.c,v 1.33 2002/03/14 01:26:43 millert Exp $ */
+/* $OpenBSD: zs.c,v 1.34 2002/04/28 03:51:19 art Exp $ */
/* $NetBSD: zs.c,v 1.49 1997/08/31 21:26:37 pk Exp $ */
/*
@@ -104,11 +104,11 @@
/*
* Select software interrupt bit based on TTY ipl.
*/
-#if PIL_TTY == 1
+#if IPL_TTY == 1
# define IE_ZSSOFT IE_L1
-#elif PIL_TTY == 4
+#elif IPL_TTY == 4
# define IE_ZSSOFT IE_L4
-#elif PIL_TTY == 6
+#elif IPL_TTY == 6
# define IE_ZSSOFT IE_L6
#else
# error "no suitable software interrupt bit"
@@ -292,12 +292,12 @@ zsattach(parent, dev, aux)
return;
}
pri = ra->ra_intr[0].int_pri;
- printf(" pri %d, softpri %d\n", pri, PIL_TTY);
+ printf(" pri %d, softpri %d\n", pri, IPL_TTY);
if (!didintr) {
didintr = 1;
prevpri = pri;
intr_establish(pri, &levelhard);
- intr_establish(PIL_TTY, &levelsoft);
+ intr_establish(IPL_TTY, &levelsoft);
} else if (pri != prevpri)
panic("broken zs interrupt scheme");
sc = (struct zs_softc *)dev;
@@ -939,7 +939,7 @@ zshard(intrarg)
/* XXX -- but this will go away when zshard moves to locore.s */
struct clockframe *p = intrarg;
- if ((p->psr & PSR_PIL) < (PIL_TTY << 8)) {
+ if ((p->psr & PSR_PIL) < (IPL_TTY << 8)) {
zsshortcuts++;
(void) spltty();
if (zshardscope) {
@@ -953,7 +953,7 @@ zshard(intrarg)
#if defined(SUN4M)
if (CPU_ISSUN4M)
- raise(0, PIL_TTY);
+ raise(0, IPL_TTY);
else
#endif
ienab_bis(IE_ZSSOFT);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 01:58:04 +0000