diff options
author | wdenk | 2003-10-19 23:22:11 +0000 |
---|---|---|
committer | wdenk | 2003-10-19 23:22:11 +0000 |
commit | a3ad8e26a4ac96838b2963cb462770c70c9f6443 (patch) | |
tree | be6c86113d1ce3da1d26b19b305d77d00370703f /cpu/at91rm9200/at91rm9200_ether.c | |
parent | d7281f41094bee59eca958de3c04995a2f79034a (diff) |
* Patch by Steven Scholz, 18 Oct 2003:
Fix AT91RM9200 ethernet driver
* Patch by Nye Liu, 17 Oct 2003:
Fix typo in include/mpc8xx.h
* Patch by Richard Woodruff, 16 Oct 03:
Fixes for cpu/arm925/interrupt.c
- Initialize timestamp & lastdec vars.
- fix timestamp overflows.
- fix lastdec overflow.
- smarter normalization to allow udelay() below 1ms to work.
* Patch by Scott McNutt, 16 Oct
add networking support for the Altera Nios Development Kit,
Cyclone Edition (DK-1C20)
* Patch by Jon Diekema, 14 Oct 2003:
add hint about doc/README.silent to README file
Diffstat (limited to 'cpu/at91rm9200/at91rm9200_ether.c')
-rw-r--r-- | cpu/at91rm9200/at91rm9200_ether.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpu/at91rm9200/at91rm9200_ether.c b/cpu/at91rm9200/at91rm9200_ether.c index 47b57da08c8..347a57b2ce6 100644 --- a/cpu/at91rm9200/at91rm9200_ether.c +++ b/cpu/at91rm9200/at91rm9200_ether.c @@ -334,12 +334,12 @@ static UCHAR at91rm9200_EmacReadPhy (AT91PS_EMAC p_mac, * TRUE - if data read successfully */ static UCHAR at91rm9200_EmacWritePhy (AT91PS_EMAC p_mac, - unsigned char RegisterAddress, - unsigned short *pOutput) + unsigned char RegisterAddress, + unsigned short *pOutput) { p_mac->EMAC_MAN = (AT91C_EMAC_HIGH & ~AT91C_EMAC_LOW) | AT91C_EMAC_CODE_802_3 | AT91C_EMAC_RW_W | - (RegisterAddress << 18); + (RegisterAddress << 18) | *pOutput; udelay (10000); |