diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2008-07-22 22:28:07 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:27:18 +0200 |
| commit | 482cc1b78fae30281528145098ab8d9908d5fafe (patch) | |
| tree | 4587121197bb788c514e2f833878cc0312d0241f /i386/i386at/lpr.c | |
| parent | 155f729a36531a464b82c63ae49adac5cc3b2d70 (diff) | |
2008-07-19 Barry deFreese <bddebian@comcast.net>
* chips/busses.h (bus_ctlr, bus_device): Make intr return void instead
of int.
* device/tty.h (tty): Make t_start and t_stop return void instead of
int.
* i386/i386/ipl.h (ivect[]): return void instead of int.
* i386/i386at/pic_isa.h (ivect[]): Likewise.
* i386/i386at/kd_mouse.c (mouseintr): Likewise.
* i386/i386at/com.c (comintr, comstop): Likewise.
* i386/i386at/kd.c (kdcnputc, kdstart, kdstop, kdintr): Likewise.
* i386/i386/trap.c (exception, thread_exception_return, i386_exception):
Add __attribute__ ((noreturn)).
* i386/i386at/kd.c (kdcnprobe): Return 0 at end of function.
* i386/i386at/lpr.c (lprintr, lprstart): Return void instead of int.
(lprstart): Don't return numeric values any longer.
* kern/eventcount.c (evc_wait_clear): Return a value.
* kern/exceptions.c (exception, exception_try_task, exception_no_server,
exception_raise, exception_raise_continue, exception_raise_continue_slow,
exception_raise_continue_fast): Add __attribute__ ((noreturn)).
(exception, exceptio_try_task, exception_raise,
exception_raise_continue_slow, exception_raise_continue_fast):
Remove spurious returns.
(exception_no_server): Add panic() on return from thread_halt_self().
Diffstat (limited to 'i386/i386at/lpr.c')
| -rw-r--r-- | i386/i386at/lpr.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c index 05edc7b..ee8e721 100644 --- a/i386/i386at/lpr.c +++ b/i386/i386at/lpr.c @@ -65,7 +65,8 @@ extern void ttrstrt(); * Driver information for auto-configuration stuff. */ -int lprprobe(), lprintr(), lprstart(), lprstop(); +int lprprobe(), lprstop(); +void lprintr(), lprstart(); void lprattach(struct bus_device *); #ifdef MACH_KERNEL int lprstop(), lprgetstat(), lprsetstat(); @@ -280,7 +281,7 @@ int lprioctl(dev, cmd, addr, mode) } #endif /* MACH_KERNEL */ -int lprintr(unit) +void lprintr(unit) int unit; { register struct tty *tp = &lpr_tty[unit]; @@ -295,7 +296,7 @@ int unit; lprstart(tp); } -int lprstart(tp) +void lprstart(tp) struct tty *tp; { spl_t s = spltty(); @@ -305,13 +306,13 @@ struct tty *tp; if (tp->t_state & (TS_TIMEOUT|TS_TTSTOP|TS_BUSY)) { splx(s); - return(0); + return; } if (status & 0x20) { printf("Printer out of paper!\n"); splx(s); - return(0); + return; } if (tp->t_outq.c_cc <= TTLOWAT(tp)) { @@ -331,7 +332,7 @@ struct tty *tp; } if (tp->t_outq.c_cc == 0) { splx(s); - return(0); + return; } #ifdef MACH_KERNEL nch = getc(&tp->t_outq); @@ -366,7 +367,7 @@ struct tty *tp; } #endif /* MACH_KERNEL */ splx(s); - return(0); + return; } #ifdef MACH_KERNEL |