Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[pci] Replace pci_max_bus() with pci_num_bus()
Signed-off-by: Michael Brown <mcb30@ipxe.org>
  • Loading branch information
mcb30 committed Feb 17, 2011
1 parent f9b3fae commit abb5590
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
10 changes: 5 additions & 5 deletions src/arch/i386/interface/pcbios/pcibios.c
Expand Up @@ -29,11 +29,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
*/

/**
* Determine maximum PCI bus number within system
* Determine number of PCI buses within system
*
* @ret max_bus Maximum bus number
* @ret num_bus Number of buses
*/
static int pcibios_max_bus ( void ) {
static int pcibios_num_bus ( void ) {
int discard_a, discard_D;
uint8_t max_bus;

Expand All @@ -48,7 +48,7 @@ static int pcibios_max_bus ( void ) {
"D" ( 0 )
: "ebx", "edx" );

return max_bus;
return ( max_bus + 1 );
}

/**
Expand Down Expand Up @@ -105,7 +105,7 @@ int pcibios_write ( struct pci_device *pci, uint32_t command, uint32_t value ){
return ( ( status >> 8 ) & 0xff );
}

PROVIDE_PCIAPI ( pcbios, pci_max_bus, pcibios_max_bus );
PROVIDE_PCIAPI ( pcbios, pci_num_bus, pcibios_num_bus );
PROVIDE_PCIAPI_INLINE ( pcbios, pci_read_config_byte );
PROVIDE_PCIAPI_INLINE ( pcbios, pci_read_config_word );
PROVIDE_PCIAPI_INLINE ( pcbios, pci_read_config_dword );
Expand Down
2 changes: 1 addition & 1 deletion src/arch/x86/core/pcidirect.c
Expand Up @@ -38,7 +38,7 @@ void pcidirect_prepare ( struct pci_device *pci, int where ) {
PCIDIRECT_CONFIG_ADDRESS );
}

PROVIDE_PCIAPI_INLINE ( direct, pci_max_bus );
PROVIDE_PCIAPI_INLINE ( direct, pci_num_bus );
PROVIDE_PCIAPI_INLINE ( direct, pci_read_config_byte );
PROVIDE_PCIAPI_INLINE ( direct, pci_read_config_word );
PROVIDE_PCIAPI_INLINE ( direct, pci_read_config_dword );
Expand Down
8 changes: 4 additions & 4 deletions src/arch/x86/include/ipxe/pcidirect.h
Expand Up @@ -26,14 +26,14 @@ struct pci_device;
extern void pcidirect_prepare ( struct pci_device *pci, int where );

/**
* Determine maximum PCI bus number within system
* Determine number of PCI buses within system
*
* @ret max_bus Maximum bus number
* @ret num_bus Number of buses
*/
static inline __always_inline int
PCIAPI_INLINE ( direct, pci_max_bus ) ( void ) {
PCIAPI_INLINE ( direct, pci_num_bus ) ( void ) {
/* No way to work this out via Type 1 accesses */
return 0xff;
return 0x100;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/bus/pci.c
Expand Up @@ -234,7 +234,7 @@ static int pcibus_probe ( struct root_device *rootdev ) {
uint32_t tmp;
int rc;

num_bus = ( pci_max_bus() + 1 );
num_bus = pci_num_bus();
for ( busdevfn = 0 ; busdevfn < PCI_BUSDEVFN ( num_bus, 0, 0 ) ;
busdevfn++ ) {

Expand Down
8 changes: 4 additions & 4 deletions src/include/ipxe/efi/efi_pci.h
Expand Up @@ -33,14 +33,14 @@ extern int efipci_write ( struct pci_device *pci, unsigned long location,
unsigned long value );

/**
* Determine maximum PCI bus number within system
* Determine number of PCI buses within system
*
* @ret max_bus Maximum bus number
* @ret num_bus Number of buses
*/
static inline __always_inline int
PCIAPI_INLINE ( efi, pci_max_bus ) ( void ) {
PCIAPI_INLINE ( efi, pci_num_bus ) ( void ) {
/* No way to work this out via EFI */
return 0xff;
return 0x100;
}

/**
Expand Down
6 changes: 3 additions & 3 deletions src/include/ipxe/pci_io.h
Expand Up @@ -49,11 +49,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <bits/pci_io.h>

/**
* Determine maximum PCI bus number within system
* Determine number of PCI buses within system
*
* @ret max_bus Maximum bus number
* @ret num_bus Number of buses
*/
int pci_max_bus ( void );
int pci_num_bus ( void );

/**
* Read byte from PCI configuration space
Expand Down
2 changes: 1 addition & 1 deletion src/interface/efi/efi_pci.c
Expand Up @@ -73,7 +73,7 @@ int efipci_write ( struct pci_device *pci, unsigned long location,
return 0;
}

PROVIDE_PCIAPI_INLINE ( efi, pci_max_bus );
PROVIDE_PCIAPI_INLINE ( efi, pci_num_bus );
PROVIDE_PCIAPI_INLINE ( efi, pci_read_config_byte );
PROVIDE_PCIAPI_INLINE ( efi, pci_read_config_word );
PROVIDE_PCIAPI_INLINE ( efi, pci_read_config_dword );
Expand Down

0 comments on commit abb5590

Please sign in to comment.