Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 6 Apr 2004 23:04:27 -0700 (PDT)
From:      Warner Losh <imp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 50576 for review
Message-ID:  <200404070604.i3764Qi5002954@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help 
http://perforce.freebsd.org/chv.cgi?CH=50576

Change 50576 by imp@imp_pacopaco on 2004/04/06 23:04:22

	IFC @50573

Affected files ...

.. //depot/projects/power/sys/conf/files.pc98#5 integrate
.. //depot/projects/power/sys/dev/sio/sio.c#7 integrate
.. //depot/projects/power/sys/i386/isa/bs/bs.c#2 delete
.. //depot/projects/power/sys/i386/isa/bs/bsfunc.c#2 delete
.. //depot/projects/power/sys/i386/isa/bs/bsfunc.h#2 delete
.. //depot/projects/power/sys/i386/isa/bs/bshw.c#2 delete
.. //depot/projects/power/sys/i386/isa/bs/bshw.h#2 delete
.. //depot/projects/power/sys/i386/isa/bs/bshw.lst#2 delete
.. //depot/projects/power/sys/i386/isa/bs/bshw_dma.c#2 delete
.. //depot/projects/power/sys/i386/isa/bs/bshw_pdma.c#2 delete
.. //depot/projects/power/sys/i386/isa/bs/bsif.c#2 delete
.. //depot/projects/power/sys/i386/isa/bs/bsif.h#3 delete
.. //depot/projects/power/sys/i386/isa/bs/bsvar.h#2 delete
.. //depot/projects/power/sys/pc98/conf/GENERIC#4 integrate
.. //depot/projects/power/sys/pc98/conf/GENERIC.hints#3 integrate

Differences ...

==== //depot/projects/power/sys/conf/files.pc98#5 (text+ko) ====

@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-# $FreeBSD: src/sys/conf/files.pc98,v 1.290 2004/03/22 13:37:11 nyan Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.291 2004/04/07 05:44:50 imp Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -196,10 +196,6 @@
 i386/ibcs2/imgact_coff.c	optional	ibcs2
 i386/isa/atpic.c		standard
 i386/isa/atpic_vector.s		standard
-i386/isa/bs/bs.c		optional	bs
-i386/isa/bs/bsfunc.c		optional	bs
-i386/isa/bs/bshw.c		optional	bs
-i386/isa/bs/bsif.c		count		bs
 i386/isa/cy.c			count		cy
 i386/isa/elink.c		optional	ep
 i386/isa/elink.c		optional	ie

==== //depot/projects/power/sys/dev/sio/sio.c#7 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.424 2004/04/07 04:59:55 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.425 2004/04/07 05:30:54 imp Exp $");
 
 #include "opt_comconsole.h"
 #include "opt_compat.h"
@@ -1792,20 +1792,9 @@
 			}
 		}
 		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;

==== //depot/projects/power/sys/pc98/conf/GENERIC#4 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.244 2004/03/15 00:49:40 obrien Exp $
+# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.245 2004/04/07 05:44:50 imp Exp $
 
 machine		pc98
 #cpu		I386_CPU		# Do not enable with other cpu types
@@ -101,8 +101,6 @@
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 
 device		aic		# PC-9801-100
-#options 	BS_TARG_SAFEMODE
-#device		bs	1	# WD33C93 SCSI card (55/92 like board)
 device		ct		# host adapter using WD33C93[ABC] chip (C bus)
 
 device		ncv		# NCR 53C500

==== //depot/projects/power/sys/pc98/conf/GENERIC.hints#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/pc98/conf/GENERIC.hints,v 1.18 2004/03/16 12:40:11 nyan Exp $
+# $FreeBSD: src/sys/pc98/conf/GENERIC.hints,v 1.19 2004/04/07 05:44:50 imp Exp $
 
 hint.atacbus.0.at="isa"
 hint.atacbus.0.port="0x640"
@@ -35,45 +35,6 @@
 hint.aic.0.irq="5"
 hint.aic.0.flags="0x10000"
 
-# PC-9801-92
-#hint.bs.0.at="isa"
-#hint.bs.0.port="0xCC0"
-#hint.bs.0.irq="5"
-#hint.bs.0.drq="3"
-#hint.bs.0.flags="0"
-# SC-98
-#hint.bs.0.at="isa"
-#hint.bs.0.port="0xCC0"
-#hint.bs.0.irq="5"
-#hint.bs.0.drq="3"
-#hint.bs.0.flags="0x10000"
-# HA-55BS2 and later
-#hint.bs.0.at="isa"
-#hint.bs.0.port="0xCC0"
-#hint.bs.0.irq="5"
-#hint.bs.0.drq="3"
-#hint.bs.0.flags="0x20000"
-# ELECOM type
-#hint.bs.0.at="isa"
-#hint.bs.0.port="0xCC0"
-#hint.bs.0.irq="5"
-#hint.bs.0.drq="3"
-#hint.bs.0.flags="0x30000"
-# SMIT
-#hint.bs.0.at="isa"
-#hint.bs.0.port="0xCC0"
-#hint.bs.0.irq="5"
-#hint.bs.0.drq="3"
-#hint.bs.0.maddr="0xdd000"
-#hint.bs.0.iosiz="0x1000"
-#hint.bs.0.flags="0x40000"
-# Logitec LHA-20x
-#hint.bs.0.at="isa"
-#hint.bs.0.port="0xCC0"
-#hint.bs.0.irq="5"
-#hint.bs.0.drq="3"
-#hint.bs.0.flags="0x50000"
-
 # GENERIC
 hint.ct.0.at="isa"
 # SC98

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404070604.i3764Qi5002954>