giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Oops, some machine dependent changes was accidentally committed.

This commit is contained in:
bg- 2006-11-17 13:03:51 +00:00
parent 27e531baad
commit f3a6cee55b
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/dev/cc2420.c
View File

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: cc2420.c,v 1.5 2006/11/17 12:27:23 bg- Exp $ * @(#)$Id: cc2420.c,v 1.6 2006/11/17 13:03:51 bg- Exp $
*/ */
/* /*
* This code is almost device independent and should be possible to * This code is almost device independent and should be possible to
@ -250,8 +250,6 @@ cc2420_resend(void)
if (SFD_IS_1) if (SFD_IS_1)
return 0; /* Transmission has started. */ return 0; /* Transmission has started. */
PRINTF("REFOO\n");
return 0;
/* /*
* In the exceptional case that transmission never occurred we try * In the exceptional case that transmission never occurred we try
* again but never verify if the transmission ever starts. If a new * again but never verify if the transmission ever starts. If a new
@ -480,7 +478,6 @@ PROCESS_THREAD(cc2420_retransmit_process, ev, data)
{ {
static u8_t seq, n; static u8_t seq, n;
static struct etimer etimer; static struct etimer etimer;
static unsigned taccr1;
PROCESS_BEGIN(); PROCESS_BEGIN();
@ -490,16 +487,7 @@ PROCESS_THREAD(cc2420_retransmit_process, ev, data)
n = 0; n = 0;
do { do {
taccr1 = TACCR1 - TAR;
#if 0
if(taccr1 <= 14)
etimer_set(&etimer, RETRANSMIT_TIMEOUT + 1);
else
etimer_set(&etimer, RETRANSMIT_TIMEOUT + 0);
#else
etimer_set(&etimer, RETRANSMIT_TIMEOUT); etimer_set(&etimer, RETRANSMIT_TIMEOUT);
#endif
PROCESS_WAIT_UNTIL(etimer_expired(&etimer) || ev == PROCESS_EVENT_POLL); PROCESS_WAIT_UNTIL(etimer_expired(&etimer) || ev == PROCESS_EVENT_POLL);
if (ev == PROCESS_EVENT_POLL) { if (ev == PROCESS_EVENT_POLL) {
etimer_stop(&etimer); etimer_stop(&etimer);
@ -509,7 +497,7 @@ PROCESS_THREAD(cc2420_retransmit_process, ev, data)
else if (n < MAX_RETRANSMISSIONS) { else if (n < MAX_RETRANSMISSIONS) {
cc2420_resend(); cc2420_resend();
n++; n++;
PRINTF("RETRANS %d %u\n", n, taccr1); PRINTF("RETRANS %d\n", n);
} else { } else {
break; break;
} }