diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2002-10-17 07:04:31 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2002-10-17 07:04:31 +0000 |
| commit | 4bc30afc1ef6688ba2d68597de8e84a2a9cdfe1e (patch) | |
| tree | 740742631f3851cf2218a059eb9bad098359776c | |
| parent | e34215c0e9b97b01f0009ef2e9e8038f716a1c22 (diff) | |
| download | FreeBSD-src-4bc30afc1ef6688ba2d68597de8e84a2a9cdfe1e.zip FreeBSD-src-4bc30afc1ef6688ba2d68597de8e84a2a9cdfe1e.tar.gz | |
Add new syscons option SC_NO_SUSPEND_VTYSWITCH.
This disables vty switch during suspend/resume.
| -rw-r--r-- | sys/conf/NOTES | 1 | ||||
| -rw-r--r-- | sys/conf/options.alpha | 1 | ||||
| -rw-r--r-- | sys/conf/options.amd64 | 1 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 1 | ||||
| -rw-r--r-- | sys/conf/options.ia64 | 1 | ||||
| -rw-r--r-- | sys/conf/options.pc98 | 1 | ||||
| -rw-r--r-- | sys/isa/syscons_isa.c | 4 |
7 files changed, 10 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index c20bf71..d16b313 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1102,6 +1102,7 @@ options SC_NO_CUTPASTE options SC_NO_FONT_LOADING options SC_NO_HISTORY options SC_NO_SYSMOUSE +options SC_NO_SUSPEND_VTYSWITCH # `flags' for sc # 0x80 Put the video card in the VESA 800x600 dots, 16 color mode diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha index 784b27d..56e6b6a 100644 --- a/sys/conf/options.alpha +++ b/sys/conf/options.alpha @@ -45,6 +45,7 @@ SC_NORM_REV_ATTR opt_syscons.h SC_PIXEL_MODE opt_syscons.h SC_RENDER_DEBUG opt_syscons.h SC_TWOBUTTON_MOUSE opt_syscons.h +SC_NO_SUSPEND_VTYSWITCH opt_syscons.h DEV_SC VGA_ALT_SEQACCESS opt_vga.h diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 2b4a817..78bf9e8 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -32,6 +32,7 @@ SC_NORM_REV_ATTR opt_syscons.h SC_PIXEL_MODE opt_syscons.h SC_RENDER_DEBUG opt_syscons.h SC_TWOBUTTON_MOUSE opt_syscons.h +SC_NO_SUSPEND_VTYSWITCH opt_syscons.h VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 4c553bb..94be90e 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -93,6 +93,7 @@ SC_NORM_REV_ATTR opt_syscons.h SC_PIXEL_MODE opt_syscons.h SC_RENDER_DEBUG opt_syscons.h SC_TWOBUTTON_MOUSE opt_syscons.h +SC_NO_SUSPEND_VTYSWITCH opt_syscons.h VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64 index 4e3caf5..79fc50d 100644 --- a/sys/conf/options.ia64 +++ b/sys/conf/options.ia64 @@ -36,6 +36,7 @@ SC_NORM_REV_ATTR opt_syscons.h SC_PIXEL_MODE opt_syscons.h SC_RENDER_DEBUG opt_syscons.h SC_TWOBUTTON_MOUSE opt_syscons.h +SC_NO_SUSPEND_VTYSWITCH opt_syscons.h VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index c03fa92..80a9310 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -92,6 +92,7 @@ SC_NORM_REV_ATTR opt_syscons.h SC_PIXEL_MODE opt_syscons.h SC_RENDER_DEBUG opt_syscons.h SC_TWOBUTTON_MOUSE opt_syscons.h +SC_NO_SUSPEND_VTYSWITCH opt_syscons.h GDC opt_gdc.h diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c index dabf55d..0a9e22e 100644 --- a/sys/isa/syscons_isa.c +++ b/sys/isa/syscons_isa.c @@ -93,6 +93,7 @@ static int sc_cur_scr; static int scsuspend(device_t dev) { +#ifndef SC_NO_SUSPEND_VTYSWITCH int retry = 10; static int dummy; sc_softc_t *sc; @@ -107,17 +108,20 @@ scsuspend(device_t dev) tsleep(&dummy, 0, "scsuspend", 100); } while (retry--); +#endif return (0); } static int scresume(device_t dev) { +#ifndef SC_NO_SUSPEND_VTYSWITCH sc_softc_t *sc; sc = &main_softc; sc_switch_scr(sc, sc_cur_scr); +#endif return (0); } |
