mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-05 09:14:03 +00:00
Only allow `sensitive' devices for displays in find_display(). This is
a quick fix for syscons deciding not to become the console because it thinks another tty device has priority.
This commit is contained in:
parent
29285d6cc5
commit
f9dd61a448
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=11670
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
|
||||
* $Id: isa.c,v 1.51 1995/09/10 21:35:09 bde Exp $
|
||||
* $Id: isa.c,v 1.52 1995/09/15 03:10:06 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -869,7 +869,10 @@ isa_strayintr(d)
|
||||
/*
|
||||
* Find the highest priority enabled display device. Since we can't
|
||||
* distinguish display devices from ttys, depend on display devices
|
||||
* being before serial ttys in the table.
|
||||
* being sensitive and before sensitive non-display devices (if any)
|
||||
* in isa_devtab_tty.
|
||||
*
|
||||
* XXX we should add capability flags IAMDISPLAY and ISUPPORTCONSOLES.
|
||||
*/
|
||||
struct isa_device *
|
||||
find_display()
|
||||
@ -877,7 +880,7 @@ find_display()
|
||||
struct isa_device *dvp;
|
||||
|
||||
for (dvp = isa_devtab_tty; dvp->id_driver != NULL; dvp++)
|
||||
if (dvp->id_enabled)
|
||||
if (dvp->id_driver->sensitive_hw && dvp->id_enabled)
|
||||
return (dvp);
|
||||
return (NULL);
|
||||
}
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
|
||||
* $Id: isa.c,v 1.51 1995/09/10 21:35:09 bde Exp $
|
||||
* $Id: isa.c,v 1.52 1995/09/15 03:10:06 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -869,7 +869,10 @@ isa_strayintr(d)
|
||||
/*
|
||||
* Find the highest priority enabled display device. Since we can't
|
||||
* distinguish display devices from ttys, depend on display devices
|
||||
* being before serial ttys in the table.
|
||||
* being sensitive and before sensitive non-display devices (if any)
|
||||
* in isa_devtab_tty.
|
||||
*
|
||||
* XXX we should add capability flags IAMDISPLAY and ISUPPORTCONSOLES.
|
||||
*/
|
||||
struct isa_device *
|
||||
find_display()
|
||||
@ -877,7 +880,7 @@ find_display()
|
||||
struct isa_device *dvp;
|
||||
|
||||
for (dvp = isa_devtab_tty; dvp->id_driver != NULL; dvp++)
|
||||
if (dvp->id_enabled)
|
||||
if (dvp->id_driver->sensitive_hw && dvp->id_enabled)
|
||||
return (dvp);
|
||||
return (NULL);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user