diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-02-17 20:17:17 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-02-17 20:17:17 -0800 |
| commit | d0c6656a62113b913948361779d6298fe76f6e61 (patch) | |
| tree | efa2541a1abae4760717c6db421ea818114ab6f7 /gpxe/src/drivers/net/via-velocity.c | |
| parent | 85b92a462dab7ce36c48614ea18314f8fc83ca9c (diff) | |
| download | syslinux-d0c6656a62113b913948361779d6298fe76f6e61.tar.gz | |
Update gPXE to version 0.9.6+ 277b84c6e7d49f3cf01c855007f591de8c7cb75f
Update gPXE to version 0.9.6+, from commit
277b84c6e7d49f3cf01c855007f591de8c7cb75f in the main gPXE repository.
The only differences is src/config/general.h which has a few protocols
added, and src/arch/i386/prefix/boot1a.S which was called boot1a.s in
the upstream repository.
Diffstat (limited to 'gpxe/src/drivers/net/via-velocity.c')
| -rw-r--r-- | gpxe/src/drivers/net/via-velocity.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gpxe/src/drivers/net/via-velocity.c b/gpxe/src/drivers/net/via-velocity.c index 428f609c..4473ed15 100644 --- a/gpxe/src/drivers/net/via-velocity.c +++ b/gpxe/src/drivers/net/via-velocity.c @@ -550,7 +550,7 @@ static void velocity_transmit(struct nic *nic, const char *dest, /* Destination vptr->td_rings[entry].tdesc0.pktsize = pktlen; vptr->td_rings[entry].td_buf[0].pa_low = virt_to_bus(ptxb); vptr->td_rings[entry].td_buf[0].pa_high &= - cpu_to_le32(0xffff0000L); + cpu_to_le32(0xffff0000UL); vptr->td_rings[entry].td_buf[0].bufsize = vptr->td_rings[entry].tdesc0.pktsize; vptr->td_rings[entry].tdesc1.CMDZ = 2; @@ -1234,7 +1234,7 @@ static int velocity_open(struct nic *nic, struct pci_device *pci __unused) /* Tx Descriptor needs 64 bytes alignment; */ TxPhyAddr = virt_to_bus(vptr->TxDescArrays); - printf("Unaligned Address : %lX\n", TxPhyAddr); + printf("Unaligned Address : %X\n", TxPhyAddr); diff = 64 - (TxPhyAddr - ((TxPhyAddr >> 6) << 6)); TxPhyAddr += diff; vptr->td_rings = (struct tx_desc *) (vptr->TxDescArrays + diff); |