From 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sat, 25 Jul 2009 19:39:46 +0000
Subject: Added xorg-server-1.6.2.tar.gz

---
 .../hw/xfree86/os-support/shared/bios_mmap.c       |  29 +-----
 xorg-server/hw/xfree86/os-support/shared/inout.S   | 111 ---------------------
 .../hw/xfree86/os-support/shared/posix_tty.c       |  11 +-
 xorg-server/hw/xfree86/os-support/shared/sigio.c   |   2 +-
 .../hw/xfree86/os-support/shared/stdResource.c     |   3 -
 5 files changed, 7 insertions(+), 149 deletions(-)
 delete mode 100644 xorg-server/hw/xfree86/os-support/shared/inout.S

(limited to 'xorg-server/hw/xfree86/os-support/shared')

diff --git a/xorg-server/hw/xfree86/os-support/shared/bios_mmap.c b/xorg-server/hw/xfree86/os-support/shared/bios_mmap.c
index 8bac87ebe..0c368e713 100644
--- a/xorg-server/hw/xfree86/os-support/shared/bios_mmap.c
+++ b/xorg-server/hw/xfree86/os-support/shared/bios_mmap.c
@@ -91,33 +91,15 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
    *  re: boundaries and sizes and such...
    */
 
-/*
- * The Jensen lacks dense memory, thus we have to address the bus via
- * the sparse addressing scheme.
- *
- * Martin Ostermann (ost@comnets.rwth-aachen.de) - Apr.-Sep. 1996
- */
-
 #ifdef linux
 
-#ifdef TEST_JENSEN_CODE /* define to test the Sparse addressing on a non-Jensen */
-#define SPARSE (5)
-#define isJensen (1)
-#else
-#define isJensen (!_bus_base())
-#define SPARSE (7)
-#endif
-
 extern unsigned long _bus_base(void);
-extern unsigned long _bus_base_sparse(void);
-#define BUS_BASE (isJensen ? _bus_base_sparse() : _bus_base())
-#define JENSEN_SHIFT(x) (isJensen ? ((long)x<<SPARSE) : (long)x)
+#define BUS_BASE _bus_base()
 
 #else
 
 extern u_int64_t dense_base(void);
 #define BUS_BASE dense_base()
-#define JENSEN_SHIFT(x) ((long) x)
 
 #endif
 
@@ -141,8 +123,8 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
 	Offset += Base & (psize - 1);
 	Base &= ~(psize - 1);
 	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-	base = mmap((caddr_t)0, JENSEN_SHIFT(mlen), PROT_READ,
-		    MAP_SHARED, fd, (off_t)(JENSEN_SHIFT(Base) + BUS_BASE));
+	base = mmap((caddr_t)0, mlen, PROT_READ,
+		    MAP_SHARED, fd, (off_t)(Base + BUS_BASE));
 
 	if (base == MAP_FAILED)
 	{
@@ -151,10 +133,9 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
 		return(-1);
 	}
 
-	xf86SlowBCopyFromBus((unsigned char *)(base+JENSEN_SHIFT(Offset)), 
-								    Buf, Len);
+	xf86SlowBCopyFromBus((unsigned char *)(base+Offset), Buf, Len);
 
-	munmap((caddr_t)JENSEN_SHIFT(base), JENSEN_SHIFT(mlen));
+	munmap((caddr_t)base, mlen);
 	close(fd);
 	return(Len);
 }
diff --git a/xorg-server/hw/xfree86/os-support/shared/inout.S b/xorg-server/hw/xfree86/os-support/shared/inout.S
deleted file mode 100644
index 80c47c419..000000000
--- a/xorg-server/hw/xfree86/os-support/shared/inout.S
+++ /dev/null
@@ -1,111 +0,0 @@
-/* $XConsortium: inout.s /main/6 1996/02/21 17:53:35 kaleb $ */
-
-
-
-
-
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.S,v 1.1 1999/07/10 07:24:52 dawes Exp $ */
-
-#include "assyntax.h"
-
-/*
- *	Make i80386 io primitives available at C-level.
- */
-
-	FILE("inout.s")
-	AS_BEGIN
-	SEG_TEXT
-
-/*
- *-----------------------------------------------------------------------
- * inb ---
- *	Input one byte.
- *
- * Results:
- *      Byte in al.
- *-----------------------------------------------------------------------
- */
-	GLOBL	GLNAME(inb)
-GLNAME(inb):
-	MOV_L	(REGOFF(4,ESP),EDX)
-	SUB_L	(EAX,EAX)
-	IN_B
-	RET
-
-/*
- *-----------------------------------------------------------------------
- * outb ---
- *	Output one byte.
- *
- * Results:
- *      None.
- *-----------------------------------------------------------------------
- */
-	GLOBL	GLNAME(outb)
-GLNAME(outb):
-	MOV_L	(REGOFF(4,sp),EDX)
-	MOV_L	(REGOFF(8,sp),EAX)
-	OUT_B
-	RET
-/*
- *-----------------------------------------------------------------------
- * inw ---
- *	Input one 16-bit word.
- *
- * Results:
- *      Word in ax.
- *-----------------------------------------------------------------------
- */
-	GLOBL	GLNAME(inw)
-GLNAME(inw):
-	MOV_L	(REGOFF(4,ESP),EDX)
-	IN_W
-	RET
-
-/*
- *-----------------------------------------------------------------------
- * outw ---
- *	Output one 16-bit word.
- *
- * Results:
- *      None.
- *-----------------------------------------------------------------------
- */
-	GLOBL	GLNAME(outw)
-GLNAME(outw):
-	MOV_L	(REGOFF(4,ESP),EDX)
-	MOV_L	(REGOFF(8,ESP),EAX)
-	OUT_W
-	RET
-
-/*
- *-----------------------------------------------------------------------
- * inl ---
- *	Input one 32-bit longword.
- *
- * Results:
- *      Word in eax.
- *-----------------------------------------------------------------------
- */
-	GLOBL	GLNAME(inl)
-GLNAME(inl):
-	MOV_L	(REGOFF(4,ESP),EDX)
-	IN_L
-	RET
-
-/*
- *-----------------------------------------------------------------------
- * outl ---
- *	Output one 32-bit longword.
- *
- * Results:
- *      None.
- *-----------------------------------------------------------------------
- */
-	GLOBL	GLNAME(outl)
-GLNAME(outl):
-	MOV_L	(REGOFF(4,ESP),EDX)
-	MOV_L	(REGOFF(8,ESP),EAX)
-	OUT_L
-	RET
-
diff --git a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
index 002e3a275..316526bdc 100644
--- a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
+++ b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
@@ -114,9 +114,6 @@ GetBaud (int baudrate)
 _X_EXPORT int
 xf86OpenSerial (pointer options)
 {
-#ifdef Lynx
-	struct sgttyb ms_sgtty;
-#endif
 	struct termios t;
 	int fd, i;
 	char *dev;
@@ -155,12 +152,6 @@ xf86OpenSerial (pointer options)
 #endif
 	}
 
-#ifdef Lynx
-	/* LynxOS does not assert DTR without this */
-	ioctl (fd, TIOCGETP, (char *) &ms_sgtty);
-	ioctl (fd, TIOCSDTR, (char *) &ms_sgtty);
-#endif
-
 	/* set up default port parameters */
 	SYSCALL (tcgetattr (fd, &t));
 	t.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR\
@@ -343,7 +334,7 @@ xf86SetSerial (int fd, pointer options)
 	if ((xf86SetBoolOption (options, "ClearDTR", FALSE)))
 	{
 #ifdef CLEARDTR_SUPPORT
-# if !defined(Lynx) || defined(TIOCMBIC)
+# if defined(TIOCMBIC)
 		val = TIOCM_DTR;
 		SYSCALL (ioctl(fd, TIOCMBIC, &val));
 # else
diff --git a/xorg-server/hw/xfree86/os-support/shared/sigio.c b/xorg-server/hw/xfree86/os-support/shared/sigio.c
index f51131c6b..92bdd2988 100644
--- a/xorg-server/hw/xfree86/os-support/shared/sigio.c
+++ b/xorg-server/hw/xfree86/os-support/shared/sigio.c
@@ -229,7 +229,7 @@ xf86RemoveSIGIOHandler(int fd)
 	    sigemptyset(&sa.sa_mask);
 	    sigaddset(&sa.sa_mask, SIGIO);
 	    sa.sa_flags   = 0;
-	    sa.sa_handler = SIG_DFL;
+	    sa.sa_handler = SIG_IGN;
 	    sigaction(SIGIO, &sa, &osa);
 	}
     }
diff --git a/xorg-server/hw/xfree86/os-support/shared/stdResource.c b/xorg-server/hw/xfree86/os-support/shared/stdResource.c
index c144211f0..8cb101488 100644
--- a/xorg-server/hw/xfree86/os-support/shared/stdResource.c
+++ b/xorg-server/hw/xfree86/os-support/shared/stdResource.c
@@ -77,9 +77,6 @@ xf86StdAccResFromOS(resPtr ret)
     ret = xf86AddResToList(ret, &range, -1);
     RANGE(range, 0x000f0000, 0x000fffff, ResExcMemBlock);
     ret = xf86AddResToList(ret, &range, -1);
-    RANGE(range, 0x00100000, 0x3fffffff,
-	ResExcMemBlock | ResBios | ResEstimated);
-    ret = xf86AddResToList(ret, &range, -1);
 #if 0
     RANGE(range, 0xfec00000, 0xfecfffff, ResExcMemBlock | ResBios);
     ret = xf86AddResToList(ret, &range, -1);
-- 
cgit v1.2.3