diff options
| author | yokota <yokota@FreeBSD.org> | 1999-05-09 04:58:35 +0000 |
|---|---|---|
| committer | yokota <yokota@FreeBSD.org> | 1999-05-09 04:58:35 +0000 |
| commit | aea63d1e76e7c3e4b8eee596a22e305243c847b7 (patch) | |
| tree | 7c510b0361445a130d6aaa66e765071363e0c7a7 /sys/isa | |
| parent | 58c19147f4605aaf8a46a34a01ff899c039fba57 (diff) | |
| download | FreeBSD-src-aea63d1e76e7c3e4b8eee596a22e305243c847b7.zip FreeBSD-src-aea63d1e76e7c3e4b8eee596a22e305243c847b7.tar.gz | |
Revive APM hooking code for i386 arch now that the same source file is
used for both i386 and alpha (the code was in sys/i386/isa/psm.c, but
was disabled when ported to alpha.)
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/psm.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/isa/psm.c b/sys/isa/psm.c index c6f69a7..58550b8 100644 --- a/sys/isa/psm.c +++ b/sys/isa/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.6 1999/05/07 10:10:40 phk Exp $ + * $Id: psm.c,v 1.7 1999/05/08 21:59:29 dfr Exp $ */ /* @@ -62,7 +62,9 @@ */ #include "psm.h" -/* #include "apm.h" */ +#ifdef __i386__ +#include "apm.h" +#endif #include "opt_devfs.h" #include "opt_psm.h" @@ -85,6 +87,9 @@ #include <sys/select.h> #include <sys/uio.h> +#ifdef __i386__ +#include <machine/apm_bios.h> +#endif #include <machine/clock.h> #include <machine/limits.h> #include <machine/mouse.h> @@ -2176,7 +2181,7 @@ enable_msintelli(struct psm_softc *sc) static int psmresume(void *dummy) { - struct psm_softc *sc = psm_softc[(int)dummy]; + struct psm_softc *sc = PSM_SOFTC((int)dummy); int unit = (int)dummy; int err = 0; int s; |
