diff options
| author | David Greenman <dg@FreeBSD.org> | 1994-10-01 03:29:28 +0000 |
|---|---|---|
| committer | David Greenman <dg@FreeBSD.org> | 1994-10-01 03:29:28 +0000 |
| commit | 414c40f66d57c428f72eef27b04d6bdd5bee4f72 (patch) | |
| tree | 40be715c34cead4f2fc131208e59f8e556481276 /sys | |
| parent | 140cffd349f2f480a7bc9f0abafaa98991e6afb6 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/apm/apm.c | 8 | ||||
| -rw-r--r-- | sys/i386/bios/apm.c | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index 366084470460..6c35e1340234 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -547,6 +547,9 @@ apmprobe(struct isa_device *dvp) printf("apm%d: 32-bit connection error.\n", dvp->id_unit); return 0; } + if ((apm_version & 0xff00) != 0x0100) return 0; + if ((apm_version & 0x00f0) >= 0x00a0) return 0; + if ((apm_version & 0x000f) >= 0x000a) return 0; return -1; } @@ -698,9 +701,14 @@ apmattach(struct isa_device *dvp) disengaged = ((apm_flags & APM_DISENGAGED) != 0); /* print bootstrap messages */ +#ifdef DEBUG printf(" found APM BIOS version %d.%d\n", dvp->id_unit, majorversion, minorversion); printf("apm%d: Code32 0x%08x, Code16 0x%08x, Data 0x%08x\n", dvp->id_unit, cs32_base, cs16_base, ds_base); printf("apm%d: Code entry 0x%08x, Idling CPU %s, Management %s\n", dvp->id_unit, cs_entry, is_enabled(idle_cpu), is_enabled(!disabled)); +#else + printf(" found APM BIOS version %d.%d\n", majorversion, minorversion); + printf("apm%d: Idling CPU %s\n", dvp->id_unit, is_enabled(idle_cpu)); +#endif /* * APM 1.0 does not have: diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index 366084470460..6c35e1340234 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -547,6 +547,9 @@ apmprobe(struct isa_device *dvp) printf("apm%d: 32-bit connection error.\n", dvp->id_unit); return 0; } + if ((apm_version & 0xff00) != 0x0100) return 0; + if ((apm_version & 0x00f0) >= 0x00a0) return 0; + if ((apm_version & 0x000f) >= 0x000a) return 0; return -1; } @@ -698,9 +701,14 @@ apmattach(struct isa_device *dvp) disengaged = ((apm_flags & APM_DISENGAGED) != 0); /* print bootstrap messages */ +#ifdef DEBUG printf(" found APM BIOS version %d.%d\n", dvp->id_unit, majorversion, minorversion); printf("apm%d: Code32 0x%08x, Code16 0x%08x, Data 0x%08x\n", dvp->id_unit, cs32_base, cs16_base, ds_base); printf("apm%d: Code entry 0x%08x, Idling CPU %s, Management %s\n", dvp->id_unit, cs_entry, is_enabled(idle_cpu), is_enabled(!disabled)); +#else + printf(" found APM BIOS version %d.%d\n", majorversion, minorversion); + printf("apm%d: Idling CPU %s\n", dvp->id_unit, is_enabled(idle_cpu)); +#endif /* * APM 1.0 does not have: |