diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-04 16:33:49 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-04 16:33:49 -0700 |
| commit | 8e1d51d628afb18dc9a36f268dda1e9f48a1c2ad (patch) | |
| tree | 9aea9b125848fa7fc3ea45c96bff27dde2c1e8fb /firmware/microblaze/lib/eth_mac.c | |
| parent | 702d5af8ca0bab8ef295c817017df5952f6aea51 (diff) | |
| parent | 70abdef8f6c6d24a99caf8d3668f32094b159903 (diff) | |
| download | uhd-8e1d51d628afb18dc9a36f268dda1e9f48a1c2ad.tar.gz uhd-8e1d51d628afb18dc9a36f268dda1e9f48a1c2ad.tar.bz2 uhd-8e1d51d628afb18dc9a36f268dda1e9f48a1c2ad.zip | |
Merge branch 'master' into codec_gains
Conflicts:
host/lib/CMakeLists.txt
host/lib/utils/gain_handler.cpp
Diffstat (limited to 'firmware/microblaze/lib/eth_mac.c')
| -rw-r--r-- | firmware/microblaze/lib/eth_mac.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/firmware/microblaze/lib/eth_mac.c b/firmware/microblaze/lib/eth_mac.c index 375d3f4d4..034a4d494 100644 --- a/firmware/microblaze/lib/eth_mac.c +++ b/firmware/microblaze/lib/eth_mac.c @@ -83,14 +83,6 @@ eth_mac_read_rmon(int addr) int eth_mac_miim_read(int addr) { - if (hwconfig_simulation_p()){ - switch(addr){ - case PHY_LINK_AN: - return LANSR_MASTER | LANSR_LINK_GOOD | LANSR_SPEED_1000; - default: - return 0; - } - } int phy_addr = PHY_ADDR; eth_mac->miiaddress = ((addr & 0x1f) << 8) | phy_addr; @@ -112,7 +104,7 @@ eth_mac_miim_write(int addr, int value) eth_mac->miitx_data = value; eth_mac->miicommand = MIIC_WCTRLDATA; - //printf("MIIM-WRITE ADDR 0x%x VAL 0x%x\n",addr,value); +// printf("MIIM-WRITE ADDR 0x%x VAL 0x%x\n",addr,value); while((eth_mac->miistatus & MIIS_BUSY) != 0) ; } |