Deleted Added
full compact
tdfx_pci.c (130585) tdfx_pci.c (142253)
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 130585 2004-06-16 09:47:26Z phk $");
33__FBSDID("$FreeBSD: head/sys/dev/tdfx/tdfx_pci.c 142253 2005-02-22 18:57:18Z sam $");
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

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

379 tdfx_info->mrdesc.mr_flags = MDF_UNCACHEABLE;
380 /* This length of 1000h was taken from the linux device driver... */
381 tdfx_info->mrdesc.mr_len = 0x1000;
382
383 /*
384 * If, for some reason, we can't set the MTRR (N/A?) we may still continue
385 */
386#ifdef DEBUG
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

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

379 tdfx_info->mrdesc.mr_flags = MDF_UNCACHEABLE;
380 /* This length of 1000h was taken from the linux device driver... */
381 tdfx_info->mrdesc.mr_len = 0x1000;
382
383 /*
384 * If, for some reason, we can't set the MTRR (N/A?) we may still continue
385 */
386#ifdef DEBUG
387 if(retval == 0) {
388 device_printf(dev, "MTRR Set Type Uncacheable %x\n",
389 (u_int32_t)tdfx_info->mrdesc.mr_base);
390 } else {
391 device_printf(dev, "Couldn't Set MTRR\n");
392 }
387 device_printf(dev, "MTRR Set Type Uncacheable %x\n",
388 (u_int32_t)tdfx_info->mrdesc.mr_base);
393#endif
394 }
395#ifdef DEBUG
396 else {
397 device_printf(dev, "Couldn't Set MTRR\n");
398 return 0;
399 }
400#endif

--- 467 unchanged lines hidden ---
389#endif
390 }
391#ifdef DEBUG
392 else {
393 device_printf(dev, "Couldn't Set MTRR\n");
394 return 0;
395 }
396#endif

--- 467 unchanged lines hidden ---