diff options
| author | bde <bde@FreeBSD.org> | 1995-11-18 07:07:04 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1995-11-18 07:07:04 +0000 |
| commit | 921eaa04e60f2d1bbb3cbcf53b38eec24a31d8eb (patch) | |
| tree | 57a908b623f8e1dd6094204c7544fd9fb2d7962c /sys/i386/isa/cx.c | |
| parent | 27735b844a8d23945f18404cc29f3551a34a21a0 (diff) | |
| download | FreeBSD-src-921eaa04e60f2d1bbb3cbcf53b38eec24a31d8eb.zip FreeBSD-src-921eaa04e60f2d1bbb3cbcf53b38eec24a31d8eb.tar.gz | |
Fixed the type of a timeout function.
Removed related bogus casts of function pointers.
Removed a bogus include.
Diffstat (limited to 'sys/i386/isa/cx.c')
| -rw-r--r-- | sys/i386/isa/cx.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c index 55bdf2b..1770061 100644 --- a/sys/i386/isa/cx.c +++ b/sys/i386/isa/cx.c @@ -39,18 +39,14 @@ # include <machine/pio.h> # define RB_GETC(q) getc(q) # else /* BSD 4.4 Lite */ -# include <machine/cpufunc.h> # include <sys/devconf.h> # endif -# define oproc_func_t void(*)(struct tty*) #endif #ifdef __bsdi__ # include <sys/ttystats.h> # include <machine/inline.h> # define tsleep(tp,pri,msg,x) ((tp)->t_state |= TS_WOPEN,\ ttysleep (tp, (caddr_t)&tp->t_rawq, pri, msg, x)) -# define oproc_func_t int(*)() -# define timeout_func_t void(*)() #endif #if !defined (__FreeBSD__) || __FreeBSD__ >= 2 # define t_out t_outq @@ -119,7 +115,7 @@ int cxopen (dev_t dev, int flag, int mode, struct proc *p) bzero (cx_tty[unit], sizeof (*cx_tty[unit])); c->ttyp = cx_tty[unit]; #endif - c->ttyp->t_oproc = (oproc_func_t) cxoproc; + c->ttyp->t_oproc = cxoproc; c->ttyp->t_param = cxparam; } #ifdef __bsdi__ @@ -806,7 +802,7 @@ int cxrinta (cx_chan_t *c) c->stat->ibytes += len; if (tp && (tp->t_state & TS_ISOPEN)) { int i; - void (*rint)() = (void(*)()) + int (*rint)(int, struct tty *) = linesw[tp->t_line].l_rint; for (i=0; i<len; ++i) @@ -855,7 +851,7 @@ int cxrinta (cx_chan_t *c) /* Handle received data. */ if ((risr & RIS_EOBUF) && tp && (tp->t_state & TS_ISOPEN)) { - void (*rint)() = (void(*)()) linesw[tp->t_line].l_rint; + int (*rint)(int, struct tty *) = linesw[tp->t_line].l_rint; unsigned char *buf; int i; @@ -941,7 +937,7 @@ void cxmint (cx_chan_t *c) /* * Recover after lost transmit interrupts. */ -void cxtimeout (caddr_t a) +void cxtimeout (void *a) { cx_board_t *b; cx_chan_t *c; @@ -963,6 +959,6 @@ void cxtimeout (caddr_t a) } splx (s); } - timeout ((timeout_func_t) cxtimeout, 0, hz*5); + timeout (cxtimeout, 0, hz*5); } #endif /* NCX */ |
