diff options
| author | Warner Losh <imp@FreeBSD.org> | 2004-04-11 20:15:15 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2004-04-11 20:15:15 +0000 |
| commit | 3b453e1bbaeb2b96486a91bf8ab243e99e00c2e7 (patch) | |
| tree | e881865314b8e5e80d4bafd6ad57df248d35b790 /sys/dev | |
| parent | 9dc313a3f7dda68fce7d8e16d03b0b2aa9159ddd (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/sx/sx.c | 34 | ||||
| -rw-r--r-- | sys/dev/sx/sx_pci.c | 2 |
2 files changed, 11 insertions, 25 deletions
diff --git a/sys/dev/sx/sx.c b/sys/dev/sx/sx.c index e88d7459b51ad..8cef3aed5d33e 100644 --- a/sys/dev/sx/sx.c +++ b/sys/dev/sx/sx.c @@ -91,21 +91,13 @@ static d_ioctl_t sxioctl; #define CDEV_MAJOR 185 static struct cdevsw sx_cdevsw = { - /* open */ sxopen, - /* close */ sxclose, - /* read */ ttyread, - /* write */ sxwrite, - /* ioctl */ sxioctl, - /* poll */ ttypoll, - /* mmap */ nommap, - /* strategy */ nostrategy, - /* name */ "sx", - /* maj */ CDEV_MAJOR, - /* dump */ nodump, - /* psize */ nopsize, - /* flags */ D_TTY | D_KQFILTER, - /* bmaj */ -1, - /* kqfilter */ ttykqfilter, + .d_version = D_VERSION, + .d_open = sxopen, + .d_close = sxclose, + .d_write = sxwrite, + .d_ioctl = sxioctl, + .d_name = "sx", + .d_flags = D_TTY | D_NEEDGIANT, }; static int sx_debug = 0; /* DBG_ALL|DBG_PRINTF|DBG_MODEM|DBG_IOCTL|DBG_PARAM;e */ @@ -344,7 +336,7 @@ sxopen( dev_t dev, int flag, int mode, - struct proc *p) + d_thread_t *p) { int oldspl, error; int card, chan; @@ -513,7 +505,7 @@ sxclose( dev_t dev, int flag, int mode, - struct proc *p) + d_thread_t *p) { struct sx_port *pp; struct tty *tp; @@ -705,7 +697,7 @@ sxioctl( u_long cmd, caddr_t data, int flag, - struct proc *p) + d_thread_t *p) { struct sx_softc *sc; struct sx_port *pp; @@ -1513,12 +1505,6 @@ sx_receive( i = sx_rxbuf[x]; if ((*linesw[tp->t_line].l_rint)(i, tp) == -1) pp->sp_delta_overflows++; - /* - * doesn't seem to be much point doing this here. - * this driver has no softtty processing! ?? - */ - if (pp->sp_hotchar && i == pp->sp_hotchar) - setsofttty(); } } pp->sp_state &= ~SX_SS_IRCV; diff --git a/sys/dev/sx/sx_pci.c b/sys/dev/sx/sx_pci.c index 8f7d31aa98693..35abb5517bb58 100644 --- a/sys/dev/sx/sx_pci.c +++ b/sys/dev/sx/sx_pci.c @@ -42,7 +42,7 @@ #include <dev/sx/sx.h> #include <dev/sx/sx_util.h> -#include <pci/pcivar.h> +#include <dev/pci/pcivar.h> static int sx_pci_probe( |