Deleted Added
sdiff udiff text old ( 142253 ) new ( 142880 )
full compact
tdfx_pci.c (142253) tdfx_pci.c (142880)
1/*-
2 * Copyright (c) 2000-2001 by Coleman Kane <cokane@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2000-2001 by Coleman Kane <cokane@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/dev/tdfx/tdfx_pci.c 142253 2005-02-22 18:57:18Z sam $");
33__FBSDID("$FreeBSD: head/sys/dev/tdfx/tdfx_pci.c 142880 2005-03-01 07:50:12Z imp $");
34
35/* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET
36 *
37 * Copyright (C) 2000-2001, by Coleman Kane <cokane@FreeBSD.org>,
38 * based upon the 3dfx driver written for linux, by Daryll Straus, Jon Taylor,
39 * and Jens Axboe, located at http://linux.3dfx.com.
40 */
41

--- 73 unchanged lines hidden (view full) ---

115};
116
117static int
118tdfx_probe(device_t dev)
119{
120 /*
121 * probe routine called on kernel boot to register supported devices. We get
122 * a device structure to work with, and we can test the VENDOR/DEVICE IDs to
34
35/* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET
36 *
37 * Copyright (C) 2000-2001, by Coleman Kane <cokane@FreeBSD.org>,
38 * based upon the 3dfx driver written for linux, by Daryll Straus, Jon Taylor,
39 * and Jens Axboe, located at http://linux.3dfx.com.
40 */
41

--- 73 unchanged lines hidden (view full) ---

115};
116
117static int
118tdfx_probe(device_t dev)
119{
120 /*
121 * probe routine called on kernel boot to register supported devices. We get
122 * a device structure to work with, and we can test the VENDOR/DEVICE IDs to
123 * see if this PCI device is one that we support. Return 0 if yes, ENXIO if
124 * not.
123 * see if this PCI device is one that we support. Return BUS_PRROBE_DEFAULT
124 * if yes, ENXIO if not.
125 */
126 switch(pci_get_devid(dev)) {
127 case PCI_DEVICE_ALLIANCE_AT3D:
128 device_set_desc(dev, "ProMotion At3D 3D Accelerator");
125 */
126 switch(pci_get_devid(dev)) {
127 case PCI_DEVICE_ALLIANCE_AT3D:
128 device_set_desc(dev, "ProMotion At3D 3D Accelerator");
129 return 0;
129 return BUS_PROBE_DEFAULT;
130 case PCI_DEVICE_3DFX_VOODOO2:
131 device_set_desc(dev, "3DFX Voodoo II 3D Accelerator");
130 case PCI_DEVICE_3DFX_VOODOO2:
131 device_set_desc(dev, "3DFX Voodoo II 3D Accelerator");
132 return 0;
132 return BUS_PROBE_DEFAULT;
133 /*case PCI_DEVICE_3DFX_BANSHEE:
134 device_set_desc(dev, "3DFX Voodoo Banshee 2D/3D Graphics Accelerator");
133 /*case PCI_DEVICE_3DFX_BANSHEE:
134 device_set_desc(dev, "3DFX Voodoo Banshee 2D/3D Graphics Accelerator");
135 return 0;
135 return BUS_PROBE_DEFAULT;
136 case PCI_DEVICE_3DFX_VOODOO3:
137 device_set_desc(dev, "3DFX Voodoo3 2D/3D Graphics Accelerator");
136 case PCI_DEVICE_3DFX_VOODOO3:
137 device_set_desc(dev, "3DFX Voodoo3 2D/3D Graphics Accelerator");
138 return 0;*/
138 return BUS_PROBE_DEFAULT;*/
139 case PCI_DEVICE_3DFX_VOODOO1:
140 device_set_desc(dev, "3DFX Voodoo Graphics 3D Accelerator");
139 case PCI_DEVICE_3DFX_VOODOO1:
140 device_set_desc(dev, "3DFX Voodoo Graphics 3D Accelerator");
141 return 0;;
141 return BUS_PROBE_DEFAULT;
142 };
143
144 return ENXIO;
145}
146
147static int
148tdfx_attach(device_t dev) {
149 /*

--- 714 unchanged lines hidden --- 		142 };
143
144 return ENXIO;
145}
146
147static int
148tdfx_attach(device_t dev) {
149 /*

--- 714 unchanged lines hidden ---