diff options
| author | Michael Brown | 2008-11-19 03:22:56 +0100 |
|---|---|---|
| committer | Michael Brown | 2008-11-19 20:15:44 +0100 |
| commit | b59e0cc56eb6d5f3b6f934722931f6919309ffd2 (patch) | |
| tree | 0e74a023207232f7911e1ccb9abdf6454dea70f5 /src/drivers/bus | |
| parent | [libgcc] Make __libgcc architecture-specific (diff) | |
| download | ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.tar.gz ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.tar.xz ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.zip | |
[i386] Change [u]int32_t to [unsigned] int, rather than [unsigned] long
This brings us in to line with Linux definitions, and also simplifies
adding x86_64 support since both platforms have 2-byte shorts, 4-byte
ints and 8-byte long longs.
Diffstat (limited to 'src/drivers/bus')
| -rw-r--r-- | src/drivers/bus/isapnp.c | 2 | ||||
| -rw-r--r-- | src/drivers/bus/pci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/bus/isapnp.c b/src/drivers/bus/isapnp.c index 0915a92b7..8f812df8e 100644 --- a/src/drivers/bus/isapnp.c +++ b/src/drivers/bus/isapnp.c @@ -84,7 +84,7 @@ static void isapnpbus_remove ( struct root_device *rootdev ); * */ -#define ISAPNP_CARD_ID_FMT "ID %04x:%04x (\"%s\") serial %lx" +#define ISAPNP_CARD_ID_FMT "ID %04x:%04x (\"%s\") serial %x" #define ISAPNP_CARD_ID_DATA(identifier) \ (identifier)->vendor_id, (identifier)->prod_id, \ isa_id_string ( (identifier)->vendor_id, (identifier)->prod_id ), \ diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c index 967441acd..54d1136fa 100644 --- a/src/drivers/bus/pci.c +++ b/src/drivers/bus/pci.c @@ -67,7 +67,7 @@ static unsigned long pci_bar ( struct pci_device *pci, unsigned int reg ) { if ( sizeof ( unsigned long ) > sizeof ( uint32_t ) ) { return ( ( ( uint64_t ) high << 32 ) | low ); } else { - DBG ( "Unhandled 64-bit BAR %08lx%08lx\n", + DBG ( "Unhandled 64-bit BAR %08x%08x\n", high, low ); return PCI_BASE_ADDRESS_MEM_TYPE_64; } |