d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix vga_probe() so that it doesn't report a non-vga display adapter as

Browse Source 
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)
This commit is contained in:
Doug Rabson 1998-10-31 10:35:24 +00:00
parent b421db370b
commit 57250ffb42
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/alpha/alpha/dec_kn20aa.c
View File

@ -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

6
sys/isa/syscons.c
View File

@ -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

10
sys/pci/pcisupport.c
View File

@ -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;