summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author[email protected] <[email protected]>2012-04-08 10:43:02 +0000
committer[email protected] <[email protected]>2012-04-08 10:43:02 +0000
commitce4ef74ef4ee77defd74a2f1a4062cf303990055 (patch)
tree2dc42a5d3859f247e03bf35980fd42b0b6d53399
parent7494880ac206acf3d8f1a3142efa40ef10e0f7b0 (diff)
update AT91SAM9260 macb driver
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2023 bbd45198-f89e-11dd-88c7-29a3b14d5316
-rwxr-xr-xbsp/at91sam9260/application.c5
-rwxr-xr-xbsp/at91sam9260/macb.c8
-rwxr-xr-xbsp/at91sam9260/macb.h2
3 files changed, 8 insertions, 7 deletions
diff --git a/bsp/at91sam9260/application.c b/bsp/at91sam9260/application.c
index dbdeae60b5..8d272f5aed 100755
--- a/bsp/at91sam9260/application.c
+++ b/bsp/at91sam9260/application.c
@@ -43,7 +43,7 @@
#ifdef RT_USING_LWIP
#include <netif/ethernetif.h>
-#include <arch/sys_arch_init.h>
+//#include <arch/sys_arch_init.h>
#include "macb.h"
#endif
@@ -128,10 +128,9 @@ void rt_init_thread_entry(void* parameter)
eth_system_device_init();
rt_hw_macb_init();
/* re-init device driver */
- //rt_device_init_all();
+ rt_device_init_all();
/* init lwip system */
lwip_sys_init();
- rt_kprintf("TCP/IP initialized!\n");
}
#endif
diff --git a/bsp/at91sam9260/macb.c b/bsp/at91sam9260/macb.c
index e29a504377..ae18e3ffe1 100755
--- a/bsp/at91sam9260/macb.c
+++ b/bsp/at91sam9260/macb.c
@@ -324,13 +324,15 @@ void macb_update_link(struct rt_macb_eth *macb)
rt_kprintf("%s: link up (%dMbps/%s-duplex)\n",
dev->parent.name, macb->speed,
DUPLEX_FULL == macb->duplex ? "Full":"Half");
- macb->parent.link_status = 1;
+ //macb->parent.link_status = 1;
+ //netif_set_link_up(macb->parent.netif);
} else {
rt_kprintf("%s: link down\n", dev->parent.name);
- macb->parent.link_status = 0;
+ //macb->parent.link_status = 0;
+ //netif_set_link_down(macb->parent.netif);
}
- eth_device_linkchange(&macb->parent, RT_TRUE);
+ //eth_device_linkchange(&macb->parent, RT_TRUE);
}
}
diff --git a/bsp/at91sam9260/macb.h b/bsp/at91sam9260/macb.h
index 8d5950e78e..4697790f62 100755
--- a/bsp/at91sam9260/macb.h
+++ b/bsp/at91sam9260/macb.h
@@ -330,7 +330,7 @@ struct dma_desc {
#define MACB_TX_USED_OFFSET 31
#define MACB_TX_USED_SIZE 1
-void rt_hw_macb_init();
+extern void rt_hw_macb_init();
#endif /* _MACB_H */