[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tossim HilTimerMilliC.nc, 1.1.2.2, 1.1.2.3 sim_gain.c, 1.1.2.5, 1.1.2.6

[Phil Levis]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HilTimerMilliC.nc sim_gain.c 
Log Message:
Bug fix from Andreas Larsson.


Index: HilTimerMilliC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/HilTimerMilliC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** HilTimerMilliC.nc	7 Nov 2006 23:15:13 -0000	1.1.2.2
--- HilTimerMilliC.nc	6 Dec 2006 01:36:18 -0000	1.1.2.3
***************
*** 42,46 ****
  
    enum {
!     TIMER_COUNT = uniqueCount("UQ_TIMER_MILLI")
    };
  
--- 42,46 ----
  
    enum {
!     TIMER_COUNT = uniqueCount(UQ_TIMER_MILLI)
    };
  

Index: sim_gain.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/sim_gain.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** sim_gain.c	5 Jun 2006 16:48:40 -0000	1.1.2.5
--- sim_gain.c	6 Dec 2006 01:36:18 -0000	1.1.2.6
***************
*** 7,12 ****
  
  
! gain_entry_t* connectivity[TOSSIM_MAX_NODES];
! sim_gain_noise_t noise[TOSSIM_MAX_NODES];
  double sensitivity = 4.0;
  
--- 7,12 ----
  
  
! gain_entry_t* connectivity[TOSSIM_MAX_NODES + 1];
! sim_gain_noise_t noise[TOSSIM_MAX_NODES + 1];
  double sensitivity = 4.0;
  
***************
*** 15,18 ****
--- 15,21 ----
  
  gain_entry_t* sim_gain_first(int src) __attribute__ ((C, spontaneous)) {
+   if (src > TOSSIM_MAX_NODES) {
+     return connecctivity[TOSSIM_MAX_NODES];
+   } 
    return connectivity[src];
  }
***************
*** 24,31 ****
  void sim_gain_add(int src, int dest, double gain) __attribute__ ((C, spontaneous))  {
    gain_entry_t* current;
    int temp = sim_node();
    sim_set_node(src);
  
!   current = connectivity[src];
    while (current != NULL) {
      if (current->mote == dest) {
--- 27,37 ----
  void sim_gain_add(int src, int dest, double gain) __attribute__ ((C, spontaneous))  {
    gain_entry_t* current;
+   if (src > TOSSIM_MAX_NODES) {
+     src = TOSSIM_MAX_NODES;
+   }
    int temp = sim_node();
    sim_set_node(src);
  
!   current = sim_gain_first(src);
    while (current != NULL) {
      if (current->mote == dest) {
***************
*** 51,55 ****
    int temp = sim_node();
    sim_set_node(src);
!   current = connectivity[src];
    while (current != NULL) {
      if (current->mote == dest) {
--- 57,61 ----
    int temp = sim_node();
    sim_set_node(src);
!   current = sim_gain_first(src);
    while (current != NULL) {
      if (current->mote == dest) {
***************
*** 67,71 ****
    int temp = sim_node();
    sim_set_node(src);
!   current = connectivity[src];
    while (current != NULL) {
      if (current->mote == dest) {
--- 73,77 ----
    int temp = sim_node();
    sim_set_node(src);
!   current = sim_gain_first(src);
    while (current != NULL) {
      if (current->mote == dest) {
***************
*** 83,89 ****
    gain_entry_t* prevLink;
    int temp = sim_node();
    sim_set_node(src);
      
!   current = connectivity[src];
    prevLink = NULL;
      
--- 89,100 ----
    gain_entry_t* prevLink;
    int temp = sim_node();
+   
+   if (src > TOSSIM_MAX_NODES) {
+     src = TOSSIM_MAX_NODES;
+   }
+ 
    sim_set_node(src);
      
!   current = sim_gain_first(src);
    prevLink = NULL;
      
***************
*** 108,111 ****
--- 119,125 ----
  
  void sim_gain_set_noise_floor(int node, double mean, double range) __attribute__ ((C, spontaneous))  {
+   if (node > TOSSIM_MAX_NODES) {
+     node = TOSSIM_MAX_NODES;
+   }
    noise[node].mean = mean;
    noise[node].range = range;
***************
*** 113,120 ****
--- 127,140 ----
  
  double sim_gain_noise_mean(int node) {
+   if (node > TOSSIM_MAX_NODES) {
+     node = TOSSIM_MAX_NODES;
+   }
    return noise[node].mean;
  }
  
  double sim_gain_noise_range(int node) {
+   if (node > TOSSIM_MAX_NODES) {
+     node = TOSSIM_MAX_NODES;
+   }
    return noise[node].range;
  }
***************
*** 123,128 ****
  // [mean-range, mean+range].
  double sim_gain_sample_noise(int node)  __attribute__ ((C, spontaneous)) {
!   double val = noise[node].mean;
!   double adjust = (sim_random() % 2000000);
    adjust /= 1000000.0;
    adjust -= 1.0;
--- 143,152 ----
  // [mean-range, mean+range].
  double sim_gain_sample_noise(int node)  __attribute__ ((C, spontaneous)) {
!   double val, adjust;
!   if (node > TOSSIM_MAX_NODES) {
!     node = TOSSIM_MAX_NODES;
!   } 
!   val = noise[node].mean;
!   adjust = (sim_random() % 2000000);
    adjust /= 1000000.0;
    adjust -= 1.0;