narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[e1000] Use PCI_BASE_ADDRESS_* symbols instead of integers 

When compiling for the Linux kernel, PCI_BASE_ADDRESS_0 == 0, and
PCI_BASE_ADDRESS_1 == 1.  This is not so when compiling for gPXE.  We
must use the symbolic names rather than integers to get the correct
values.

Bug identified and patch supplied by:

   George Chou <george.chou@advantech.com>
pull/1/head
Marty Connor 2008-12-05 09:42:46 -05:00 committed by Michael Brown
parent ce0a0ccf5c
commit 1206999288
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/net/e1000/e1000.c
View File

@ -818,8 +818,8 @@ e1000_probe ( struct pci_device *pdev,
* because it depends on mac_type * because it depends on mac_type
*/ */
if ( ( adapter->hw.mac_type == e1000_ich8lan ) && ( pdev->ioaddr ) ) { if ( ( adapter->hw.mac_type == e1000_ich8lan ) && ( pdev->ioaddr ) ) {
flash_start = pci_bar_start ( pdev, 1 ); flash_start = pci_bar_start ( pdev, PCI_BASE_ADDRESS_1 );
flash_len = pci_bar_size ( pdev, 1 ); flash_len = pci_bar_size ( pdev, PCI_BASE_ADDRESS_1 );
adapter->hw.flash_address = ioremap ( flash_start, flash_len ); adapter->hw.flash_address = ioremap ( flash_start, flash_len );
if ( ! adapter->hw.flash_address ) if ( ! adapter->hw.flash_address )
goto err_flashmap; goto err_flashmap;