narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[compiler] Fix 64bit compile time errors 

Apart from format specifier fixes there are two changes in proper code:
- Change type of regs in skge_hw to unsigned long
- Cast result of sizeof in myri10ge to uint32_t

Both don't change anything for i386 and should be fine on x86_64.

Signed-off-by: Piotr Jaroszyński <p.jaroszynski@gmail.com>
Signed-off-by: Joshua Oreman <oremanj@rwcr.net>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/1/head
Piotr Jaroszyński 2010-03-30 15:33:20 +02:00 committed by Michael Brown
parent 905ea56753
commit 7c6d3752c9
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/net/ath5k/ath5k.c
View File

@ -843,7 +843,7 @@ ath5k_rxbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
if (ah->ah_setup_rx_desc(ah, ds, if (ah->ah_setup_rx_desc(ah, ds,
iob_tailroom(iob), /* buffer size */ iob_tailroom(iob), /* buffer size */
0) != 0) { 0) != 0) {
DBG("ath5k: error setting up RX descriptor for %d bytes\n", iob_tailroom(iob)); DBG("ath5k: error setting up RX descriptor for %zd bytes\n", iob_tailroom(iob));
return -EINVAL; return -EINVAL;
} }
@ -1293,7 +1293,7 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)
iob = bf->iob; iob = bf->iob;
bf->iob = NULL; bf->iob = NULL;
DBG2("ath5k: tx %d bytes complete, %d retries\n", DBG2("ath5k: tx %zd bytes complete, %d retries\n",
iob_len(iob), ts.ts_retry[0]); iob_len(iob), ts.ts_retry[0]);
net80211_tx_complete(sc->dev, iob, ts.ts_retry[0], net80211_tx_complete(sc->dev, iob, ts.ts_retry[0],

2
src/drivers/net/eepro100.c
View File

@ -448,7 +448,7 @@ static int ifec_net_transmit ( struct net_device *netdev,
return -ENOBUFS; return -ENOBUFS;
} }
DBG2 ( "transmitting packet (%d bytes). status = %hX, cmd=%hX\n", DBG2 ( "transmitting packet (%zd bytes). status = %hX, cmd=%hX\n",
iob_len ( iobuf ), tcb->status, inw ( ioaddr + SCBCmd ) ); iob_len ( iobuf ), tcb->status, inw ( ioaddr + SCBCmd ) );
tcb->command = CmdSuspend | CmdTx | CmdTxFlex; tcb->command = CmdSuspend | CmdTx | CmdTxFlex;

4
src/drivers/net/myri10ge.c
View File

@ -723,7 +723,7 @@ static int myri10ge_net_open ( struct net_device *netdev )
/* Set the interrupt queue size. */ /* Set the interrupt queue size. */
data[0] = ( sizeof ( priv->dma->receive_completion ) data[0] = ( (uint32_t)( sizeof ( priv->dma->receive_completion ) )
| MXGEFW_CMD_SET_INTRQ_SIZE_FLAG_NO_STRICT_SIZE_CHECK ); | MXGEFW_CMD_SET_INTRQ_SIZE_FLAG_NO_STRICT_SIZE_CHECK );
TRY ( CMD_SET_ , INTRQ_SIZE , ); TRY ( CMD_SET_ , INTRQ_SIZE , );
@ -973,7 +973,7 @@ static int myri10ge_net_transmit ( struct net_device *netdev,
return -ENOBUFS; return -ENOBUFS;
} }
DBG2 ( "TX %p+%d ", iobuf->data, iob_len ( iobuf ) ); DBG2 ( "TX %p+%zd ", iobuf->data, iob_len ( iobuf ) );
DBG2_HD ( iobuf->data, 14 ); DBG2_HD ( iobuf->data, 14 );
/* Record the packet being transmitted, so we can later report /* Record the packet being transmitted, so we can later report

6
src/drivers/net/skge.c
View File

@ -1983,13 +1983,13 @@ static void skge_rx_refill(struct net_device *dev)
if (iob || (control & BMU_OWN)) if (iob || (control & BMU_OWN))
continue; continue;
DBG2("refilling rx desc %d: ", (ring->to_clean - ring->start)); DBG2("refilling rx desc %zd: ", (ring->to_clean - ring->start));
iob = alloc_iob(RX_BUF_SIZE); iob = alloc_iob(RX_BUF_SIZE);
if (iob) { if (iob) {
skge_rx_setup(skge, e, iob, RX_BUF_SIZE); skge_rx_setup(skge, e, iob, RX_BUF_SIZE);
} else { } else {
DBG("descr %d: alloc_iob() failed\n", DBG("descr %zd: alloc_iob() failed\n",
(ring->to_clean - ring->start)); (ring->to_clean - ring->start));
/* We pass the descriptor to the NIC even if the /* We pass the descriptor to the NIC even if the
* allocation failed. The card will stop as soon as it * allocation failed. The card will stop as soon as it
@ -2354,7 +2354,7 @@ static int skge_probe(struct pci_device *pdev,
hw->pdev = pdev; hw->pdev = pdev;
hw->regs = (u32)ioremap(pci_bar_start(pdev, PCI_BASE_ADDRESS_0), hw->regs = (unsigned long)ioremap(pci_bar_start(pdev, PCI_BASE_ADDRESS_0),
SKGE_REG_SIZE); SKGE_REG_SIZE);
if (!hw->regs) { if (!hw->regs) {
DBG(PFX "cannot map device registers\n"); DBG(PFX "cannot map device registers\n");

2
src/drivers/net/skge.h
View File

@ -2461,7 +2461,7 @@ struct skge_ring {
struct skge_hw { struct skge_hw {
u32 regs; unsigned long regs;
struct pci_device *pdev; struct pci_device *pdev;
u32 intr_mask; u32 intr_mask;
struct net_device *dev[2]; struct net_device *dev[2];

6
src/net/80211/wpa.c
View File

@ -383,7 +383,7 @@ static int wpa_maybe_install_gtk ( struct wpa_common_ctx *ctx,
return -ENOENT; return -ENOENT;
if ( ie->len - 6u > sizeof ( ctx->gtk.tk ) ) { if ( ie->len - 6u > sizeof ( ctx->gtk.tk ) ) {
DBGC ( ctx, "WPA %p: GTK KDE is too long (%d bytes, max %d)\n", DBGC ( ctx, "WPA %p: GTK KDE is too long (%d bytes, max %zd)\n",
ctx, ie->len - 4, sizeof ( ctx->gtk.tk ) ); ctx, ie->len - 4, sizeof ( ctx->gtk.tk ) );
return -EINVAL; return -EINVAL;
} }
@ -737,7 +737,7 @@ static int wpa_handle_1_of_2 ( struct wpa_common_ctx *ctx,
return rc; /* non-fatal */ return rc; /* non-fatal */
} }
if ( pkt->datalen > sizeof ( ctx->gtk.tk ) ) { if ( pkt->datalen > sizeof ( ctx->gtk.tk ) ) {
DBGC ( ctx, "WPA %p: too much GTK data (%d > %d)\n", DBGC ( ctx, "WPA %p: too much GTK data (%d > %zd)\n",
ctx, pkt->datalen, sizeof ( ctx->gtk.tk ) ); ctx, pkt->datalen, sizeof ( ctx->gtk.tk ) );
return wpa_fail ( ctx, -EINVAL ); return wpa_fail ( ctx, -EINVAL );
} }
@ -813,7 +813,7 @@ static int eapol_key_rx ( struct io_buffer *iob, struct net_device *netdev,
} }
if ( ( void * ) ( pkt + 1 ) + ntohs ( pkt->datalen ) > iob->tail ) { if ( ( void * ) ( pkt + 1 ) + ntohs ( pkt->datalen ) > iob->tail ) {
DBGC ( ctx, "WPA %p: packet truncated (has %d extra bytes, " DBGC ( ctx, "WPA %p: packet truncated (has %zd extra bytes, "
"states %d)\n", ctx, iob->tail - ( void * ) ( pkt + 1 ), "states %d)\n", ctx, iob->tail - ( void * ) ( pkt + 1 ),
ntohs ( pkt->datalen ) ); ntohs ( pkt->datalen ) );
rc = -EINVAL; rc = -EINVAL;