chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

* 3dfx_device.c (cardInfo_t): Make dev be 'struct pci_dev *' even for

Browse Source 
kernels < 2.6.0.
	(findCardType): Assign to cards[n].dev the dev variable instead of
	devfn. Fix macro to use devfn instead.
This commit is contained in:
guillemj
2007-01-31 01:02:21 +00:00
parent e4d0ae4ff1
commit e0fdb356a3
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Device3Dfx/3dfx_driver.c
View File

@@ -216,11 +216,7 @@ struct cardInfo_t {
int addr1;
int addr2;
unsigned char bus;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
struct pci_dev *dev;
#else
unsigned char dev;
#endif
struct file *curFile;
#ifdef CONFIG_MTRR
int mtrr_buf;
@@ -254,7 +250,7 @@ static void findCardType(int vendor, int device)
pci_read_config_dword(dev, PCI_BASE_ADDRESS_1, &cards[numCards].addr1);
pci_read_config_dword(dev, PCI_BASE_ADDRESS_2, &cards[numCards].addr2);
cards[numCards].bus = dev->bus->number;
cards[numCards].dev = dev->devfn;
cards[numCards].dev = dev;
cards[numCards].addr0 &= ~0xF;
cards[numCards].addr1 &= ~0xF;
@@ -263,7 +259,9 @@ static void findCardType(int vendor, int device)
cards[numCards].curFile = 0;
DEBUGMSG(("3dfx: board vendor %d type %d located at %x/%x bus %d dev %d\n",
vendor, device, cards[numCards].addr0, cards[numCards].addr1, cards[numCards].bus, cards[numCards].dev));
vendor, device,
cards[numCards].addr0, cards[numCards].addr1,
cards[numCards].bus, cards[numCards].dev->devfn));
++numCards;
}

7
Device3Dfx/ChangeLog
View File

@@ -1,3 +1,10 @@
2007-01-31 Guillem Jover <guillem@hadrons.org>
* 3dfx_device.c (cardInfo_t): Make dev be 'struct pci_dev *' even for
kernels < 2.6.0.
(findCardType): Assign to cards[n].dev the dev variable instead of
devfn. Fix macro to use devfn instead.
2006-12-03 Guillem Jover <guillem@hadrons.org>
* 3dfx_device.c (my_remap_page_range): Define as remap_pfn_range for