URL
https://opencores.org/ocsvn/or1k/or1k/trunk
Subversion Repositories or1k
Compare Revisions
- This comparison shows the changes necessary to convert path
/
- from Rev 405 to Rev 406
- ↔ Reverse comparison
Rev 405 → Rev 406
/trunk/or1ksim/testbench/eth.c
22,7 → 22,7
eth_ipgr2 = (unsigned long *)(ETH_BASE + ETH_IPGR2), |
eth_packetlen = (unsigned long *)(ETH_BASE + ETH_PACKETLEN), |
eth_collconf = (unsigned long *)(ETH_BASE + ETH_COLLCONF), |
eth_rx_bd_adr = (unsigned long *)(ETH_BASE + ETH_RX_BD_ADR), |
eth_rx_bd_num = (unsigned long *)(ETH_BASE + ETH_RX_BD_NUM), |
eth_controlmoder = (unsigned long *)(ETH_BASE + ETH_CTRLMODER), |
eth_miimoder = (unsigned long *)(ETH_BASE + ETH_MIIMODER), |
eth_miicommand = (unsigned long *)(ETH_BASE + ETH_MIICOMMAND), |
/trunk/or1ksim/peripheral/ethernet.c
156,7 → 156,7
printf( "IPGR2 : 0x%08lX\n", eth->regs.ipgr2 ); |
printf( "PACKETLEN : 0x%08lX\n", eth->regs.packetlen ); |
printf( "COLLCONF : 0x%08lX\n", eth->regs.collconf ); |
printf( "RX_BD_ADR : 0x%08lX\n", eth->regs.rx_bd_adr ); |
printf( "RX_BD_NUM : 0x%08lX\n", eth->regs.rx_bd_num ); |
printf( "CTRLMODER : 0x%08lX\n", eth->regs.controlmoder ); |
printf( "MIIMODER : 0x%08lX\n", eth->regs.miimoder ); |
printf( "MIICOMMAND : 0x%08lX\n", eth->regs.miicommand ); |
215,7 → 215,7
case ETH_IPGR2: return eth->regs.ipgr2; |
case ETH_PACKETLEN: return eth->regs.packetlen; |
case ETH_COLLCONF: return eth->regs.collconf; |
case ETH_RX_BD_ADR: return eth->regs.rx_bd_adr; |
case ETH_RX_BD_NUM: return eth->regs.rx_bd_num; |
case ETH_CTRLMODER: return eth->regs.controlmoder; |
case ETH_MIIMODER: return eth->regs.miimoder; |
case ETH_MIICOMMAND: return eth->regs.miicommand; |
259,7 → 259,7
case ETH_IPGR2: eth->regs.ipgr2 = value; return; |
case ETH_PACKETLEN: eth->regs.packetlen = value; return; |
case ETH_COLLCONF: eth->regs.collconf = value; return; |
case ETH_RX_BD_ADR: eth_write_rx_bd_adr( eth, value ); return; |
case ETH_RX_BD_NUM: eth_write_rx_bd_num( eth, value ); return; |
case ETH_CTRLMODER: eth->regs.controlmoder = value; return; |
case ETH_MIIMODER: eth->regs.miimoder = value; return; |
case ETH_MIICOMMAND: eth->regs.miicommand = value; return; |
292,10 → 292,10
} |
|
|
/* When RX_BD_ADR is written, also reset current RX BD index */ |
void eth_write_rx_bd_adr( struct eth_device *eth, unsigned long value ) |
/* When RX_BD_NUM is written, also reset current RX BD index */ |
void eth_write_rx_bd_num( struct eth_device *eth, unsigned long value ) |
{ |
eth->rx.bd_index = eth->regs.rx_bd_adr = value & 0xFF; |
eth->rx.bd_index = eth->regs.rx_bd_num = value & 0xFF; |
} |
|
|
742,7 → 742,7
/* advance to next BD */ |
if ( TEST_FLAG( eth->rx.bd, ETH_TX_BD, WRAP ) || |
eth->rx.bd_index >= ETH_BD_COUNT ) |
eth->rx.bd_index = eth->regs.rx_bd_adr; |
eth->rx.bd_index = eth->regs.rx_bd_num; |
else |
++ eth->rx.bd_index; |
} |
/trunk/or1ksim/peripheral/ethernet.h
39,7 → 39,7
#define ETH_IPGR2 (4 * 0x05) |
#define ETH_PACKETLEN (4 * 0x06) |
#define ETH_COLLCONF (4 * 0x07) |
#define ETH_RX_BD_ADR (4 * 0x08) |
#define ETH_RX_BD_NUM (4 * 0x08) |
#define ETH_CTRLMODER (4 * 0x09) |
#define ETH_MIIMODER (4 * 0x0A) |
#define ETH_MIICOMMAND (4 * 0x0B) |
/trunk/or1ksim/peripheral/ethernet_i.h
138,7 → 138,7
unsigned long ipgr2; |
unsigned long packetlen; |
unsigned long collconf; |
unsigned long rx_bd_adr; |
unsigned long rx_bd_num; |
unsigned long controlmoder; |
unsigned long miimoder; |
unsigned long miicommand; |