[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tossim sim_noise.c, 1.8, 1.9

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22611

Modified Files:
	sim_noise.c 
Log Message:
Undo incorrect bug fix.


Index: sim_noise.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/sim_noise.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sim_noise.c	29 Jul 2007 23:38:25 -0000	1.8
--- sim_noise.c	30 Jul 2007 01:10:52 -0000	1.9
***************
*** 251,254 ****
--- 251,261 ----
      }
      pKey[NOISE_HISTORY-1] = search_bin_num(noiseData[node_id].noiseTrace[i]);
+     dbg("TestCorrupt", "Looking up with key ");
+     {
+       int ctr;
+       for(ctr = 0; ctr < NOISE_HISTORY; ctr++)
+ 	dbg_clear("TestCorrupt", "%0.3hhi ", pKey[ctr]);
+     }
+     dbg_clear("TestCorrupt", "\n");
      sim_noise_dist(node_id);
      arrangeKey(node_id);
***************
*** 390,394 ****
    arrangeKey(node_id);
    
!   for(i = NOISE_HISTORY+1; i < noiseData[node_id].noiseTraceIndex; i++) {
      noiseData[node_id].key[NOISE_HISTORY-1] = search_bin_num(noiseData[node_id].noiseTrace[i]);
      sim_noise_add(node_id, noiseData[node_id].noiseTrace[i+1]);
--- 397,401 ----
    arrangeKey(node_id);
    
!   for(i = NOISE_HISTORY; i < noiseData[node_id].noiseTraceIndex; i++) {
      noiseData[node_id].key[NOISE_HISTORY-1] = search_bin_num(noiseData[node_id].noiseTrace[i]);
      sim_noise_add(node_id, noiseData[node_id].noiseTrace[i+1]);