projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kw_spi: fix clock prescaler computation
[oweals/u-boot.git]
/
drivers
/
net
/
calxedaxgmac.c
diff --git
a/drivers/net/calxedaxgmac.c
b/drivers/net/calxedaxgmac.c
index 01b2eeeaeed611a90774684937adb41e59494d4f..e3553d68d8627a07f6b7abf4c6d3448337f19025 100644
(file)
--- a/
drivers/net/calxedaxgmac.c
+++ b/
drivers/net/calxedaxgmac.c
@@
-16,6
+16,7
@@
*/
#include <common.h>
#include <malloc.h>
*/
#include <common.h>
#include <malloc.h>
+#include <linux/compiler.h>
#include <linux/err.h>
#include <asm/io.h>
#include <linux/err.h>
#include <asm/io.h>
@@
-433,7
+434,7
@@
static int xgmac_init(struct eth_device *dev, bd_t * bis)
return 0;
}
return 0;
}
-static int xgmac_tx(struct eth_device *dev, vo
latile vo
id *packet, int length)
+static int xgmac_tx(struct eth_device *dev, void *packet, int length)
{
struct xgmac_regs *regs = (struct xgmac_regs *)dev->iobase;
struct calxeda_eth_dev *priv = dev->priv;
{
struct xgmac_regs *regs = (struct xgmac_regs *)dev->iobase;
struct calxeda_eth_dev *priv = dev->priv;
@@
-441,7
+442,7
@@
static int xgmac_tx(struct eth_device *dev, volatile void *packet, int length)
struct xgmac_dma_desc *txdesc = &priv->tx_chain[currdesc];
int timeout;
struct xgmac_dma_desc *txdesc = &priv->tx_chain[currdesc];
int timeout;
- desc_set_buf_addr_and_size(txdesc,
(void *)
packet, length);
+ desc_set_buf_addr_and_size(txdesc, packet, length);
desc_set_tx_owner(txdesc, TXDESC_FIRST_SEG |
TXDESC_LAST_SEG | TXDESC_CRC_EN_APPEND);
desc_set_tx_owner(txdesc, TXDESC_FIRST_SEG |
TXDESC_LAST_SEG | TXDESC_CRC_EN_APPEND);
@@
-475,7
+476,7
@@
static int xgmac_rx(struct eth_device *dev)
length = desc_get_rx_frame_len(rxdesc);
length = desc_get_rx_frame_len(rxdesc);
- NetReceive(
(volatile unsigned char *)
desc_get_buf_addr(rxdesc), length);
+ NetReceive(desc_get_buf_addr(rxdesc), length);
/* set descriptor back to owned by XGMAC */
desc_set_rx_owner(rxdesc);
/* set descriptor back to owned by XGMAC */
desc_set_rx_owner(rxdesc);