diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-10-10 07:49:34 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-10-10 07:49:34 +0000 |
| commit | 88398a5e21b7b50c3352fd5bd2cbaa229852a646 (patch) | |
| tree | f4445784f918a9f56eafbaa4ed4c626cffea36ce /os/io/platforms/AT91SAM7X/mac_lld.c | |
| parent | 660c9df44e117f84bc51795abbfb4189cb736c82 (diff) | |
| download | ChibiOS-88398a5e21b7b50c3352fd5bd2cbaa229852a646.tar.gz ChibiOS-88398a5e21b7b50c3352fd5bd2cbaa229852a646.tar.bz2 ChibiOS-88398a5e21b7b50c3352fd5bd2cbaa229852a646.zip | |
Integrated Liam's patch for Davicom 9161 PHY.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1207 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/io/platforms/AT91SAM7X/mac_lld.c')
| -rw-r--r-- | os/io/platforms/AT91SAM7X/mac_lld.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/os/io/platforms/AT91SAM7X/mac_lld.c b/os/io/platforms/AT91SAM7X/mac_lld.c index 47167fa80..223d54342 100644 --- a/os/io/platforms/AT91SAM7X/mac_lld.c +++ b/os/io/platforms/AT91SAM7X/mac_lld.c @@ -174,16 +174,14 @@ void mac_lld_init(void) { AT91C_EMAC_CLRSTAT;/* Initial NCR settings.*/
mac_lld_set_address(Ð1, default_mac);
-#if PHY_HARDWARE == PHY_MICREL_KS8721
/*
* PHY device identification.
*/
AT91C_BASE_EMAC->EMAC_NCR |= AT91C_EMAC_MPE;
- if ((miiGet(Ð1, MII_PHYSID1) != (MII_KS8721_ID >> 16)) ||
- ((miiGet(Ð1, MII_PHYSID2) & 0xFFF0) != (MII_KS8721_ID & 0xFFF0)))
+ if ((miiGet(Ð1, MII_PHYSID1) != (PHY_ID >> 16)) ||
+ ((miiGet(Ð1, MII_PHYSID2) & 0xFFF0) != (PHY_ID & 0xFFF0)))
chSysHalt();
AT91C_BASE_EMAC->EMAC_NCR &= ~AT91C_EMAC_MPE;
-#endif
/*
* Interrupt configuration. |