diff options
| author | Michael Brown <mcb30@ipxe.org> | 2011-02-14 01:37:44 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2011-02-17 01:59:30 +0000 |
| commit | e2b5a588691c6b0bdb99ca4b27cb8c5ea0ac712b (patch) | |
| tree | 21e9e3cbaa7c0810d3ec6a89aa0a2a52c855db3b | |
| parent | 4f4c21462114cb4e397377d8ea59c4204a4e33f7 (diff) | |
| download | ipxe-e2b5a588691c6b0bdb99ca4b27cb8c5ea0ac712b.tar.gz | |
[efi] Rename efi_pci.h to efi_pci_api.h
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/include/ipxe/efi/efi_pci_api.h (renamed from src/include/ipxe/efi/efi_pci.h) | 10 | ||||
| -rw-r--r-- | src/include/ipxe/pci_io.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/include/ipxe/efi/efi_pci.h b/src/include/ipxe/efi/efi_pci_api.h index e06473d3e..1bc43e303 100644 --- a/src/include/ipxe/efi/efi_pci.h +++ b/src/include/ipxe/efi/efi_pci_api.h @@ -1,5 +1,5 @@ -#ifndef _IPXE_EFI_PCI_H -#define _IPXE_EFI_PCI_H +#ifndef _IPXE_EFI_PCI_API_H +#define _IPXE_EFI_PCI_API_H /** @file * @@ -39,8 +39,8 @@ extern int efipci_write ( struct pci_device *pci, unsigned long location, */ static inline __always_inline int PCIAPI_INLINE ( efi, pci_num_bus ) ( void ) { - /* No way to work this out via EFI */ - return 0x100; + /* EFI does not want us to scan the PCI bus ourselves */ + return 0; } /** @@ -145,4 +145,4 @@ PCIAPI_INLINE ( efi, pci_write_config_dword ) ( struct pci_device *pci, value ); } -#endif /* _IPXE_EFI_PCI_H */ +#endif /* _IPXE_EFI_PCI_API_H */ diff --git a/src/include/ipxe/pci_io.h b/src/include/ipxe/pci_io.h index dab5b7807..7368cf48b 100644 --- a/src/include/ipxe/pci_io.h +++ b/src/include/ipxe/pci_io.h @@ -43,7 +43,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); PROVIDE_SINGLE_API_INLINE ( PCIAPI_PREFIX_ ## _subsys, _api_func ) /* Include all architecture-independent I/O API headers */ -#include <ipxe/efi/efi_pci.h> +#include <ipxe/efi/efi_pci_api.h> /* Include all architecture-dependent I/O API headers */ #include <bits/pci_io.h> |