Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-08-07 11:28:58 +00:00
Code Issues Projects Releases Wiki Activity

CC2420: Eliminated duplicated code in cc2420_read

Browse Source
This commit is contained in:
kkrentz 2013-06-05 07:50:21 -07:00
parent e3eb924f13
commit e977da8fe2
1 changed files with 33 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dev/cc2420/cc2420.c
View File

@ -775,26 +775,12 @@ cc2420_read(void *buf, unsigned short bufsize)
if(len > CC2420_MAX_PACKET_LEN) { if(len > CC2420_MAX_PACKET_LEN) {
/* Oops, we must be out of sync. */ /* Oops, we must be out of sync. */
flushrx();
RIMESTATS_ADD(badsynch); RIMESTATS_ADD(badsynch);
RELEASE_LOCK(); } else if(len <= FOOTER_LEN) {
return 0;
}
if(len <= FOOTER_LEN) {
flushrx();
RIMESTATS_ADD(tooshort); RIMESTATS_ADD(tooshort);
RELEASE_LOCK(); } else if(len - FOOTER_LEN > bufsize) {
return 0;
}
if(len - FOOTER_LEN > bufsize) {
flushrx();
RIMESTATS_ADD(toolong); RIMESTATS_ADD(toolong);
RELEASE_LOCK(); } else {
return 0;
}
getrxdata(buf, len - FOOTER_LEN); getrxdata(buf, len - FOOTER_LEN);
getrxdata(footer, FOOTER_LEN); getrxdata(footer, FOOTER_LEN);
@ -824,12 +810,12 @@ cc2420_read(void *buf, unsigned short bufsize)
} }
RELEASE_LOCK(); RELEASE_LOCK();
return len - FOOTER_LEN;
if(len < FOOTER_LEN) {
return 0;
} }
return len - FOOTER_LEN; flushrx();
RELEASE_LOCK();
return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void