projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
serial: add BCM283x mini UART driver
[oweals/u-boot.git]
/
drivers
/
net
/
eepro100.c
diff --git
a/drivers/net/eepro100.c
b/drivers/net/eepro100.c
index a23a5852ee1d8ae32e25424b5ac97b8d43c6de84..d4a6386810b6509bcfbcc5ef90556210129287ad 100644
(file)
--- a/
drivers/net/eepro100.c
+++ b/
drivers/net/eepro100.c
@@
-240,23
+240,23
@@
static void eepro100_halt (struct eth_device *dev);
static inline int INW (struct eth_device *dev, u_long addr)
{
static inline int INW (struct eth_device *dev, u_long addr)
{
- return le16_to_cpu
(*(volatile u16 *) (addr +
dev->iobase));
+ return le16_to_cpu
(*(volatile u16 *)(addr + (u_long)
dev->iobase));
}
static inline void OUTW (struct eth_device *dev, int command, u_long addr)
{
}
static inline void OUTW (struct eth_device *dev, int command, u_long addr)
{
- *(volatile u16 *)
((addr + dev->iobase)) = cpu_to_le16
(command);
+ *(volatile u16 *)
((addr + (u_long)dev->iobase)) = cpu_to_le16
(command);
}
static inline void OUTL (struct eth_device *dev, int command, u_long addr)
{
}
static inline void OUTL (struct eth_device *dev, int command, u_long addr)
{
- *(volatile u32 *)
((addr + dev->iobase)) = cpu_to_le32
(command);
+ *(volatile u32 *)
((addr + (u_long)dev->iobase)) = cpu_to_le32
(command);
}
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
static inline int INL (struct eth_device *dev, u_long addr)
{
}
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
static inline int INL (struct eth_device *dev, u_long addr)
{
- return le32_to_cpu
(*(volatile u32 *) (addr +
dev->iobase));
+ return le32_to_cpu
(*(volatile u32 *)(addr + (u_long)
dev->iobase));
}
static int get_phyreg (struct eth_device *dev, unsigned char addr,
}
static int get_phyreg (struct eth_device *dev, unsigned char addr,
@@
-674,7
+674,8
@@
static int eepro100_recv (struct eth_device *dev)
/* Pass the packet up to the protocol
* layers.
*/
/* Pass the packet up to the protocol
* layers.
*/
- NetReceive((u8 *)rx_ring[rx_next].data, length);
+ net_process_received_packet((u8 *)rx_ring[rx_next].data,
+ length);
} else {
/* There was an error.
*/
} else {
/* There was an error.
*/