diff options
| author | Scott Long <scottl@FreeBSD.org> | 2004-02-22 04:18:23 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2004-02-22 04:18:23 +0000 |
| commit | 685cd723aa7fd76b1fe9f6d9a7e43fc67c5623be (patch) | |
| tree | 930b62375c8a867ea25bde2a98adbdaae55a5f3b /comms | |
| parent | BROKEN: Checksum mismatch (diff) | |
Catch up to the cdevsw changes in 5-current.
Notes
Notes:
svn path=/head/; revision=101673
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/ltmdm/files/patch-aa | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/comms/ltmdm/files/patch-aa b/comms/ltmdm/files/patch-aa index 5f39485aa027..551b36241a5d 100644 --- a/comms/ltmdm/files/patch-aa +++ b/comms/ltmdm/files/patch-aa @@ -1,5 +1,5 @@ ---- sys/dev/ltmdm/ltmdmsio.c.orig Mon Mar 11 20:47:31 2002 -+++ sys/dev/ltmdm/ltmdmsio.c Wed Sep 17 16:34:20 2003 +--- sys/dev/ltmdm/ltmdmsio.c.orig Mon Mar 11 18:47:31 2002 ++++ sys/dev/ltmdm/ltmdmsio.c Sat Feb 21 20:56:45 2004 @@ -60,7 +60,9 @@ #include <sys/proc.h> #include <sys/module.h> @@ -86,7 +86,7 @@ /* dump */ nodump, /* psize */ nopsize, #if __FreeBSD_version < 430000 -@@ -373,10 +395,25 @@ +@@ -373,10 +395,30 @@ /* bmaj */ -1, /* kqfilter */ ttykqfilter, #else /* __FreeBSD_version >= 500000 */ @@ -101,7 +101,6 @@ + .d_read = sioread, + .d_write = siowrite, + .d_ioctl = sioioctl, -+ .d_poll = ttypoll, + .d_name = driver_name, +#ifdef MAJOR_AUTO + .d_maj = MAJOR_AUTO, @@ -110,10 +109,16 @@ +#endif + .d_kqfilter = ttykqfilter, +#endif ++#if __FreeBSD_version >= 502102 ++ .d_flags = D_TTY | D_NEEDGIANT, ++ .d_version = D_VERSION ++#else ++ .d_poll = ttypoll, ++#endif }; static u_int com_events; /* input chars + weighted output completions */ -@@ -1295,8 +1332,11 @@ +@@ -1295,8 +1337,11 @@ DPRINTF(1,(" x_chip_version = %d\n", x_chip_version)); com->flags = flags; @@ -125,7 +130,7 @@ /* * initialize the device registers as follows: -@@ -1685,7 +1725,9 @@ +@@ -1685,7 +1730,9 @@ s = splfunc(); com->do_timestamp = FALSE; com->do_dcd_timestamp = FALSE; @@ -135,7 +140,7 @@ write_vuart_port(UART_CFCR, com->cfcr_image &= ~CFCR_SBREAK); { write_vuart_port(UART_IER, 0); -@@ -1894,23 +1936,34 @@ +@@ -1894,23 +1941,34 @@ u_char recv_data; u_char int_ctl; u_char int_ctl_new; @@ -170,7 +175,7 @@ line_status = read_vuart_port(UART_LSR); /* input event? (check first to help avoid overruns) */ -@@ -2195,7 +2248,9 @@ +@@ -2195,7 +2253,9 @@ break; default: splx(s); @@ -180,7 +185,7 @@ if (error == ENODEV) error = ENOTTY; return (error); -@@ -2796,7 +2851,7 @@ +@@ -2796,7 +2856,7 @@ #endif DRIVER_MODULE(ltmdm, pci, ltmdm_pci_driver, ltmdm_devclass, ltmdm_event, 0); |