9
0
Fork 0

svn_rev_310

use type_data instead of pric for edev
This commit is contained in:
Sascha Hauer 2007-07-05 18:01:42 +02:00 committed by Sascha Hauer
parent 1db57b0bfc
commit 381840e830
3 changed files with 10 additions and 10 deletions

View File

@ -150,7 +150,7 @@ UCHAR at91rm9200_EmacWritePhy (AT91PS_EMAC p_mac,
return TRUE;
}
static int at91rm9200_eth_open (struct eth_device *ndev)
static int at91rm9200_eth_open (struct eth_device *edev)
{
int ret;
@ -172,7 +172,7 @@ static int at91rm9200_eth_open (struct eth_device *ndev)
return 0;
}
static int at91rm9200_eth_send (struct eth_device *ndev, volatile void *packet, int length)
static int at91rm9200_eth_send (struct eth_device *edev, volatile void *packet, int length)
{
while (!(p_mac->EMAC_TSR & AT91C_EMAC_BNQ));
p_mac->EMAC_TAR = (long) packet;
@ -182,7 +182,7 @@ static int at91rm9200_eth_send (struct eth_device *ndev, volatile void *packet,
return 0;
}
static int at91rm9200_eth_rx (struct eth_device *ndev)
static int at91rm9200_eth_rx (struct eth_device *edev)
{
int size;
@ -203,7 +203,7 @@ static int at91rm9200_eth_rx (struct eth_device *ndev)
return size;
}
static void at91rm9200_eth_halt (struct eth_device *ndev)
static void at91rm9200_eth_halt (struct eth_device *edev)
{
};

View File

@ -161,7 +161,7 @@ static void dm9000_reset(void)
udelay(1000); /* delay 1ms */
}
int dm9000_eth_open(struct eth_device *ndev)
int dm9000_eth_open(struct eth_device *edev)
{
int lnk, i = 0, ctl;
@ -218,7 +218,7 @@ int dm9000_eth_open(struct eth_device *ndev)
return 0;
}
int dm9000_eth_send (struct eth_device *ndev, volatile void *packet, int length)
int dm9000_eth_send (struct eth_device *edev, volatile void *packet, int length)
{
char *data_ptr;
u32 tmplen, i;
@ -272,7 +272,7 @@ int dm9000_eth_send (struct eth_device *ndev, volatile void *packet, int length)
return 0;
}
void dm9000_eth_halt (struct eth_device *ndev)
void dm9000_eth_halt (struct eth_device *edev)
{
printf("eth_halt\n");
@ -282,7 +282,7 @@ void dm9000_eth_halt (struct eth_device *ndev)
DM9000_iow(DM9000_RCR, 0x00); /* Disable RX */
}
int dm9000_eth_rx (struct eth_device *ndev)
int dm9000_eth_rx (struct eth_device *edev)
{
u8 rxbyte, *rdptr = (u8 *) NetRxPackets[0];
u16 RxStatus, RxLen = 0;
@ -413,7 +413,7 @@ int dm9000_probe(struct device_d *dev)
printf("dm9000_eth_init()\n");
edev = malloc(sizeof(struct eth_device));
dev->priv = edev;
dev->type_ddata = edev;
edev->dev = dev;
edev->open = dm9000_eth_open;

View File

@ -821,7 +821,7 @@ int mpc5xxx_fec_probe(struct device_d *dev)
int i;
edev = (struct eth_device *)malloc(sizeof(struct eth_device));
dev->priv = edev;
dev->type_data = edev;
fec = (mpc5xxx_fec_priv *)malloc(sizeof(*fec));
edev->priv = fec;
edev->dev = dev;