Deleted Added
full compact
tdfx_pci.c (89319) tdfx_pci.c (95092)
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

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

23 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
24 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
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 *
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

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

23 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
24 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
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 * $FreeBSD: head/sys/dev/tdfx/tdfx_pci.c 89319 2002-01-14 00:13:45Z alfred $
31 * $FreeBSD: head/sys/dev/tdfx/tdfx_pci.c 95092 2002-04-20 01:35:45Z marcel $
32 */
33
34/* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET
35 *
36 * Copyright (C) 2000-2001, by Coleman Kane <cokane@FreeBSD.org>,
37 * based upon the 3dfx driver written for linux, by Daryll Straus, Jon Taylor,
38 * and Jens Axboe, located at http://linux.3dfx.com.
39 */

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

385 /* This length of 1000h was taken from the linux device driver... */
386 tdfx_info->mrdesc.mr_len = 0x1000;
387
388 /*
389 * If, for some reason, we can't set the MTRR (N/A?) we may still continue
390 */
391#ifdef DEBUG
392 if(retval == 0) {
32 */
33
34/* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET
35 *
36 * Copyright (C) 2000-2001, by Coleman Kane <cokane@FreeBSD.org>,
37 * based upon the 3dfx driver written for linux, by Daryll Straus, Jon Taylor,
38 * and Jens Axboe, located at http://linux.3dfx.com.
39 */

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

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

--- 467 unchanged lines hidden ---
395 } else {
396 device_printf(dev, "Couldn't Set MTRR\n");
397 }
398#endif
399 }
400#ifdef DEBUG
401 else {
402 device_printf(dev, "Couldn't Set MTRR\n");

--- 467 unchanged lines hidden ---