[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net DisseminationEngine.h, 1.1.2.2, 1.1.2.3 DisseminationEngineP.nc, 1.1.2.1, 1.1.2.2

[Phil Levis]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	DisseminationEngine.h DisseminationEngineP.nc 
Log Message:
Changed structure names so that MIG can work.
Added required #includes so MIG can work.


Index: DisseminationEngine.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Attic/DisseminationEngine.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** DisseminationEngine.h	16 Mar 2006 19:57:46 -0000	1.1.2.2
--- DisseminationEngine.h	2 Jun 2006 20:52:42 -0000	1.1.2.3
***************
*** 39,48 ****
  
  enum {
!   AM_DISSEMINATION = 13,
!   AM_DISSEMINATION_PROBE = 14,
    DISSEMINATION_SEQNO_UNKNOWN = 0,
  };
  
! typedef nx_struct dissemination_message_t {
    nx_uint16_t key;
    nx_uint32_t seqno;
--- 39,48 ----
  
  enum {
!   AM_DISSEMINATION_MESSAGE = 13,
!   AM_DISSEMINATION_PROBE_MESSAGE = 14,
    DISSEMINATION_SEQNO_UNKNOWN = 0,
  };
  
! typedef nx_struct dissemination_message {
    nx_uint16_t key;
    nx_uint32_t seqno;
***************
*** 50,54 ****
  } dissemination_message_t;
  
! typedef nx_struct dissemination_probe_message_t {
    nx_uint16_t key;
  } dissemination_probe_message_t;
--- 50,54 ----
  } dissemination_message_t;
  
! typedef nx_struct dissemination_probe_message {
    nx_uint16_t key;
  } dissemination_probe_message_t;

Index: DisseminationEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Attic/DisseminationEngineP.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** DisseminationEngineP.nc	2 Mar 2006 22:08:53 -0000	1.1.2.1
--- DisseminationEngineP.nc	2 Jun 2006 20:52:42 -0000	1.1.2.2
***************
*** 60,76 ****
  
    components ActiveMessageC;
-   MainC.SoftwareInit -> ActiveMessageC;
    DisseminationEngineImplP.RadioControl -> ActiveMessageC;
  
!   components new AMSenderC(AM_DISSEMINATION) as DisseminationSendC;
    DisseminationEngineImplP.AMSend -> DisseminationSendC.AMSend;
  
!   components new AMReceiverC(AM_DISSEMINATION) as DisseminationReceiveC;
    DisseminationEngineImplP.Receive -> DisseminationReceiveC.Receive;
  
!   components new AMSenderC(AM_DISSEMINATION_PROBE) as DisseminationProbeSendC;
    DisseminationEngineImplP.ProbeAMSend -> DisseminationProbeSendC.AMSend;
  
!   components new AMReceiverC(AM_DISSEMINATION_PROBE) 
      as DisseminationProbeReceiveC;
    DisseminationEngineImplP.ProbeReceive -> DisseminationProbeReceiveC.Receive;
--- 60,75 ----
  
    components ActiveMessageC;
    DisseminationEngineImplP.RadioControl -> ActiveMessageC;
  
!   components new AMSenderC(AM_DISSEMINATION_MESSAGE) as DisseminationSendC;
    DisseminationEngineImplP.AMSend -> DisseminationSendC.AMSend;
  
!   components new AMReceiverC(AM_DISSEMINATION_MESSAGE) as DisseminationReceiveC;
    DisseminationEngineImplP.Receive -> DisseminationReceiveC.Receive;
  
!   components new AMSenderC(AM_DISSEMINATION_PROBE_MESSAGE) as DisseminationProbeSendC;
    DisseminationEngineImplP.ProbeAMSend -> DisseminationProbeSendC.AMSend;
  
!   components new AMReceiverC(AM_DISSEMINATION_PROBE_MESSAGE) 
      as DisseminationProbeReceiveC;
    DisseminationEngineImplP.ProbeReceive -> DisseminationProbeReceiveC.Receive;