projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add watchdog driver.
[bertos.git]
/
bertos
/
cpu
/
arm
/
drv
/
eth_at91.c
diff --git
a/bertos/cpu/arm/drv/eth_at91.c
b/bertos/cpu/arm/drv/eth_at91.c
index cac5da26456c4d21d07f964534f190385388c41c..2b3aaca9ea8fa69634d70eb413affef880516a2c 100644
(file)
--- a/
bertos/cpu/arm/drv/eth_at91.c
+++ b/
bertos/cpu/arm/drv/eth_at91.c
@@
-236,7
+236,7
@@
static void emac_reset(void)
uint32_t phy_id = phy_hw_read(NIC_PHY_ID1) << 16
| phy_hw_read(NIC_PHY_ID2);
uint32_t phy_id = phy_hw_read(NIC_PHY_ID1) << 16
| phy_hw_read(NIC_PHY_ID2);
- ASSERT((phy_id & 0xFFFFFFF0) == (NIC_PHY_ID & 0xFFFFFFF0));
+
//
ASSERT((phy_id & 0xFFFFFFF0) == (NIC_PHY_ID & 0xFFFFFFF0));
LOG_INFO("PHY ID %#08lx\n", phy_id);
ticks_t start = timer_clock();
LOG_INFO("PHY ID %#08lx\n", phy_id);
ticks_t start = timer_clock();
@@
-486,7
+486,7
@@
int eth_init()
/* Set the vector. */
AIC_SVR(EMAC_ID) = emac_irqHandler;
/* Initialize to edge triggered with defined priority. */
/* Set the vector. */
AIC_SVR(EMAC_ID) = emac_irqHandler;
/* Initialize to edge triggered with defined priority. */
- AIC_SMR(EMAC_ID) = AIC_SRCTYPE_INT_EDGE_TRIGGERED;
+ AIC_SMR(EMAC_ID) = AIC_SRCTYPE_INT_EDGE_TRIGGERED
| 7
;
/* Clear pending interrupt */
AIC_ICCR = BV(EMAC_ID);
/* Enable the system IRQ */
/* Clear pending interrupt */
AIC_ICCR = BV(EMAC_ID);
/* Enable the system IRQ */