[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/GGB/apps/TestStraw TestStraw.h, NONE, 1.1 TestStraw.nc, NONE, 1.1 TestStrawM.nc, NONE, 1.1 Makefile, 1.1, 1.2 README, 1.2, 1.3 DataCollector.h, 1.2, NONE DataCollector.nc, 1.1, NONE DataCollectorM.nc, 1.1, NONE

[Sukun Kim]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/TestStraw
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5932

Modified Files:
	Makefile README 
Added Files:
	TestStraw.h TestStraw.nc TestStrawM.nc 
Removed Files:
	DataCollector.h DataCollector.nc DataCollectorM.nc 
Log Message:


--- NEW FILE: TestStraw.h ---
enum {
  EEPROM_ID = unique("ByteEEPROM"),
  STRAW_ID = 2,
  EEPROM_USAGE = 50000,
};


--- NEW FILE: TestStraw.nc ---
includes TestStraw;
configuration TestStraw
{
}
implementation
{
  components Main, TestStrawM, StrawC, ByteEEPROM;

  Main.StdControl -> TestStrawM;
  Main.StdControl -> StrawC;
  Main.StdControl -> ByteEEPROM;

  TestStrawM.Straw -> StrawC.Straw[STRAW_ID];
  TestStrawM.ReadData -> ByteEEPROM.ReadData[EEPROM_ID];
  TestStrawM.AllocationReq -> ByteEEPROM.AllocationReq[EEPROM_ID];
}


--- NEW FILE: TestStrawM.nc ---
module TestStrawM
{
  provides {
    interface StdControl;
  }
  uses {
    interface Straw;
    interface ReadData;
    interface AllocationReq;
  }
}
implementation
{
  event result_t ReadData.readDone(uint8_t *buffer, uint32_t numBytesRead,
    result_t success) {
    return call Straw.readDone(success);
  }

  event result_t Straw.read(uint32_t start, uint32_t size, uint8_t* bffr) {
    return call ReadData.read(start, bffr, size);
  }

  event result_t AllocationReq.requestProcessed(result_t success) {
    return SUCCESS;
  }

  command result_t StdControl.init() {
    call AllocationReq.request(EEPROM_USAGE);
    return SUCCESS;
  }
  command result_t StdControl.start() {
    return SUCCESS;
  }
  command result_t StdControl.stop() {
    return SUCCESS;
  }
}


Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/TestStraw/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	19 May 2005 04:11:45 -0000	1.1
--- Makefile	1 Dec 2006 01:04:55 -0000	1.2
***************
*** 1,6 ****
  COMPONENT=DataCollector
  
! PFLAGS += -I%T/lib/Queue -I%T/lib/MintRoute
  PFLAGS += -I%T/lib/Broadcast
  PFLAGS += -I../../tos/lib/Straw
  
--- 1,7 ----
  COMPONENT=DataCollector
  
! PFLAGS += -I%T/lib/Queue
  PFLAGS += -I%T/lib/Broadcast
+ PFLAGS += -I%T/lib/MintRoute
  PFLAGS += -I../../tos/lib/Straw
  

Index: README
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/TestStraw/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README	9 Nov 2005 03:43:20 -0000	1.2
--- README	1 Dec 2006 01:04:55 -0000	1.3
***************
*** 1,2 ****
! Please look at tinyos-1.x/contrib/GGB/tools/java/net/tinyos/straw/README
! 
--- 1 ----
! A program testing Straw

--- DataCollector.h DELETED ---

--- DataCollector.nc DELETED ---

--- DataCollectorM.nc DELETED ---