zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed lockup in the experimental MAC driver. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1199 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2009-10-03 06:48:01 +00:00
parent 48cf30f8ab
commit 9a08941c1f
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/ARM7-AT91SAM7X-WEB-GCC/web/webthread.c
View File

@ -102,8 +102,8 @@ static void PeriodicTimerHandler(eventid_t id) {
*/ */
static void ARPTimerHandler(eventid_t id) { static void ARPTimerHandler(eventid_t id) {
uip_arp_timer();
(void)macPollLinkStatus(&ETH1); (void)macPollLinkStatus(&ETH1);
uip_arp_timer();
} }
/* /*

28
os/io/platforms/AT91SAM7X/mac_lld.c
View File

@ -293,6 +293,19 @@ void mac_lld_release_transmit_descriptor(MACTransmitDescriptor *tdp) {
chSysUnlock(); chSysUnlock();
} }
/**
* @brief Cleans an incomplete frame.
* @param from the start position of the incomplete frame
*/
static void cleanup(EMACDescriptor *from) {
while (from != rxptr) {
from->w1 &= ~W1_R_OWNERSHIP;
if (++from >= &rd[EMAC_RECEIVE_DESCRIPTORS])
from = rd;
}
}
/** /**
* @brief Returns a receive descriptor. * @brief Returns a receive descriptor.
* *
@ -337,9 +350,11 @@ skip:
restart: restart:
edp = rxptr; edp = rxptr;
while (n > 0) { while (n > 0) {
if (!(rxptr->w1 & W1_R_OWNERSHIP)) if (!(rxptr->w1 & W1_R_OWNERSHIP)) {
goto skip; /* Empty buffer for some reason... */ /* Empty buffer for some reason... cleaning up the incomplete frame.*/
cleanup(edp);
goto skip;
}
/* /*
* End Of Frame found. * End Of Frame found.
*/ */
@ -352,12 +367,7 @@ restart:
if ((edp != rxptr) && (rxptr->w2 & W2_R_FRAME_START)) { if ((edp != rxptr) && (rxptr->w2 & W2_R_FRAME_START)) {
/* Found another start... cleaning up the incomplete frame.*/ /* Found another start... cleaning up the incomplete frame.*/
do { cleanup(edp);
edp->w1 &= ~W1_R_OWNERSHIP;
if (++edp >= &rd[EMAC_RECEIVE_DESCRIPTORS])
edp = rd;
}
while (edp != rxptr);
goto restart; /* Another start buffer for some reason... */ goto restart; /* Another start buffer for some reason... */
} }