diff options
author | jkim <jkim@FreeBSD.org> | 2011-05-09 18:46:49 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2011-05-09 18:46:49 +0000 |
commit | 7524282161c632ffb78c9164f3b96d7b79d87d3f (patch) | |
tree | bf9745f930ffa05f3a43721363572afea4b3a11b /sys/pc98 | |
parent | 6d3172737bad4b518a4747bbbcfcb94d14ed92f6 (diff) | |
download | FreeBSD-src-7524282161c632ffb78c9164f3b96d7b79d87d3f.zip FreeBSD-src-7524282161c632ffb78c9164f3b96d7b79d87d3f.tar.gz |
Move VT switching hack for suspend/resume from bus drivers to syscons.c
using event handlers. A different version was
Submitted by: Taku YAMAMOTO (taku at tackymt dot homeip dot net)
Diffstat (limited to 'sys/pc98')
-rw-r--r-- | sys/pc98/cbus/syscons_cbus.c | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c index 0220b2f..e5c2979 100644 --- a/sys/pc98/cbus/syscons_cbus.c +++ b/sys/pc98/cbus/syscons_cbus.c @@ -49,17 +49,6 @@ __FBSDID("$FreeBSD$"); static devclass_t sc_devclass; static sc_softc_t main_softc; -#ifdef SC_NO_SUSPEND_VTYSWITCH -static int sc_no_suspend_vtswitch = 1; -#else -static int sc_no_suspend_vtswitch = 0; -#endif -static int sc_cur_scr; - -TUNABLE_INT("hw.syscons.sc_no_suspend_vtswitch", &sc_no_suspend_vtswitch); -SYSCTL_DECL(_hw_syscons); -SYSCTL_INT(_hw_syscons, OID_AUTO, sc_no_suspend_vtswitch, CTLFLAG_RW, - &sc_no_suspend_vtswitch, 0, "Disable VT switch before suspend."); static void scidentify(driver_t *driver, device_t parent) @@ -87,47 +76,6 @@ scattach(device_t dev) return sc_attach_unit(device_get_unit(dev), device_get_flags(dev)); } -static int -scsuspend(device_t dev) -{ - int retry = 10; - sc_softc_t *sc; - - sc = &main_softc; - - if (sc->cur_scp == NULL) - return (0); - - sc_cur_scr = sc->cur_scp->index; - - if (sc_no_suspend_vtswitch) - return (0); - - do { - sc_switch_scr(sc, 0); - if (!sc->switch_in_progress) { - break; - } - pause("scsuspend", hz); - } while (retry--); - - return (0); -} - -static int -scresume(device_t dev) -{ - sc_softc_t *sc; - - if (sc_no_suspend_vtswitch) - return (0); - - sc = &main_softc; - sc_switch_scr(sc, sc_cur_scr); - - return (0); -} - int sc_max_unit(void) { @@ -242,8 +190,6 @@ static device_method_t sc_methods[] = { DEVMETHOD(device_identify, scidentify), DEVMETHOD(device_probe, scprobe), DEVMETHOD(device_attach, scattach), - DEVMETHOD(device_suspend, scsuspend), - DEVMETHOD(device_resume, scresume), { 0, 0 } }; |