trial

This reverts commit 58692a7fd8.

.gitignore

@@ -0,0 +1,9 @@
+*.o
+*.a
+*.lo
+*.so
+*.exe
+fxgasm.h
+*.exe
+fxgasm
+fxinline.h

Device3Dfx/3dfx_driver.c

@@ -71,23 +71,33 @@
 #include <linux/mm.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,46) && \
     LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17) || \
     defined(DEVFS_SUPPORT)
-#include <linux/devfs_fs_kernel.h>
+	#include <linux/devfs_fs_kernel.h>
-#define HAVE_DEVFS 1
+	#define HAVE_DEVFS 1
 #else
-#define HAVE_DEVFS 0
+	#define HAVE_DEVFS 0
 #endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+	#include <linux/device.h>
+	#include <linux/err.h>
+	#define HAVE_CLASS_DEVICE 1
+#else
+	#define HAVE_CLASS_DEVICE 0
+#endif
+
 #include <asm/segment.h>
 #include <asm/ioctl.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
-
 #include <asm/uaccess.h>
+
 #ifdef CONFIG_MTRR
-#include <asm/mtrr.h>
+	#include <asm/mtrr.h>
 #endif
 
 #define MAJOR_3DFX 107
@@ -112,44 +122,44 @@
 #define SC_DATA  0x3c5
 
 #ifndef PCI_VENDOR_ID_3DFX
-#define PCI_VENDOR_ID_3DFX 0x121a
+	#define PCI_VENDOR_ID_3DFX 0x121a
 #endif
 
 #ifndef PCI_VENDOR_ID_ALLIANCE
-#define PCI_VENDOR_ID_ALLIANCE 0x1142
+	#define PCI_VENDOR_ID_ALLIANCE 0x1142
 #endif
 
 #ifndef PCI_VENDOR_ID_MACRONIX
-#define PCI_VENDOR_ID_MACRONIX 0x10d9
+	#define PCI_VENDOR_ID_MACRONIX 0x10d9
 #endif
 
 #ifndef PCI_DEVICE_ID_3DFX_VOODOO2
-#define PCI_DEVICE_ID_3DFX_VOODOO2 2
+	#define PCI_DEVICE_ID_3DFX_VOODOO2 2
 #endif
 
 #ifndef PCI_DEVICE_ID_ALLIANCE_AT3D
-#define PCI_DEVICE_ID_ALLIANCE_AT3D 0x643d
+	#define PCI_DEVICE_ID_ALLIANCE_AT3D 0x643d
 #endif
 
 #ifndef PCI_DEVICE_ID_MACRONIX_MX86251
-#define PCI_DEVICE_ID_MACRONIX_MX86251 0x8626
+	#define PCI_DEVICE_ID_MACRONIX_MX86251 0x8626
 #endif
 
 #ifndef PCI_DEVICE_ID_3DFX_BANSHEE
-#define PCI_DEVICE_ID_3DFX_BANSHEE 3
+	#define PCI_DEVICE_ID_3DFX_BANSHEE 3
 #endif
 
 #ifndef PCI_DEVICE_ID_3DFX_VOODOO3
-#define PCI_DEVICE_ID_3DFX_VOODOO3 5
+	#define PCI_DEVICE_ID_3DFX_VOODOO3 5
 #endif
 
 #ifndef PCI_DEVICE_ID_3DFX_VOODOO4
-#define PCI_DEVICE_ID_3DFX_VOODOO4 9
+	#define PCI_DEVICE_ID_3DFX_VOODOO4 9
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,73)
-#define pci_get_device pci_find_device
+	#define pci_get_device pci_find_device
-#define pci_dev_put(dev)
+	#define pci_dev_put(dev)
 #endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
@@ -198,22 +208,22 @@ static struct pci_card {
  * on kernel version.
  */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,14)
-#define VM_OFFSET(vma) (vma->vm_offset)
+	#define VM_OFFSET(vma) (vma->vm_offset)
-#define VM_OFFSET_ALIGNED(vma) ((vma->vm_offset) & ~PAGE_MASK)
+	#define VM_OFFSET_ALIGNED(vma) ((vma->vm_offset) & ~PAGE_MASK)
 #else
-#define VM_OFFSET(vma) (vma->vm_pgoff << PAGE_SHIFT)
+	#define VM_OFFSET(vma) (vma->vm_pgoff << PAGE_SHIFT)
-#define VM_OFFSET_ALIGNED(vma) ((vma->vm_pgoff) & ~PAGE_MASK)
+	#define VM_OFFSET_ALIGNED(vma) ((vma->vm_pgoff) & ~PAGE_MASK)
 #endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
-#define my_remap_page_range(vma, start, ofs, len, prot) \
+	#define my_remap_page_range(vma, start, ofs, len, prot) \
-	remap_pfn_range(vma, start, ofs >> PAGE_SHIFT, len, prot)
+		remap_pfn_range(vma, start, ofs >> PAGE_SHIFT, len, prot)
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#define my_remap_page_range(vma, start, ofs, len, prot) \
+	#define my_remap_page_range(vma, start, ofs, len, prot) \
-	remap_page_range(vma, start, ofs, len, prot)
+		remap_page_range(vma, start, ofs, len, prot)
 #else
-#define my_remap_page_range(vma, start, ofs, len, prot) \
+	#define my_remap_page_range(vma, start, ofs, len, prot) \
-	remap_page_range(start, ofs, len, prot)
+		remap_page_range(start, ofs, len, prot)
 #endif
 
 struct pioData_t {
@@ -256,6 +266,10 @@ static int numCards = 0;
 static devfs_handle_t devfs_handle;
 #endif
 #endif
+#if HAVE_CLASS_DEVICE
+static struct class *class_3dfx = NULL;
+static struct device *device_3dfx = NULL;
+#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 static void findCardType(int vendor, int device)
@@ -303,6 +317,7 @@ static int findCards(void)
 {
 	int error;
 	
+	numCards = 0;
 	error = pci_register_driver(&driver_3dfx);
 
 	if (error)
@@ -799,6 +814,11 @@ static struct file_operations fops_3dfx = {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 static int probe_3dfx(struct pci_dev *dev, const struct pci_device_id *id)
 {
+	if (numCards >= MAXCARDS) {
+		printk("3dfx: too many cards, MAXCARDS=%d\n", MAXCARDS);
+		return -ENODEV;
+	}
+
 	pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &cards[numCards].addr0);
 	pci_read_config_dword(dev, PCI_BASE_ADDRESS_1, &cards[numCards].addr1);
 	pci_read_config_dword(dev, PCI_BASE_ADDRESS_2, &cards[numCards].addr2);
@@ -833,6 +853,50 @@ static struct pci_driver driver_3dfx = {
 };
 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
 
+#if HAVE_CLASS_DEVICE
+static int create_device_3dfx(void)
+{
+	class_3dfx = class_create(THIS_MODULE, "3dfx");
+	if (IS_ERR(class_3dfx)) {
+		int ret = PTR_ERR(class_3dfx);
+		class_3dfx = NULL;
+		printk("3dfx: class_create() failed, returned %d\n", ret);
+		return ret;
+	}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+	device_3dfx = device_create(class_3dfx, NULL,
+				    MKDEV(MAJOR_3DFX, DEVICE_VOODOO),
+				    NULL, "3dfx");
+#else
+	device_3dfx = device_create(class_3dfx, NULL,
+				    MKDEV(MAJOR_3DFX, DEVICE_VOODOO),
+				    "3dfx");
+#endif
+					
+	if (IS_ERR(device_3dfx)) {
+		int ret = PTR_ERR(device_3dfx);
+		device_3dfx = NULL;
+		class_destroy(class_3dfx);
+		class_3dfx = NULL;
+		printk("3dfx: device_create() failed, returned %d\n", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static void destroy_device_3dfx(void)
+{
+	if (device_3dfx)
+		device_destroy(class_3dfx, MKDEV(MAJOR_3DFX, DEVICE_VOODOO));
+	if (class_3dfx)
+		class_destroy(class_3dfx);
+
+	device_3dfx = NULL;
+	class_3dfx = NULL;
+}
+#endif
+
 #ifdef MODULE
 int init_module(void)
 {
@@ -840,8 +904,17 @@ int init_module(void)
 
 	DEBUGMSG(("3dfx: Entering init_module()\n"));
 	
+	ret = findCards();
+	if (ret < 0) {
+		printk("3dfx: findCards() failed, returned %d\n", ret);
+		return -ENODEV;
+	}
+
 	if ((ret = register_chrdev(MAJOR_3DFX, "3dfx", &fops_3dfx)) < 0) {
 		printk("3dfx: Unable to register character device with major %d\n", MAJOR_3DFX);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+		pci_unregister_driver(&driver_3dfx);
+#endif
 		return ret;
 	}
 
@@ -857,22 +930,21 @@ int init_module(void)
 		&fops_3dfx, NULL);
 #endif
 #endif
-
+#if HAVE_CLASS_DEVICE
-	DEBUGMSG(("3dfx: Successfully registered device 3dfx\n"));
+	ret = create_device_3dfx();
-	ret = findCards();
 	if (ret < 0) {
-		printk("3dfx: findCards() failed, returned %d\n", ret);
+		unregister_chrdev(MAJOR_3DFX, "3dfx");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+		pci_unregister_driver(&driver_3dfx);
+#endif
 		return ret;
 	}
+#endif
 
 #ifdef CONFIG_MTRR
 	ret = setmtrr_3dfx();
 	if (ret < 0) {
 		DEBUGMSG(("setmtrr_3dfx() failed, returned %d\n", ret));
-		/*
-		unregister_chrdev(MAJOR_3DFX, "3dfx");
-		return ret;
-		*/
 	}
 #endif
 
@@ -893,7 +965,9 @@ void cleanup_module(void)
 	devfs_unregister(devfs_handle);
 #endif
 #endif
-
+#if HAVE_CLASS_DEVICE
+	destroy_device_3dfx();
+#endif
 	unregister_chrdev(MAJOR_3DFX, "3dfx");
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
@@ -906,17 +980,18 @@ long init_3dfx(long mem_start, long mem_end)
 {
 	int ret;
 
-	if (register_chrdev(MAJOR_3DFX, "3dfx", &fops_3dfx)) {
-		DEBUGMSG(("3dfx: Unable to register_chrdev with major %d\n", MAJOR_3DFX));
-		return 0;
-	}
-
 	ret = findCards();
 	if (ret < 0) {
 		printk("3dfx: findCards() failed, returned %d\n", ret);
-		return 0;
+		return -ENODEV;
 	}
 	
+	if (ret=register_chrdev(MAJOR_3DFX, "3dfx", &fops_3dfx)) {
+		DEBUGMSG(("3dfx: Unable to register_chrdev with major %d\n", MAJOR_3DFX));
+		return ret;
+	}
+
+
 	return mem_start;
 }
 #endif /* !MODULE */
@@ -926,7 +1001,7 @@ MODULE_AUTHOR("Daryll Strauss et al.");
 MODULE_DESCRIPTION("3dfx glide kernel device driver");
 MODULE_LICENSE("GPL");
 #ifdef MODULE_VERSION
-MODULE_VERSION("2011.05.27");
+MODULE_VERSION("2026.03.24");
 #endif
 #endif
 

Device3Dfx/debian/changelog

@@ -0,0 +1,5 @@
+device3dfx (2.3-1) unstable; urgency=low
+
+  * Initial package.
+
+ -- RetroDebian <root@retrodebian.local>  Thu, 20 Mar 2026 10:00:00 +0000

Device3Dfx/debian/compat

@@ -0,0 +1 @@
+5

Device3Dfx/debian/control.modules.in

@@ -0,0 +1,14 @@
+Source: device3dfx
+Section: misc
+Priority: optional
+Maintainer: RetroDebian <root@retrodebian.local>
+Standards-Version: 3.7.3
+
+Package: device3dfx-modules-_KVERS_
+Architecture: any
+Provides: device3dfx-modules
+Depends: linux-modules-_KVERS_ | linux-image-_KVERS_
+Description: Device3Dfx kernel module for Debian Linux kernels
+ External kernel module providing /dev/3dfx support for 3dfx hardware.
+ .
+ This package contains the compiled kernel module for _KVERS_.

Device3Dfx/debian/rules

@@ -0,0 +1,37 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+
+PACKAGE=device3dfx-modules
+MA_DIR ?= /usr/share/modass
+
+-include $(MA_DIR)/include/generic.make
+-include $(MA_DIR)/include/common-rules.make
+
+kdist_config: prep-deb-files
+	ln -sf ../3dfx_driver.c kbuild/3dfx.c
+
+kdist_clean:
+	rm -f kbuild/3dfx.c
+	$(MAKE) -C $(KSRC) M=$(PWD)/kbuild clean
+
+binary-modules:
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	ln -sf ../3dfx_driver.c kbuild/3dfx.c
+	$(MAKE) -C $(KSRC) M=$(PWD)/kbuild modules
+
+	mkdir -p debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/extra
+	cp kbuild/3dfx.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/extra/
+
+	dh_installdocs
+	dh_installchangelogs
+	dh_installmodules
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol -- -v$(VERSION)
+	dh_md5sums
+	dh_builddeb --destdir=$(DEB_DESTDIR)
+	dh_clean -k

LICENSE

@@ -0,0 +1,255 @@
+3DFX GLIDE Source Code General Public License
+
+
+1. PREAMBLE
+
+	This license is for software that provides a 3D graphics application 
+	program interface (API).The license is intended to offer terms similar
+	to some standard General Public Licenses designed to foster open 
+	standards and unrestricted accessibility to source code. Some of these
+	licenses require that, as a condition of the license of the software, 
+	any derivative works (that is, new software which is a work containing
+	the original program or a portion of it) must be available for general
+	use, without restriction other than for a minor transfer fee, and that
+	the source code for such derivative works must likewise be made 
+	available. The only restriction is that such derivative works must be
+	subject to the same General Public License terms as the original work. 
+
+	This 3dfx GLIDE Source Code General Public License differs from the
+	standard licenses of this type in that it does not require the entire
+	derivative work to be made available under the terms of this license
+	nor is the recipient required to make available the source code for
+	the entire derivative work. Rather, the license is limited to only the
+	identifiable portion of the derivative work that is derived from the
+	licensed software. The precise terms and conditions for copying, 
+	distribution and modification follow.
+
+
+2. DEFINITIONS
+
+	2.1 This License applies to any program (or other "work") which 
+	contains a notice placed by the copyright holder saying it may be 
+	distributed under the terms of this 3dfx GLIDE Source Code General 
+	Public License. 
+
+	2.2 The term "Program" as used in this Agreement refers to 3DFX's 
+	GLIDE source code and object code and any Derivative Work.
+
+	2.3 "Derivative Work" means, for the purpose of the License, that 
+	portion of any work that contains the Program or the identifiable 
+	portion of a work that is derived from the Program, either verbatim or
+	with modifications and/or translated into another language, and that 
+	performs 3D graphics API operations. It does not include any other 
+	portions of a work.
+
+	2.4 "Modifications of the Program" means any work, which includes a
+	Derivative Work, and includes the whole of such work.
+
+	2.5 "License" means this 3dfx GLIDE Source Code General Public License.
+
+	2.6 The "Source Code" for a work means the preferred form of the work
+	for making modifications to it. For an executable work, complete source
+	code means all the source code for all modules it contains, any
+	associated interface definition files, and the scripts used to control
+	compilation and installation of the executable work.
+
+	2.7 "3dfx" means 3dfx Interactive, Inc.
+
+
+3. LICENSED ACTIVITIES
+
+	3.1 COPYING - You may copy and distribute verbatim copies of the 
+	Program's Source Code as you receive it, in any medium, subject to the
+	provision of section 3.3 and provided also that:
+
+		(a) you conspicuously and appropriately publish on each copy
+	an appropriate copyright notice (3dfx Interactive, Inc. 1999), a notice
+	that recipients who wish to copy, distribute or modify the Program can
+	only do so subject to this License, and a disclaimer of warranty as
+	set forth in section 5;
+
+		(b) keep intact all the notices that refer to this License and
+	to the absence of any warranty; and
+ 
+		(c) do not make any use of the GLIDE trademark without the prior
+	written permission of 3dfx, and 
+
+		(d) give all recipients of the Program a copy of this License
+	along with the Program or instructions on how to easily receive a copy
+	of this License.
+
+
+	3.2 MODIFICATION OF THE PROGRAM/DERIVATIVE WORKS - You may modify your
+	copy or copies of the Program or any portion of it, and copy and
+	distribute such modifications subject to the provisions of section 3.3
+	and provided that you also meet all of the following conditions: 
+
+		(a) you conspicuously and appropriately publish on each copy
+	of a Derivative Work an appropriate copyright notice, a notice that
+	recipients who wish to copy, distribute or modify the Derivative Work
+	can only do so subject to this License, and a disclaimer of warranty
+	as set forth in section 5;
+
+		(b) keep intact all the notices that refer to this License and
+	to the absence of any warranty; and
+ 
+		(c) give all recipients of the Derivative Work a copy of this
+	License along with the Derivative Work or instructions on how to easily
+	receive a copy of this License.
+
+		(d) You must cause the modified files of the Derivative Work
+	to carry prominent notices stating that you changed the files and the
+	date of any change. 
+
+		(e) You must cause any Derivative Work that you distribute or
+	publish to be licensed at no charge to all third parties under the
+	terms of this License. 
+
+		(f) You do not make any use of the GLIDE trademark without the 
+	prior written permission of 3dfx.
+		
+		(g) If the Derivative Work normally reads commands 
+	interactively when run, you must cause it, when started running for
+	such interactive use, to print or display an announcement as follows:
+
+	"COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED THIS 
+	SOFTWARE IS FREE AND PROVIDED "AS IS," WITHOUT WARRANTY OF ANY KIND, 
+	EITHER EXPRESSED OR IMPLIED. THERE IS NO RIGHT TO USE THE GLIDE 
+	TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX INTERACTIVE, 
+	INC. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A FULL TEXT OF THE
+	DISTRIBUTION AND NON-WARRANTY PROVISIONS (REQUEST COPY FROM 
+	INFO@3DFX.COM)."
+
+		(h) The requirements of this section 3.2 do not apply to the
+	modified work as a whole but only to the Derivative Work. It is not
+	the intent of this License to claim rights or contest your rights to
+	work written entirely by you; rather, the intent is to exercise the
+	right to control the distribution of Derivative Works. 
+
+
+	3.3 DISTRIBUTION 
+
+		(a) All copies of the Program or Derivative Works which are
+	distributed must include in the file headers the following language
+	verbatim:
+
+	"THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED 
+	ONLY PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO 
+	RIGHT TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 
+	3DFX INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM 
+	THE DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC (info@3dfx.com). 
+	THIS PROGRAM. IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+	EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+	FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+
+	USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+	RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS
+	IN TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+	AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+	SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+	THE UNITED STATES.
+
+	COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED"
+
+		(b) You may distribute the Program or a Derivative Work in
+	object code or executable form under the terms of Sections 3.1 and 3.2
+	provided that you also do one of the following: 
+
+			(1) Accompany it with the complete corresponding
+	machine-readable source code, which must be distributed under the 
+	terms of Sections 3.1 and 3.2; or,
+ 
+			(2) Accompany it with a written offer, valid for at
+	least three years, to give any third party, for a charge no more than
+	your cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be 
+	distributed under the terms of Sections 3.1 and 3.2 on a medium 
+	customarily used for software interchange; or,
+ 
+			(3) Accompany it with the information you received as
+	to the offer to distribute corresponding source code. (This alternative
+	is allowed only for noncommercial distribution and only if you received
+	the program in object code or executable form with such an offer, in
+	accord with Subsection 3.3(b)(2) above.)
+ 
+		(c) The source code distributed need not include anything
+	that is normally distributed (in either source or binary form) with
+	the major components (compiler, kernel, and so on) of the operating
+	system on which the executable runs, unless that component itself
+	accompanies the executable code.
+ 
+		(d) If distribution of executable code or object code is made
+	by offering access to copy from a designated place, then offering
+	equivalent access to copy the source code from the same place counts
+	as distribution of the source code, even though third parties are not
+	compelled to copy the source along with the object code. 
+
+		(e) Each time you redistribute the Program or any Derivative
+	Work, the recipient automatically receives a license from 3dfx and
+	successor licensors to copy, distribute or modify the Program and
+	Derivative Works subject to the terms and conditions of the License.
+	You may not impose any further restrictions on the recipients' 
+	exercise of the rights granted herein. You are not responsible for
+	enforcing compliance by third parties to this License.
+ 
+		(f) You may not make any use of the GLIDE trademark without 
+	the prior written permission of 3dfx.
+
+		(g) You may not copy, modify, sublicense, or distribute the
+	Program or any Derivative Works except as expressly provided under
+	this License. Any attempt otherwise to copy, modify, sublicense or
+	distribute the Program or any Derivative Works is void, and will
+	automatically terminate your rights under this License. However,
+	parties who have received copies, or rights, from you under this
+	License will not have their licenses terminated so long as such
+	parties remain in full compliance.
+
+ 
+4. MISCELLANEOUS
+
+	4.1 Acceptance of this License is voluntary. By using, modifying or
+	distributing the Program or any Derivative Work, you indicate your 
+	acceptance of this License to do so, and all its terms and conditions
+	for copying, distributing or modifying the Program or works based on
+	it. Nothing else grants you permission to modify or distribute the
+	Program or Derivative Works and doing so without acceptance of this
+	License is in violation of the U.S. and international copyright laws.
+
+	4.2 If the distribution and/or use of the Program or Derivative Works
+	is restricted in certain countries either by patents or by copyrighted
+	interfaces, the original copyright holder who places the Program under
+	this License may add an explicit geographical distribution limitation
+	excluding those countries, so that distribution is permitted only in
+	or among countries not thus excluded. In such case, this License
+	incorporates the limitation as if written in the body of this License.
+
+	4.3 This License is to be construed according to the laws of the 
+	State of California and you consent to personal jurisdiction in the
+	State of California in the event it is necessary to enforce the
+	provisions of this License.
+
+
+5. NO WARRANTIES
+
+	5.1 TO THE EXTENT PERMITTED BY APPLICABLE LAW, THERE IS NO WARRANTY
+	FOR THE PROGRAM. OR DERIVATIVE WORKS THE COPYRIGHT HOLDERS AND/OR
+	OTHER PARTIES PROVIDE THE PROGRAM AND ANY DERIVATIVE WORKS"AS IS"
+	WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+	BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+	FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY
+	AND PERFORMANCE OF THE PROGRAM AND ANY DERIVATIVE WORK IS WITH YOU.
+	SHOULD THE PROGRAM OR ANY DERIVATIVE WORK PROVE DEFECTIVE, YOU ASSUME
+	THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+	5.2 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL 3DFX
+	INTERACTIVE, INC., OR ANY OTHER COPYRIGHT HOLDER, OR ANY OTHER PARTY
+	WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM OR DERIVATIVE WORKS AS
+	PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+	SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+	INABILITY TO USE THE PROGRAM OR DERIVATIVE WORKS (INCLUDING BUT NOT
+	LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES
+	SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM OR
+	DERIVATIVE WORKS TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
+	HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+	DAMAGES.
+

README

@@ -0,0 +1,5 @@
+This is the source code to 3Dfx Glide for Voodoo graphics accelerators.
+It's forked from the original CVS repo of Glide open source project at
+sourceforge:  https://sourceforge.net/projects/glide/
+
+Source is licensed under 3DFX GLIDE Source Code General Public License.

glide2x/cvg/glide/src/cpuid.c

@@ -1,8 +1,10 @@
 /*
  * CPU detection code
  *
- * $Header$
+ *
- * $Log$
+ * Revision 1.1.2.2  2006/09/02 03:12:29  guillemj
+ * Backport glide3 fix for PIC compilation with gcc 4.1 from Hans de Goede.
+ *
  * Revision 1.1.2.1  2004/12/12 15:16:02  koolsmoky
  * new cpuid
  *
@@ -32,14 +34,17 @@
  *
  */
 
-
 #include <signal.h>
 #include <setjmp.h>
 #include <string.h>
 
 #include "cpuid.h"
 
-typedef unsigned long word32;
+#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3)))
+typedef unsigned int __attribute__((__may_alias__)) word32;
+#else
+typedef unsigned int word32;
+#endif
 
 /* These are the bit flags that get set on calling cpuid
  * with register eax set to 1

glide2x/cvg/glide/src/fxgasm.c

@@ -129,6 +129,10 @@ main (int argc, char **argv)
     OFFSET (gc, cmdTransportInfo.fifoLfbP, "fifoLfbP");
     OFFSET (gc, cmdTransportInfo.lfbLockCount, "lfbLockCount");
 
+#if GLIDE_DISPATCH_SETUP
+    OFFSET (gc,curArchProcs.triSetupProc,"kTriProcOffset\t\t");
+#endif
+
     SIZEOF (gr.GCs[0].state,"GrState\t");
     SIZEOF (gr.hwConfig,"GrHwConfiguration");
     SIZEOF (gr.GCs[0],"GC\t");

glide2x/cvg/glide/src/gdraw.c

@@ -17,8 +17,10 @@
  ** 
  ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
  **
- ** $Header$
+ ** Revision 1.4.2.4  2005/04/25 23:53:59  koolsmoky
- ** $Log$
+ ** Fix grDrawTriangle calling convention for Linux.
+ ** Thanks to Ozkan Sezer <sezeroz@gmail.com>.
+ **
  ** Revision 1.4.2.3  2005/04/23 18:27:26  koolsmoky
  ** fixed grDrawTriangle triangle dispatch code
  **
@@ -648,7 +650,8 @@ all_done:                       /* come here on degenerate lines */
 /*---------------------------------------------------------------------------
  ** grDrawTriangle
  */
-#if (GLIDE_PLATFORM & GLIDE_OS_WIN32) && !GLIDE_USE_C_TRISETUP && !defined(GLIDE_DEBUG)
+#ifndef HAVE_XDRAWTRI_ASM	/* grDrawTriangle() not in asm */
+#if defined(_MSC_VER) && !GLIDE_USE_C_TRISETUP && !defined(GLIDE_DEBUG)
 __declspec(naked)
 #endif
 GR_ENTRY(grDrawTriangle, void, (const GrVertex *a, const GrVertex *b, const GrVertex *c))
@@ -692,8 +695,8 @@ GR_ENTRY(grDrawTriangle, void, (const GrVertex *a, const GrVertex *b, const GrVe
 
 all_done:
   GR_END();
-#else
+
-#if defined(__MSC__)
+#elif defined(_MSC_VER)
   {
     __asm {
       mov edx, [_GlideRoot + kCurGCOffset];
@@ -701,59 +704,13 @@ all_done:
       jmp eax;
     }
   }
-#endif
-#if defined( __linux__ )
 
-  /* Here's the basic strategy for this dispatch code:
+#else
-   *   We jump to _GlideRoot.curGC->archDispatchProcs.triSetupProc
+#error "Write triangle proc dispatch for this compiler"
-   *   which contains code that looks like a function, we leave the
-   *   paramters passed to grDrawTriangle on the stack and the dispatched
-   *   function picks them up.  However we have to compensate for 
-   *   the compiler pushing anything on the stack.  The following describes
-   *   why and when we have to pop.
-   *
-   * BIG_OPT: gcc pushes a frame pointer to maintain things, BIG_OPT
-   *          turns on -fomit-frame-pointer so we don't have to pop it.
-   *
-   * PIC:     When using position independant code gcc stores eip in ebx
-   *          so it saves ebx from the previous call automatically.  
-   *          Therefore, once we have the jump address we have to pop ebx
-   *          to restore the stack.  
-   *
-   * The syntax is further complicated by the fact that gcc can (and will)
-   * emit code between the asm statements, so they all need to be in a single
-   * asm statement, wrapped with #ifdef's.  This means we have fun with 
-   * deciding if we need to list trashed registers and when we need commas
-   * between them.
-   */
-
-  asm (
-#if defined(PIC)
-       "popl %%ebx\n\t"
-#endif 
-#if !defined(BIG_OPT)
-       "popl %%ebp\n\t"
-#endif
-       "jmp *%0" 
-       : /* no outputs */        
-       : "m" (_GlideRoot.curGC->curArchProcs.triSetupProc)
-#if defined (PIC) || !defined (BIG_OPT)
-       :
-#endif
-#if defined (PIC)
-        "ebx"
-#endif
-#if defined (PIC) && !defined (BIG_OPT)
-       ,
-#endif
-#if !defined(BIG_OPT)
-        "ebp"
-#endif
-       );
-#endif
 #endif
 #undef FN_NAME
 } /* grDrawTriangle */
+#endif /* HAVE_XDRAWTRI_ASM */
 
 /*---------------------------------------------------------------------------
  ** grDrawPlanarPolygon

glide2x/cvg/glide/src/makefile.linux

@@ -86,7 +86,7 @@ CDEFS = -DINIT_LINUX -D__3Dfx_PCI_CFG__
 LDLIBS = -lm
 
 # general
-CDEFS += -DGLIDE_HW_TRI_SETUP=1 -DGLIDE_PACKED_RGB=1 -DGLIDE_TRI_CULLING=1 -DGLIDE_DEFAULT_GAMMA=1.3f -DGLIDE_LIB=1
+CDEFS += -DGLIDE_HW_TRI_SETUP=1 -DGLIDE_PACKED_RGB=0 -DGLIDE_TRI_CULLING=1 -DGLIDE_DEFAULT_GAMMA=1.3f -DGLIDE_LIB=1
 #CDEFS += -DGLIDE3 -DGLIDE3_ALPHA -DGLIDE3_SCALER
 
 # special sli buffer clears
@@ -110,6 +110,8 @@ override USE_FIFO = 1
 ifeq ($(USE_X86),1)
 CDEFS += -DGLIDE_DISPATCH_SETUP=1 -DGLIDE_DISPATCH_DOWNLOAD=1
 override USE_FIFO = 1
+CDEFS += -DHAVE_XDRAWTRI_ASM=1
+override USE_DRAWTRI_ASM = 1
 else
 CDEFS += -DGLIDE_USE_C_TRISETUP=1
 endif
@@ -151,11 +153,12 @@ override USE_X86 = 1
 endif
 
 ifeq ($(USE_X86),1)
-CFLAGS += -DGL_X86
+CFLAGS += -DGL_X86 -DBIG_OPT
-OPTFLAGS ?= -O2 -ffast-math
+OPTFLAGS ?= -O6 -march=pentium2 -mtune=pentium3 -fomit-frame-pointer -funroll-loops \
+	-fexpensive-optimizations -ffast-math -Wno-unused
 else
 CFLAGS += -DGLIDE_USE_C_TRISETUP
-OPTFLAGS ?= -O2 -ffast-math
+OPTFLAGS ?= -O6 -march=pentium2 -mtune=pentium3 -ffast-math -Wno-unused
 endif
 
 # optflags
@@ -193,6 +196,9 @@ GLIDE_OBJECTS = \
 	fpu.o \
 	xtexdl_def.o
 
+ifeq ($(USE_DRAWTRI_ASM),1)
+GLIDE_OBJECTS += xdrawtri.o
+endif
 ifeq ($(USE_X86),1)
 GLIDE_OBJECTS += \
 	xdraw2_def.o
@@ -283,6 +289,8 @@ xdraw2_3dnow.o: xdraw2.asm
 	$(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $<
 xtexdl_3dnow.o: xtexdl.asm
 	$(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $<
+xdrawtri.o: xdrawtri.asm
+	$(AS) -o $@ $(ASFLAGS) $<
 
 #cpuid.lo: cpuid.o
 #	$(CP) $< $@
@@ -296,6 +304,8 @@ xdraw2_3dnow.lo: xdraw2_3dnow.o
 	$(CP) $< $@
 xtexdl_3dnow.lo: xtexdl_3dnow.o
 	$(CP) $< $@
+xdrawtri.lo: xdrawtri.o
+	$(CP) $< $@
 
 $(GLIDE_OBJECTS): fxinline.h fxgasm.h
 

glide2x/cvg/glide/src/rcver.h

@@ -1,10 +1,10 @@
 
-#include "fxbldno.h"
+/*#include "fxbldno.h"*/
 
 #define MANVERSION              2
 #define MANREVISION             56
 
-//#define BUILD_NUMBER            40405
+#define BUILD_NUMBER            40405
 
 #ifndef GLIDE3
 #define VERSIONSTR "2.56\0"

glide2x/cvg/glide/src/xdraw2.inc

@@ -131,8 +131,8 @@
     push      tempVal               ; fifo space required
     call      _FifoMakeRoom         ; note: updates fifoPtr
 
-    ;add       esp, 12               ; remove 3 DWORD arguments from stack
+    add       esp, 12               ; remove 3 DWORD arguments from stack
-    ;nop                             ; filler
+    nop                             ; filler
 %ELSE   ; !GLIDE_CULLING
 
     ;; Prologue stuff
@@ -158,8 +158,8 @@
     push      tempVal               ; fifo space needed
     call      _FifoMakeRoom         ; note: updates fifoPtr
 
-    ;add       esp, 12               ; remove 3 DWORD arguments from stack
+    add       esp, 12               ; remove 3 DWORD arguments from stack
-    ;nop                             ; filler
+    nop                             ; filler
 %ENDIF  ; GLIDE_CULLING
 
 
@@ -1015,7 +1015,7 @@
     push    eax
     call    _FifoMakeRoom
 
-    ;add	    esp, 12
+    add	    esp, 12
 
     ;; Send triangle parameters
     

glide2x/cvg/glide/src/xdrawtri.asm

@@ -0,0 +1,46 @@
+;; THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+;; PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+;; TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+;; INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+;; DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+;; THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+;; EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+;; FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+;;
+;; USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+;; RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+;; TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+;; AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+;; SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+;; THE UNITED STATES.
+;;
+;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+
+;; Adapted from gdraw.c:grDrawTriangle() for nasm
+
+%include "xos.inc"
+
+%include "fxgasm.h"
+
+extrn   _GlideRoot
+
+segment SEG_TEXT
+
+align 16
+proc grDrawTriangle, 12
+
+;;mov edx, dword [_GlideRoot+curGC]
+;;mov eax, dword [edx+kTriProcOffset]
+  mov eax, dword [_GlideRoot+curGC]
+  jmp [eax + kTriProcOffset]
+endp
+  align 16
+
+%if XOS == XOS_WIN32
+%ifdef __MINGW32__
+; GNU LD fails with '_' prefix
+export  grDrawTriangle@12
+%else
+export _grDrawTriangle@12
+%endif
+%endif ; _WIN32

glide2x/cvg/glide/src/xtexdl.asm

@@ -88,7 +88,7 @@ extrn _FifoMakeRoom, 12
     push %2
     push %1
     call _FifoMakeRoom
-    ;add  esp, 12
+    add  esp, 12
 %ENDMACRO ; _grCommandTransportMakeRoom
 
 ;;; Definitions of cvg regs and glide root structures.
@@ -166,7 +166,7 @@ proc _grTexDownload_MMX, 24
     femms                               ; we'll use MMX/3DNow!, make sure FPU register cleared
 %ENDIF
 %IFDEF GL_MMX
-;    emms                                ; we'll use MMX
+    emms                                ; we'll use MMX
 %ENDIF
 
     movd      mm3, [esp + _baseAddr$]   ; 0 | address of texture to download

glide2x/h3/cinit/h3cinit.h

@@ -0,0 +1,132 @@
+/*
+** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
+** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
+** 
+** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+** THE UNITED STATES.  
+** 
+** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+*/
+
+
+#ifndef __H3CINIT_H__
+#define __H3CINIT_H__
+
+#include <3dfx.h>
+
+#define H3_GRXCLK_SPEED 100
+#define H4_GRXCLK_SPEED 143
+#define H4_OEM_GRXCLK_SPEED 141
+#define H4_BRINGUP_GRXCLK_SPEED 100
+
+#ifdef H4
+#define DEFAULT_GRXCLK_SPEED H4_BRINGUP_GRXCLK_SPEED
+#else
+#define DEFAULT_GRXCLK_SPEED H3_GRXCLK_SPEED
+#endif
+
+FxU32                             // return # of MB of memory
+h3InitGetMemSize(FxU32 regBase);  // init register base
+
+FxU32                           // return # of MB of memory
+h3InitSgram(FxU32 regBase,      // init iegister base
+            FxU32 sgramMode,
+            FxU32 sgramMask,
+            FxU32 sgramColor,
+            char *vendorName);  // NULL or name of SGRAM vendor
+
+void
+h3InitPlls(FxU32 regBase,               // init iegister base
+           FxU32 grxSpeedInMHz,         // desired GRX clock frequency (MHz)
+           FxU32 memSpeedInMHz);        // desired MEM clock frequency (MHz)
+
+void
+h4InitPlls(FxU32 regBase,               // init register base
+           FxU32 deviceID,              // H4 or H4_OEM
+           FxU32 grxSpeedInMHz);        // desired clock frequency (MHz)
+
+void 
+h3InitVga(
+    FxU32 regBase,              // memory base address
+    FxU32 legacyDecode);        // 1=enable VGA decode, 0=disable
+
+void
+h3InitVideoProc(
+    FxU32 regBase,              // memory base address
+    FxU32 vidProcCfg);          // vidProcCfg register control bits
+
+FxBool
+h3InitSetVideoMode(
+    FxU32 regBase,              // memory base address
+    FxU32 xRes,                 // x resolution
+    FxU32 yRes,                 // y resolution
+    FxU32 refresh,              // refresh freq
+#if defined(H3VDD) && defined(H3_B0)
+  FxU32 loadClut, // really a bool, should we load the lookup table
+  FxU32 scanlinedouble); // set scanline double bit and double y?
+#else
+    FxU32 loadClut) ;           // initialize clut entries?
+#endif
+
+void
+h3InitVideoDesktopSurface(
+    FxU32 regBase,
+    FxU32 enable,               // 1=enable desktop surface (DS), 1=disable
+    FxU32 tiled,                // 0=DS linear, 1=tiled
+    FxU32 pixFmt,               // pixel format of DS
+    FxU32 clutBypass,           // bypass clut for DS?
+    FxU32 clutSelect,           // 0=lower 256 CLUT entries, 1=upper 256
+    FxU32 startAddress,         // board address of beginning of DS
+    FxU32 stride);              // distance between scanlines of the DS, in
+                                // units of bytes for linear DS's and tiles for
+                                // tiled DS's
+
+void
+h3InitVideoOverlaySurface(
+    FxU32 regBase,
+    FxU32 enable,               // 1=enable Overlay surface (OS), 1=disable
+    FxU32 stereo,               // 1=enable OS stereo, 0=disable
+    FxU32 horizScaling,         // 1=enable horizontal scaling, 0=disable
+    FxU32 dudx,                 // horizontal scale factor (ignored if not
+                                // scaling)
+    FxU32 verticalScaling,      // 1=enable vertical scaling, 0=disable
+    FxU32 dvdy,                 // vertical scale factor (ignored if not
+                                // scaling)
+    FxU32 filterMode,           // duh
+    FxU32 tiled,                // 0=OS linear, 1=tiled
+    FxU32 pixFmt,               // pixel format of OS
+    FxU32 clutBypass,           // bypass clut for OS?
+    FxU32 clutSelect,           // 0=lower 256 CLUT entries, 1=upper 256
+    FxU32 startAddress,         // board address of beginning of OS
+    FxU32 stride);              // distance between scanlines of the OS, in
+                                // units of bytes for linear OS's and tiles for
+                                // tiled OS's
+
+#ifndef H3VDD
+void
+h3InitMeasureSiProcess(
+    FxU32 regBase);             // init register base
+#endif // #ifndef H3VDD
+
+void
+h3InitBlockWrite(
+    FxU32 regBase,
+    FxU32 enable,               // 1=enable block writes, 0=disable
+    FxU32 threshhold);          // block write threshhold
+
+void
+h3InitResetAll(
+    FxU32 regBase);             // init register base
+
+#endif /*  __H3CINIT_H__ */
+

glide2x/h3/cinit/h3cinitdd.h

@@ -0,0 +1,85 @@
+/*
+** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
+** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
+** 
+** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+** THE UNITED STATES.  
+** 
+** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+*/
+
+#include <stddef.h>
+
+#ifdef __DJGPP__
+#include <fxdpmi.h>
+#endif
+
+#if defined(__WATCOMC__)
+#include <conio.h>
+
+#define _inp inp
+#define _outp outp
+
+#define _inpw inpw
+#define _outpw outpw
+
+#define _inpd inpd
+#define _outpd outpd
+
+#endif
+
+#ifdef __linux__
+#define _inp pioInByte
+#define _outp pioOutByte
+#define _inpw pioInWord
+#define _outpw pioOutWord
+#define _inpd pioInLong
+#define _outpd pioOutLong
+#endif
+
+
+#define SSTIOADDR(regName)      ((FxU16)offsetof(SstIORegs, regName))
+
+#define ISET32(addr, value)     _outpd((FxU16) ((FxU16) regBase + (FxU16) (SSTIOADDR(addr))), value)
+#define IGET32(addr)            _inpd((FxU16) ((FxU16) regBase + (FxU16) (SSTIOADDR(addr))))
+
+#define ISET8PHYS(a,b) {\
+FxU16 port = (FxU16) (regBase) + (FxU16) (a);\
+GDBG_INFO(120, "OUT8:  Port 0x%x Value 0x%x\n", port, b);\
+_outp(port, (FxU8) (b));}
+
+#define ISET16PHYS(a,b) {\
+FxU16 port = (FxU16)(regBase) + (FxU16)(a);\
+GDBG_INFO(120, "OUT16:  Port 0x%x Value 0x%x\n", port, b);\
+_outpw(port, (FxU16) (b));}
+
+#define IGET8PHYS(a) _inp((FxU16) ((FxU16) (regBase) + (FxU16) (a)))
+#define IGET16PHYS(a) _inpw((FxU16) ((FxU16) (regBase) + (FxU16)(a)))
+
+#define CHECKFORROOM while (! (_inp((FxU16) regBase) & (FxU16)(0x3f)))
+#define MESSAGE GDBG_PRINTF
+
+#ifdef OLD
+
+
+#define ISET32(a,b)\
+GDBG_INFO(120, "SET32: Register 0x%x Value 0x%x\n", (FxU32) (&((SstIORegs *)regBase)->a) - (FxU32) regBase, b); \
+((FxU32) (((SstIORegs *) regBase)->a)) = (FxU32) b
+
+#define IGET32(a) ((FxU32) (((SstIORegs *) regBase)->a))
+
+
+
+
+
+#endif /* #ifdef OLD */

glide2x/h3/cinit/h4oempll.h

@@ -0,0 +1,257 @@
+/*
+** Copyright (c) 1995-1999, 3Dfx Interactive, Inc.
+** All Rights Reserved.
+**
+** This is UNPUBLISHED PROPRIETARY SOURCE CODE of 3Dfx Interactive, Inc.;
+** the contents of this file may not be disclosed to third parties, copied or
+** duplicated in any form, in whole or in part, without the prior written
+** permission of 3Dfx Interactive, Inc.
+**
+** RESTRICTED RIGHTS LEGEND:
+** Use, duplication or disclosure by the Government is subject to restrictions
+** as set forth in subdivision (c)(1)(ii) of the Rights in Technical Data
+** and Computer Software clause at DFARS 252.227-7013, and/or in similar or
+** successor clauses in the FAR, DOD or NASA FAR Supplement. Unpublished  -
+** rights reserved under the Copyright Laws of the United States.
+**
+** File name:   h4oempll.h
+**
+** Description: Avenger OEM PLL table and values.
+**
+** $History: h4oempll.h $
+** 
+** *****************  Version 2  *****************
+** User: Michael      Date: 1/08/99    Time: 1:50p
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Implement the 3Dfx/STB unified header.
+** 
+** *****************  Version 1  *****************
+** User: Andrew       Date: 12/20/98   Time: 11:10a
+** Created in $/devel/h3/Win95/dx/minivdd
+** H4 OEM Pll Table
+** 
+** *****************  Version 5  *****************
+** User: Pault        Date: 11/05/98   Time: 2:07p
+** Updated in $/devel/h4/cinit
+** The table now goes up to 220 MHz for Avenger. Also, all of the entries
+** up through 141 MHz have the M factor set at 24 so the entries can be
+** used with Avenger OEM.
+** 
+** *****************  Version 3  *****************
+** User: Artg         Date: 8/27/98    Time: 11:08a
+** Updated in $/devel/h3/Win95/dx/minivdd
+** added guard ifdef for redundant plltable define.
+** 
+** *****************  Version 2  *****************
+** User: Ken          Date: 4/15/98    Time: 6:42p
+** Updated in $/devel/h3/win95/dx/minivdd
+** added unified header to all files, with revision, etc. info in it
+**
+*/
+
+//
+// generated by gen_plltable.pl at Thu Nov  5 12:38:23 1998
+//
+
+#define MIN_PLL_FREQ 30
+#define MAX_PLL_FREQ 120
+#define MAX_H4_OEM_PLL_FREQ 141
+#define MAX_H4_PLL_FREQ 220
+
+FxU32 _h4oempllTable[] = {
+//	   pllCtrl        n   m   k actual(MHz)
+//	   -------      --- --- --- -----------
+	0x00003460,  //  52  24   0 29.737758
+	0x00003660,  //  54  24   0 30.839157
+	0x00003860,  //  56  24   0 31.940555
+	0x00003A60,  //  58  24   0 33.041954
+	0x00003C60,  //  60  24   0 34.143352
+	0x00003E60,  //  62  24   0 35.244751
+	0x00003F60,  //  63  24   0 35.795450
+	0x00004160,  //  65  24   0 36.896848
+	0x00004360,  //  67  24   0 37.998247
+	0x00004560,  //  69  24   0 39.099645
+	0x00004760,  //  71  24   0 40.201044
+	0x00004860,  //  72  24   0 40.751743
+	0x00004A60,  //  74  24   0 41.853142
+	0x00004C60,  //  76  24   0 42.954540
+	0x00004E60,  //  78  24   0 44.055938
+	0x00005060,  //  80  24   0 45.157337
+	0x00005260,  //  82  24   0 46.258735
+	0x00005360,  //  83  24   0 46.809435
+	0x00005560,  //  85  24   0 47.910833
+	0x00005760,  //  87  24   0 49.012232
+	0x00005960,  //  89  24   0 50.113630
+	0x00005B60,  //  91  24   0 51.215028
+	0x00005C60,  //  92  24   0 51.765728
+	0x00005E60,  //  94  24   0 52.867126
+	0x00006060,  //  96  24   0 53.968525
+	0x00006260,  //  98  24   0 55.069923
+	0x00006460,  // 100  24   0 56.171322
+	0x00006660,  // 102  24   0 57.272720
+	0x00006760,  // 103  24   0 57.823419
+	0x00006960,  // 105  24   0 58.924818
+	0x00006B60,  // 107  24   0 60.026216
+	0x00006D60,  // 109  24   0 61.127615
+	0x00006F60,  // 111  24   0 62.229013
+	0x00007060,  // 112  24   0 62.779712
+	0x00007260,  // 114  24   0 63.881111
+	0x00007460,  // 116  24   0 64.982509
+	0x00007660,  // 118  24   0 66.083908
+	0x00007860,  // 120  24   0 67.185306
+	0x00007960,  // 121  24   0 67.736005
+	0x00007B60,  // 123  24   0 68.837404
+	0x00007D60,  // 125  24   0 69.938802
+	0x00007F60,  // 127  24   0 71.040201
+	0x00008160,  // 129  24   0 72.141599
+	0x00008360,  // 131  24   0 73.242998
+	0x00008460,  // 132  24   0 73.793697
+	0x00008660,  // 134  24   0 74.895095
+	0x00008860,  // 136  24   0 75.996494
+	0x00008A60,  // 138  24   0 77.097892
+	0x00008C60,  // 140  24   0 78.199291
+	0x00008D60,  // 141  24   0 78.749990
+	0x00008F60,  // 143  24   0 79.851388
+	0x00009160,  // 145  24   0 80.952787
+	0x00009360,  // 147  24   0 82.054185
+	0x00009560,  // 149  24   0 83.155584
+	0x00009760,  // 151  24   0 84.256982
+	0x00009860,  // 152  24   0 84.807682
+	0x00009A60,  // 154  24   0 85.909080
+	0x00009C60,  // 156  24   0 87.010478
+	0x00009E60,  // 158  24   0 88.111877
+	0x0000A060,  // 160  24   0 89.213275
+	0x0000A160,  // 161  24   0 89.763975
+	0x0000A360,  // 163  24   0 90.865373
+	0x0000A560,  // 165  24   0 91.966772
+	0x0000A760,  // 167  24   0 93.068170
+	0x0000A960,  // 169  24   0 94.169568
+	0x0000AB60,  // 171  24   0 95.270967
+	0x0000AC60,  // 172  24   0 95.821666
+	0x0000AE60,  // 174  24   0 96.923065
+	0x0000B060,  // 176  24   0 98.024463
+	0x0000B260,  // 178  24   0 99.125862
+	0x0000B460,  // 180  24   0 100.227260
+	0x0000B560,  // 181  24   0 100.777959
+	0x0000B760,  // 183  24   0 101.879358
+	0x0000B960,  // 185  24   0 102.980756
+	0x0000BB60,  // 187  24   0 104.082155
+	0x0000BD60,  // 189  24   0 105.183553
+	0x0000BE60,  // 190  24   0 105.734252
+	0x0000C060,  // 192  24   0 106.835651
+	0x0000C260,  // 194  24   0 107.937049
+	0x0000C460,  // 196  24   0 109.038448
+	0x0000C660,  // 198  24   0 110.139846
+	0x0000C860,  // 200  24   0 111.241245
+	0x0000C960,  // 201  24   0 111.791944
+	0x0000CB60,  // 203  24   0 112.893342
+	0x0000CD60,  // 205  24   0 113.994741
+	0x0000CF60,  // 207  24   0 115.096139
+	0x0000D160,  // 209  24   0 116.197538
+	0x0000D260,  // 210  24   0 116.748237
+	0x0000D460,  // 212  24   0 117.849635
+	0x0000D660,  // 214  24   0 118.951034
+	0x0000D860,  // 216  24   0 120.052432
+	0x0000DA60,  // 218  24   0 121.153831
+	0x0000DC60,  // 220  24   0 122.255229
+	0x0000DD60,  // 221  24   0 122.805928
+	0x0000DF60,  // 223  24   0 123.907327
+	0x0000E160,  // 225  24   0 125.008725
+	0x0000E360,  // 227  24   0 126.110124
+	0x0000E560,  // 229  24   0 127.211522
+	0x0000E660,  // 230  24   0 127.762222
+	0x0000E860,  // 232  24   0 128.863620
+	0x0000EA60,  // 234  24   0 129.965018
+	0x0000EC60,  // 236  24   0 131.066417
+	0x0000EE60,  // 238  24   0 132.167815
+	0x0000F060,  // 240  24   0 133.269214
+	0x0000F160,  // 241  24   0 133.819913
+	0x0000F360,  // 243  24   0 134.921312
+	0x0000F560,  // 245  24   0 136.022710
+	0x0000F760,  // 247  24   0 137.124108
+	0x0000F960,  // 249  24   0 138.225507
+	0x0000FA60,  // 250  24   0 138.776206
+	0x0000FC60,  // 252  24   0 139.877605
+	0x0000FE60,  // 254  24   0 140.979003
+	0x00007528,  // 117  10   0 141.988618
+	0x00001200,  //  18   0   0 143.181800
+	0x0000B340,  // 179  16   0 143.977254
+	0x00004F18,  //  79   6   0 144.971573
+	0x0000310C,  //  49   3   0 146.045436
+	0x00009834,  // 152  13   0 146.999981
+	0x00001D04,  //  29   1   0 147.954527
+	0x0000E350,  // 227  20   0 149.039237
+	0x0000DA4C,  // 218  19   0 149.999981
+	0x00007224,  // 114   9   0 150.991716
+	0x0000882C,  // 136  11   0 151.992988
+	0x0000C944,  // 201  17   0 152.978449
+	0x00002908,  //  41   2   0 153.920435
+	0x0000F754,  // 247  21   0 155.009862
+	0x0000CD44,  // 205  17   0 155.992803
+	0x0000FA54,  // 250  21   0 156.877450
+	0x0000FC54,  // 252  21   0 158.122510
+	0x0000D144,  // 209  17   0 159.007157
+	0x0000BC3C,  // 188  15   0 160.026718
+	0x00002B08,  //  43   2   0 161.079525
+	0x0000D544,  // 213  17   0 162.021511
+	0x0000922C,  // 146  11   0 163.006972
+	0x00007C24,  // 124   9   0 164.008244
+	0x0000F04C,  // 240  19   0 164.999979
+	0x0000FD50,  // 253  20   0 165.960723
+	0x00002104,  //  33   1   0 167.045433
+	0x0000AE34,  // 174  13   0 167.999979
+	0x0000390C,  //  57   3   0 168.954524
+	0x00005D18,  //  93   6   0 170.028388
+	0x0000D540,  // 213  16   0 171.022706
+	0x00001600,  //  22   0   0 171.818160
+	0x00008F28,  // 143  10   0 173.011342
+	0x00009C2C,  // 156  11   0 174.020957
+	0x00006C1C,  // 108   7   0 174.999978
+	0x0000CF3C,  // 207  15   0 176.029389
+	0x00008624,  // 134   9   0 177.024771
+	0x00005514,  //  85   5   0 177.954523
+	0x00001700,  //  23   0   0 178.977250
+	0x00005614,  //  86   5   0 179.999977
+	0x0000AF30,  // 175  12   0 181.022704
+	0x00005714,  //  87   5   0 182.045431
+	0x0000711C,  // 113   7   0 182.954522
+	0x0000A52C,  // 165  11   0 183.933543
+	0x0000A62C,  // 166  11   0 185.034942
+	0x00001800,  //  24   0   0 186.136340
+	0x0000DC3C,  // 220  15   0 186.978586
+	0x0000C334,  // 195  13   0 188.045431
+	0x0000400C,  //  64   3   0 188.999976
+	0x00009024,  // 144   9   0 190.041298
+	0x00002604,  //  38   1   0 190.909067
+	0x0000E23C,  // 226  15   0 192.032061
+	0x0000FE44,  // 254  17   0 192.918636
+	0x00009324,  // 147   9   0 193.946256
+	0x0000AF2C,  // 175  11   0 194.947528
+	0x0000D938,  // 217  14   0 195.980089
+	0x0000E83C,  // 232  15   0 197.085536
+	0x00005110,  //  81   4   0 198.068157
+	0x00008920,  // 137   8   0 199.022702
+	0x0000F940,  // 249  16   0 199.659066
+	0x0000FB40,  // 251  16   0 201.249974
+	0x00007D1C,  // 125   7   0 202.045429
+	0x0000EF3C,  // 239  15   0 202.981258
+	0x00003708,  //  55   2   0 204.034065
+	0x0000E338,  // 227  14   0 204.928951
+	0x0000B92C,  // 185  11   0 205.961512
+	0x00009D24,  // 157   9   0 206.962784
+	0x0000F53C,  // 245  15   0 208.034733
+	0x0000470C,  //  71   3   0 209.045428
+	0x00002A04,  //  42   1   0 209.999973
+	0x0000DB34,  // 219  13   0 210.954519
+	0x0000EB38,  // 235  14   0 212.088041
+	0x00007518,  // 117   6   0 212.982927
+	0x0000FC3C,  // 252  15   0 213.930454
+	0x00001C00,  //  28   0   0 214.772700
+	0x0000B328,  // 179  10   0 215.965882
+	0x0000C32C,  // 195  11   0 216.975497
+	0x0000871C,  // 135   7   0 217.954518
+	0x00009720,  // 151   8   0 219.068154
+	0x0000A724,  // 167   9   0 219.979311
+};
+FxU32 *h4oempllTable = (FxU32*) (_h4oempllTable - MIN_PLL_FREQ);
+

glide2x/h3/cinit/h4pll.h

@@ -0,0 +1,277 @@
+/*
+** Copyright (c) 1995-1999, 3Dfx Interactive, Inc.
+** All Rights Reserved.
+**
+** This is UNPUBLISHED PROPRIETARY SOURCE CODE of 3Dfx Interactive, Inc.;
+** the contents of this file may not be disclosed to third parties, copied or
+** duplicated in any form, in whole or in part, without the prior written
+** permission of 3Dfx Interactive, Inc.
+**
+** RESTRICTED RIGHTS LEGEND:
+** Use, duplication or disclosure by the Government is subject to restrictions
+** as set forth in subdivision (c)(1)(ii) of the Rights in Technical Data
+** and Computer Software clause at DFARS 252.227-7013, and/or in similar or
+** successor clauses in the FAR, DOD or NASA FAR Supplement. Unpublished  -
+** rights reserved under the Copyright Laws of the United States.
+**
+** File name:   h4pll.h
+**
+** Description: Avenger PLL table and values.
+**
+** $History: h4pll.h $
+** 
+** *****************  Version 2  *****************
+** User: Michael      Date: 1/08/99    Time: 1:51p
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Implement the 3Dfx/STB unified header.
+** 
+** *****************  Version 1  *****************
+** User: Andrew       Date: 11/18/98   Time: 12:27p
+** Created in $/devel/h3/Win95/dx/minivdd
+** Pll Table for Avenger
+** 
+** *****************  Version 8  *****************
+** User: Pault        Date: 11/16/98   Time: 3:30p
+** Updated in $/devel/h4/cinit
+** This version of the table has m=k=1 and is based on the same
+** calculations we have been using in the lab. This will not work for
+** AvengerOEM.
+** 
+** *****************  Version 7  *****************
+** User: Pault        Date: 11/15/98   Time: 4:17p
+** Updated in $/devel/h4/cinit
+** Added missing pllTable definition at the bottom of the file.
+** 
+** *****************  Version 6  *****************
+** User: Pault        Date: 11/15/98   Time: 2:00p
+** Updated in $/devel/h4/cinit
+** Temporary table to work with Avenger. This table has k=1. But m values
+** are not wedged to 24 below 141 MHz, so this table with not work with
+** AvengerOEM.
+** 
+** *****************  Version 5  *****************
+** User: Pault        Date: 11/05/98   Time: 2:07p
+** Updated in $/devel/h4/cinit
+** The table now goes up to 220 MHz for Avenger. Also, all of the entries
+** up through 141 MHz have the M factor set at 24 so the entries can be
+** used with Avenger OEM.
+** 
+** *****************  Version 3  *****************
+** User: Artg         Date: 8/27/98    Time: 11:08a
+** Updated in $/devel/h3/Win95/dx/minivdd
+** added guard ifdef for redundant plltable define.
+** 
+** *****************  Version 2  *****************
+** User: Ken          Date: 4/15/98    Time: 6:42p
+** Updated in $/devel/h3/win95/dx/minivdd
+** added unified header to all files, with revision, etc. info in it
+**
+*/
+
+//
+// generated by gen_plltable_at.pl at Sun Nov 15 14:16:18 1998
+//
+
+#define MIN_PLL_FREQ 30
+#define MAX_PLL_FREQ 120
+#define MAX_H4_OEM_PLL_FREQ 141
+#define MAX_H4_PLL_FREQ 220
+
+FxU32 _h4pllTable[] = {
+//	   pllCtrl        n   m   k actual(MHz)
+//	   -------      --- --- --- -----------
+	0x00000B05,  //  11   1   1 31.022723
+	0x00000B05,  //  11   1   1 31.022723
+	0x00000B05,  //  11   1   1 31.022723
+	0x00000C05,  //  12   1   1 33.409087
+	0x00000C05,  //  12   1   1 33.409087
+	0x00000D05,  //  13   1   1 35.795450
+	0x00000D05,  //  13   1   1 35.795450
+	0x00000E05,  //  14   1   1 38.181813
+	0x00000E05,  //  14   1   1 38.181813
+	0x00000E05,  //  14   1   1 38.181813
+	0x00000F05,  //  15   1   1 40.568177
+	0x00000F05,  //  15   1   1 40.568177
+	0x00001005,  //  16   1   1 42.954540
+	0x00001005,  //  16   1   1 42.954540
+	0x00001005,  //  16   1   1 42.954540
+	0x00001105,  //  17   1   1 45.340903
+	0x00001105,  //  17   1   1 45.340903
+	0x00001205,  //  18   1   1 47.727267
+	0x00001205,  //  18   1   1 47.727267
+	0x00001305,  //  19   1   1 50.113630
+	0x00001305,  //  19   1   1 50.113630
+	0x00001305,  //  19   1   1 50.113630
+	0x00001405,  //  20   1   1 52.499993
+	0x00001405,  //  20   1   1 52.499993
+	0x00001505,  //  21   1   1 54.886357
+	0x00001505,  //  21   1   1 54.886357
+	0x00001505,  //  21   1   1 54.886357
+	0x00001605,  //  22   1   1 57.272720
+	0x00001605,  //  22   1   1 57.272720
+	0x00001705,  //  23   1   1 59.659083
+	0x00001705,  //  23   1   1 59.659083
+	0x00001805,  //  24   1   1 62.045447
+	0x00001805,  //  24   1   1 62.045447
+	0x00001805,  //  24   1   1 62.045447
+	0x00001905,  //  25   1   1 64.431810
+	0x00001905,  //  25   1   1 64.431810
+	0x00001A05,  //  26   1   1 66.818173
+	0x00001A05,  //  26   1   1 66.818173
+	0x00001A05,  //  26   1   1 66.818173
+	0x00001B05,  //  27   1   1 69.204537
+	0x00001B05,  //  27   1   1 69.204537
+	0x00001C05,  //  28   1   1 71.590900
+	0x00001C05,  //  28   1   1 71.590900
+	0x00001D05,  //  29   1   1 73.977263
+	0x00001D05,  //  29   1   1 73.977263
+	0x00001D05,  //  29   1   1 73.977263
+	0x00001E05,  //  30   1   1 76.363627
+	0x00001E05,  //  30   1   1 76.363627
+	0x00001F05,  //  31   1   1 78.749990
+	0x00001F05,  //  31   1   1 78.749990
+	0x00002005,  //  32   1   1 81.136353
+	0x00002005,  //  32   1   1 81.136353
+	0x00002005,  //  32   1   1 81.136353
+	0x00002105,  //  33   1   1 83.522717
+	0x00002105,  //  33   1   1 83.522717
+	0x00002205,  //  34   1   1 85.909080
+	0x00002205,  //  34   1   1 85.909080
+	0x00002205,  //  34   1   1 85.909080
+	0x00002305,  //  35   1   1 88.295443
+	0x00002305,  //  35   1   1 88.295443
+	0x00002405,  //  36   1   1 90.681807
+	0x00002405,  //  36   1   1 90.681807
+	0x00002505,  //  37   1   1 93.068170
+	0x00002505,  //  37   1   1 93.068170
+	0x00002505,  //  37   1   1 93.068170
+	0x00002605,  //  38   1   1 95.454533
+	0x00002605,  //  38   1   1 95.454533
+	0x00002705,  //  39   1   1 97.840897
+	0x00002705,  //  39   1   1 97.840897
+	0x00002705,  //  39   1   1 97.840897
+	0x00002805,  //  40   1   1 100.227260
+	0x00002805,  //  40   1   1 100.227260
+	0x00002905,  //  41   1   1 102.613623
+	0x00002905,  //  41   1   1 102.613623
+	0x00002A05,  //  42   1   1 104.999987
+	0x00002A05,  //  42   1   1 104.999987
+	0x00002A05,  //  42   1   1 104.999987
+	0x00002B05,  //  43   1   1 107.386350
+	0x00002B05,  //  43   1   1 107.386350
+	0x00002C05,  //  44   1   1 109.772713
+	0x00002C05,  //  44   1   1 109.772713
+	0x00002D05,  //  45   1   1 112.159077
+	0x00002D05,  //  45   1   1 112.159077
+	0x00002D05,  //  45   1   1 112.159077
+	0x00002E05,  //  46   1   1 114.545440
+	0x00002E05,  //  46   1   1 114.545440
+	0x00002F05,  //  47   1   1 116.931803
+	0x00002F05,  //  47   1   1 116.931803
+	0x00002F05,  //  47   1   1 116.931803
+	0x00003005,  //  48   1   1 119.318167
+	0x00003005,  //  48   1   1 119.318167
+	0x00003105,  //  49   1   1 121.704530
+	0x00003105,  //  49   1   1 121.704530
+	0x00003205,  //  50   1   1 124.090893
+	0x00003205,  //  50   1   1 124.090893
+	0x00003205,  //  50   1   1 124.090893
+	0x00003305,  //  51   1   1 126.477257
+	0x00003305,  //  51   1   1 126.477257
+	0x00003405,  //  52   1   1 128.863620
+	0x00003405,  //  52   1   1 128.863620
+	0x00003405,  //  52   1   1 128.863620
+	0x00003505,  //  53   1   1 131.249983
+	0x00003505,  //  53   1   1 131.249983
+	0x00003605,  //  54   1   1 133.636347
+	0x00003605,  //  54   1   1 133.636347
+	0x00003705,  //  55   1   1 136.022710
+	0x00003705,  //  55   1   1 136.022710
+	0x00003705,  //  55   1   1 136.022710
+	0x00003805,  //  56   1   1 138.409073
+	0x00003805,  //  56   1   1 138.409073
+	0x00003905,  //  57   1   1 140.795437
+	0x00003905,  //  57   1   1 140.795437
+	0x00003A05,  //  58   1   1 143.181800
+	0x00003A05,  //  58   1   1 143.181800
+	0x00003A05,  //  58   1   1 143.181800
+	0x00003B05,  //  59   1   1 145.568163
+	0x00003B05,  //  59   1   1 145.568163
+	0x00003C05,  //  60   1   1 147.954527
+	0x00003C05,  //  60   1   1 147.954527
+	0x00003C05,  //  60   1   1 147.954527
+	0x00003D05,  //  61   1   1 150.340890
+	0x00003D05,  //  61   1   1 150.340890
+	0x00003E05,  //  62   1   1 152.727253
+	0x00003E05,  //  62   1   1 152.727253
+	0x00003F05,  //  63   1   1 155.113617
+	0x00003F05,  //  63   1   1 155.113617
+	0x00003F05,  //  63   1   1 155.113617
+	0x00004005,  //  64   1   1 157.499980
+	0x00004005,  //  64   1   1 157.499980
+	0x00004105,  //  65   1   1 159.886343
+	0x00004105,  //  65   1   1 159.886343
+	0x00004105,  //  65   1   1 159.886343
+	0x00004205,  //  66   1   1 162.272707
+	0x00004205,  //  66   1   1 162.272707
+	0x00004305,  //  67   1   1 164.659070
+	0x00004305,  //  67   1   1 164.659070
+	0x0000e721,  //  68   1   1 166.81
+	0x0000e721,  //  68   1   1 166.81
+	0x0000e721,  //  68   1   1 166.81
+	0x00004505,  //  69   1   1 169.431797
+	0x00004505,  //  69   1   1 169.431797
+	0x00004605,  //  70   1   1 171.818160
+	0x00004605,  //  70   1   1 171.818160
+	0x00004605,  //  70   1   1 171.818160
+	0x00004705,  //  71   1   1 174.204523
+	0x00004705,  //  71   1   1 174.204523
+	0x00004805,  //  72   1   1 176.590887
+	0x00004805,  //  72   1   1 176.590887
+	0x00004905,  //  73   1   1 178.977250
+	0x00004905,  //  73   1   1 178.977250
+	0x00004905,  //  73   1   1 178.977250
+	0x00004A05,  //  74   1   1 181.363613
+	0x00004A05,  //  74   1   1 181.363613
+	0x00004B05,  //  75   1   1 183.749977
+	0x00004B05,  //  75   1   1 183.749977
+	0x00004C05,  //  76   1   1 186.136340
+	0x00004C05,  //  76   1   1 186.136340
+	0x00004C05,  //  76   1   1 186.136340
+	0x00004D05,  //  77   1   1 188.522703
+	0x00004D05,  //  77   1   1 188.522703
+	0x00004E05,  //  78   1   1 190.909067
+	0x00004E05,  //  78   1   1 190.909067
+	0x00004E05,  //  78   1   1 190.909067
+	0x00004F05,  //  79   1   1 193.295430
+	0x00004F05,  //  79   1   1 193.295430
+	0x00005005,  //  80   1   1 195.681793
+	0x00005005,  //  80   1   1 195.681793
+	0x00005105,  //  81   1   1 198.068157
+	0x00005105,  //  81   1   1 198.068157
+	0x00005105,  //  81   1   1 198.068157
+	0x00005205,  //  82   1   1 200.454520
+	0x00005205,  //  82   1   1 200.454520
+	0x00005305,  //  83   1   1 202.840883
+	0x00005305,  //  83   1   1 202.840883
+	0x00005305,  //  83   1   1 202.840883
+	0x00005405,  //  84   1   1 205.227247
+	0x00005405,  //  84   1   1 205.227247
+	0x00005505,  //  85   1   1 207.613610
+	0x00005505,  //  85   1   1 207.613610
+	0x00005605,  //  86   1   1 209.999973
+	0x00005605,  //  86   1   1 209.999973
+	0x00005605,  //  86   1   1 209.999973
+	0x00005705,  //  87   1   1 212.386337
+	0x00005705,  //  87   1   1 212.386337
+	0x00005805,  //  88   1   1 214.772700
+	0x00005805,  //  88   1   1 214.772700
+	0x00005905,  //  89   1   1 217.159063
+	0x00005905,  //  89   1   1 217.159063
+	0x00005905,  //  89   1   1 217.159063
+	0x00005A05,  //  90   1   1 219.545427
+	0x00005A05,  //  90   1   1 219.545427
+};
+
+FxU32 *h4pllTable = (FxU32*) (_h4pllTable - MIN_PLL_FREQ);
+

glide2x/h3/cinit/memtable.h

@@ -0,0 +1,110 @@
+/*
+** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
+** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
+** 
+** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+** THE UNITED STATES.  
+** 
+** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+**
+** File name:   memtable.h
+**
+** Description: Table to initialize dramInit0 and sgramMode.
+**
+** $History: memtable.h $
+** 
+** *****************  Version 1  *****************
+** User: Sapphire     Date: 3/16/99    Time: 7:28p
+** Created in $/Releases/Voodoo3/V3_OEM_100/3dfx/devel/H3/cinit
+** 
+** *****************  Version 6  *****************
+** User: Michael      Date: 1/11/99    Time: 3:53p
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Implement the 3Dfx/STB unified header.
+** 
+** *****************  Version 5  *****************
+** User: Psmith       Date: 8/09/98    Time: 7:53a
+** Updated in $/devel/h3/cinit
+** added Generic SGRAM/SDRAM memory timings that have lower performance
+** but will work for all currently-supported chips.
+** default memory vendor type changed to Generic from Samsung.
+** 
+** *****************  Version 4  *****************
+** User: Psmith       Date: 7/31/98    Time: 1:35a
+** Updated in $/devel/h3/cinit
+** changed block write to 2 cycles for Etron 16Mbit partsd
+** 
+** *****************  Version 3  *****************
+** User: Psmith       Date: 7/22/98    Time: 9:11a
+** Updated in $/devel/h3/cinit
+** added sdram support
+** 
+** *****************  Version 2  *****************
+** User: Ken          Date: 4/15/98    Time: 6:41p
+** Updated in $/devel/h3/win95/dx/minivdd
+** added unified header to all files, with revision, etc. info in it
+**
+*/
+
+//
+// generated by gen_memtable.pl at Sun Aug  9 07:21:36 1998
+//
+
+#define MEM_TYPE_SGRAM  0
+#define MEM_TYPE_SDRAM  1
+
+
+struct memTable_st {
+    char vendor[8];
+    FxU32 type;
+    FxU32 size;
+    FxU32 dramInit0;
+    FxU32 sgramMode;
+} memTable[] = {
+
+//      vendor   	type 		size 	dramInit0 	sgramMode
+//    ---------- 	---- 		---- 	--------- 	---------
+    {    "ETRON", 	MEM_TYPE_SGRAM, 16, 	0x001698e9, 	0x00000037} , 
+    {    "ETRON", 	MEM_TYPE_SGRAM,  8, 	0x0016a169, 	0x00000037} , 
+    {  "GENERIC", 	MEM_TYPE_SDRAM, 16, 	0x00169d25, 	0x00000037} , 
+    {  "GENERIC", 	MEM_TYPE_SGRAM, 16, 	0x00179d29, 	0x00000037} , 
+    {  "GENERIC", 	MEM_TYPE_SGRAM,  8, 	0x001fa569, 	0x00000037} , 
+    {    "GLINK", 	MEM_TYPE_SGRAM,  8, 	0x001ea169, 	0x00000037} , 
+    {    "MOSYS", 	MEM_TYPE_SGRAM, 16, 	0x00015495, 	0x00000027} , 
+    {    "MOSYS", 	MEM_TYPE_SGRAM,  8, 	0x00155495, 	0x00000027} , 
+    {  "SAMSUNG", 	MEM_TYPE_SDRAM, 16, 	0x00169d25, 	0x00000037} , 
+    {  "SAMSUNG", 	MEM_TYPE_SGRAM, 16, 	0x00169d25, 	0x00000037} , 
+    {  "SAMSUNG", 	MEM_TYPE_SGRAM,  8, 	0x00169d25, 	0x00000037} , 
+    {  "SIEMENS", 	MEM_TYPE_SGRAM,  8, 	0x0016a169, 	0x00000037} , 
+    {  "TOSHIBA", 	MEM_TYPE_SGRAM,  8, 	0x0016a565, 	0x00000037} , 
+};
+#define MEM_TABLE_SIZE (sizeof(memTable)/sizeof(struct memTable_st))
+
+#define MEM_ETRON_SGRAM_16	0
+#define MEM_ETRON_SGRAM_8	1
+#define MEM_GENERIC_SDRAM_16	2
+#define MEM_GENERIC_SGRAM_16	3
+#define MEM_GENERIC_SGRAM_8	4
+#define MEM_GLINK_SGRAM_8	5
+#define MEM_MOSYS_SGRAM_16	6
+#define MEM_MOSYS_SGRAM_8	7
+#define MEM_SAMSUNG_SDRAM_16	8
+#define MEM_SAMSUNG_SGRAM_16	9
+#define MEM_SAMSUNG_SGRAM_8	10
+#define MEM_SIEMENS_SGRAM_8	11
+#define MEM_TOSHIBA_SGRAM_8	12
+
+#define MEM_DEFAULT_SGRAM_8  MEM_GENERIC_SGRAM_8
+#define MEM_DEFAULT_SGRAM_16 MEM_GENERIC_SGRAM_16
+#define MEM_DEFAULT_SDRAM_16 MEM_GENERIC_SDRAM_16
+

glide2x/h3/cinit/modetabl.h

@@ -0,0 +1,446 @@
+/*
+** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
+** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
+** 
+** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+** THE UNITED STATES.  
+** 
+** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+**
+** File name:   modetabl.h
+**
+** Description: Mode table that contains modes and related register values.
+**
+** $History: modetabl.h $
+** 
+** *****************  Version 1  *****************
+** User: Sapphire     Date: 3/16/99    Time: 7:28p
+** Created in $/Releases/Voodoo3/V3_OEM_100/3dfx/devel/H3/cinit
+** 
+** *****************  Version 25  *****************
+** User: Stb_srogers  Date: 3/02/99    Time: 4:04p
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Adding the 960x720 & 1280x960 modes
+** 
+** *****************  Version 24  *****************
+** User: Stb_srogers  Date: 2/16/99    Time: 5:04p
+** Updated in $/devel/h3/win95/dx/minivdd
+** 
+** *****************  Version 22  *****************
+** User: Stb_srogers  Date: 2/11/99    Time: 6:59p
+** Updated in $/devel/h3/win95/dx/minivdd
+** 
+** *****************  Version 21  *****************
+** User: Stb_srogers  Date: 2/09/99    Time: 11:30a
+** Updated in $/devel/h3/win95/dx/minivdd
+** 
+** *****************  Version 20  *****************
+** User: Andrew       Date: 2/07/99    Time: 4:45p
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Change the clocks as per Malcolm Gray suggestion and added new modes
+** 1600x1024, 1920x1200, and 2048x1536.
+** 
+** *****************  Version 19  *****************
+** User: Stb_srogers  Date: 1/29/99    Time: 8:08a
+** Updated in $/devel/h3/win95/dx/minivdd
+** 
+** *****************  Version 18  *****************
+** User: Andrew       Date: 1/12/99    Time: 12:40p
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Removed my changes since complaint mode is 75 Hz
+** 
+** *****************  Version 16  *****************
+** User: Michael      Date: 1/11/99    Time: 3:54p
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Implement the 3Dfx/STB unified header.
+** 
+** *****************  Version 15  *****************
+** User: Michael      Date: 12/31/98   Time: 9:55a
+** Updated in $/devel/h3/Win95/dx/minivdd
+** STB's customized refresh rates.  Customizations are surrounded by
+** "#ifdef INCSTBCUST".
+** 
+** *****************  Version 14  *****************
+** User: Andrew       Date: 8/31/98    Time: 11:26p
+** Updated in $/devel/h3/Win95/dx/minivdd
+** John's fixes for 800x600
+** 
+** *****************  Version 13  *****************
+** User: Andrew       Date: 8/20/98    Time: 10:11p
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Updated 320x240@60,72 400x300 @ 72 & 85, 1792x1392 changed from 72 to
+** 75.
+** 
+** *****************  Version 12  *****************
+** User: Andrew       Date: 7/27/98    Time: 11:12a
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Added updates for 400x300 modes since SCANLINEDBL was not set in xls
+** file
+** 
+** *****************  Version 11  *****************
+** User: Andrew       Date: 7/21/98    Time: 2:42p
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Modified to support the new final mode list -- add new refreshs
+** 320x200, 320x240, 400x300, 512x384, and 1152x864.
+** 
+** *****************  Version 10  *****************
+** User: Andrew       Date: 7/04/98    Time: 10:37a
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Got modetabl.h the right way.....Differences  hsync skew on 1920x1440
+** and clocks on low-rez modes
+** 
+** *****************  Version 9  *****************
+** User: Andrew       Date: 6/29/98    Time: 10:58a
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Changed Dot Clock on 1792x1344 and Refresh Rate from 70 to 72.  Changed
+** CR04 on 1792x1344 @ 60 Hz
+** 
+** *****************  Version 8  *****************
+** User: Andrew       Date: 6/24/98    Time: 9:32a
+** Updated in $/devel/h3/Win95/dx/minivdd
+** New mode additions for 1792x1344 and 1856x1392 plus 1152x864 @ 100
+** 
+** *****************  Version 7  *****************
+** User: Andrew       Date: 5/19/98    Time: 6:12p
+** Updated in $/devel/h3/Win95/dx/minivdd
+** changed 1800 to 1808 and changed timing to 1808
+** 
+** *****************  Version 6  *****************
+** User: Andrew       Date: 5/07/98    Time: 11:24a
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Added modes 1792x1440 and 1920x1440.  1800x1440 was updated but still
+** does not work
+** 
+** *****************  Version 5  *****************
+** User: Andrew       Date: 4/22/98    Time: 2:58p
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Changed clock at 1280x960 @ 75 hz and 1600x1200 @ 85 Hz and added
+** broken 1800x1440
+** 
+** *****************  Version 4  *****************
+** User: Ken          Date: 4/15/98    Time: 6:42p
+** Updated in $/devel/h3/win95/dx/minivdd
+** added unified header to all files, with revision, etc. info in it
+**
+*/
+
+
+// Begin STB Changes
+// STB-SR 12/23/98 changing modetable
+// STB-SR 12/30/98 All but 720x350 and 720x400 work
+// STB-SR 01/07/99 720x350 and 720x400 work.  I had assumed that SR1 (Sequencer
+// Register 1), was always 0x21.  Bit 0 defines wether or not the character
+// width is 8 or 9.  1->8 pixel wide char, 0->9 pixel char.  The actual change
+// was made in minivdd\modetabl.h
+// STB-SR 02/11/99 Adding STB & 3Dfx unified modes for Voodoo3
+#ifdef H4
+// If you need to make changes to the modetable, you must also edit
+// dd16\h3.c and dd16\setmode.c
+//              r[0]  r[1]  r[2]  r[3]  r[4]  r[5]  r[6]  r[7]  r[8]  r[9]  r[10] r[11] r[12] r[13] r[14] r[15] r[16] r[17] r[18] r[19] r[20]
+// x    y  rr,    0h    1h    2h    3h    4h    5h    6h    7h    9h   10h    11h   12h   15h   16h   1ah   1bh  3c2   SR1  pllctrl0  dacmode
+// x    y  rr, Htotl HDEnE HBlSt HBlEn HSySt HSyEn Vtotl Ovflw MxSLn VSySt  VSyEn VDEnE VBlSt VBlEn HExtn VExtn MiscO  SR1  pllctrl0  dacmode 
+// New Standardized modetable for both 3Dfx and STB
+{  640,  480,  60, 0x5f, 0x4f, 0x4f, 0x83, 0x51, 0x9d, 0x0b, 0x3e, 0x40, 0xe9,
+	0x2b, 0xdf, 0xdf, 0x0c, 0x00, 0x00, 0xcf, 0x21, 0x37, 0xd1, 0x00},
+{  640,  480,  72, 0x63, 0x4f, 0x4f, 0x87, 0x52, 0x97, 0x06, 0x3e, 0x40, 0xe8,
+	0x2b, 0xdf, 0xdf, 0x07, 0x00, 0x00, 0xcf, 0x21, 0x0f, 0x56, 0x00},
+{  640,  480,  75, 0x64, 0x4f, 0x4f, 0x88, 0x51, 0x99, 0xf2, 0x1f, 0x40, 0xe0,
+	0x23, 0xdf, 0xdf, 0xf3, 0x00, 0x00, 0xcf, 0x21, 0x0f, 0x56, 0x00},
+{  640,  480,  85, 0x63, 0x4f, 0x4f, 0x87, 0x56, 0x9d, 0xfb, 0x1f, 0x40, 0xe0,
+	0x23, 0xdf, 0xdf, 0xfc, 0x00, 0x00, 0xcf, 0x21, 0x1f, 0xb3, 0x00},
+{  800,  600,  56, 0x7b, 0x63, 0x63, 0x9f, 0x66, 0x8f, 0x6f, 0xf0, 0x60, 0x58,
+	0x2a, 0x57, 0x57, 0x70, 0x80, 0x00, 0x0f, 0x21, 0x1f, 0xb3, 0x00},
+{  800,  600,  60, 0x7f, 0x63, 0x63, 0x83, 0x68, 0x18, 0x72, 0xf0, 0x60, 0x58,
+	0x2c, 0x57, 0x57, 0x73, 0xa0, 0x00, 0x0f, 0x21, 0x27, 0xf4, 0x00},
+{  800,  600,  72, 0x7d, 0x63, 0x63, 0x81, 0x6a, 0x19, 0x98, 0xf0, 0x60, 0x7c,
+	0x22, 0x57, 0x57, 0x99, 0xa0, 0x00, 0x0f, 0x21, 0x1f, 0xf9, 0x00},
+{  800,  600,  75, 0x7f, 0x63, 0x63, 0x83, 0x65, 0x0f, 0x6f, 0xf0, 0x60, 0x58,
+	0x2b, 0x57, 0x57, 0x70, 0xa0, 0x00, 0x0f, 0x21, 0x07, 0x51, 0x00},
+{  800,  600,  85, 0x7e, 0x63, 0x63, 0x82, 0x67, 0x0f, 0x75, 0xf0, 0x60, 0x58,
+	0x2b, 0x57, 0x57, 0x76, 0xa0, 0x00, 0x0f, 0x21, 0x17, 0xda, 0x00},
+{ 1024,  768,  60, 0xa3, 0x7f, 0x7f, 0x87, 0x82, 0x93, 0x24, 0xf5, 0x60, 0x02,
+	0x28, 0xff, 0xff, 0x25, 0x20, 0x00, 0xcf, 0x21, 0x07, 0x6b, 0x00},
+{ 1024,  768,  70, 0xa1, 0x7f, 0x7f, 0x85, 0x82, 0x93, 0x24, 0xf5, 0x60, 0x02,
+	0x28, 0xff, 0xff, 0x25, 0x20, 0x00, 0xcf, 0x21, 0x2a, 0xf9, 0x00},
+{ 1024,  768,  75, 0x9f, 0x7f, 0x7f, 0x83, 0x81, 0x8d, 0x1e, 0xf5, 0x60, 0x00,
+	0x23, 0xff, 0xff, 0x1f, 0x20, 0x00, 0x0f, 0x21, 0x06, 0x40, 0x00},
+{ 1024,  768,  85, 0xa7, 0x7f, 0x7f, 0x8b, 0x85, 0x91, 0x26, 0xf5, 0x60, 0x00,
+	0x23, 0xff, 0xff, 0x27, 0x20, 0x00, 0x0f, 0x21, 0x0e, 0x82, 0x00},
+{ 1152,  864,  60, 0xb3, 0x8f, 0x8f, 0x97, 0x93, 0x9f, 0x87, 0xff, 0x60, 0x60,
+	0x23, 0x5f, 0x5f, 0x88, 0x00, 0x00, 0x0f, 0x21, 0x26, 0xf4, 0x00},
+{ 1152,  864,  70, 0xb4, 0x8f, 0x8f, 0x98, 0x93, 0x9f, 0x8e, 0xff, 0x60, 0x60,
+	0x23, 0x5f, 0x5f, 0x8f, 0x00, 0x00, 0x0f, 0x21, 0x0e, 0x82, 0x00},
+{ 1152,  864,  75, 0xc3, 0x8f, 0x8f, 0x87, 0x97, 0x07, 0x82, 0xff, 0x60, 0x60,
+	0x23, 0x5f, 0x5f, 0x83, 0xa0, 0x00, 0x0f, 0x21, 0x12, 0xb3, 0x00},
+{ 1152,  864,  85, 0xbf, 0x8f, 0x8f, 0x83, 0x97, 0x07, 0x8d, 0xff, 0x60, 0x60,
+	0x23, 0x5f, 0x5f, 0x8e, 0xa0, 0x00, 0x0f, 0x21, 0x06, 0x64, 0x00},
+{ 1280,  960,  60, 0xdc, 0x9f, 0x9f, 0x80, 0xab, 0x99, 0xe6, 0xff, 0x60, 0xc0,
+	0x23, 0xbf, 0xbf, 0xe7, 0xa0, 0x00, 0x0f, 0x21, 0x12, 0xb3, 0x00},
+{ 1280,  960,  85, 0xd3, 0x9f, 0x9f, 0x97, 0xa7, 0x1b, 0xf1, 0xff, 0x60, 0xc0,
+	0x23, 0xbf, 0xbf, 0xf2, 0xa0, 0x00, 0x0f, 0x21, 0x0a, 0xa4, 0x00},
+{ 1280, 1024,  60, 0xce, 0x9f, 0x9f, 0x92, 0xa5, 0x13, 0x28, 0x5a, 0x60, 0x00,
+	0x23, 0xff, 0xff, 0x29, 0xa0, 0x41, 0x0f, 0x21, 0x12, 0xb3, 0x00},
+{ 1280, 1024,  75, 0xce, 0x9f, 0x9f, 0x92, 0xa1, 0x13, 0x28, 0x5a, 0x60, 0x00,
+	0x23, 0xff, 0xff, 0x29, 0xa0, 0x41, 0x0f, 0x21, 0x0a, 0x95, 0x00},
+{ 1280, 1024,  85, 0xd3, 0x9f, 0x9f, 0x97, 0xa7, 0x1b, 0x2e, 0x5a, 0x60, 0x00,
+	0x23, 0xff, 0xff, 0x2f, 0xa0, 0x41, 0x0f, 0x21, 0x05, 0x40, 0x00},
+{ 1600, 1024,  60, 0x00, 0xc7, 0xc7, 0x84, 0xcb, 0x1f, 0x2c, 0x5a, 0x60, 0x02,
+	0x25, 0xff, 0xff, 0x2d, 0x21, 0x41, 0xcf, 0x21, 0x0e, 0xb9, 0x00},
+{ 1600, 1024,  76, 0x00, 0xc7, 0xc7, 0x84, 0xcb, 0x1f, 0x2c, 0x5a, 0x60, 0x02,
+	0x25, 0xff, 0xff, 0x2d, 0x21, 0x41, 0xcf, 0x21, 0x15, 0xa4, 0x00},
+{ 1600, 1024,  85, 0x00, 0xc7, 0xc7, 0x84, 0xcb, 0x1f, 0x2c, 0x5a, 0x60, 0x02,
+	0x25, 0xff, 0xff, 0x2d, 0x21, 0x41, 0xcf, 0x21, 0x09, 0x68, 0x00},
+{ 1600, 1200,  60, 0x00, 0xc7, 0xc7, 0x84, 0xcf, 0x07, 0xe0, 0x10, 0x40, 0xb0,
+	0x23, 0xaf, 0xaf, 0xe1, 0xa1, 0x55, 0x0f, 0x21, 0x19, 0xad, 0x00},
+{ 1600, 1200,  65, 0x00, 0xc7, 0xc7, 0x84, 0xcf, 0x07, 0xe0, 0x10, 0x40, 0xb0,
+	0x23, 0xaf, 0xaf, 0xe1, 0xa1, 0x55, 0x0f, 0x21, 0x21, 0xeb, 0x00},
+{ 1600, 1200,  70, 0x00, 0xc7, 0xc7, 0x84, 0xcf, 0x07, 0xe0, 0x10, 0x40, 0xb0,
+	0x23, 0xaf, 0xaf, 0xe1, 0xa1, 0x55, 0x0f, 0x21, 0x09, 0x64, 0x00},
+{ 1600, 1200,  75, 0x00, 0xc7, 0xc7, 0x84, 0xcf, 0x07, 0xe0, 0x10, 0x40, 0xb0,
+	0x23, 0xaf, 0xaf, 0xe1, 0xa1, 0x55, 0x0f, 0x21, 0x05, 0x50, 0x00},
+{ 1600, 1200,  80, 0x00, 0xc7, 0xc7, 0x84, 0xcf, 0x07, 0xe0, 0x10, 0x40, 0xb0,
+	0x23, 0xaf, 0xaf, 0xe1, 0xa1, 0x55, 0x0f, 0x21, 0x11, 0xad, 0x00},
+{ 1600, 1200,  85, 0x00, 0xc7, 0xc7, 0x84, 0xcf, 0x07, 0xe0, 0x10, 0x40, 0xb0,
+	0x23, 0xaf, 0xaf, 0xe1, 0xa1, 0x55, 0x0f, 0x21, 0x05, 0x5b, 0x00},
+{ 1600, 1200, 100, 0x00, 0xc7, 0xc7, 0x84, 0xcf, 0x07, 0xe0, 0x10, 0x40, 0xb0,
+	0x23, 0xaf, 0xaf, 0xe1, 0xa1, 0x55, 0x0f, 0x21, 0x15, 0xfd, 0x00},
+{ 1792, 1344,  60, 0x94, 0x6f, 0x6f, 0x98, 0x77, 0x04, 0x70, 0x1f, 0x40, 0x40,
+	0x23, 0x3f, 0x3f, 0x71, 0x20, 0x55, 0x4f, 0x21, 0x0d, 0x8d, 0x01},
+{ 1792, 1344,  75, 0x95, 0x6f, 0x6f, 0x99, 0x75, 0x03, 0x87, 0x1f, 0x40, 0x40,
+	0x23, 0x3f, 0x3f, 0x88, 0x20, 0x55, 0x4f, 0x21, 0x15, 0xfd, 0x01},
+{ 1856, 1392,  60, 0x99, 0x73, 0x73, 0x9d, 0x79, 0x07, 0x9d, 0x1f, 0x40, 0x70,
+	0x23, 0x6f, 0x6f, 0x9e, 0x20, 0x55, 0x4f, 0x21, 0x09, 0x78, 0x01},
+{ 1856, 1392,  75, 0x9b, 0x73, 0x73, 0x9f, 0x7b, 0x09, 0xda, 0x1f, 0x40, 0x70,
+	0x23, 0x6f, 0x6f, 0xdb, 0x20, 0x55, 0x4f, 0x21, 0x09, 0x9f, 0x01},
+{ 1920, 1080,  60, 0x8f, 0x77, 0x77, 0x93, 0x79, 0x02, 0x63, 0x10, 0x40, 0x3a,
+	0x2d, 0x37, 0x37, 0x64, 0x20, 0x55, 0xcf, 0x21, 0x05, 0x41, 0x01},
+{ 1920, 1080,  72, 0x9b, 0x77, 0x77, 0x9f, 0x7a, 0x08, 0x92, 0x10, 0x40, 0x3a,
+	0x2d, 0x37, 0x37, 0x93, 0x20, 0x55, 0xcf, 0x21, 0x11, 0xb3, 0x01},
+{ 1920, 1200,  60, 0x9d, 0x77, 0x77, 0x81, 0x7b, 0x8b, 0xe0, 0x10, 0x40, 0xb2,
+	0x25, 0xaf, 0xaf, 0xe1, 0x20, 0x55, 0xcf, 0x21, 0x1d, 0xf2, 0x01},
+{ 1920, 1200,  76, 0x9d, 0x77, 0x77, 0x81, 0x7b, 0x8b, 0xe0, 0x10, 0x40, 0xb2,
+	0x25, 0xaf, 0xaf, 0xe1, 0x20, 0x55, 0xcf, 0x21, 0x15, 0xee, 0x01},
+{ 1920, 1440,  60, 0x9e, 0x77, 0x77, 0x82, 0x7f, 0x8c, 0xda, 0x1f, 0x40, 0xa0,
+	0x23, 0x9f, 0x9f, 0xdb, 0x20, 0x55, 0x4f, 0x21, 0x05, 0x60, 0x01},
+{ 1920, 1440,  75, 0xa0, 0x77, 0x77, 0x84, 0x80, 0x8e, 0xda, 0x1f, 0x40, 0xa0,
+	0x23, 0x9f, 0x9f, 0xdb, 0x20, 0x55, 0x4f, 0x21, 0x09, 0xa4, 0x01},
+{ 2048, 1536,  60, 0x98, 0x7f, 0x7f, 0x9c, 0x82, 0x10, 0x3b, 0xba, 0x40, 0x00,
+	0x23, 0xff, 0xff, 0x3c, 0x20, 0x55, 0x0f, 0x21, 0x09, 0x84, 0x01},
+{ 2048, 1536,  75, 0xa1, 0x7f, 0x7f, 0x85, 0x83, 0x91, 0x44, 0xba, 0x40, 0x00,
+	0x23, 0xff, 0xff, 0x45, 0x20, 0x55, 0x0f, 0x21, 0x05, 0x84, 0x01},
+{  320,  200,  70, 0x2d, 0x27, 0x27, 0x91, 0x28, 0x8e, 0xbf, 0x1f, 0xc0, 0x9c,
+	0x2e, 0x8f, 0x8f, 0xc0, 0x80, 0x00, 0x4f, 0x21, 0x73, 0xd1, 0x00},
+{  320,  200,  85, 0x2f, 0x27, 0x27, 0x93, 0x29, 0x8d, 0xbb, 0x1f, 0xc0, 0x90,
+	0x23, 0x8f, 0x8f, 0xbc, 0x80, 0x00, 0x4f, 0x21, 0x0f, 0x2a, 0x00},
+{  320,  240,  60, 0x2d, 0x27, 0x27, 0x91, 0x28, 0x8e, 0x0b, 0x3e, 0xc0, 0xe9,
+	0x2b, 0xdf, 0xdf, 0x0c, 0x80, 0x00, 0xcf, 0x21, 0x73, 0xd1, 0x00},
+{  320,  240,  72, 0x2f, 0x27, 0x27, 0x93, 0x29, 0x8b, 0x06, 0x3e, 0xc0, 0xe8,
+	0x2b, 0xdf, 0xdf, 0x07, 0x80, 0x00, 0xcf, 0x21, 0x0f, 0x2a, 0x00},
+{  320,  240,  75, 0x30, 0x27, 0x27, 0x94, 0x28, 0x8c, 0xf2, 0x1f, 0xc0, 0xe0,
+	0x23, 0xdf, 0xdf, 0xf3, 0x80, 0x00, 0xcf, 0x21, 0x63, 0xe5, 0x00},
+{  320,  240,  85, 0x2f, 0x27, 0x27, 0x93, 0x2a, 0x8e, 0xfb, 0x1f, 0xc0, 0xe0,
+	0x23, 0xdf, 0xdf, 0xfc, 0x80, 0x00, 0xcf, 0x21, 0x43, 0xb3, 0x00},
+{  400,  300,  60, 0x3d, 0x31, 0x31, 0x81, 0x34, 0x1c, 0x72, 0xf0, 0xe0, 0x58,
+	0x2c, 0x57, 0x57, 0x73, 0xa0, 0x00, 0x0f, 0x21, 0x3f, 0xbc, 0x00},
+{  400,  300,  72, 0x3c, 0x31, 0x31, 0x80, 0x35, 0x1c, 0x98, 0xf0, 0xe0, 0x7c,
+	0x22, 0x57, 0x57, 0x99, 0xa0, 0x00, 0x0f, 0x21, 0x43, 0xf9, 0x00},
+{  400,  300,  75, 0x3d, 0x31, 0x31, 0x81, 0x32, 0x17, 0x6f, 0xf0, 0xe0, 0x58,
+	0x2b, 0x57, 0x57, 0x70, 0xa0, 0x00, 0x0f, 0x21, 0x13, 0x51, 0x00},
+{  400,  300,  85, 0x3d, 0x31, 0x31, 0x81, 0x33, 0x17, 0x75, 0xf0, 0xe0, 0x58,
+	0x2b, 0x57, 0x57, 0x76, 0xa0, 0x00, 0x0f, 0x21, 0x13, 0x5d, 0x00},
+{  512,  384,  60, 0x4f, 0x3f, 0x3f, 0x93, 0x41, 0x09, 0x24, 0xf5, 0xe0, 0x02,
+	0x28, 0xff, 0xff, 0x25, 0x20, 0x00, 0xcf, 0x21, 0x2f, 0xea, 0x00},
+{  512,  384,  70, 0x4e, 0x3f, 0x3f, 0x92, 0x41, 0x09, 0x24, 0xf5, 0xe0, 0x02,
+	0x28, 0xff, 0xff, 0x25, 0x20, 0x00, 0xcf, 0x21, 0x2b, 0xf9, 0x00},
+{  512,  384,  75, 0x4d, 0x3f, 0x3f, 0x91, 0x40, 0x06, 0x1e, 0xf5, 0xe0, 0x00,
+	0x23, 0xff, 0xff, 0x1f, 0x20, 0x00, 0xcf, 0x21, 0x07, 0x40, 0x00},
+{  512,  384,  85, 0x51, 0x3f, 0x3f, 0x95, 0x42, 0x08, 0x26, 0xf5, 0xe0, 0x00,
+	0x23, 0xff, 0xff, 0x27, 0x20, 0x00, 0xcf, 0x21, 0x0f, 0x82, 0x00},
+{  640,  400,  70, 0x5f, 0x4f, 0x4f, 0x83, 0x51, 0x9d, 0xbf, 0x1f, 0x40, 0x9c,
+	0x2e, 0x8f, 0x8f, 0xc0, 0x00, 0x00, 0x4f, 0x21, 0x37, 0xd1, 0x00},
+{  640,  400,  85, 0x63, 0x4f, 0x4f, 0x87, 0x53, 0x9b, 0xbb, 0x1f, 0x40, 0x90,
+	0x23, 0x8f, 0x8f, 0xbc, 0x00, 0x00, 0x4f, 0x21, 0x0f, 0x56, 0x00},
+{  720,  480,  60, 0x6b, 0x59, 0x59, 0x8f, 0x5b, 0x8a, 0x0b, 0x3e, 0x40, 0xe9,
+	0x2b, 0xdf, 0xdf, 0x0c, 0x80, 0x00, 0xcf, 0x21, 0x0b, 0x3d, 0x00},
+{  720,  480,  72, 0x6e, 0x59, 0x59, 0x92, 0x5b, 0x8c, 0x06, 0x3e, 0x40, 0xe8,
+	0x2b, 0xdf, 0xdf, 0x07, 0x80, 0x00, 0xcf, 0x21, 0x2f, 0xfb, 0x00},
+{  720,  480,  85, 0x70, 0x59, 0x59, 0x94, 0x61, 0x89, 0xfb, 0x1f, 0x40, 0xe0,
+	0x23, 0xdf, 0xdf, 0xfc, 0x80, 0x00, 0xcf, 0x21, 0x1b, 0xb3, 0x00},
+{  720,  576,  72, 0x70, 0x59, 0x59, 0x94, 0x5d, 0x89, 0x80, 0xf0, 0x60, 0x41,
+	0x25, 0x3f, 0x3f, 0x81, 0x80, 0x00, 0x0f, 0x21, 0x13, 0x8f, 0x00},
+{  720,  576, 100, 0x70, 0x59, 0x59, 0x94, 0x5d, 0x89, 0x80, 0xf0, 0x60, 0x41,
+	0x25, 0x3f, 0x3f, 0x81, 0x80, 0x00, 0x0f, 0x21, 0x17, 0xe9, 0x00},
+#else // #ifdef H4
+// STB End Changes
+
+
+{320, 200, 70, 0x2f, 0x27, 0x27, 0x93, 0x2a, 0x8e, 0xbb, 0x1f, 0x40, 0x91,
+	0x24, 0x8f, 0x8f, 0xbc, 0x80, 0x00, 0x4f, 0x21, 0xee, 0xdb, 0x00},
+{320, 200, 85, 0x2f, 0x27, 0x27, 0x93, 0x2a, 0x8e, 0xbb, 0x1f, 0x40, 0x91,
+	0x24, 0x8f, 0x8f, 0xbc, 0x80, 0x00, 0x4f, 0x21, 0x37, 0x82, 0x00},
+{320, 240, 60, 0x2d, 0x27, 0x27, 0x8f, 0x29, 0x8e, 0x0b, 0x3e, 0x40, 0xe1,
+	0x24, 0xdf, 0xdf, 0xfc, 0x80, 0x00, 0xcf, 0x21, 0xea, 0xd1, 0x00},
+{320, 240, 72, 0x2f, 0x27, 0x27, 0x93, 0x2a, 0x8e, 0x06, 0x3e, 0x40, 0xe1,
+	0x24, 0xdf, 0xdf, 0xfc, 0x80, 0x00, 0xcf, 0x21, 0x37, 0x82, 0x00},
+{320, 240, 85, 0x2f, 0x27, 0x27, 0x93, 0x2a, 0x8e, 0xfb, 0x1f, 0x40, 0xe1,
+	0x24, 0xdf, 0xdf, 0xfc, 0x80, 0x00, 0xcf, 0x21, 0x3f, 0xa9, 0x00},
+{400, 300, 60, 0x3d, 0x31, 0x31, 0x81, 0x34, 0x1c, 0x72, 0xf0, 0x60, 0x59,
+	0x2d, 0x57, 0x57, 0x73, 0xa0, 0x00, 0x0f, 0x21, 0xf4, 0x56, 0x00},
+{400, 300, 72, 0x3c, 0x31, 0x31, 0x80, 0x34, 0x1b, 0x98, 0xf0, 0x60, 0x7d,
+	0x23, 0x57, 0x57, 0x99, 0xa0, 0x00, 0x0f, 0x21, 0xf4, 0x6c, 0x00},
+{400, 300, 85, 0x3d, 0x31, 0x31, 0x80, 0x33, 0x1b, 0x75, 0xf0, 0x60, 0x59,
+	0x2c, 0x57, 0x57, 0x76, 0xa0, 0x00, 0x0f, 0x21, 0xb8, 0x5d, 0x00},
+{512, 384, 60, 0x4f, 0x3f, 0x3f, 0x93, 0x41, 0x0a, 0x24, 0xf5, 0x60, 0x04,
+	0x2a, 0xff, 0xff, 0x25, 0x20, 0x00, 0xcf, 0x21, 0x5e, 0xe1, 0x00},
+{512, 384, 72, 0x4e, 0x3f, 0x3f, 0x92, 0x41, 0x0a, 0x24, 0xf5, 0x60, 0x03,
+	0x29, 0xff, 0xff, 0x25, 0x20, 0x00, 0xcf, 0x21, 0xbc, 0x82, 0x00},
+{512, 384, 75, 0x4d, 0x3f, 0x3f, 0x91, 0x41, 0x07, 0x1e, 0xf5, 0x60, 0x01,
+	0x24, 0xff, 0xff, 0x1f, 0x20, 0x00, 0x0f, 0x21, 0x2a, 0x82, 0x00},
+{512, 384, 85, 0x51, 0x3f, 0x3f, 0x95, 0x43, 0x09, 0x26, 0xf5, 0x60, 0x01,
+	0x24, 0xff, 0xff, 0x27, 0x20, 0x00, 0x0f, 0x21, 0x36, 0xc4, 0x00},
+{640, 350, 85, 0x63, 0x4f, 0x4f, 0x87, 0x54, 0x9c, 0xbb, 0x1f, 0x40, 0x7e,
+	0x21, 0x5d, 0x5d, 0xbc, 0x20, 0x00, 0x8f, 0x21, 0x36, 0x82, 0x00},
+{640, 400, 70, 0x63, 0x4f, 0x4f, 0x87, 0x54, 0x9c, 0xbb, 0x1f, 0x40, 0x91,
+	0x24, 0x8f, 0x8f, 0xbc, 0x20, 0x00, 0x4f, 0x21, 0xed, 0xdb, 0x00},
+{640, 400, 85, 0x63, 0x4f, 0x4f, 0x87, 0x54, 0x9c, 0xbb, 0x1f, 0x40, 0x91,
+	0x24, 0x8f, 0x8f, 0xbc, 0x20, 0x00, 0x4f, 0x21, 0x36, 0x82, 0x00},
+{640, 480, 60, 0x5f, 0x4f, 0x4f, 0x83, 0x52, 0x9e, 0x0b, 0x3e, 0x40, 0xea,
+	0x2c, 0xdf, 0xdf, 0x0c, 0x20, 0x00, 0xcf, 0x21, 0x7d, 0x72, 0x00},
+{640, 480, 72, 0x63, 0x4f, 0x4f, 0x87, 0x56, 0x9b, 0x06, 0x3e, 0x40, 0xe9,
+	0x2c, 0xdf, 0xdf, 0x07, 0x20, 0x00, 0xcf, 0x21, 0x36, 0x82, 0x00},
+{640, 480, 75, 0x64, 0x4f, 0x4f, 0x88, 0x51, 0x99, 0xf2, 0x1f, 0x40, 0xe1,
+	0x24, 0xdf, 0xdf, 0xf3, 0x20, 0x00, 0xcf, 0x21, 0x36, 0x82, 0x00},
+{640, 480, 85, 0x63, 0x4f, 0x4f, 0x87, 0x56, 0x9e, 0xfb, 0x1f, 0x40, 0xe1,
+	0x24, 0xdf, 0xdf, 0xfc, 0x20, 0x00, 0xcf, 0x21, 0x3e, 0xa9, 0x00},
+{640, 480, 100, 0x63, 0x4f, 0x4f, 0x87, 0x56, 0x9e, 0xfb, 0x1f, 0x40, 0xe1,
+	0x24, 0xdf, 0xdf, 0xfc, 0x20, 0x00, 0xcf, 0x21, 0x58, 0x45, 0x00},
+{640, 480, 120, 0x63, 0x4f, 0x4f, 0x87, 0x56, 0x9e, 0xfb, 0x1f, 0x40, 0xe1,
+	0x24, 0xdf, 0xdf, 0xfc, 0x20, 0x00, 0xcf, 0x21, 0x48, 0x45, 0x00},
+{720, 400, 72, 0x70, 0x59, 0x59, 0x94, 0x5e, 0x87, 0xbc, 0x1f, 0x40, 0x91,
+	0x24, 0x8f, 0x8f, 0xbd, 0xa0, 0x00, 0x4f, 0x21, 0x20, 0x13, 0x00},
+{720, 400, 85, 0x70, 0x59, 0x59, 0x94, 0x5e, 0x87, 0xbc, 0x1f, 0x40, 0x91,
+	0x24, 0x8f, 0x8f, 0xbd, 0xa0, 0x00, 0x4f, 0x21, 0xb8, 0x75, 0x00},
+{720, 480, 60, 0x70, 0x59, 0x59, 0x94, 0x5e, 0x87, 0x15, 0x3e, 0x40, 0xe1,
+	0x24, 0xdf, 0xdf, 0x16, 0xa0, 0x00, 0x4f, 0x21, 0xc4, 0x69, 0x00},
+{720, 480, 72, 0x70, 0x59, 0x59, 0x94, 0x5e, 0x87, 0x15, 0x3e, 0x40, 0xe1,
+	0x24, 0xdf, 0xdf, 0x16, 0xa0, 0x00, 0x4f, 0x21, 0xd8, 0x8b, 0x00},
+{720, 576, 72, 0x70, 0x59, 0x59, 0x94, 0x5e, 0x87, 0x80, 0xf0, 0x60, 0x41,
+	0x24, 0x3f, 0x3f, 0x81, 0xa0, 0x00, 0x4f, 0x21, 0xb0, 0x89, 0x00},
+{720, 576, 100, 0x70, 0x59, 0x59, 0x94, 0x5e, 0x87, 0x80, 0xf0, 0x60, 0x41,
+	0x24, 0x3f, 0x3f, 0x81, 0xa0, 0x00, 0x4f, 0x21, 0xec, 0xfe, 0x00},
+{800, 600, 56, 0x7b, 0x63, 0x63, 0x9f, 0x69, 0x99, 0x6f, 0xf0, 0x60, 0x59,
+	0x2b, 0x57, 0x57, 0x70, 0xa0, 0x00, 0x0f, 0x21, 0x3e, 0xa9, 0x00},
+{800, 600, 60, 0x7b, 0x63, 0x63, 0x9f, 0x6a, 0x94, 0x6c, 0xf0, 0x60, 0x59,
+	0x2c, 0x57, 0x57, 0x6d, 0xa0, 0x00, 0x0f, 0x21, 0x06, 0x1e, 0x00},
+{800, 600, 72, 0x7d, 0x63, 0x63, 0x81, 0x68, 0x17, 0x98, 0xf0, 0x60, 0x7d,
+	0x23, 0x57, 0x57, 0x99, 0x80, 0x00, 0x0f, 0x21, 0x06, 0x28, 0x00},
+{800, 600, 75, 0x7f, 0x63, 0x63, 0x83, 0x65, 0x0f, 0x6f, 0xf0, 0x60, 0x59,
+	0x2c, 0x57, 0x57, 0x70, 0x80, 0x00, 0x0f, 0x21, 0x55, 0x9d, 0x00},
+{800, 600, 85, 0x7e, 0x63, 0x63, 0x82, 0x67, 0x0f, 0x75, 0xf0, 0x60, 0x59,
+	0x2c, 0x57, 0x57, 0x76, 0x80, 0x00, 0x0f, 0x21, 0x31, 0x6c, 0x00},
+{800, 600, 100, 0x7e, 0x63, 0x63, 0x82, 0x66, 0x0e, 0x75, 0xf0, 0x60, 0x59,
+//	0x2c, 0x57, 0x57, 0x76, 0x80, 0x00, 0x0f, 0x21, 0x8c, 0xa9, 0x00},
+	0x2c, 0x57, 0x57, 0x76, 0x80, 0x00, 0x0f, 0x21, 0x0b, 0x92, 0x00},
+{800, 600, 120, 0x7e, 0x63, 0x63, 0x82, 0x66, 0x0e, 0x75, 0xf0, 0x60, 0x59,
+	0x2c, 0x57, 0x57, 0x76, 0x80, 0x00, 0x0f, 0x21, 0x24, 0x3b, 0x00},
+{1152, 864, 60, 0xb4, 0x8f, 0x8f, 0x98, 0x94, 0x80, 0x8e, 0xff, 0x60, 0x61,
+//	0x24, 0x5f, 0x5f, 0x8f, 0x80, 0x00, 0x0f, 0x21, 0x84, 0xc4, 0x00},
+	0x24, 0x5f, 0x5f, 0x8f, 0x80, 0x00, 0x0f, 0x21, 0x0b, 0xb3, 0x00},
+{1152, 864, 75, 0xc3, 0x8f, 0x8f, 0x87, 0x98, 0x08, 0x82, 0xff, 0x60, 0x61,
+//	0x24, 0x5f, 0x5f, 0x83, 0xa0, 0x00, 0x0f, 0x21, 0x50, 0xa4, 0x00},
+	0x24, 0x5f, 0x5f, 0x83, 0xa0, 0x00, 0x0f, 0x21, 0x12, 0xb3, 0x00},
+{1152, 864, 85, 0xc0, 0x8f, 0x8f, 0x84, 0x98, 0x08, 0x89, 0xff, 0x60, 0x61,
+//	0x24, 0x5f, 0x5f, 0x8a, 0xa0, 0x00, 0x0f, 0x21, 0x6c, 0xf4, 0x00},
+	0x24, 0x5f, 0x5f, 0x8a, 0xa0, 0x00, 0x0f, 0x21, 0x16, 0xeb, 0x00},
+{1152, 864, 100, 0x5f, 0x47, 0x47, 0x83, 0x4c, 0x93, 0x82, 0xff, 0x60, 0x61,
+//	0x24, 0x5f, 0x5f, 0x83, 0x20, 0x00, 0x0f, 0x21, 0x40, 0xb3, 0x01},
+	0x24, 0x5f, 0x5f, 0x83, 0x20, 0x00, 0x0f, 0x21, 0x0a, 0x9f, 0x01},
+{1024, 768, 60, 0xa3, 0x7f, 0x7f, 0x87, 0x83, 0x94, 0x24, 0xf5, 0x60, 0x04,
+//	0x2a, 0xff, 0xff, 0x25, 0x00, 0x00, 0xcf, 0x21, 0x5d, 0xe1, 0x00},
+	0x2a, 0xff, 0xff, 0x25, 0x00, 0x00, 0xcf, 0x21, 0x07, 0x6b, 0x00},
+{1024, 768, 70, 0xa1, 0x7f, 0x7f, 0x85, 0x83, 0x94, 0x24, 0xf5, 0x60, 0x03,
+//	0x29, 0xff, 0xff, 0x25, 0x00, 0x00, 0xcf, 0x21, 0x4d, 0xda, 0x00},
+	0x29, 0xff, 0xff, 0x25, 0x00, 0x00, 0xcf, 0x21, 0x13, 0xf9, 0x00},
+{1024, 768, 72, 0xa1, 0x7f, 0x7f, 0x85, 0x83, 0x94, 0x24, 0xf5, 0x60, 0x03,
+	0x29, 0xff, 0xff, 0x25, 0x00, 0x00, 0xcf, 0x21, 0x74, 0xa5, 0x00},
+{1024, 768, 75, 0x9f, 0x7f, 0x7f, 0x83, 0x82, 0x8e, 0x1e, 0xf5, 0x60, 0x01,
+//	0x24, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x0f, 0x21, 0x29, 0x82, 0x00},
+	0x24, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x0f, 0x21, 0x12, 0x82, 0x00},
+{1024, 768, 85, 0xa7, 0x7f, 0x7f, 0x8b, 0x86, 0x92, 0x26, 0xf5, 0x60, 0x01,
+//	0x24, 0xff, 0xff, 0x27, 0x00, 0x00, 0x0f, 0x21, 0x35, 0xc4, 0x00},
+	0x24, 0xff, 0xff, 0x27, 0x00, 0x00, 0x0f, 0x21, 0x0e, 0x82, 0x00},
+{1024, 768, 100, 0xa7, 0x7f, 0x7f, 0x8b, 0x86, 0x92, 0x26, 0xf5, 0x60, 0x01,
+//	0x24, 0xff, 0xff, 0x27, 0x00, 0x00, 0x0f, 0x21, 0x3c, 0x82, 0x00},
+	0x24, 0xff, 0xff, 0x27, 0x00, 0x00, 0x0f, 0x21, 0x06, 0x5b, 0x00},
+{1024, 768, 120, 0xa7, 0x7f, 0x7f, 0x8b, 0x86, 0x92, 0x26, 0xf5, 0x60, 0x01,
+//	0x24, 0xff, 0xff, 0x27, 0x00, 0x00, 0x0f, 0x21, 0x50, 0xcb, 0x00},
+	0x24, 0xff, 0xff, 0x27, 0x00, 0x00, 0x0f, 0x21, 0x0a, 0x93, 0x00},
+{1280, 960, 60, 0xdc, 0x9f, 0x9f, 0x80, 0xac, 0x9a, 0xe6, 0xff, 0x60, 0xc1,
+	0x24, 0xbf, 0xbf, 0xe7, 0xa0, 0x00, 0x0f, 0x21, 0x50, 0xa4, 0x00},
+{1280, 960, 75, 0xcd, 0x9f, 0x9f, 0x91, 0xa4, 0x16, 0xe6, 0xff, 0x60, 0xc1,
+	0x24, 0xbf, 0xbf, 0xe7, 0xa0, 0x00, 0x0f, 0x21, 0x0c, 0x2a, 0x00},
+{1280, 960, 85, 0x67, 0x4f, 0x4f, 0x8b, 0x54, 0x9e, 0xf1, 0xff, 0x60, 0xc1,
+	0x24, 0xbf, 0xbf, 0xf2, 0x20, 0x00, 0x0f, 0x21, 0x38, 0xa4, 0x01},
+{1280, 1024, 60, 0xce, 0x9f, 0x9f, 0x92, 0xa6, 0x14, 0x28, 0x5a, 0x60, 0x01,
+//	0x24, 0xff, 0xff, 0x29, 0xa0, 0x41, 0x0f, 0x21, 0x50, 0xa4, 0x00},
+	0x24, 0xff, 0xff, 0x29, 0xa0, 0x41, 0x0f, 0x21, 0x12, 0xb3, 0x00},
+{1280, 1024, 75, 0xce, 0x9f, 0x9f, 0x92, 0xa2, 0x14, 0x28, 0x5a, 0x60, 0x01,
+//	0x24, 0xff, 0xff, 0x29, 0xa0, 0x41, 0x0f, 0x21, 0x30, 0x82, 0x00},
+	0x24, 0xff, 0xff, 0x29, 0xa0, 0x41, 0x0f, 0x21, 0x15, 0x82, 0x00},
+{1280, 1024, 85, 0x67, 0x4f, 0x4f, 0x8b, 0x54, 0x9e, 0x2e, 0x5a, 0x60, 0x01,
+//	0x24, 0xff, 0xff, 0x2f, 0x20, 0x41, 0x0f, 0x21, 0x28, 0x82, 0x01},
+	0x24, 0xff, 0xff, 0x2f, 0x20, 0x41, 0x0f, 0x21, 0x11, 0x82, 0x01},
+{1280, 1024, 100, 0x67, 0x4f, 0x4f, 0x8b, 0x54, 0x9e, 0x2e, 0x5a, 0x60, 0x01,
+//	0x24, 0xff, 0xff, 0x2f, 0x20, 0x41, 0x0f, 0x21, 0x3c, 0xda, 0x01},
+	0x24, 0xff, 0xff, 0x2f, 0x20, 0x41, 0x0f, 0x21, 0x0a, 0xcd, 0x01},
+{1600, 1024, 76, 0x7e, 0x63, 0x63, 0x82, 0x66, 0x0f, 0x2c, 0x5a, 0x60, 0x03,
+   0x06, 0xff, 0xff, 0x2d, 0x80, 0x41, 0xcf, 0x21, 0x4c, 0xf8, 0x01,},
+{1600, 1200, 60, 0x82, 0x63, 0x63, 0x86, 0x68, 0x14, 0xe0, 0x10, 0x40, 0xb1,
+//	0x24, 0xaf, 0xaf, 0xe1, 0x80, 0x55, 0x0f, 0x21, 0x44, 0xd5, 0x01},
+	0x24, 0xaf, 0xaf, 0xe1, 0x80, 0x55, 0x0f, 0x21, 0x0a, 0xb3, 0x01},
+{1600, 1200, 65, 0x82, 0x63, 0x63, 0x86, 0x68, 0x14, 0xe0, 0x10, 0x40, 0xb1,
+//	0x24, 0xaf, 0xaf, 0xe1, 0x80, 0x55, 0x0f, 0x21, 0x44, 0xe7, 0x01},
+	0x24, 0xaf, 0xaf, 0xe1, 0x80, 0x55, 0x0f, 0x21, 0x11, 0x91, 0x01},
+{1600, 1200, 70, 0x82, 0x63, 0x63, 0x86, 0x68, 0x14, 0xe0, 0x10, 0x40, 0xb1,
+//	0x24, 0xaf, 0xaf, 0xe1, 0x80, 0x55, 0x0f, 0x21, 0x34, 0xc4, 0x01},
+	0x24, 0xaf, 0xaf, 0xe1, 0x80, 0x55, 0x0f, 0x21, 0x0d, 0x82, 0x01},
+{1600, 1200, 75, 0x82, 0x63, 0x63, 0x86, 0x68, 0x14, 0xe0, 0x10, 0x40, 0xb1,
+//	0x24, 0xaf, 0xaf, 0xe1, 0x80, 0x55, 0x0f, 0x21, 0x30, 0xc4, 0x01},
+	0x24, 0xaf, 0xaf, 0xe1, 0x80, 0x55, 0x0f, 0x21, 0x09, 0x6f, 0x01},
+{1600, 1200, 80, 0x82, 0x63, 0x63, 0x86, 0x68, 0x14, 0xe0, 0x10, 0x40, 0xb1,
+//	0x24, 0xaf, 0xaf, 0xe1, 0x80, 0x55, 0x0f, 0x21, 0x24, 0xa4, 0x01},
+	0x24, 0xaf, 0xaf, 0xe1, 0x80, 0x55, 0x0f, 0x21, 0x11, 0xb3, 0x01},
+{1600, 1200, 85, 0x82, 0x63, 0x63, 0x86, 0x68, 0x14, 0xe0, 0x10, 0x40, 0xb1,
+//	0x24, 0xaf, 0xaf, 0xe1, 0x80, 0x55, 0x0f, 0x21, 0x0c, 0x4e, 0x01},
+	0x24, 0xaf, 0xaf, 0xe1, 0x80, 0x55, 0x0f, 0x21, 0x09, 0x7e, 0x01},
+{1792, 1344, 60, 0x8e, 0x6f, 0x6f, 0x92, 0x71, 0x1f, 0x74, 0x1f, 0x40, 0x43,
+//	0x29, 0x3f, 0x3f, 0x75, 0x80, 0x55, 0x0f, 0x21, 0x30, 0xbf, 0x01},
+	0x29, 0x3f, 0x3f, 0x75, 0x80, 0x55, 0x0f, 0x21, 0x15, 0xbf, 0x01},
+{1792, 1344, 75, 0x94, 0x6f, 0x6f, 0x98, 0x74, 0x01, 0x87, 0x1f, 0x40, 0x4a,
+//	0x4d, 0x3f, 0x3f, 0x88, 0x00, 0x55, 0x0f, 0x21, 0x0c, 0x59, 0x01},
+	0x4d, 0x3f, 0x3f, 0x88, 0x00, 0x55, 0x0f, 0x21, 0x05, 0x6b, 0x01},
+{1856, 1392, 60, 0x92, 0x73, 0x73, 0x96, 0x7c, 0x03, 0xa4, 0x1f, 0x40, 0x73,
+//	0x29, 0x6f, 0x6f, 0xa5, 0x00, 0x55, 0x0f, 0x21, 0x3c, 0xf7, 0x01},
+	0x29, 0x6f, 0x6f, 0xa5, 0x00, 0x55, 0x0f, 0x21, 0x15, 0xcb, 0x01},
+{1920, 1200, 76, 0x9d, 0x77, 0x77, 0x81, 0x7c, 0x8b, 0xe0, 0x10, 0x40, 0xb3,
+   0xb6, 0xaf, 0xaf, 0xe1, 0x00, 0x55, 0xcf, 0x21, 0x14, 0x76, 0x01,},
+{1920, 1440, 60, 0x9d, 0x77, 0x77, 0x81, 0x7a, 0x87, 0xda, 0x1f, 0x40, 0xa1,
+//	0x24, 0x9f, 0x9f, 0xdb, 0x00, 0x55, 0x0f, 0x21, 0x30, 0xe3, 0x01},
+	0x24, 0x9f, 0x9f, 0xdb, 0x00, 0x55, 0x0f, 0x21, 0x0d, 0xa1, 0x01},
+{2048, 1536, 60, 0x98, 0x7f, 0x7f, 0x9c, 0x80, 0x0f, 0x3b, 0xba, 0x40, 0x01,
+   0x04, 0xff, 0xff, 0x3c, 0x00, 0x55, 0x0f, 0x21, 0x28, 0xc7, 0x01,},
+{2048, 1536, 75, 0xa1, 0x7f, 0x7f, 0x85, 0x84, 0x90, 0x44, 0xba, 0x40, 0x01,
+   0x04, 0xff, 0xff, 0x45, 0x00, 0x55, 0x0f, 0x21, 0x1c, 0xc7, 0x01,},
+// STB Begin Changes
+#endif  // #ifdef H4
+// STB End Changes

glide2x/h3/cinit/plltable.h

@@ -0,0 +1,151 @@
+/*
+** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
+** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
+** 
+** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+** THE UNITED STATES.  
+** 
+** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+**
+** File name:   plltable.h
+**
+** Description: The V3 PLL table.
+**
+** $History: plltable.h $
+** 
+** *****************  Version 1  *****************
+** User: Sapphire     Date: 3/16/99    Time: 7:28p
+** Created in $/Releases/Voodoo3/V3_OEM_100/3dfx/devel/H3/cinit
+** 
+** *****************  Version 4  *****************
+** User: Michael      Date: 1/12/99    Time: 9:23a
+** Updated in $/devel/h3/Win95/dx/minivdd
+** Implement the 3Dfx/STB unified header.
+** 
+** *****************  Version 3  *****************
+** User: Artg         Date: 8/27/98    Time: 11:08a
+** Updated in $/devel/h3/Win95/dx/minivdd
+** added guard ifdef for redundant plltable define.
+** 
+** *****************  Version 2  *****************
+** User: Ken          Date: 4/15/98    Time: 6:42p
+** Updated in $/devel/h3/win95/dx/minivdd
+** added unified header to all files, with revision, etc. info in it
+*/
+
+//
+// generated by gen_plltable.pl at Thu Apr  9 18:44:30 1998
+//
+
+#define MIN_PLL_FREQ 30
+#define MAX_PLL_FREQ 120
+
+#if !defined(Host_H3)
+FxU32 _pllTable[] = {
+//	   pllCtrl        n   m   k actual(MHz)
+//	   -------      --- --- --- -----------
+	0x00006B2E,  // 107  11   2 30.013108
+	0x00001806,  //  24   1   2 31.022723
+	0x00007B32,  // 123  12   2 31.960223
+	0x0000511E,  //  81   7   2 33.011359
+	0x0000240A,  //  36   2   2 34.005677
+	0x0000561E,  //  86   7   2 34.999996
+	0x0000772A,  // 119  10   2 36.093745
+	0x00001D06,  //  29   1   2 36.988632
+	0x0000531A,  //  83   6   2 38.032666
+	0x00006B22,  // 107   8   2 39.017041
+	0x00007926,  // 121   9   2 40.025821
+	0x00007C26,  // 124   9   2 41.002061
+	0x00002D0A,  //  45   2   2 42.059654
+	0x00002206,  //  34   1   2 42.954540
+	0x00005416,  //  84   5   2 43.977267
+	0x00005616,  //  86   5   2 44.999994
+	0x00005816,  //  88   5   2 46.022721
+	0x0000671A,  // 103   6   2 46.981528
+	0x0000410E,  //  65   3   2 47.965903
+	0x00002706,  //  39   1   2 48.920448
+	0x00002806,  //  40   1   2 50.113630
+	0x0000370A,  //  55   2   2 51.008516
+	0x0000380A,  //  56   2   2 51.903402
+	0x0000480E,  //  72   3   2 52.977266
+	0x0000771A,  // 119   6   2 54.140618
+	0x0000791A,  // 121   6   2 55.035504
+	0x00007B1A,  // 123   6   2 55.930391
+	0x00007D1A,  // 125   6   2 56.825277
+	0x00004F0E,  //  79   3   2 57.988629
+	0x0000400A,  //  64   2   2 59.062492
+	0x00006B2D,  // 107  11   1 60.026216
+	0x00007E35,  // 126  13   1 61.090901
+	0x00001805,  //  24   1   1 62.045447
+	0x00002A0D,  //  42   3   1 62.999992
+	0x00007B31,  // 123  12   1 63.920446
+	0x0000742D,  // 116  11   1 64.982509
+	0x0000511D,  //  81   7   1 66.022719
+	0x00006525,  // 101   9   1 67.035115
+	0x00002409,  //  36   2   1 68.011355
+	0x00006825,  // 104   9   1 68.987595
+	0x0000561D,  //  86   7   1 69.999991
+	0x00007529,  // 117  10   1 70.994309
+	0x00007729,  // 119  10   1 72.187491
+	0x0000310D,  //  49   3   1 73.022718
+	0x00001D05,  //  29   1   1 73.977263
+	0x00007125,  // 113   9   1 74.845032
+	0x00005319,  //  83   6   1 76.065331
+	0x00002909,  //  41   2   1 76.960217
+	0x00006B21,  // 107   8   1 78.034081
+	0x00001F05,  //  31   1   1 78.749990
+	0x00007925,  // 121   9   1 80.051643
+	0x00006F21,  // 111   8   1 80.897717
+	0x00007C25,  // 124   9   1 82.004122
+	0x0000380D,  //  56   3   1 83.045444
+	0x00002D09,  //  45   2   1 84.119308
+	0x00005D19,  //  93   6   1 85.014194
+	0x00002205,  //  34   1   1 85.909080
+	0x00005315,  //  83   5   1 86.931807
+	0x00005415,  //  84   5   1 87.954534
+	0x00005515,  //  85   5   1 88.977261
+	0x00005615,  //  86   5   1 89.999989
+	0x00005715,  //  87   5   1 91.022716
+	0x00005815,  //  88   5   1 92.045443
+	0x00002505,  //  37   1   1 93.068170
+	0x00006719,  // 103   6   1 93.963056
+	0x00005B15,  //  91   5   1 95.113624
+	0x0000410D,  //  65   3   1 95.931806
+	0x0000781D,  // 120   7   1 97.045442
+	0x00002705,  //  39   1   1 97.840897
+	0x00005111,  //  81   4   1 99.034078
+	0x00002805,  //  40   1   1 100.227260
+	0x00007D1D,  // 125   7   1 101.022714
+	0x00003709,  //  55   2   1 102.017033
+	0x00007119,  // 113   6   1 102.911919
+	0x00003809,  //  56   2   1 103.806805
+	0x00002A05,  //  42   1   1 104.999987
+	0x0000480D,  //  72   3   1 105.954532
+	0x00002B05,  //  43   1   1 107.386350
+	0x00007719,  // 119   6   1 108.281236
+	0x00003B09,  //  59   2   1 109.176123
+	0x00007919,  // 121   6   1 110.071009
+	0x00003C09,  //  60   2   1 110.965895
+	0x00007B19,  // 123   6   1 111.860781
+	0x00004D0D,  //  77   3   1 113.113622
+	0x00007D19,  // 125   6   1 113.650554
+	0x00002E05,  //  46   1   1 114.545440
+	0x00004F0D,  //  79   3   1 115.977258
+	0x00002F05,  //  47   1   1 116.931803
+	0x00004009,  //  64   2   1 118.124985
+	0x0000510D,  //  81   3   1 118.840894
+	0x00006B2C,  // 107  11   0 120.052432
+};
+FxU32 *pllTable = (FxU32*) (_pllTable - MIN_PLL_FREQ);
+#endif
+

glide2x/h3/glide/src/cpudtect.asm

@@ -17,8 +17,11 @@
 ;; 
 ;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 ;;
-;; $Header$
+;; Revision 1.1.1.1.2.1  2006/11/30 09:16:50  guillemj
-;; $Log$
+;; Switch to the new "build system", to be in sync with the rest of glide.
+;; Backport cpudtect.asm from glide3 for h3.
+;; Add fpu.c to cvg.
+;;
 ;; Revision 1.1.1.1.8.1  2003/11/07 13:38:38  dborca
 ;; unite the clans
 ;;
@@ -66,7 +69,7 @@ CPUTypeP6       equ 6h
         
 ;;; References to external data:
     
-segment		TEXT
+segment		SEG_TEXT
 ;;
 ;;  _cpu_detect_asm - detect the type of CPU 
 ;; 

glide2x/h3/glide/src/gdraw.c

@@ -752,29 +752,17 @@ all_done:
    * between them.
    */
 
-  asm (
+asm (
 #if defined(PIC)
-       "popl %%ebx\n\t"
+     "popl %%ebx\n\t"
 #endif
-#if !defined(BIG_OPT)
+     "jmp *%0"
-       "popl %%ebp\n\t"
+     : 
+     : "m" (_GlideRoot.curGC->archDispatchProcs.triSetupProc)
+#if defined(PIC)
+     : "ebx"
 #endif
-       "jmp *%0" 
+);
-       : /* no outputs */        
-       :"m" (_GlideRoot.curGC->archDispatchProcs.triSetupProc)
-#if defined (PIC) || !defined (BIG_OPT)
-       :
-#endif
-#if defined (PIC)
-        "ebx"
-#endif
-#if defined (PIC) && !defined (BIG_OPT)
-       ,
-#endif
-#if !defined(BIG_OPT)
-        "ebp"
-#endif
-       );
 #endif
 #endif
 #undef FN_NAME

glide2x/h3/glide/src/makefile.linux

@@ -112,6 +112,8 @@ override USE_FIFO = 1
 ifeq ($(USE_X86),1)
 CDEFS += -DGLIDE_DISPATCH_SETUP=1 -DGLIDE_DISPATCH_DOWNLOAD=1
 override USE_FIFO = 1
+CDEFS += -DHAVE_XDRAWTRI_ASM=1
+override USE_DRAWTRI_ASM = 1
 else
 CDEFS += -DGLIDE_USE_C_TRISETUP=1
 endif
@@ -139,7 +141,7 @@ ASFLAGS = -O6 -felf -D__linux__
 ASFLAGS += $(CDEFS)
 
 # compiler
-CFLAGS = -Wall -W
+CFLAGS = -Wall
 CFLAGS += -I. -I../../incsrc -I../../minihwc -I../../cinit
 CFLAGS += -I$(FX_GLIDE_SW)/fxmisc -I$(FX_GLIDE_SW)/newpci/pcilib -I$(FX_GLIDE_SW)/fxmemmap
 CFLAGS += $(CDEFS)
@@ -150,11 +152,12 @@ override USE_X86 = 1
 endif
 
 ifeq ($(USE_X86),1)
-CFLAGS += -DGL_X86
+CFLAGS += -DGL_X86 -DBIG_OPT
-OPTFLAGS ?= -O2 -ffast-math
+OPTFLAGS ?= -O6 -march=pentium2 -mtune=pentium3 -fomit-frame-pointer -funroll-loops \
+	-fexpensive-optimizations -ffast-math
 else
 CFLAGS += -DGLIDE_USE_C_TRISETUP
-OPTFLAGS ?= -O2 -ffast-math
+OPTFLAGS ?= -O6 -march=pentium2 -mtune=pentium3 -ffast-math
 endif
 
 # optflags
@@ -191,6 +194,9 @@ GLIDE_OBJECTS = \
 	cpuid.o \
 	xtexdl_def.o
 
+ifeq ($(USE_DRAWTRI_ASM),1)
+GLIDE_OBJECTS += xdrawtri.o
+endif
 ifeq ($(USE_X86),1)
 GLIDE_OBJECTS += \
 	xdraw2_def.o \
@@ -256,7 +262,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_SO): $(GLIDE_LIBDIR)/$(GLIDE_SHARED)
 	ln -fs $(GLIDE_SHARED) $(GLIDE_LIBDIR)/$(GLIDE_SO)
 
 $(GLIDE_LIBDIR)/$(GLIDE_SHARED): $(GLIDE_OBJECTS:.o=.lo)
-	$(CC) -o $@ -shared -Wl,-soname,$(GLIDE_SONAME) $^ $(LDFLAGS) $(LDLIBS)
+	$(CC) -o $@ -shared -Wl,--no-undefined -Wl,-soname,$(GLIDE_SONAME) $^ $(LDFLAGS) $(LDLIBS)
 
 ###############################################################################
 #	rules(2)
@@ -274,6 +280,8 @@ xdraw3_3dnow.o: xdraw3.asm
 	$(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $<
 xtexdl_3dnow.o: xtexdl.asm
 	$(AS) -o $@ $(ASFLAGS) -DGL_AMD3D=1 $<
+xdrawtri.o: xdrawtri.asm
+	$(AS) -o $@ $(ASFLAGS) $<
 
 cpuid.lo: cpuid.o
 	$(CP) $< $@
@@ -287,6 +295,8 @@ xdraw3_3dnow.lo: xdraw3_3dnow.o
 	$(CP) $< $@
 xtexdl_3dnow.lo: xtexdl_3dnow.o
 	$(CP) $< $@
+xdrawtri.lo: xdrawtri.o
+	$(CP) $< $@
 
 $(GLIDE_OBJECTS): fxinline.h fxgasm.h
 
@@ -308,7 +318,7 @@ clean:
 	-$(RM) ../../cinit/*.o ../../cinit/*.lo
 	-$(RM) ../../minihwc/*.o ../../minihwc/*.lo
 	-$(RM) $(FX_GLIDE_SW)/newpci/pcilib/*.o $(FX_GLIDE_SW)/newpci/pcilib/*.lo
-	-$(RM) $(FX_GLIDE_SW)/fxmisc/linutil.o $(FX_GLIDE_SW)/fxmisc/linutil.lo
+	-$(RM) $(FX_GLIDE_SW)/fxmisc/*.o $(FX_GLIDE_SW)/fxmisc/*.lo
 	-$(RM) fxinline.h
 	-$(RM) fxgasm.h
 

glide2x/h3/glide/src/xdraw2.asm

@@ -56,161 +56,143 @@
 ; B4 Chip field fix.
 ;;
 
-TITLE   xdraw2.asm
+%include "xos.inc"
-OPTION OLDSTRUCTS
 
-.586P
+extrn _GlideRoot
-.MMX
+extrn _FifoMakeRoom
-.K3D
 
-EXTRN   __GlideRoot:    DWORD
+segment		SEG_DATA
-EXTRN   __FifoMakeRoom: NEAR
+    One         DD  1.0
-
-_DATA   SEGMENT
-    One         DD  03f800000r
     Area        DD  0
 
-IF GLIDE_PACKED_RGB    
+%if GLIDE_PACKED_RGB
     bias0   DD  0
     bias1   DD  0
-ENDIF
+%endif
-_DATA   ENDS
 
 ; Ugly, but seems to workaround the problem with locally defined
 ; data segment globals not getting relocated properly when using
 ; djgpp.
 
-zArea   TEXTEQU <One+04h>
+%define zArea   One+04h
 
 ;;; Definitions of cvg regs and glide root structures.
-INCLUDE fxgasm.h
+%include "fxgasm.h"
 
 ; Arguments (STKOFF = 16 from 4 pushes)
-STKOFF  = 16
+STKOFF  equ 16
-_va$    =  4 + STKOFF
+_va$    equ  4 + STKOFF
-_vb$    =  8 + STKOFF
+_vb$    equ  8 + STKOFF
-_vc$    = 12 + STKOFF
+_vc$    equ 12 + STKOFF
 
-PROC_TYPE MACRO procType:=<Default>
+X       equ 0
-    IFDEF GL_AMD3D
+Y       equ 4
-	EXITM <__trisetup_3DNow_&procType&@12>
+
-    ELSE
+%MACRO PROC_TYPE 1
-	EXITM <__trisetup_Default_&procType&@12>
+    %IFDEF GL_AMD3D
-    ENDIF
+        proc _trisetup_3DNow_%1, 12
-    ENDM	
+    %ELSE
+        proc _trisetup_Default_%1, 12
+    %ENDIF
+%ENDM
 
 ;--------------------------------------------------------------------------
-_TEXT       SEGMENT PAGE PUBLIC USE32 'CODE'
+segment		SEG_TEXT
-            ASSUME DS: FLAT, SS: FLAT
+
+            ALIGN  32
+PROC_TYPE cull
+
+%define GLIDE_CULLING       1
+%define GLIDE_PACK_RGB      0
+%define GLIDE_PACK_ALPHA    0
+%define GLIDE_GENERIC_SETUP 0
+%INCLUDE "xdraw2.inc"
+%undef GLIDE_GENERIC_SETUP
+%undef GLIDE_PACK_ALPHA
+%undef GLIDE_PACK_RGB           
+%undef GLIDE_CULLING
+
+endp
 
             ALIGN  32
 
-            PUBLIC  PROC_TYPE(cull)
+%IF GLIDE_PACKED_RGB
-PROC_TYPE(cull)  PROC    NEAR
 
-GLIDE_CULLING       textequ <1>
+PROC_TYPE cull_rgb
-GLIDE_PACK_RGB      textequ <0>
-GLIDE_PACK_ALPHA    textequ <0>
-GLIDE_GENERIC_SETUP textequ <0>
-INCLUDE xdraw2.inc
-GLIDE_GENERIC_SETUP textequ <0>    
-GLIDE_PACK_ALPHA    textequ <0>
-GLIDE_PACK_RGB      textequ <0>    
-GLIDE_CULLING       textequ <0>
 
-PROC_TYPE(cull) ENDP
+%define GLIDE_CULLING       1
+%define GLIDE_PACK_RGB      1
+%define GLIDE_PACK_ALPHA    0
+%define GLIDE_GENERIC_SETUP 0
+%INCLUDE "xdraw2.inc"
+%undef GLIDE_GENERIC_SETUP      
+%undef GLIDE_PACK_ALPHA
+%undef GLIDE_PACK_RGB           
+%undef GLIDE_CULLING
+
+endp
 
             ALIGN  32
+PROC_TYPE cull_argb
 
-IF GLIDE_PACKED_RGB
+%define GLIDE_CULLING       1
-            PUBLIC  PROC_TYPE(cull_rgb)
+%define GLIDE_PACK_RGB      1
-PROC_TYPE(cull_rgb)  PROC    NEAR
+%define GLIDE_PACK_ALPHA    1
+%define GLIDE_GENERIC_SETUP 0
+%INCLUDE "xdraw2.inc"
+%undef GLIDE_GENERIC_SETUP      
+%undef GLIDE_PACK_ALPHA
+%undef GLIDE_PACK_RGB           
+%undef GLIDE_CULLING
 
-GLIDE_CULLING       textequ <1>
+endp
-GLIDE_PACK_RGB      textequ <1>
+%ENDIF ; GLIDE_PACKED_RGB
-GLIDE_PACK_ALPHA    textequ <0>
-GLIDE_GENERIC_SETUP textequ <0>
-INCLUDE xdraw2.inc
-GLIDE_GENERIC_SETUP textequ <0>    
-GLIDE_PACK_ALPHA    textequ <0>
-GLIDE_PACK_RGB      textequ <0>    
-GLIDE_CULLING       textequ <0>
-
-PROC_TPYE(cull_rgb) ENDP
-
-            ALIGN  32
-
-            PUBLIC  PROC_TPYE(cull_argb)
-PROC_TPYE(cull_argb)  PROC    NEAR
-
-GLIDE_CULLING       textequ <1>
-GLIDE_PACK_RGB      textequ <1>
-GLIDE_PACK_ALPHA    textequ <1>
-GLIDE_GENERIC_SETUP textequ <0>
-INCLUDE xdraw2.inc
-GLIDE_GENERIC_SETUP textequ <0>    
-GLIDE_PACK_ALPHA    textequ <0>
-GLIDE_PACK_RGB      textequ <0>    
-GLIDE_CULLING       textequ <0>
-
-PROC_TPYE(cull_argb) ENDP
-ENDIF ; GLIDE_PACKED_RGB
 
             ALIGN   32
+PROC_TYPE Default
 
-            PUBLIC  PROC_TYPE()
+%define GLIDE_CULLING       0
-PROC_TYPE()  PROC    NEAR
+%define GLIDE_PACK_RGB      0
+%define GLIDE_PACK_ALPHA    0
+%define GLIDE_GENERIC_SETUP 0
+%INCLUDE "xdraw2.inc"
+%undef GLIDE_GENERIC_SETUP    
+%undef GLIDE_PACK_ALPHA
+%undef GLIDE_PACK_RGB         
+%undef GLIDE_CULLING
 
-GLIDE_CULLING       textequ <0>
+endp
-GLIDE_PACK_RGB      textequ <0>
-GLIDE_PACK_ALPHA    textequ <0>
-GLIDE_GENERIC_SETUP textequ <0>
-INCLUDE xdraw2.inc
-GLIDE_GENERIC_SETUP textequ <0>    
-GLIDE_PACK_ALPHA    textequ <0>
-GLIDE_PACK_RGB      textequ <0>    
-GLIDE_CULLING       textequ <0>
-
-PROC_TYPE() ENDP
 
             ALIGN  32
 
-IF GLIDE_PACKED_RGB    
+%IF GLIDE_PACKED_RGB    
-            PUBLIC  PROC_TYPE(rgb)
-PROC_TPYE(rgb)  PROC    NEAR
 
-GLIDE_CULLING       textequ <0>
+PROC_TYPE rgb
-GLIDE_PACK_RGB      textequ <1>
-GLIDE_PACK_ALPHA    textequ <0>
-GLIDE_GENERIC_SETUP textequ <0>
-INCLUDE xdraw2.inc
-GLIDE_GENERIC_SETUP textequ <0>    
-GLIDE_PACK_ALPHA    textequ <0>
-GLIDE_PACK_RGB      textequ <0>    
-GLIDE_CULLING       textequ <0>
 
-PROC_TPYE(rgb) ENDP
+%define GLIDE_CULLING       0
+%define GLIDE_PACK_RGB      1
+%define GLIDE_PACK_ALPHA    0
+%define GLIDE_GENERIC_SETUP 0
+%INCLUDE "xdraw2.inc"
+%undef GLIDE_GENERIC_SETUP      
+%undef GLIDE_PACK_ALPHA
+%undef GLIDE_PACK_RGB           
+%undef GLIDE_CULLING
+
+endp
 
             ALIGN  32
+PROC_TYPE argb
 
-            PUBLIC  PROC_TPYE(argb)
+%define GLIDE_CULLING       0
-PROC_TPYE(argb)  PROC    NEAR
+%define GLIDE_PACK_RGB      1
-
+%define GLIDE_PACK_ALPHA    1
-GLIDE_CULLING       textequ <0>
+%define GLIDE_GENERIC_SETUP 0
-GLIDE_PACK_RGB      textequ <1>
+%INCLUDE "xdraw2.inc"
-GLIDE_PACK_ALPHA    textequ <1>
+%undef GLIDE_GENERIC_SETUP      
-GLIDE_GENERIC_SETUP textequ <0>
+%undef GLIDE_PACK_ALPHA
-INCLUDE xdraw2.inc
+%undef GLIDE_PACK_RGB           
-GLIDE_GENERIC_SETUP textequ <0>    
+%undef GLIDE_CULLING
-GLIDE_PACK_ALPHA    textequ <0>
-GLIDE_PACK_RGB      textequ <0>    
-GLIDE_CULLING       textequ <0>
-
-PROC_TPYE(argb) ENDP
-ENDIF ; GLIDE_PACKED_RGB
-
-    
-_TEXT ENDS
-
-END
 
+endp
+%ENDIF ; GLIDE_PACKED_RGB

glide2x/h3/glide/src/xdrawtri.S

@@ -0,0 +1,38 @@
+/*
+ * THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+ * PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+ * TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+ * INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+ * DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+ * THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+ * FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+ *
+ * USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+ * RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+ * TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+ * AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+ * SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+ * THE UNITED STATES.
+ *
+ * COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+ */
+
+/* Adapted from gdraw.c:grDrawTriangle() for gas */
+
+#include "fxgasm.h"
+
+.extern _GlideRoot
+
+.text
+
+.p2align 4,,15
+.globl grDrawTriangle
+.type  grDrawTriangle,@function
+grDrawTriangle:
+/*movl (_GlideRoot+curGC),%edx
+  movl kTriProcOffset(%edx),%eax*/
+  movl (_GlideRoot + curGC),%eax
+  jmp  *kTriProcOffset(%eax)
+
+.p2align 4,,15

glide2x/h3/glide/src/xdrawtri.asm

@@ -0,0 +1,46 @@
+;; THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+;; PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+;; TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+;; INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+;; DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+;; THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+;; EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+;; FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+;;
+;; USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+;; RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+;; TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+;; AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+;; SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+;; THE UNITED STATES.
+;;
+;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+
+;; Adapted from gdraw.c:grDrawTriangle() for nasm
+
+%include "xos.inc"
+
+%include "fxgasm.h"
+
+extrn   _GlideRoot
+
+segment SEG_TEXT
+
+align 16
+proc grDrawTriangle, 12
+
+;;mov edx, dword [_GlideRoot+curGC]
+;;mov eax, dword [edx+kTriProcOffset]
+  mov eax, dword [_GlideRoot+curGC]
+  jmp [eax + kTriProcOffset]
+endp
+  align 16
+
+%if XOS == XOS_WIN32
+%ifdef __MINGW32__
+; GNU LD fails with '_' prefix
+export  grDrawTriangle@12
+%else
+export _grDrawTriangle@12
+%endif
+%endif ; _WIN32

glide2x/h3/glide/src/xos.inc

@@ -1,8 +1,9 @@
 ;
 ; compulsory header for glide3/xdraw* assembly specializations (NASM)
 ;
-; $Header$
+; Revision 1.1.2.1  2006/12/03 04:47:28  guillemj
-; $Log$
+; Backported from glide3x.
+;
 ; Revision 1.1.2.3  2004/10/04 08:57:52  dborca
 ; supporting DOS/OpenWatcom in Assembly files
 ;
@@ -74,7 +75,7 @@
 
 %macro		endp	0
 	%ifnctx	proc
-		%error	Mismatched `endp'/`proc'
+		%error	Mismatched ENDP/PROC
 	%else
 		%pop
 	%endif
@@ -105,9 +106,9 @@
 ;---------------------------------------
 %if XOS == XOS_WIN32
 
-%define TEXT  .text   align=32
+%define SEG_TEXT  .text   align=32
-%define DATA  .data   align=32
+%define SEG_DATA  .data   align=32
-%define CONST .rdata  align=32
+%define SEG_CONST .rdata  align=32
 
 %endif
 
@@ -116,9 +117,9 @@
 ;---------------------------------------
 %if XOS == XOS_DJGPP
 
-%define TEXT  .text
+%define SEG_TEXT  .text
-%define DATA  .data
+%define SEG_DATA  .data
-%define CONST .rodata
+%define SEG_CONST .rodata
 
 %endif
 
@@ -127,9 +128,9 @@
 ;---------------------------------------
 %if XOS == XOS_LINUX
 
-%define TEXT  .text   align=32
+%define SEG_TEXT  .text   align=32
-%define DATA  .data   align=32
+%define SEG_DATA  .data   align=32
-%define CONST .rodata align=32
+%define SEG_CONST .rodata align=32
 
 %endif
 
@@ -138,8 +139,8 @@
 ;---------------------------------------
 %if XOS == XOS_WATCD
 
-%define TEXT  _TEXT	align=1 public use32 class=CODE FLAT
+%define SEG_TEXT   _TEXT	align=1 public use32 class=CODE FLAT
-%define DATA  _DATA	align=4 public use32 class=DATA FLAT
+%define SEG_DATA   _DATA	align=4 public use32 class=DATA FLAT
-%define CONST CONST2	align=4 public use32 class=DATA FLAT
+%define SEG_CONST CONST2	align=4 public use32 class=DATA FLAT
 
 %endif

glide2x/h3/glide/src/xtexdl.asm

@@ -54,55 +54,46 @@
 ;; mmx stuff for 3DNow!(tm) capable processors
 ;; 
 
-TITLE   xtexdl.asm
+%include "xos.inc"
-OPTION OLDSTRUCTS
-
-.586P
-.MMX
-.K3D
-    
-ifdef USE_PACKET_FIFO
-EXTRN   __FifoMakeRoom: NEAR
-endif
     
+%ifdef USE_PACKET_FIFO
+extrn _FifoMakeRoom
+%endif
 
 ;;; Definitions of cvg regs and glide root structures.
-INCLUDE fxgasm.h
+%INCLUDE "fxgasm.h"
 
 ; Arguments (STKOFF = 16 from 4 dword pushes)
-STACKOFFSET = 16
+STACKOFFSET equ 16
-_gc$        =  4 + STACKOFFSET
+_gc$        equ  4 + STACKOFFSET
-_baseAddr$  =  8 + STACKOFFSET
+_baseAddr$  equ  8 + STACKOFFSET
-_maxS$      = 12 + STACKOFFSET
+_maxS$      equ 12 + STACKOFFSET
-_minT$      = 16 + STACKOFFSET
+_minT$      equ 16 + STACKOFFSET
-_maxT$      = 20 + STACKOFFSET
+_maxT$      equ 20 + STACKOFFSET
-_texData$   = 24 + STACKOFFSET
+_texData$   equ 24 + STACKOFFSET
 
     ;; NB: The first set of registers (eax, ecx, and edx) are volatile across
     ;; function calls. The remaining registers are supposedly non-volatile
     ;; so they only store things that are non-volatile across the call.
 
-fifo    TEXTEQU <ebp>           ; fifo ptr in inner loop
+%define fifo    ebp           ; fifo ptr in inner loop
-gc      TEXTEQU <esi>           ; graphics context
+%define gc      esi           ; graphics context
-dataPtr TEXTEQU <edi>           ; pointer to exture data to be downloaded
+%define dataPtr edi           ; pointer to exture data to be downloaded
-curT    TEXTEQU <ebx>           ; counter for texture scan lines (t-coordinate)
+%define curT    ebx           ; counter for texture scan lines (t-coordinate)
-curS    TEXTEQU <ecx>           ; texture s-coordinate
+%define curS    ecx           ; texture s-coordinate
-fRoom   TEXTEQU <edx>           ; room available in fifo (in bytes)
+%define fRoom   edx           ; room available in fifo (in bytes)
     
-GR_FIFO_WRITE   MACRO __addr, __offset, __data
+%MACRO GR_FIFO_WRITE 3
-    mov    [__addr + __offset], __data
+    mov    [%1 + _%2], %3
-ENDM ; GR_FIFO_WRITE
+%ENDM ; GR_FIFO_WRITE
 
 ;--------------------------------------------------------------------------
 
-_TEXT         SEGMENT PAGE PUBLIC USE32 'CODE'
+segment		SEG_TEXT
-              ASSUME DS: FLAT, SS: FLAT
 
               ALIGN  32
 
-              PUBLIC __grTexDownload_3DNow_MMX@24
+proc _grTexDownload_3DNow_MMX, 24
-
-__grTexDownload_3DNow_MMX@24 PROC NEAR
 
     push      ebx                       ; save caller's register variable
     mov       curT, [esp + _maxT$ - 12] ; curT = maxT
@@ -158,15 +149,15 @@ __grTexDownload_3DNow_MMX@24 PROC NEAR
     cmp       fRoom, 4                  ; enough room for NULL packet in fifo?
     jge       __mmxAlignFifo            ; yes, write NULL packet to align fifo
 
-ifdef USE_PACKET_FIFO
+%ifdef USE_PACKET_FIFO
-    push      @Line                     ; Line # inside this function
+    push      __LINE__                  ; Line # inside this function
     push      0                         ; NULL file name
 
     push      4                         ; fifo space required (bytes)
-    call      __FifoMakeRoom            ; make fifo room
+    call      _FifoMakeRoom             ; make fifo room
 
     add       esp, 12                   ; pop 3 DWORD parameters to FifoMakeRoom
-endif
+%endif
     mov       fifo, [gc + fifoPtr]      ; fifoPtr modified by FifoMakeRoom, reload
 
     mov       fRoom, [gc + fifoRoom]    ; fifoRoom modified by FifoMakeRoom, reload
@@ -177,7 +168,7 @@ endif
 
 __mmxAlignFifo:
 
-    mov       DWORD PTR [fifo], 0       ; write NULL packet
+    mov       DWORD [fifo], 0           ; write NULL packet
     sub       fRoom, 4                  ; fifoRoom -= 4
 
     mov       [gc + fifoRoom], fRoom    ; store new fifoRoom
@@ -193,7 +184,7 @@ __mmxAlignFifo:
 
 __loopT:
 
-IFDEF GLIDE_DEBUG
+%IFDEF GLIDE_DEBUG
 
     ;; Make sure that we have a QWORD aligned fifoPtr; force GP if not aligned
 
@@ -203,7 +194,7 @@ IFDEF GLIDE_DEBUG
     xor       eax, eax                  ; create 0
     mov       [eax], eax                ; move to DS:[0] forces GP 
 __alignmentOK:      
-ENDIF ; GLIDE_DEBUG
+%ENDIF ; GLIDE_DEBUG
 
     ;; Compute packet header words
     ;;  hdr1: downloadSpace[31:30] numWords[21:3] packetType[2:0]
@@ -253,15 +244,15 @@ __startDownload:
     cmp       fRoom, eax                ; fifo space available >= fifo space required ?
     jge       __loopT                   ; yup, write next scan line
 
-ifdef USE_PACKET_FIFO
+%ifdef USE_PACKET_FIFO
-    push      @Line                     ; Line # inside this function
+    push      __LINE__                  ; Line # inside this function
     push      0h                        ; NULL file name
 
     push      eax                       ; fifo space required
-    call      __FifoMakeRoom            ; make fifo room (if fifoPtr QWORD aligned before
+    call      _FifoMakeRoom             ; make fifo room (if fifoPtr QWORD aligned before
 
     add       esp, 12                   ; pop 3 DWORD parameters to FifoMakeRoom
-endif
+%endif
     mov       fifo, [gc + fifoPtr]      ; fifoPtr was modified by FifoMakeRoom, reload
 
     mov       fRoom, [gc + fifoRoom]    ; fifoRoom was modified by FifoMakeRoom, reload
@@ -278,10 +269,7 @@ __dlDone:
     pop       esi                       ; restore caller's register variable
     pop       ebx                       ; restore caller's register variable
     
-    ret       24                        ; pop 6 DWORD parameters and return
+    ret                                 ; pop 6 DWORD parameters and return
 
-__grTexDownload_3DNow_MMX@24 ENDP
+endp
 
-_TEXT ENDS
-
-END

glide2x/mk.sh

@@ -0,0 +1 @@
+make -f makefile.linux FX_GLIDE_HW=cvg USE_X86=1

glide2x/sst1/glide/src/fxinline.h

@@ -1,7 +0,0 @@
-#ifndef __FX_INLINE_H__
-#define __FX_INLINE_H__
-
-/* The # of 2-byte entries in the hw fog table */
-#define kInternalFogTableEntryCount 0x40UL
-
-#endif /* __FX_INLINE_H__ */

glide3x/cvg/glide3/src/gpci.c

@@ -312,10 +312,10 @@ static GrTexDownloadProc _texDownloadProcs[][2][4] =
       _grTexDownload_3DNow_MMX,
       _grTexDownload_3DNow_MMX,
     },
-  }
+  },
 #endif /* GL_AMD3D */
 #if GL_MMX
-  ,{ 
+  { 
     { 
       _grTexDownload_Default_8_1, 
       _grTexDownload_Default_8_2, 

glide3x/cvg/glide3/src/rcver.h

@@ -18,12 +18,12 @@
 ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 */
 
-#include "fxbldno.h"
+//#include "fxbldno.h"
 
 #define MANVERSION              3
 #define MANREVISION             03
 
-//#define BUILD_NUMBER            40405
+#define BUILD_NUMBER            40405
 
 #ifndef GLIDE3
 #define VERSIONSTR "2.44\0"

glide3x/h3/glide3/src/cpudtect.asm

@@ -17,8 +17,9 @@
 ;; 
 ;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 ;;
-;; $Header$
+;; Revision 1.1.1.1.8.1  2003/11/07 13:38:38  dborca
-;; $Log$
+;; unite the clans
+;;
 ;; Revision 1.1.1.1  1999/11/24 21:44:53  joseph
 ;; Initial checkin for SourceForge
 ;;
@@ -63,7 +64,7 @@ CPUTypeP6       equ 6h
         
 ;;; References to external data:
     
-segment		TEXT
+segment		SEG_TEXT
 ;;
 ;;  _cpu_detect_asm - detect the type of CPU 
 ;; 

glide3x/h3/glide3/src/makefile.linux

@@ -113,8 +113,8 @@ ifdef DEBUG
 CDEFS += -DGDBG_INFO_ON -DGLIDE_DEBUG -DGLIDE_SANITY_ASSERT -DGLIDE_SANITY_SIZE
 endif
 
-# other
+# shameless plug and splash screen - not for linux DRI builds
-CDEFS += -DGLIDE_PLUG -DGLIDE_SPLASH
+#CDEFS += -DGLIDE_PLUG -DGLIDE_SPLASH
 
 ifeq ($(TEXUS2),1)
 CDEFS += -DHAVE_TEXUS2
@@ -132,7 +132,7 @@ ASFLAGS = -O6 -felf -D__linux__
 ASFLAGS += $(CDEFS)
 
 # compiler
-CFLAGS = -Wall -W
+CFLAGS = -Wall
 CFLAGS += -I. -I../../incsrc -I../../minihwc -I../../cinit
 CFLAGS += -I$(FX_GLIDE_SW)/fxmisc -I$(FX_GLIDE_SW)/newpci/pcilib -I$(FX_GLIDE_SW)/fxmemmap
 CFLAGS += -I$(FX_GLIDE_SW)/texus2/lib
@@ -278,7 +278,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_SO): $(GLIDE_LIBDIR)/$(GLIDE_SHARED)
 	ln -fs $(GLIDE_SHARED) $(GLIDE_LIBDIR)/$(GLIDE_SO)
 
 $(GLIDE_LIBDIR)/$(GLIDE_SHARED): $(GLIDE_OBJECTS:.o=.lo)
-	$(CC) -o $@ -shared -Wl,-soname,$(GLIDE_SONAME) $^ $(LDFLAGS) $(LDLIBS)
+	$(CC) -o $@ -shared -Wl,--no-undefined -Wl,-soname,$(GLIDE_SONAME) $^ $(LDFLAGS) $(LDLIBS)
 
 $(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_LIB)
 ifeq ($(TEXUS2),1)

glide3x/h3/glide3/src/xdraw2.asm

@@ -16,9 +16,9 @@
 ;; 
 ;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 ;;
-;; $Header$
+;; Revision 1.1.1.1.8.1  2003/11/07 13:38:39  dborca
-;; $Revision$
+;; unite the clans
-;; $Log$
+;;
 ;; Revision 1.1.1.1  1999/11/24 21:44:58  joseph
 ;; Initial checkin for SourceForge
 ;;
@@ -108,11 +108,11 @@ extrn _grValidateState
     movd      [fifo], mm1           ; store current param | previous param
 %ENDMACRO ; WRITE_MM1LOW_FIFO
 
-segment		DATA
+segment		SEG_DATA
     One         DD  1.0
     Area        DD  0
 
-segment		CONST
+segment		SEG_CONST
 $T2003  DD  12288.0
 $T2005  DD  1.0
 $T2006  DD  256.0
@@ -150,7 +150,7 @@ Y       equ 4
 
 ;--------------------------------------------------------------------------
 
-segment		TEXT
+segment		SEG_TEXT
 
             ALIGN    32
 PROC_TYPE clip_nocull_invalid

glide3x/h3/glide3/src/xdraw3.asm

@@ -31,11 +31,11 @@ extrn _grCommandTransportMakeRoom, 12
 ;;; include listing.inc
 %INCLUDE "fxgasm.h"
     
-segment		CONST
+segment		SEG_CONST
         ALIGN 8
 _F256_F256      DD    256.0, 256.0
 
-segment		DATA
+segment		SEG_DATA
         ALIGN   8
 btab            DD    0, 0, 0, 0, 0, 0, 0, 0
 atab            DD    0, 0, 0, 0, 0, 0, 0, 0
@@ -44,7 +44,7 @@ strideinbytes   DD    0
 vertices        DD    0
 
 
-segment		TEXT
+segment		SEG_TEXT
 
             ALIGN 32
 %define _mode     20
@@ -2143,14 +2143,14 @@ endp
 ;;; include listing.inc
 %INCLUDE "fxgasm.h"
 
-segment		CONST
+segment		SEG_CONST
 _F1    DD      1.0
 _F256  DD      256.0
 
 _VPF1    DD      1.0
 _VPF256  DD      256.0
 
-segment		DATA
+segment		SEG_DATA
 vSize           DD    0
 ccoow           DD    0
 packetVal       DD    0
@@ -2162,7 +2162,7 @@ vPtr0           DD    0
 vPtr1           DD    0
 vPtr2           DD    0
 
-segment		TEXT
+segment		SEG_TEXT
     
 _pktype equ 20
 _type equ 24

glide3x/h3/glide3/src/xdrawtri.asm

@@ -0,0 +1,67 @@
+;; THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+;; PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+;; TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+;; INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE
+;; DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com).
+;; THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+;; EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+;; FULL TEXT OF THE NON-WARRANTY PROVISIONS.
+;;
+;; USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+;; RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+;; TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+;; AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+;; SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+;; THE UNITED STATES.
+;;
+;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+
+;; Adapted from gdraw.c:grDrawTriangle() for nasm
+
+%include "xos.inc"
+
+%if XOS == XOS_WIN32
+%else
+%error This source is only meant for x86/Windows
+%endif
+
+%include "fxgasm.h"
+
+; tls constants (from fxglide.h)
+%define W95_TEB_PTR        0x18
+%define W95_TEB_TLS_OFFSET 0x88
+%define WNT_TEB_PTR        0x18
+%define WNT_TEB_TLS_OFFSET 0xE10
+
+extrn   _GlideRoot
+
+segment SEG_TEXT
+
+            align 4
+proc grDrawTriangle, 12
+
+	mov		eax, dword [fs:WNT_TEB_PTR]
+	add		eax, dword [_GlideRoot+tlsOffset]
+	mov		edx, dword [eax]
+	test		edx, edx
+	je		L0
+	mov		eax, dword [edx+lostContext]
+	test		eax, eax
+	je		L0
+	mov		eax, dword [eax]
+	test		eax, 1
+	jnz		L0
+	mov		eax, dword [edx+kTriProcOffset]
+	jmp		eax
+L0:	; lostContext
+; MSVC doesn't emit a RET here in gdraw.obj, which seems wrong.
+	ret
+
+endp
+
+%ifdef __MINGW32__
+; GNU LD fails with '_' prefix
+export  grDrawTriangle@12
+%else
+export _grDrawTriangle@12
+%endif

glide3x/h3/glide3/src/xos.inc

@@ -1,8 +1,8 @@
 ;
 ; compulsory header for glide3/xdraw* assembly specializations (NASM)
 ;
-; $Header$
+; Revision 1.1.2.3  2004/10/04 08:57:52  dborca
-; $Log$
+; supporting DOS/OpenWatcom in Assembly files
 ;
 ; Revision 1.1.2.1  2003/06/07 09:53:25  dborca
 ; initial checkin for NASM sources
@@ -71,7 +71,7 @@
 
 %macro		endp	0
 	%ifnctx	proc
-		%error	Mismatched `endp'/`proc'
+		%error	Mismatched ENDP/PROC
 	%else
 		%pop
 	%endif
@@ -102,9 +102,9 @@
 ;---------------------------------------
 %if XOS == XOS_WIN32
 
-%define TEXT  .text   align=32
+%define SEG_TEXT  .text   align=32
-%define DATA  .data   align=32
+%define SEG_DATA  .data   align=32
-%define CONST .rdata  align=32
+%define SEG_CONST .rdata  align=32
 
 %macro SET_TLSBASE 1
 	mov	%1, dword [fs:18h] ; get thread local storage base pointer
@@ -125,9 +125,9 @@
 ;---------------------------------------
 %if XOS == XOS_DJGPP
 
-%define TEXT  .text
+%define SEG_TEXT  .text
-%define DATA  .data
+%define SEG_DATA  .data
-%define CONST .rodata
+%define SEG_CONST .rodata
 
 extrn threadValueDJGPP
 
@@ -148,9 +148,9 @@ extrn threadValueDJGPP
 ;---------------------------------------
 %if XOS == XOS_LINUX
 
-%define TEXT  .text   align=32
+%define SEG_TEXT  .text   align=32
-%define DATA  .data   align=32
+%define SEG_DATA  .data   align=32
-%define CONST .rodata align=32
+%define SEG_CONST .rodata align=32
 
 extrn threadValueLinux
 
@@ -171,9 +171,9 @@ extrn threadValueLinux
 ;---------------------------------------
 %if XOS == XOS_WATCD
 
-%define TEXT  _TEXT	align=1 public use32 class=CODE FLAT
+%define SEG_TEXT   _TEXT	align=1 public use32 class=CODE FLAT
-%define DATA  _DATA	align=4 public use32 class=DATA FLAT
+%define SEG_DATA   _DATA	align=4 public use32 class=DATA FLAT
-%define CONST CONST2	align=4 public use32 class=DATA FLAT
+%define SEG_CONST CONST2	align=4 public use32 class=DATA FLAT
 
 extrn threadValueDJGPP
 

glide3x/h3/glide3/src/xtexdl.asm

@@ -16,9 +16,9 @@
 ;; 
 ;; COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
 ;;
-;; $Header$
+;; Revision 1.1.1.1.8.2  2005/06/09 18:32:29  jwrdegoede
-;; $Revision$
+;; Fixed all warnings with gcc4 -Wall -W -Wno-unused-parameter, except for a couple I believe to be a gcc bug. This has been reported to gcc.
-;; $Log$
+;;
 ;; Revision 1.1.1.1.8.1  2003/11/07 13:38:39  dborca
 ;; unite the clans
 ;;
@@ -111,7 +111,7 @@ _texData$   equ 24 + STACKOFFSET
 ;
 ;--------------------------------------------------------------------------
 
-segment		TEXT
+segment		SEG_TEXT
 
               ALIGN  32
 
@@ -327,7 +327,7 @@ endp
 ;
 ;--------------------------------------------------------------------------
 
-segment		TEXT
+segment		SEG_TEXT
 
               ALIGN  32
 
@@ -518,7 +518,7 @@ endp
 
 
 
-;segment		TEXT
+;segment		SEG_TEXT
 
               ALIGN  32