summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>1998-10-31 10:35:24 +0000
committerdfr <dfr@FreeBSD.org>1998-10-31 10:35:24 +0000
commit6812cb0412f8b584d79915b6f855ce0cbdc2d962 (patch)
tree04c86d5710708f0a053a9c18d0e4a4a8523ef270 /sys
parentc9ebff45d03b2e60c25849990936ef4b3bae0483 (diff)
downloadFreeBSD-src-6812cb0412f8b584d79915b6f855ce0cbdc2d962.zip
FreeBSD-src-6812cb0412f8b584d79915b6f855ce0cbdc2d962.tar.gz
* Fix vga_probe() so that it doesn't report a non-vga display adapter as
a vga. * Fix broken logic in syscons for a failed probe. * Fix AlphaStation 500/600 so that non-serial consoles are supported. Submitted by: Thomas Valentino Crimi <tcrimi+@andrew.cmu.edu> (vga bits), Andrew Gallatin <gallatin@cs.duke.edu> (AS500/AS600)
Diffstat (limited to 'sys')
-rw-r--r--sys/alpha/alpha/dec_kn20aa.c6
-rw-r--r--sys/isa/syscons.c6
-rw-r--r--sys/pci/pcisupport.c10
3 files changed, 14 insertions, 8 deletions
diff --git a/sys/alpha/alpha/dec_kn20aa.c b/sys/alpha/alpha/dec_kn20aa.c
index 2f018fb..1f4e672 100644
--- a/sys/alpha/alpha/dec_kn20aa.c
+++ b/sys/alpha/alpha/dec_kn20aa.c
@@ -130,20 +130,20 @@ dec_kn20aa_cons_init()
case 3:
/* display console ... */
/* XXX */
-#if NPCKBD > 0
+#if NSC > 0
sccnattach();
#else
panic("not configured to use display && keyboard console");
break;
+#endif
default:
printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
panic("consinit: unknown console type %d\n",
- ctb->ctb_term_type);
+ (int)ctb->ctb_term_type);
}
-#endif
}
#if 0
static void
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index 6d9f7c9..3c3bf5e 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: syscons.c,v 1.273 1998/08/06 09:15:53 dfr Exp $
+ * $Id: syscons.c,v 1.274 1998/09/17 09:38:35 dfr Exp $
* from: i386/isa syscons.c,v 1.278
*/
@@ -452,12 +452,12 @@ scprobe(device_t dev)
if (!scvidprobe(device_get_unit(dev), isa_get_flags(dev))) {
if (bootverbose)
printf("sc%d: no video adapter is found.\n", device_get_unit(dev));
- return (0);
+ return (ENXIO);
}
(*biosvidsw.diag)(bootverbose);
#if defined(VESA) && defined(VM86)
if (vesa_load())
- return FALSE;
+ return ENXIO;
(*biosvidsw.diag)(bootverbose);
#endif
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index b78ac65..1cac450 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pcisupport.c,v 1.71 1998/07/07 05:00:09 bde Exp $
+** $Id: pcisupport.c,v 1.72 1998/09/16 20:29:22 msmith Exp $
**
** Device driver for DEC/INTEL PCI chipsets.
**
@@ -1137,8 +1137,14 @@ static char* vga_probe (pcici_t tag, pcidi_t typea)
if ((data & PCI_SUBCLASS_MASK)
== PCI_SUBCLASS_DISPLAY_VGA)
type = "VGA-compatible display device";
- else
+ else {
+ /*
+ * If it isn't a vga display device,
+ * don't pretend we found one.
+ */
type = "Display device";
+ return 0;
+ }
}
break;
OpenPOWER on IntegriCloud