summaryrefslogtreecommitdiffstats
path: root/sys/dev/sio
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2004-04-07 20:46:16 +0000
committerimp <imp@FreeBSD.org>2004-04-07 20:46:16 +0000
commitb49b7fe7994689a25dfc2162fe02f1d030360089 (patch)
treef64359b8b72bc65b9f8f6a8e46b2999e7062a280 /sys/dev/sio
parentbaec2dbefc3b20ea2b6218e6ceceb970085edff6 (diff)
downloadFreeBSD-src-b49b7fe7994689a25dfc2162fe02f1d030360089.zip
FreeBSD-src-b49b7fe7994689a25dfc2162fe02f1d030360089.tar.gz
Remove advertising clause from University of California Regent's
license, per letter dated July 22, 1999 and email from Peter Wemm, Alan Cox and Robert Watson. Approved by: core, peter, alc, rwatson
Diffstat (limited to 'sys/dev/sio')
-rw-r--r--sys/dev/sio/sio.c17
-rw-r--r--sys/dev/sio/sioreg.h4
-rw-r--r--sys/dev/sio/siovar.h4
3 files changed, 12 insertions, 13 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 6415fb5..64a49bb 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -1792,9 +1788,20 @@ siointr1(com)
}
}
line_status = inb(com->line_status_port);
-
+ if (line_status == 0xff) {
+ printf("sio%d: spouting nonsense -- disabled.\n",
+ com->unit);
+ com->gone = 1;
+ break;
+ }
/* input event? (check first to help avoid overruns) */
while (line_status & LSR_RCV_MASK) {
+ if (line_status == 0xff) {
+ printf("sio%d: linestats bogus -- disabled.\n",
+ com->unit);
+ com->gone = 1;
+ return;
+ }
/* break/unnattached error bits or real input? */
if (!(line_status & LSR_RXRDY))
recv_data = 0;
diff --git a/sys/dev/sio/sioreg.h b/sys/dev/sio/sioreg.h
index dd4beec..7b00452 100644
--- a/sys/dev/sio/sioreg.h
+++ b/sys/dev/sio/sioreg.h
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
diff --git a/sys/dev/sio/siovar.h b/sys/dev/sio/siovar.h
index 44c84f4..22a6019 100644
--- a/sys/dev/sio/siovar.h
+++ b/sys/dev/sio/siovar.h
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
OpenPOWER on IntegriCloud