diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1998-02-13 17:54:53 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1998-02-13 17:54:53 +0000 |
| commit | aa7caaaeb858ea7c3ce447f86596fe43e259f57c (patch) | |
| tree | d9a5c13038ec751baacdc0486d297074c970461d /sys/isa | |
| parent | cc7324910b3f616747a95eaa93beb8767137b55d (diff) | |
| download | src-aa7caaaeb858ea7c3ce447f86596fe43e259f57c.tar.gz src-aa7caaaeb858ea7c3ce447f86596fe43e259f57c.zip | |
Fix a couple of lines that dropped out in my merge yesterday.
Complained about by: ache
Notes
Notes:
svn path=/head/; revision=33327
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/syscons.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index 164b2aa861f8..6eed3c40185e 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.254 1998/02/12 22:05:05 phk Exp $ + * $Id: syscons.c,v 1.255 1998/02/13 11:31:34 phk Exp $ */ #include "sc.h" @@ -507,8 +507,12 @@ scvidprobe(int unit, int flags) /* Get the BIOS video mode pointer */ segoff = *(u_long *)pa_to_va(0x4a8); pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff)); - if (ISMAPPED(pa, MODE_PARAM_SIZE)) - video_mode_ptr = (char *)pa_to_va(pa); + if (ISMAPPED(pa, sizeof(u_long))) { + segoff = *(u_long *)pa_to_va(pa); + pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff)); + if (ISMAPPED(pa, MODE_PARAM_SIZE)) + video_mode_ptr = (char *)pa_to_va(pa); + } } } |