diff options
| author | Guillem Jover <guillem@hadrons.org> | 2009-12-17 14:39:22 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@hadrons.org> | 2009-12-18 10:36:33 +0100 |
| commit | 04152ecb45319bdfca49592cc1c88dc7f5a3ac5f (patch) | |
| tree | b68dfae073bdb6c4b728c7a53881fbb8f1f0dcea | |
| parent | 8fdd03d725c84795ee646ff90e4b8e90bdab00f3 (diff) | |
Match function types with `struct tty' member functions
* i386/i386at/com.c (comstart): Change return type to `void'.
* i386/i386at/lpr.c (lprstop): Likewise.
| -rw-r--r-- | i386/i386at/com.c | 12 | ||||
| -rw-r--r-- | i386/i386at/lpr.c | 9 |
2 files changed, 11 insertions, 10 deletions
diff --git a/i386/i386at/com.c b/i386/i386at/com.c index bd5b989..602e1ff 100644 --- a/i386/i386at/com.c +++ b/i386/i386at/com.c @@ -46,7 +46,8 @@ #include <device/cons.h> -int comprobe(), comstart(), commctl(); +int comprobe(), commctl(); +void comstart(struct tty *); void comstop(), comattach(), comintr(); static void comparam(); int comgetstat(), comsetstat(); @@ -609,7 +610,7 @@ comparm(int unit, int baud, int intr, int mode, int modem) int comst_1, comst_2, comst_3, comst_4, comst_5 = 14; -int +void comstart(tp) struct tty *tp; { @@ -618,7 +619,7 @@ struct tty *tp; if (tp->t_state & (TS_TIMEOUT|TS_TTSTOP|TS_BUSY)) { comst_1++; - return(0); + return; } if ((!queue_empty(&tp->t_delayed_write)) && (tp->t_outq.c_cc <= TTLOWAT(tp))) { @@ -627,7 +628,7 @@ comst_2++; } if (!tp->t_outq.c_cc) { comst_3++; - return(0); + return; } #if 0 @@ -651,12 +652,11 @@ comst_4++; timeout(ttrstrt, (char *)tp, (nch & 0x7f) + 6); tp->t_state |= TS_TIMEOUT; comst_4++; - return(0); + return; } outb(TXRX((int)tp->t_addr), nch); tp->t_state |= TS_BUSY; #endif - return(0); } /* Check for stuck xmitters */ diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c index d4f82b1..e6debab 100644 --- a/i386/i386at/lpr.c +++ b/i386/i386at/lpr.c @@ -64,11 +64,12 @@ * Driver information for auto-configuration stuff. */ -int lprprobe(), lprstop(); +int lprprobe(); +void lprstop(); void lprintr(), lprstart(); void lprattach(struct bus_device *); #ifdef MACH_KERNEL -int lprstop(), lprgetstat(), lprsetstat(); +int lprgetstat(), lprsetstat(); #endif /* MACH_KERNEL */ struct bus_device *lprinfo[NLPR]; /* ??? */ @@ -370,7 +371,7 @@ struct tty *tp; } #ifdef MACH_KERNEL -int +void lprstop(tp, flags) register struct tty *tp; int flags; @@ -379,7 +380,7 @@ int flags; tp->t_state |= TS_FLUSH; } #else /* MACH_KERNEL */ -int lprstop(tp, flag) +void lprstop(tp, flag) struct tty *tp; { int s = spltty(); |