[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/imote/imotelib ArmStub.o, 1.2, 1.3 ArmStublib.a, 1.1, 1.2 BP_BufferSramVar.o, 1.2, 1.3 BP_DummyXramVar.o, 1.2, 1.3 TOSlib.a, 1.2, 1.3 ZvDosFlashTool.exe, 1.1, 1.2 ZvDynamicScript.sp, 1.1, 1.2 motelib.a, 1.2, 1.3 motelib.h, 1.1, 1.2

[Lama Nachman]

Update of /cvsroot/tinyos/tinyos-1.x/beta/platform/imote/imotelib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26600

Modified Files:
	ArmStub.o ArmStublib.a BP_BufferSramVar.o BP_DummyXramVar.o 
	TOSlib.a ZvDosFlashTool.exe ZvDynamicScript.sp motelib.a 
	motelib.h 
Log Message:
New Imote release, v2.0


Index: ArmStub.o
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote/imotelib/ArmStub.o,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsYSlggo and /tmp/cvsTwpgjM differ

Index: ArmStublib.a
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote/imotelib/ArmStublib.a,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs23ICus and /tmp/cvsVQUfHQ differ

Index: BP_BufferSramVar.o
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote/imotelib/BP_BufferSramVar.o,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsqpvBgv and /tmp/cvsxHnLAT differ

Index: BP_DummyXramVar.o
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote/imotelib/BP_DummyXramVar.o,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvs5S1k3y and /tmp/cvs9slfrX differ

Index: TOSlib.a
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote/imotelib/TOSlib.a,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvs6ewqky and /tmp/cvsxxkTLW differ

Index: ZvDosFlashTool.exe
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote/imotelib/ZvDosFlashTool.exe,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs8zCCNB and /tmp/cvsVZpki0 differ

Index: ZvDynamicScript.sp
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote/imotelib/ZvDynamicScript.sp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ZvDynamicScript.sp	29 Jun 2004 14:56:15 -0000	1.1
--- ZvDynamicScript.sp	6 Sep 2005 08:24:15 -0000	1.2
***************
*** 91,95 ****
  
  % Deep Sleep
! System_DeepSleepEnable                  bool   ,  false ;
  System_12MCrystalWakeupDelay_TC2000     uint16 ,  32    ; % ms , max 32 ms
  System_12MCrystalWakeupDelay_TC2001     uint16 ,  13    ; % ms , max 32 ms
--- 91,95 ----
  
  % Deep Sleep
! System_DeepSleepEnable                  bool   ,  true ;
  System_12MCrystalWakeupDelay_TC2000     uint16 ,  32    ; % ms , max 32 ms
  System_12MCrystalWakeupDelay_TC2001     uint16 ,  13    ; % ms , max 32 ms
***************
*** 273,278 ****
  % ------------------------------------------------------------------------------
  
! BP_BufMemPoolBlocks                     uint8  ,  0   ;
! BP_BufMemPoolBlockSize                  uint16 ,  0   ;
  
  % ------------------------------------------------------------------------------
--- 273,278 ----
  % ------------------------------------------------------------------------------
  
! BP_BufMemPoolBlocks                     uint8  ,  12    ; % was 64
! BP_BufMemPoolBlockSize                  uint16 ,  128   ; % was 200
  
  % ------------------------------------------------------------------------------

Index: motelib.a
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote/imotelib/motelib.a,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsTokbpE and /tmp/cvsfdfs62 differ

Index: motelib.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote/imotelib/motelib.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** motelib.h	29 Jun 2004 14:56:15 -0000	1.1
--- motelib.h	6 Sep 2005 08:24:15 -0000	1.2
***************
*** 19,22 ****
--- 19,23 ----
  #include "Signals.h"
  #include "BlueOS.h"
+ #include "Config.h"
  
  /*
***************
*** 28,32 ****
  
  #define MAX_TOS_BUFFER_SIZE 32
! #define MAX_APP_MEMORY 0x1C00
  
  typedef struct tTOSBufferVar {
--- 29,36 ----
  
  #define MAX_TOS_BUFFER_SIZE 32
! //#define MAX_APP_MEMORY 0x2D00
! // reduce app memory by 1.5K to free up space for flash write buffers
! #define MAX_APP_MEMORY 0x2700
! 
  
  typedef struct tTOSBufferVar {
***************
*** 34,51 ****
    char UARTRxBuffer[MAX_TOS_BUFFER_SIZE];
    char AppMemory[MAX_APP_MEMORY];
- // BT buffers reduced to fit in BRAM limit.  Increase after removing BlueOS
- // trying to increase size - changed from 300 to 100 below
-   char BTTxBuffer[10+10*(339+64+10)]; //max BT data plus arbitrary header size
-   char BTRxBuffer[339 + 64]; //max BT data plus arbitrary header size
  } tTOSBufferVar;
  
  extern tTOSBufferVar *TOSBuffer;
  
  void HardwareInitialize ();
  int InitializeMainUart(uint8 baudrate);
! void SetNextReceiveBuffer(uint8 *newRxBuffer, uint16 newRxSize);
  void DisableMainUart();
! void MainUartTransmit(uint8 *data, uint16 bytes) ;
! //void MainUartTransmit();
  void StartRTOSClock() ;
  void StopRTOSClock() ;
--- 38,68 ----
    char UARTRxBuffer[MAX_TOS_BUFFER_SIZE];
    char AppMemory[MAX_APP_MEMORY];
  } tTOSBufferVar;
  
+ void trace(long long mode, const char *format, ...);
+ void trace_unset();
+ void trace_set(long long mode);
+ 
  extern tTOSBufferVar *TOSBuffer;
  
  void HardwareInitialize ();
+ //UART initialization functions
  int InitializeMainUart(uint8 baudrate);
! int InitializeDebugUart(uint8 baudrate);
! int InitializedMainUartDMA();
! 
! //UART cleanup functions
  void DisableMainUart();
! 
! //UART receive funtions for DMA
! void SetupMainUartDMAReceive(uint8 *newRxBuffer, uint16 newRxSize);
! 
! //UART transmission functions
! void MainUartDMATransmit(uint8 *data, uint16 bytes);
! void MainUartTransmit(uint8 data);
! void DebugUartTransmit(uint8 data);
! void DebugPrintf(char *buf, char *formatstr, ...);
! 
! //the following functions are used by the original TimerM implementation
  void StartRTOSClock() ;
  void StopRTOSClock() ;
***************
*** 53,56 ****
--- 70,78 ----
  uint32 GetRTOSClockValue();
  
+ //the following functions are used by the new TimerM implementation.  Do NOT
+ //mix and match functions
+ void InitRTOSTimer();
+ void SetRTOSInterval(uint32 val);
+ 
  void InitializeGPIOInterrupt() ;
  void EnableGPIOInterrupt() ;