summaryrefslogtreecommitdiff
path: root/i386/i386at
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2006-05-14 12:54:57 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:26:37 +0200
commitb1fa6f389a8e51765967468005c3a3258b611273 (patch)
treed12d8c7d6c69a50338701f43371efefcb3c62b41 /i386/i386at
parentd5514210b86c57db0277ce862a8081649ef26ef2 (diff)
2006-05-14 Thomas Schwinge <tschwinge@gnu.org>
* i386/i386at/autoconf.c (bus_device_init) <lpr> [! LINUX_DEV]: Depend on `MACH_LPR' instead. * i386/i386at/lpr.c: Fix obsolescent `#else' / `#endif' syntax.
Diffstat (limited to 'i386/i386at')
-rw-r--r--i386/i386at/autoconf.c4
-rw-r--r--i386/i386at/lpr.c32
2 files changed, 18 insertions, 18 deletions
diff --git a/i386/i386at/autoconf.c b/i386/i386at/autoconf.c
index 51f2a0a..1c2e9df 100644
--- a/i386/i386at/autoconf.c
+++ b/i386/i386at/autoconf.c
@@ -82,7 +82,7 @@ struct bus_device bus_device_init[] = {
'?', 0, -1, -1, 0, 0, 0, SPL_TTY, 5},
#endif /* NCOM > 0 */
-#ifndef LINUX_DEV
+#ifdef MACH_LPR
#if NLPR > 0
{&lprdriver, "lpr", 0, lprintr, 0x378, 3, 0x378,
'?', 0, -1, -1, 0, 0, 0, SPL_TTY, 7},
@@ -91,7 +91,7 @@ struct bus_device bus_device_init[] = {
{&lprdriver, "lpr", 0, lprintr, 0x3bc, 3, 0x3bc,
'?', 0, -1, -1, 0, 0, 0, SPL_TTY, 7},
#endif /* NLPR > 0 */
-#endif /* ! LINUX_DEV */
+#endif /* MACH_LPR */
0
};
diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c
index d10f801..3873151 100644
--- a/i386/i386at/lpr.c
+++ b/i386/i386at/lpr.c
@@ -39,7 +39,7 @@
#include <device/errno.h>
#include <device/tty.h>
#include <device/io_req.h>
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/dir.h>
@@ -50,7 +50,7 @@
#include <sys/systm.h>
#include <sys/uio.h>
#include <sys/file.h>
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
#include <i386/ipl.h>
#include <i386/pio.h>
@@ -70,7 +70,7 @@ int lprprobe(), lprintr(), lprstart(), lprstop();
void lprattach(struct bus_device *);
#ifdef MACH_KERNEL
int lprstop(), lprgetstat(), lprsetstat();
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
struct bus_device *lprinfo[NLPR]; /* ??? */
@@ -130,7 +130,7 @@ int dev;
int flag;
#ifdef MACH_KERNEL
io_req_t ior;
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
{
int unit = minor(dev);
struct bus_device *isai;
@@ -143,7 +143,7 @@ u_short addr;
#ifndef MACH_KERNEL
if (tp->t_state & TS_XCLUDE && u.u_uid != 0)
return(EBUSY);
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
addr = (u_short) isai->address;
tp->t_dev = dev;
tp->t_addr = *(caddr_t *)&addr;
@@ -153,7 +153,7 @@ u_short addr;
tp->t_stop = lprstop;
tp->t_getstat = lprgetstat;
tp->t_setstat = lprsetstat;
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
if ((tp->t_state & TS_ISOPEN) == 0)
ttychars(tp);
outb(INTR_ENAB(addr), inb(INTR_ENAB(addr)) | 0x10);
@@ -171,7 +171,7 @@ u_short addr = (u_short) lprinfo[unit]->address;
#ifndef MACH_KERNEL
(*linesw[tp->t_line].l_close)(tp);
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
ttyclose(tp);
if (tp->t_state&TS_HUPCLS || (tp->t_state&TS_ISOPEN)==0) {
outb(INTR_ENAB(addr), inb(INTR_ENAB(addr)) & 0x0f);
@@ -240,7 +240,7 @@ unsigned int count;
}
return (D_SUCCESS);
}
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
int lprwrite(dev, uio)
int dev;
struct uio *uio;
@@ -276,7 +276,7 @@ int lprioctl(dev, cmd, addr, mode)
splx(s);
return(0);
}
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
int lprintr(unit)
int unit;
@@ -315,7 +315,7 @@ struct tty *tp;
if (tp->t_outq.c_cc <= TTLOWAT(tp)) {
#ifdef MACH_KERNEL
tt_write_wakeup(tp);
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
if (tp->t_state & TS_ASLEEP) {
tp->t_state &= ~TS_ASLEEP;
wakeup ((caddr_t)&tp->t_outq);
@@ -325,7 +325,7 @@ struct tty *tp;
tp->t_wsel = 0;
tp->t_state &= ~TS_WCOLL;
}
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
}
if (tp->t_outq.c_cc == 0) {
splx(s);
@@ -342,7 +342,7 @@ struct tty *tp;
outb(INTR_ENAB(addr),inb(INTR_ENAB(addr)) | 0x01);
outb(INTR_ENAB(addr),inb(INTR_ENAB(addr)) & 0x1e);
tp->t_state |= TS_BUSY;
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
if (tp->t_flags & (RAW|LITOUT))
nch = ndqb(&tp->t_outq,0);
else {
@@ -362,7 +362,7 @@ struct tty *tp;
outb(INTR_ENAB(addr),inb(INTR_ENAB(addr)) & 0x1e);
tp->t_state |= TS_BUSY;
}
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
splx(s);
return(0);
}
@@ -375,7 +375,7 @@ int flags;
if ((tp->t_state & TS_BUSY) && (tp->t_state & TS_TTSTOP) == 0)
tp->t_state |= TS_FLUSH;
}
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
int lprstop(tp, flag)
struct tty *tp;
{
@@ -385,7 +385,7 @@ struct tty *tp;
tp->t_state |= TS_FLUSH;
splx(s);
}
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
lprpr(unit)
{
lprpr_addr(lprinfo[unit]->address);
@@ -399,4 +399,4 @@ lprpr_addr(addr)
STATUS(addr), inb(STATUS(addr)),
INTR_ENAB(addr), inb(INTR_ENAB(addr)));
}
-#endif NLPR
+#endif /* NLPR */