From 275658afcc2bbbcd3b4fe29a1768350606584f8f Mon Sep 17 00:00:00 2001 From: Kazutaka YOKOTA Date: Sun, 23 Sep 2001 08:42:06 +0000 Subject: [PATCH] Reinitialize the keyboard after the ACPI resume event. I am not sure if this is absolutely necessary on all systems. Yet, there certainly are motherboards and notebook systems which require this, although there are other systems which just don't. I hope we shall know when to do this on which systems, as the development of our ACPI subsystem progresses... (I know we didn't need this for the APM resume.) --- sys/dev/atkbdc/atkbd_atkbdc.c | 11 ++++++++++- sys/dev/atkbdc/atkbd_isa.c | 11 ++++++++++- sys/isa/atkbd_isa.c | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c index 5300d2f9f96..0e505dad772 100644 --- a/sys/dev/atkbdc/atkbd_atkbdc.c +++ b/sys/dev/atkbdc/atkbd_atkbdc.c @@ -148,12 +148,21 @@ atkbdattach(device_t dev) static int atkbdresume(device_t dev) { + atkbd_softc_t *sc; keyboard_t *kbd; + int args[2]; + sc = device_get_softc(dev); kbd = kbd_get_keyboard(kbd_find_keyboard(ATKBD_DRIVER_NAME, device_get_unit(dev))); - if (kbd) + if (kbd) { + kbd->kb_flags &= ~KB_INITIALIZED; + args[0] = device_get_unit(device_get_parent(dev)); + args[1] = rman_get_start(sc->intr); + (*kbdsw[kbd->kb_index]->init)(device_get_unit(dev), &kbd, + args, device_get_flags(dev)); (*kbdsw[kbd->kb_index]->clear_state)(kbd); + } return 0; } diff --git a/sys/dev/atkbdc/atkbd_isa.c b/sys/dev/atkbdc/atkbd_isa.c index 5300d2f9f96..0e505dad772 100644 --- a/sys/dev/atkbdc/atkbd_isa.c +++ b/sys/dev/atkbdc/atkbd_isa.c @@ -148,12 +148,21 @@ atkbdattach(device_t dev) static int atkbdresume(device_t dev) { + atkbd_softc_t *sc; keyboard_t *kbd; + int args[2]; + sc = device_get_softc(dev); kbd = kbd_get_keyboard(kbd_find_keyboard(ATKBD_DRIVER_NAME, device_get_unit(dev))); - if (kbd) + if (kbd) { + kbd->kb_flags &= ~KB_INITIALIZED; + args[0] = device_get_unit(device_get_parent(dev)); + args[1] = rman_get_start(sc->intr); + (*kbdsw[kbd->kb_index]->init)(device_get_unit(dev), &kbd, + args, device_get_flags(dev)); (*kbdsw[kbd->kb_index]->clear_state)(kbd); + } return 0; } diff --git a/sys/isa/atkbd_isa.c b/sys/isa/atkbd_isa.c index 5300d2f9f96..0e505dad772 100644 --- a/sys/isa/atkbd_isa.c +++ b/sys/isa/atkbd_isa.c @@ -148,12 +148,21 @@ atkbdattach(device_t dev) static int atkbdresume(device_t dev) { + atkbd_softc_t *sc; keyboard_t *kbd; + int args[2]; + sc = device_get_softc(dev); kbd = kbd_get_keyboard(kbd_find_keyboard(ATKBD_DRIVER_NAME, device_get_unit(dev))); - if (kbd) + if (kbd) { + kbd->kb_flags &= ~KB_INITIALIZED; + args[0] = device_get_unit(device_get_parent(dev)); + args[1] = rman_get_start(sc->intr); + (*kbdsw[kbd->kb_index]->init)(device_get_unit(dev), &kbd, + args, device_get_flags(dev)); (*kbdsw[kbd->kb_index]->clear_state)(kbd); + } return 0; }