[Tinyos-commits] CVS: tinyos-1.x/apps/CountRadio CountMsg.h, 1.3, 1.4 CountDualAckC.nc, 1.2, 1.3 CountDualC.nc, 1.2, 1.3 CountReceiveC.nc, 1.2, 1.3 CountSendC.nc, 1.2, 1.3 CountSleepRadioC.nc, 1.3, 1.4

[Joe Polastre]

Update of /cvsroot/tinyos/tinyos-1.x/apps/CountRadio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15527

Modified Files:
	CountMsg.h CountDualAckC.nc CountDualC.nc CountReceiveC.nc 
	CountSendC.nc CountSleepRadioC.nc 
Log Message:
change header file and apps so that you can easily use mig with
the CountRadio apps


Index: CountMsg.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/apps/CountRadio/CountMsg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CountMsg.h	30 May 2004 20:48:46 -0000	1.3
--- CountMsg.h	15 Sep 2005 00:37:10 -0000	1.4
***************
*** 25,32 ****
  enum
  {
!   AM_COUNT_MSG = 4,
  };
  
! typedef struct
  {
    uint16_t n;
--- 25,32 ----
  enum
  {
!   AM_COUNTMSG = 4,
  };
  
! typedef struct CountMsg
  {
    uint16_t n;

Index: CountDualAckC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/apps/CountRadio/CountDualAckC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CountDualAckC.nc	30 May 2004 20:48:46 -0000	1.2
--- CountDualAckC.nc	15 Sep 2005 00:37:10 -0000	1.3
***************
*** 47,52 ****
  
    CountDualAckM.Timer -> TimerC.Timer[unique("Timer")];
!   CountDualAckM.SendMsg -> GenericComm.SendMsg[AM_COUNT_MSG];
!   CountDualAckM.ReceiveMsg -> GenericComm.ReceiveMsg[AM_COUNT_MSG];
    CountDualAckM.Leds -> LedsC.Leds;
    CountDualAckM.MacControl -> CC2420RadioC;
--- 47,52 ----
  
    CountDualAckM.Timer -> TimerC.Timer[unique("Timer")];
!   CountDualAckM.SendMsg -> GenericComm.SendMsg[AM_COUNTMSG];
!   CountDualAckM.ReceiveMsg -> GenericComm.ReceiveMsg[AM_COUNTMSG];
    CountDualAckM.Leds -> LedsC.Leds;
    CountDualAckM.MacControl -> CC2420RadioC;

Index: CountDualC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/apps/CountRadio/CountDualC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CountDualC.nc	30 May 2004 20:48:46 -0000	1.2
--- CountDualC.nc	15 Sep 2005 00:37:10 -0000	1.3
***************
*** 46,51 ****
  
    CountDualM.Timer -> TimerC.Timer[unique("Timer")];
!   CountDualM.SendMsg -> GenericComm.SendMsg[AM_COUNT_MSG];
!   CountDualM.ReceiveMsg -> GenericComm.ReceiveMsg[AM_COUNT_MSG];
    CountDualM.Leds -> LedsC.Leds;
  }
--- 46,51 ----
  
    CountDualM.Timer -> TimerC.Timer[unique("Timer")];
!   CountDualM.SendMsg -> GenericComm.SendMsg[AM_COUNTMSG];
!   CountDualM.ReceiveMsg -> GenericComm.ReceiveMsg[AM_COUNTMSG];
    CountDualM.Leds -> LedsC.Leds;
  }

Index: CountReceiveC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/apps/CountRadio/CountReceiveC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CountReceiveC.nc	30 May 2004 20:48:46 -0000	1.2
--- CountReceiveC.nc	15 Sep 2005 00:37:10 -0000	1.3
***************
*** 42,46 ****
    Main.StdControl -> GenericComm;
  
!   CountReceiveM.ReceiveMsg -> GenericComm.ReceiveMsg[AM_COUNT_MSG];
    CountReceiveM.Leds -> LedsC.Leds;
  }
--- 42,46 ----
    Main.StdControl -> GenericComm;
  
!   CountReceiveM.ReceiveMsg -> GenericComm.ReceiveMsg[AM_COUNTMSG];
    CountReceiveM.Leds -> LedsC.Leds;
  }

Index: CountSendC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/apps/CountRadio/CountSendC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CountSendC.nc	30 May 2004 20:48:46 -0000	1.2
--- CountSendC.nc	15 Sep 2005 00:37:10 -0000	1.3
***************
*** 45,49 ****
  
    CountSendM.Timer -> TimerC.Timer[unique("Timer")];
!   CountSendM.SendMsg -> GenericComm.SendMsg[AM_COUNT_MSG];
    CountSendM.Leds -> LedsC.Leds;
  }
--- 45,49 ----
  
    CountSendM.Timer -> TimerC.Timer[unique("Timer")];
!   CountSendM.SendMsg -> GenericComm.SendMsg[AM_COUNTMSG];
    CountSendM.Leds -> LedsC.Leds;
  }

Index: CountSleepRadioC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/apps/CountRadio/CountSleepRadioC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CountSleepRadioC.nc	24 Sep 2004 22:52:41 -0000	1.3
--- CountSleepRadioC.nc	15 Sep 2005 00:37:10 -0000	1.4
***************
*** 35,39 ****
  
    CountSleepRadioM.CommControl -> Comm;
!   CountSleepRadioM.SendMsg -> Comm.SendMsg[AM_COUNT_MSG];
    CountSleepRadioM.Timer -> TimerC.Timer[unique("Timer")];
    CountSleepRadioM.Leds -> LedsC.Leds;
--- 35,39 ----
  
    CountSleepRadioM.CommControl -> Comm;
!   CountSleepRadioM.SendMsg -> Comm.SendMsg[AM_COUNTMSG];
    CountSleepRadioM.Timer -> TimerC.Timer[unique("Timer")];
    CountSleepRadioM.Leds -> LedsC.Leds;