[Tinyos-commits] CVS: tinyos-1.x/tos/lib/VM/languages/motlle/matelib MotlleMultihop.h, NONE, 1.1 FNmhop.nc, 1.5, 1.6 FNmhopM.nc, 1.5, 1.6 FNquery.nc, 1.5, 1.6

[David Gay]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/matelib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15505

Modified Files:
	FNmhop.nc FNmhopM.nc FNquery.nc 
Added Files:
	MotlleMultihop.h 
Log Message:
telosb fixes


--- NEW FILE: MotlleMultihop.h ---
/*
 * Copyright (c) 2004-2005 Intel Corporation
 * All rights reserved.
 *
 * This file is distributed under the terms in the attached INTEL-LICENSE     
 * file. If you do not find these files, copies can be found by writing to
 * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
 * 94704.  Attention:  Intel License Inquiry.
 */

#ifndef MOTLLEMULTIHOP_H
#define MOTLLEMULTIHOP_H

/* Pick a multi-hop router appropriate for your platform */
#if defined(PLATFORM_MICA2) || defined(PLATFORM_MICA2DOT)

#define ROUTER WMEWMAMultiHopRouter

#elif defined(PLATFORM_TELOS) || defined(PLATFORM_TELOSB) || defined(PLATFORM_MICAZ)
  
#define ROUTER LQIMultiHopRouter

#else
#error "Unsupported platform. Add appropriate definitions to this file (MotlleMultihop.h)"
#endif

#endif

Index: FNmhop.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/matelib/FNmhop.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FNmhop.nc	1 Nov 2005 02:28:11 -0000	1.5
--- FNmhop.nc	29 Nov 2005 22:51:28 -0000	1.6
***************
*** 8,11 ****
--- 8,14 ----
   * 94704.  Attention:  Intel License Inquiry.
   */
+ 
+ #include "MotlleMultihop.h"
+ 
  configuration FNmhop {
    provides {
***************
*** 22,28 ****
    components FNmhopM, MProxy, MContextSynchProxy as ContextSynch, MateEngine as VM;
    components MHandlerStoreProxy as Store;
!   components WMEWMAMultiHopRouter as Mhop, GenericCommPromiscuous as Comm, QueuedSend;
    components CC1000RadioC as Radio, HPLPowerManagementM;
  
    InterceptMsg = FNmhopM.InterceptMsg;
    SnoopMsg = FNmhopM.SnoopMsg;
--- 25,36 ----
    components FNmhopM, MProxy, MContextSynchProxy as ContextSynch, MateEngine as VM;
    components MHandlerStoreProxy as Store;
!   components ROUTER as Mhop, GenericCommPromiscuous as Comm, QueuedSend;
! #ifdef LPL
    components CC1000RadioC as Radio, HPLPowerManagementM;
  
+   FNmhopM.LowPowerListening -> Radio;
+   FNmhopM.PowerMgmtEnable -> HPLPowerManagementM.Enable;
+ #endif
+ 
    InterceptMsg = FNmhopM.InterceptMsg;
    SnoopMsg = FNmhopM.SnoopMsg;
***************
*** 56,63 ****
  
    FNmhopM.CommControl -> Comm;
-   FNmhopM.CC1000Control -> Radio;
- #ifdef LPL
-   FNmhopM.LowPowerListening -> Radio;
-   FNmhopM.PowerMgmtEnable -> HPLPowerManagementM.Enable;
- #endif
  }
--- 64,66 ----

Index: FNmhopM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/matelib/FNmhopM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FNmhopM.nc	1 Nov 2005 02:28:11 -0000	1.5
--- FNmhopM.nc	29 Nov 2005 22:51:28 -0000	1.6
***************
*** 36,40 ****
      interface RouteControl;
      interface CommControl;
-     interface CC1000Control;
  #ifdef LPL
      interface LowPowerListening;
--- 36,39 ----
***************
*** 79,83 ****
    command result_t StdControl.start() {
      call CommControl.setPromiscuous(TRUE);
-     call CC1000Control.SetRFPower(255);
  #ifdef LPL
  #ifndef RADIO_XMIT_POWER
--- 78,81 ----

Index: FNquery.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/matelib/FNquery.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FNquery.nc	1 Nov 2005 02:28:11 -0000	1.5
--- FNquery.nc	29 Nov 2005 22:51:28 -0000	1.6
***************
*** 8,11 ****
--- 8,14 ----
   * 94704.  Attention:  Intel License Inquiry.
   */
+ 
+ #include "MotlleMultihop.h"
+ 
  configuration FNquery {
    provides {
***************
*** 18,22 ****
  implementation {
    components FNqueryM, MProxy, MContextSynchProxy as ContextSynch, MateEngine as VM;
!   components MHandlerStoreProxy as Store, WMEWMAMultiHopRouter as Mhop;
  
    Epoch = FNqueryM.Epoch;
--- 21,25 ----
  implementation {
    components FNqueryM, MProxy, MContextSynchProxy as ContextSynch, MateEngine as VM;
!   components MHandlerStoreProxy as Store, ROUTER as Mhop;
  
    Epoch = FNqueryM.Epoch;