d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't pretend to support ix86's with 16-bit ints by using longs

Browse Source 
just to ensure 32-bit variables.  Doing so broke i386's with 64-bit
longs.
This commit is contained in:
Bruce Evans 1998-07-14 11:42:05 +00:00
parent b017a12bfd
commit 3cc954df66
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/syscons/syscons.c
View File

@ -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);
}

16
sys/i386/isa/syscons.c
View File

@ -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);
}

16
sys/isa/syscons.c
View File

@ -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);
}