[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tossim SimMainP.nc, 1.2, 1.3 SimMoteP.nc, 1.4, 1.5 TossimActiveMessageC.nc, 1.4, 1.5

[David Gay]

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

Modified Files:
	SimMainP.nc SimMoteP.nc TossimActiveMessageC.nc 
Log Message:
don't use __attribute__ for nesC attributes


Index: SimMainP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/SimMainP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimMainP.nc	12 Jul 2006 17:02:32 -0000	1.2
--- SimMainP.nc	8 Oct 2007 20:10:09 -0000	1.3
***************
*** 41,45 ****
  implementation {
  
!   int sim_main_start_mote() __attribute__ ((C, spontaneous)) {
      char timeBuf[128];
      atomic {
--- 41,45 ----
  implementation {
  
!   int sim_main_start_mote() @C() @spontaneous() {
      char timeBuf[128];
      atomic {

Index: SimMoteP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/SimMoteP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimMoteP.nc	12 Dec 2006 18:23:32 -0000	1.4
--- SimMoteP.nc	8 Oct 2007 20:10:09 -0000	1.5
***************
*** 80,84 ****
  
    
!   long long int sim_mote_euid(int mote) __attribute__ ((C, spontaneous)) {
      long long int result;
      int tmp = sim_node();
--- 80,84 ----
  
    
!   long long int sim_mote_euid(int mote) @C() @spontaneous() {
      long long int result;
      int tmp = sim_node();
***************
*** 89,93 ****
    }
  
!   void sim_mote_set_euid(int mote, long long int id)  __attribute__ ((C, spontaneous)) {
      int tmp = sim_node();
      sim_set_node(mote);
--- 89,93 ----
    }
  
!   void sim_mote_set_euid(int mote, long long int id)  @C() @spontaneous() {
      int tmp = sim_node();
      sim_set_node(mote);
***************
*** 96,100 ****
    }
    
!   long long int sim_mote_start_time(int mote) __attribute__ ((C, spontaneous)) {
      long long int result;
      int tmp = sim_node();
--- 96,100 ----
    }
    
!   long long int sim_mote_start_time(int mote) @C() @spontaneous() {
      long long int result;
      int tmp = sim_node();
***************
*** 105,109 ****
    }
  
!   int sim_mote_get_variable_info(int mote, char* name, void** ptr, size_t* len) __attribute__ ((C, spontaneous)) {
      int result;
      int tmpID = sim_node();
--- 105,109 ----
    }
  
!   int sim_mote_get_variable_info(int mote, char* name, void** ptr, size_t* len) @C() @spontaneous() {
      int result;
      int tmpID = sim_node();
***************
*** 115,119 ****
    }
    
!   void sim_mote_set_start_time(int mote, long long int t) __attribute__ ((C, spontaneous)) {
      int tmpID = sim_node();
      sim_set_node(mote);
--- 115,119 ----
    }
    
!   void sim_mote_set_start_time(int mote, long long int t) @C() @spontaneous() {
      int tmpID = sim_node();
      sim_set_node(mote);
***************
*** 124,128 ****
    }
    
!   bool sim_mote_is_on(int mote) __attribute__ ((C, spontaneous)) {
      bool result;
      int tmp = sim_node();
--- 124,128 ----
    }
    
!   bool sim_mote_is_on(int mote) @C() @spontaneous() {
      bool result;
      int tmp = sim_node();
***************
*** 133,137 ****
    }
    
!   void sim_mote_turn_on(int mote) __attribute__ ((C, spontaneous)) {
      int tmp = sim_node();
      sim_set_node(mote);
--- 133,137 ----
    }
    
!   void sim_mote_turn_on(int mote) @C() @spontaneous() {
      int tmp = sim_node();
      sim_set_node(mote);
***************
*** 140,144 ****
    }
    
!   void sim_mote_turn_off(int mote) __attribute__ ((C, spontaneous)) {
      int tmp = sim_node();
      sim_set_node(mote);
--- 140,144 ----
    }
    
!   void sim_mote_turn_off(int mote) @C() @spontaneous() {
      int tmp = sim_node();
      sim_set_node(mote);
***************
*** 156,160 ****
    }
    
!   void sim_mote_enqueue_boot_event(int mote) __attribute__ ((C, spontaneous)) {
      int tmp = sim_node();
      sim_set_node(mote);
--- 156,160 ----
    }
    
!   void sim_mote_enqueue_boot_event(int mote) @C() @spontaneous() {
      int tmp = sim_node();
      sim_set_node(mote);

Index: TossimActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/TossimActiveMessageC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TossimActiveMessageC.nc	25 Sep 2007 00:07:59 -0000	1.4
--- TossimActiveMessageC.nc	8 Oct 2007 20:10:09 -0000	1.5
***************
*** 244,248 ****
   }
   
!  void active_message_deliver(int node, message_t* msg, sim_time_t t) __attribute__ ((C, spontaneous)) {
     sim_event_t* evt = allocate_deliver_event(node, msg, t);
     sim_queue_insert(evt);
--- 244,248 ----
   }
   
!  void active_message_deliver(int node, message_t* msg, sim_time_t t) @C() @spontaneous() {
     sim_event_t* evt = allocate_deliver_event(node, msg, t);
     sim_queue_insert(evt);