diff options
| author | bde <bde@FreeBSD.org> | 1998-07-14 11:42:05 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-07-14 11:42:05 +0000 |
| commit | 85267f210ba2f96fcc1c6bf8d95897ebc6979f1a (patch) | |
| tree | a4591abaa196fe87223dda094a64ba2a5fdc3e12 | |
| parent | ddb797776aee737912b29fef51ce93599cff59cd (diff) | |
| download | FreeBSD-src-85267f210ba2f96fcc1c6bf8d95897ebc6979f1a.zip FreeBSD-src-85267f210ba2f96fcc1c6bf8d95897ebc6979f1a.tar.gz | |
Don't pretend to support ix86's with 16-bit ints by using longs
just to ensure 32-bit variables. Doing so broke i386's with 64-bit
longs.
| -rw-r--r-- | sys/dev/syscons/syscons.c | 16 | ||||
| -rw-r--r-- | sys/i386/isa/syscons.c | 16 | ||||
| -rw-r--r-- | sys/isa/syscons.c | 16 |
3 files changed, 24 insertions, 24 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 8f11058..7b6a36c 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/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.264 1998/06/24 10:21:30 yokota Exp $ + * $Id: syscons.c,v 1.265 1998/07/06 06:29:07 imp Exp $ */ #include "sc.h" @@ -432,8 +432,8 @@ scvidprobe(int unit, int flags) */ u_short volatile *cp; u_short was; - u_long pa; - u_long segoff; + u_int pa; + u_int segoff; /* do this test only once */ if (init_done != COLD) @@ -507,11 +507,11 @@ scvidprobe(int unit, int flags) read_vgaregs(vgaregs); /* Get the BIOS video mode pointer */ - segoff = *(u_long *)pa_to_va(0x4a8); - pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff)); - if (ISMAPPED(pa, sizeof(u_long))) { - segoff = *(u_long *)pa_to_va(pa); - pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff)); + segoff = *(u_int *)pa_to_va(0x4a8); + pa = ((segoff & 0xffff0000) >> 12) + (segoff & 0xffff); + if (ISMAPPED(pa, sizeof(u_int))) { + segoff = *(u_int *)pa_to_va(pa); + pa = ((segoff & 0xffff0000) >> 12) + (segoff & 0xffff); if (ISMAPPED(pa, MODE_PARAM_SIZE)) video_mode_ptr = (char *)pa_to_va(pa); } diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index 8f11058..7b6a36c 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/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.264 1998/06/24 10:21:30 yokota Exp $ + * $Id: syscons.c,v 1.265 1998/07/06 06:29:07 imp Exp $ */ #include "sc.h" @@ -432,8 +432,8 @@ scvidprobe(int unit, int flags) */ u_short volatile *cp; u_short was; - u_long pa; - u_long segoff; + u_int pa; + u_int segoff; /* do this test only once */ if (init_done != COLD) @@ -507,11 +507,11 @@ scvidprobe(int unit, int flags) read_vgaregs(vgaregs); /* Get the BIOS video mode pointer */ - segoff = *(u_long *)pa_to_va(0x4a8); - pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff)); - if (ISMAPPED(pa, sizeof(u_long))) { - segoff = *(u_long *)pa_to_va(pa); - pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff)); + segoff = *(u_int *)pa_to_va(0x4a8); + pa = ((segoff & 0xffff0000) >> 12) + (segoff & 0xffff); + if (ISMAPPED(pa, sizeof(u_int))) { + segoff = *(u_int *)pa_to_va(pa); + pa = ((segoff & 0xffff0000) >> 12) + (segoff & 0xffff); if (ISMAPPED(pa, MODE_PARAM_SIZE)) video_mode_ptr = (char *)pa_to_va(pa); } diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index 8f11058..7b6a36c 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.264 1998/06/24 10:21:30 yokota Exp $ + * $Id: syscons.c,v 1.265 1998/07/06 06:29:07 imp Exp $ */ #include "sc.h" @@ -432,8 +432,8 @@ scvidprobe(int unit, int flags) */ u_short volatile *cp; u_short was; - u_long pa; - u_long segoff; + u_int pa; + u_int segoff; /* do this test only once */ if (init_done != COLD) @@ -507,11 +507,11 @@ scvidprobe(int unit, int flags) read_vgaregs(vgaregs); /* Get the BIOS video mode pointer */ - segoff = *(u_long *)pa_to_va(0x4a8); - pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff)); - if (ISMAPPED(pa, sizeof(u_long))) { - segoff = *(u_long *)pa_to_va(pa); - pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff)); + segoff = *(u_int *)pa_to_va(0x4a8); + pa = ((segoff & 0xffff0000) >> 12) + (segoff & 0xffff); + if (ISMAPPED(pa, sizeof(u_int))) { + segoff = *(u_int *)pa_to_va(pa); + pa = ((segoff & 0xffff0000) >> 12) + (segoff & 0xffff); if (ISMAPPED(pa, MODE_PARAM_SIZE)) video_mode_ptr = (char *)pa_to_va(pa); } |
