[Xorg-commit] xc/programs/Xserver/hw/xfree86/os-support/bsdi bsdi_video.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bsdi
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xfree86/os-support/bsdi

Modified Files:
      Tag: XORG-CURRENT
	bsdi_video.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: bsdi_video.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/bsdi_video.c	26 Nov 2003 22:49:01 -0000	1.1.4.2
+++ b/bsdi_video.c	23 Feb 2004 21:36:46 -0000	1.1.4.3
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c,v 3.10 2003/03/14 13:46:05 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c,v 3.11 2004/01/25 01:12:24 dawes Exp $ */
 /*
  * Copyright 1992 by Rich Murphey <Rich at Rice.edu>
  * Copyright 1993 by David Wexelblat <dwex at goblin.org>
@@ -47,23 +47,17 @@
 {
         pointer base;
 
-	if (Base >= 0xA0000)
-	{
-		base = mmap(0, Size,
-			    (Flags & VIDMEM_READONLY) ?
-			     PROT_READ : (PROT_READ | PROT_WRITE),
-			     MAP_FILE, xf86Info.screenFd, Base - 0xA0000);
-		if (base == MAP_FAILED)
-		{
-		    FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)\n",
-			       strerror(errno));
-		}
-		return(base);
-	}
-	else /* Base < 0xA0000 */
+	/* just try the mapping, and either it will work, or not */
+	base = mmap(0, Size,
+		    (Flags & VIDMEM_READONLY) ?
+		     PROT_READ : (PROT_READ | PROT_WRITE),
+		     MAP_FILE, xf86Info.screenFd, Base - 0xA0000);
+	if (base == MAP_FAILED)
 	{
-	    FatalError("xf86MapVidMem: cannot mmap /dev/vga below 0xA0000\n");
+	    FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s) at 0x%x\n",
+		       strerror(errno), Base);
 	}
+	return(base);
 }
 
 void