Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: Fix remaining API interface breakage

Browse source 
These are all the files which use the API incorrectly but did not get
built using MAKEALL -a powerpc|arm.  I have no compiler for them, but
the remaining issues should be far less than without this patch.

Any outstanding issues are left to the maintainers of boards that use
these drivers.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Joe Hershberger 2012-05-22 18:36:19 +00:00
parent d1527b55f5
commit 10cbe3b6a4
29 changed files with 41 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/mips/cpu/mips32/au1x00/au1x00_eth.c
View file

@ -147,7 +147,8 @@ int au1x00_miiphy_write(const char *devname, unsigned char addr,
}
#endif
static int au1x00_send(struct eth_device* dev, volatile void *packet, int length){
static int au1x00_send(struct eth_device *dev, void *packet, int length)
{
volatile mac_fifo_t *fifo_tx =
(volatile mac_fifo_t*)(MAC0_TX_DMA_ADDR+MAC_TX_BUFF0_STATUS);
int i;

3
board/Marvell/db64360/mv_eth.c
View file

@ -190,8 +190,7 @@ int db64360_eth_poll (struct eth_device *dev)
return mv64360_eth_receive (dev);
}
int db64360_eth_transmit (struct eth_device *dev, volatile void *packet,
int length)
int db64360_eth_transmit(struct eth_device *dev, void *packet, int length)
{
mv64360_eth_xmit (dev, packet, length);
return 0;

4
board/Marvell/db64360/mv_eth.h
View file

@ -167,9 +167,7 @@ struct mv64360_eth_priv {
int mv64360_eth_init (struct eth_device *dev);
int mv64360_eth_stop (struct eth_device *dev);
int mv64360_eth_start_xmit (struct eth_device*, volatile void* packet, int length);
/* return db64360_eth0_poll(); */
int mv64360_eth_start_xmit(struct eth_device *dev, void *packet, int length);
int mv64360_eth_open (struct eth_device *dev);

3
board/Marvell/db64460/mv_eth.c
View file

@ -190,8 +190,7 @@ int db64460_eth_poll (struct eth_device *dev)
return mv64460_eth_receive (dev);
}
int db64460_eth_transmit (struct eth_device *dev, volatile void *packet,
int length)
int db64460_eth_transmit(struct eth_device *dev, void *packet, int length)
{
mv64460_eth_xmit (dev, packet, length);
return 0;

4
board/Marvell/db64460/mv_eth.h
View file

@ -166,9 +166,7 @@ struct mv64460_eth_priv {
int mv64460_eth_init (struct eth_device *dev);
int mv64460_eth_stop (struct eth_device *dev);
int mv64460_eth_start_xmit (struct eth_device*, volatile void* packet, int length);
/* return db64460_eth0_poll(); */
int mv64460_eth_start_xmit(struct eth_device *dev, void *packet, int length);
int mv64460_eth_open (struct eth_device *dev);

3
board/esd/cpci750/mv_eth.c
View file

@ -190,8 +190,7 @@ int db64360_eth_poll (struct eth_device *dev)
return mv64360_eth_receive (dev);
}
int db64360_eth_transmit (struct eth_device *dev, volatile void *packet,
int length)
int db64360_eth_transmit(struct eth_device *dev, void *packet, int length)
{
mv64360_eth_xmit (dev, packet, length);
return 0;

4
board/esd/cpci750/mv_eth.h
View file

@ -168,9 +168,7 @@ struct mv64360_eth_priv {
int mv64360_eth_init (struct eth_device *dev);
int mv64360_eth_stop (struct eth_device *dev);
int mv64360_eth_start_xmit (struct eth_device*, volatile void* packet, int length);
/* return db64360_eth0_poll(); */
int mv64360_eth_start_xmit(struct eth_device *dev, void *packet, int length);
int mv64360_eth_open (struct eth_device *dev);

3
board/evb64260/eth.c
View file

@ -246,8 +246,7 @@ gt6426x_eth_poll(void *v)
/**************************************************************************
TRANSMIT - Transmit a frame
***************************************************************************/
int
gt6426x_eth_transmit(void *v, volatile char *p, unsigned int s)
int gt6426x_eth_transmit(void *v, char *p, unsigned int s)
{
struct eth_device *wp = (struct eth_device *)v;
struct eth_dev_s *dev = (struct eth_dev_s *)wp->priv;

2
board/evb64260/eth.h
View file

@ -68,7 +68,7 @@ extern char *eth0_rx_buffer[NR];
extern char *eth_data;
extern int gt6426x_eth_poll(void *v);
extern int gt6426x_eth_transmit(void *v, volatile char *p, unsigned int s);
extern int gt6426x_eth_transmit(void *v, char *p, unsigned int s);
extern void gt6426x_eth_disable(void *v);
extern int gt6426x_eth_probe(void *v, bd_t *bis);

3
board/prodrive/p3mx/mv_eth.c
View file

@ -202,8 +202,7 @@ int db64460_eth_poll (struct eth_device *dev)
return mv64460_eth_receive (dev);
}
int db64460_eth_transmit (struct eth_device *dev, volatile void *packet,
int length)
int db64460_eth_transmit(struct eth_device *dev, void *packet, int length)
{
mv64460_eth_xmit (dev, packet, length);
return 0;

4
board/prodrive/p3mx/mv_eth.h
View file

@ -166,9 +166,7 @@ struct mv64460_eth_priv {
int mv64460_eth_init (struct eth_device *dev);
int mv64460_eth_stop (struct eth_device *dev);
int mv64460_eth_start_xmit (struct eth_device*, volatile void* packet, int length);
/* return db64460_eth0_poll(); */
int mv64460_eth_start_xmit(struct eth_device *dev, void *packet, int length);
int mv64460_eth_open (struct eth_device *dev);

3
drivers/net/altera_tse.c
View file

@ -257,8 +257,7 @@ static int tse_adjust_link(struct altera_tse_priv *priv)
return 0;
}
static int tse_eth_send(struct eth_device *dev,
volatile void *packet, int length)
static int tse_eth_send(struct eth_device *dev, void *packet, int length)
{
struct altera_tse_priv *priv = dev->priv;
volatile struct alt_sgdma_registers *tx_sgdma = priv->sgdma_tx;

3
drivers/net/ax88180.c
View file

@ -604,8 +604,7 @@ static int ax88180_recv (struct eth_device *dev)
}
/* Send a data block via Ethernet. */
static int
ax88180_send (struct eth_device *dev, volatile void *packet, int length)
static int ax88180_send(struct eth_device *dev, void *packet, int length)
{
struct ax88180_private *priv = (struct ax88180_private *)dev->priv;
unsigned short TXDES_addr;

5
drivers/net/bfin_mac.c
View file

@ -118,8 +118,7 @@ int bfin_EMAC_initialize(bd_t *bis)
return 0;
}
static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet,
int length)
static int bfin_EMAC_send(struct eth_device *dev, void *packet, int length)
{
int i;
int result = 0;
@ -471,7 +470,7 @@ int ether_post_test(int flags)
for (i = 0; i < 42; i++)
buf[i + 22] = i;
printf("--------Send 64 bytes......\n");
bfin_EMAC_send(NULL, (volatile void *)buf, 64);
bfin_EMAC_send(NULL, buf, 64);
for (i = 0; i < 100; i++) {
udelay(10000);
if ((rxbuf[rxIdx]->StatusWord & RX_COMP) != 0) {

2
drivers/net/bfin_mac.h
View file

@ -58,7 +58,7 @@ static ADI_ETHER_BUFFER *SetupTxBuffer(int no);
static int bfin_EMAC_init(struct eth_device *dev, bd_t *bd);
static void bfin_EMAC_halt(struct eth_device *dev);
static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet, int length);
static int bfin_EMAC_send(struct eth_device *dev, void *packet, int length);
static int bfin_EMAC_recv(struct eth_device *dev);
static int bfin_EMAC_setup_addr(struct eth_device *dev);

5
drivers/net/designware.c
View file

@ -189,8 +189,7 @@ static int dw_eth_init(struct eth_device *dev, bd_t *bis)
return 0;
}
static int dw_eth_send(struct eth_device *dev, volatile void *packet,
int length)
static int dw_eth_send(struct eth_device *dev, void *packet, int length)
{
struct dw_eth_dev *priv = dev->priv;
struct eth_dma_regs *dma_p = priv->dma_regs_p;
@ -203,7 +202,7 @@ static int dw_eth_send(struct eth_device *dev, volatile void *packet,
return -1;
}
memcpy((void *)desc_p->dmamac_addr, (void *)packet, length);
memcpy((void *)desc_p->dmamac_addr, packet, length);
#if defined(CONFIG_DW_ALTDESCRIPTOR)
desc_p->txrx_status |= DESC_TXSTS_TXFIRST | DESC_TXSTS_TXLAST;

2
drivers/net/ep93xx_eth.c
View file

@ -380,7 +380,7 @@ static int ep93xx_eth_rcv_packet(struct eth_device *dev)
* Send a block of data via ethernet.
*/
static int ep93xx_eth_send_packet(struct eth_device *dev,
volatile void * const packet, int const length)
void * const packet, int const length)
{
struct mac_regs *mac = GET_REGS(dev);
struct ep93xx_priv *priv = GET_PRIV(dev);

2
drivers/net/ethoc.c
View file

@ -414,7 +414,7 @@ static void ethoc_tx(struct eth_device *dev)
(void)ethoc_update_tx_stats(&bd);
}
static int ethoc_send(struct eth_device *dev, volatile void *packet, int length)
static int ethoc_send(struct eth_device *dev, void *packet, int length)
{
struct ethoc *priv = (struct ethoc *)dev->priv;
struct ethoc_bd bd;

7
drivers/net/fsl_mcdmafec.c
View file

@ -116,7 +116,7 @@ struct fec_info_dma fec_info[] = {
#endif
};
static int fec_send(struct eth_device *dev, volatile void *packet, int length);
static int fec_send(struct eth_device *dev, void *packet, int length);
static int fec_recv(struct eth_device *dev);
static int fec_init(struct eth_device *dev, bd_t * bd);
static void fec_halt(struct eth_device *dev);
@ -194,7 +194,7 @@ static void set_fec_duplex_speed(volatile fecdma_t * fecp, bd_t * bd,
}
}
static int fec_send(struct eth_device *dev, volatile void *packet, int length)
static int fec_send(struct eth_device *dev, void *packet, int length)
{
struct fec_info_dma *info = dev->priv;
cbd_t *pTbd, *pUsedTbd;
@ -301,8 +301,7 @@ static int fec_recv(struct eth_device *dev)
frame_length = pRbd->cbd_datlen - 4;
/* Fill the buffer and pass it to upper layers */
NetReceive((volatile uchar *)pRbd->cbd_bufaddr,
frame_length);
NetReceive((uchar *)pRbd->cbd_bufaddr, frame_length);
len = frame_length;
}

3
drivers/net/ftgmac100.c
View file

@ -480,8 +480,7 @@ static int ftgmac100_recv(struct eth_device *dev)
/*
* Send a data block via Ethernet
*/
static int
ftgmac100_send(struct eth_device *dev, void *packet, int length)
static int ftgmac100_send(struct eth_device *dev, void *packet, int length)
{
struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)dev->iobase;
struct ftgmac100_data *priv = dev->priv;

2
drivers/net/greth.c
View file

@ -403,7 +403,7 @@ void greth_halt(struct eth_device *dev)
}
}
int greth_send(struct eth_device *dev, volatile void *eth_data, int data_length)
int greth_send(struct eth_device *dev, void *eth_data, int data_length)
{
greth_priv *greth = dev->priv;
greth_regs *regs = greth->regs;

4
drivers/net/inca-ip_sw.c
View file

@ -158,7 +158,7 @@ static int initialized = 0;
static int inca_switch_init(struct eth_device *dev, bd_t * bis);
static int inca_switch_send(struct eth_device *dev, volatile void *packet, int length);
static int inca_switch_send(struct eth_device *dev, void *packet, int length);
static int inca_switch_recv(struct eth_device *dev);
static void inca_switch_halt(struct eth_device *dev);
static void inca_init_switch_chip(void);
@ -334,7 +334,7 @@ static int inca_switch_init(struct eth_device *dev, bd_t * bis)
}
static int inca_switch_send(struct eth_device *dev, volatile void *packet, int length)
static int inca_switch_send(struct eth_device *dev, void *packet, int length)
{
int i;
int res = -1;

3
drivers/net/mcffec.c
View file

@ -95,7 +95,6 @@ struct fec_info_s fec_info[] = {
#endif
};
int fec_send(struct eth_device *dev, volatile void *packet, int length);
int fec_recv(struct eth_device *dev);
int fec_init(struct eth_device *dev, bd_t * bd);
void fec_halt(struct eth_device *dev);
@ -134,7 +133,7 @@ void setFecDuplexSpeed(volatile fec_t * fecp, bd_t * bd, int dup_spd)
}
}
int fec_send(struct eth_device *dev, volatile void *packet, int length)
static int fec_send(struct eth_device *dev, void *packet, int length)
{
struct fec_info_s *info = dev->priv;
volatile fec_t *fecp = (fec_t *) (info->iobase);

3
drivers/net/mvgbe.c
View file

@ -525,8 +525,7 @@ static int mvgbe_write_hwaddr(struct eth_device *dev)
return 0;
}
static int mvgbe_send(struct eth_device *dev, void *dataptr,
int datasize)
static int mvgbe_send(struct eth_device *dev, void *dataptr, int datasize)
{
struct mvgbe_device *dmvgbe = to_mvgbe(dev);
struct mvgbe_registers *regs = dmvgbe->regs;

2
drivers/net/ne2000_base.c
View file

@ -749,7 +749,7 @@ static int ne2k_recv(struct eth_device *dev)
return 1;
}
static int ne2k_send(struct eth_device *dev, volatile void *packet, int length)
static int ne2k_send(struct eth_device *dev, void *packet, int length)
{
int tmo;

2
drivers/net/netarm_eth.c
View file

@ -300,7 +300,7 @@ extern int eth_rx (void)
}
/* Send a data block via Ethernet. */
extern int eth_send (volatile void *packet, int length)
extern int eth_send(void *packet, int length)
{
int i, length32;
char *pa;

6
drivers/net/plb2800_eth.c
View file

@ -82,8 +82,7 @@ typedef volatile struct {
static int plb2800_eth_init(struct eth_device *dev, bd_t * bis);
static int plb2800_eth_send(struct eth_device *dev, volatile void *packet,
int length);
static int plb2800_eth_send(struct eth_device *dev, void *packet, int length);
static int plb2800_eth_recv(struct eth_device *dev);
static void plb2800_eth_halt(struct eth_device *dev);
@ -162,8 +161,7 @@ static int plb2800_eth_init(struct eth_device *dev, bd_t * bis)
}
static int plb2800_eth_send(struct eth_device *dev, volatile void *packet,
int length)
static int plb2800_eth_send(struct eth_device *dev, void *packet, int length)
{
int i;
int res = -1;

8
drivers/net/sh_eth.c
View file

@ -46,7 +46,7 @@
#define TIMEOUT_CNT 1000
int sh_eth_send(struct eth_device *dev, volatile void *packet, int len)
int sh_eth_send(struct eth_device *dev, void *packet, int len)
{
struct sh_eth_dev *eth = dev->priv;
int port = eth->port, ret = 0, timeout;
@ -103,15 +103,15 @@ int sh_eth_recv(struct eth_device *dev)
struct sh_eth_dev *eth = dev->priv;
int port = eth->port, len = 0;
struct sh_eth_info *port_info = &eth->port_info[port];
volatile u8 *packet;
uchar *packet;
/* Check if the rx descriptor is ready */
if (!(port_info->rx_desc_cur->rd0 & RD_RACT)) {
/* Check for errors */
if (!(port_info->rx_desc_cur->rd0 & RD_RFE)) {
len = port_info->rx_desc_cur->rd1 & 0xffff;
packet = (volatile u8 *)
ADDR_TO_P2(port_info->rx_desc_cur->rd2);
packet = (uchar *)
ADDR_TO_P2(port_info->rx_desc_cur->rd2);
NetReceive(packet, len);
}

7
drivers/usb/gadget/ether.c
View file

@ -2397,8 +2397,7 @@ fail:
return -1;
}
static int usb_eth_send(struct eth_device *netdev,
volatile void *packet, int length)
static int usb_eth_send(struct eth_device *netdev, void *packet, int length)
{
int retval;
void *rndis_pkt = NULL;
@ -2419,11 +2418,11 @@ static int usb_eth_send(struct eth_device *netdev,
}
rndis_add_hdr(rndis_pkt, length);
memcpy(rndis_pkt + sizeof(struct rndis_packet_msg_type),
(void *)packet, length);
packet, length);
packet = rndis_pkt;
length += sizeof(struct rndis_packet_msg_type);
}
req->buf = (void *)packet;
req->buf = packet;
req->context = NULL;
req->complete = tx_complete;