Use fixed-width fields in struct undi_device, so that pxeprefix.S will be

able to populate the structure.
This commit is contained in:
Michael Brown
2007-01-09 01:41:26 +00:00
parent fbdebac5f4
commit cea2221737
2 changed files with 29 additions and 23 deletions

View File

@@ -76,13 +76,13 @@ static int undi_load ( struct undi_device *undi, struct undi_rom *undirom ) {
/* Debug info */
DBGC ( undi, "UNDI %p loading UNDI ROM %p to CS %04x DS %04x for ",
undi, undirom, undi_loader.UNDI_CS, undi_loader.UNDI_DS );
if ( undi->pci_busdevfn ) {
if ( undi->pci_busdevfn != 0xffff ) {
unsigned int bus = ( undi->pci_busdevfn >> 8 );
unsigned int devfn = ( undi->pci_busdevfn & 0xff );
DBGC ( undi, "PCI %02x:%02x.%x\n",
bus, PCI_SLOT ( devfn ), PCI_FUNC ( devfn ) );
}
if ( undi->isapnp_csn != -1U ) {
if ( undi->isapnp_csn != 0xffff ) {
DBGC ( undi, "ISAPnP(%04x) CSN %04x\n",
undi->isapnp_read_port, undi->isapnp_csn );
}
@@ -149,8 +149,8 @@ static int undi_load ( struct undi_device *undi, struct undi_rom *undirom ) {
int undi_load_pci ( struct undi_device *undi, struct undi_rom *undirom,
unsigned int bus, unsigned int devfn ) {
undi->pci_busdevfn = ( ( bus << 8 ) | devfn );
undi->isapnp_csn = -1U;
undi->isapnp_read_port = -1U;
undi->isapnp_csn = 0xffff;
undi->isapnp_read_port = 0xffff;
return undi_load ( undi, undirom );
}