[Tinyos-beta-commits]
CVS: tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb
app.c, 1.15, 1.16 ident_flags.txt, 1.15, 1.16 main.exe, 1.15,
1.16 main.ihex, 1.15, 1.16
Jonathan Hui
jwhui at users.sourceforge.net
Tue Jul 12 15:10:37 PDT 2005
Update of /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1222/build/telosb
Modified Files:
app.c ident_flags.txt main.exe main.ihex
Log Message:
- Reduced code size to 1960 bytes.
Index: app.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/app.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** app.c 12 Jul 2005 20:09:09 -0000 1.15
--- app.c 12 Jul 2005 22:10:32 -0000 1.16
***************
*** 1082,1090 ****
static result_t InternalFlashC$InternalFlash$read(void *arg_0x1a8c2180, void *arg_0x1a8c2310, uint16_t arg_0x1a8c2490);
static result_t InternalFlashC$InternalFlash$write(void *arg_0x1a8c39b8, void *arg_0x1a8c3b48, uint16_t arg_0x1a8c3cc8);
static void LedsC$Leds$set(uint8_t arg_0x1a8d78d0);
static result_t PowerOffM$StdControl$init(void);
static result_t PowerOffM$StdControl$start(void);
static result_t PowerOffM$StdControl$stop(void);
! static void STM25PM$TOSBootExtFlash$startRead(uint32_t arg_0x1a8d3d20);
static void STM25PM$TOSBootExtFlash$stopRead(void);
static uint8_t STM25PM$TOSBootExtFlash$readByte(void);
--- 1082,1092 ----
static result_t InternalFlashC$InternalFlash$read(void *arg_0x1a8c2180, void *arg_0x1a8c2310, uint16_t arg_0x1a8c2490);
static result_t InternalFlashC$InternalFlash$write(void *arg_0x1a8c39b8, void *arg_0x1a8c3b48, uint16_t arg_0x1a8c3cc8);
+ static void LedsC$Leds$glow(uint8_t arg_0x1a8d61b0, uint8_t arg_0x1a8d6328);
+ static void LedsC$Leds$flash(uint8_t arg_0x1a8d7d30);
static void LedsC$Leds$set(uint8_t arg_0x1a8d78d0);
static result_t PowerOffM$StdControl$init(void);
static result_t PowerOffM$StdControl$start(void);
static result_t PowerOffM$StdControl$stop(void);
! static void STM25PM$TOSBootExtFlash$startRead(uint32_t arg_0x1a8d2918);
static void STM25PM$TOSBootExtFlash$stopRead(void);
static uint8_t STM25PM$TOSBootExtFlash$readByte(void);
***************
*** 1095,1107 ****
static void HPLUSART0M$HPLUSARTControl$setModeSPI(void);
static result_t HPLUSART0M$HPLUSARTControl$isTxIntrPending(void);
! static void HPLUSART0M$HPLUSARTControl$tx(uint8_t arg_0x1a981908);
static uint8_t HPLUSART0M$HPLUSARTControl$rx(void);
static result_t HPLUSART0M$HPLUSARTControl$isRxIntrPending(void);
! static result_t ProgFlashM$ProgFlash$write(uint32_t arg_0x1a8e6928, uint8_t *arg_0x1a8e6ac0, uint16_t arg_0x1a8e6c40);
static bool VoltageC$Voltage$okToProgram(void);
# 32 "TOSBootProgFlash.nc"
! static result_t TOSBootM$ProgFlash$write(uint32_t arg_0x1a8e6928, uint8_t *arg_0x1a8e6ac0, uint16_t arg_0x1a8e6c40);
# 32 "TOSBootExtFlash.nc"
! static void TOSBootM$ExtFlash$startRead(uint32_t arg_0x1a8d3d20);
static void TOSBootM$ExtFlash$stopRead(void);
--- 1097,1109 ----
static void HPLUSART0M$HPLUSARTControl$setModeSPI(void);
static result_t HPLUSART0M$HPLUSARTControl$isTxIntrPending(void);
! static void HPLUSART0M$HPLUSARTControl$tx(uint8_t arg_0x1a980ce0);
static uint8_t HPLUSART0M$HPLUSARTControl$rx(void);
static result_t HPLUSART0M$HPLUSARTControl$isRxIntrPending(void);
! static result_t ProgFlashM$ProgFlash$write(uint32_t arg_0x1a8e5528, uint8_t *arg_0x1a8e56c0, uint16_t arg_0x1a8e5840);
static bool VoltageC$Voltage$okToProgram(void);
# 32 "TOSBootProgFlash.nc"
! static result_t TOSBootM$ProgFlash$write(uint32_t arg_0x1a8e5528, uint8_t *arg_0x1a8e56c0, uint16_t arg_0x1a8e5840);
# 32 "TOSBootExtFlash.nc"
! static void TOSBootM$ExtFlash$startRead(uint32_t arg_0x1a8d2918);
static void TOSBootM$ExtFlash$stopRead(void);
***************
*** 1127,1131 ****
# 32 "Voltage.nc"
static bool TOSBootM$Voltage$okToProgram(void);
! # 32 "Leds.nc"
static void TOSBootM$Leds$set(uint8_t arg_0x1a8d78d0);
# 3 "Exec.nc"
--- 1129,1137 ----
# 32 "Voltage.nc"
static bool TOSBootM$Voltage$okToProgram(void);
! # 34 "Leds.nc"
! static void TOSBootM$Leds$glow(uint8_t arg_0x1a8d61b0, uint8_t arg_0x1a8d6328);
! #line 33
! static void TOSBootM$Leds$flash(uint8_t arg_0x1a8d7d30);
! #line 32
static void TOSBootM$Leds$set(uint8_t arg_0x1a8d78d0);
# 3 "Exec.nc"
***************
*** 1148,1154 ****
static void TOSBootM$startupLeds(void);
! #line 73
! static void TOSBootM$codeNotify(uint8_t output);
! #line 88
static uint32_t TOSBootM$extFlashRead32(void);
--- 1154,1166 ----
static void TOSBootM$startupLeds(void);
!
!
!
!
!
!
!
!
!
static uint32_t TOSBootM$extFlashRead32(void);
***************
*** 1160,1166 ****
static inline bool TOSBootM$verifyImage(uint32_t startAddr);
! #line 143
static result_t TOSBootM$programImage(uint32_t startAddr);
! #line 198
static inline void TOSBootM$reboot(void);
--- 1172,1178 ----
static inline bool TOSBootM$verifyImage(uint32_t startAddr);
! #line 116
static result_t TOSBootM$programImage(uint32_t startAddr);
! #line 171
static inline void TOSBootM$reboot(void);
***************
*** 1174,1178 ****
static inline void TOSBootM$startupSequence(void);
! #line 261
int main(void);
# 36 "msp430/ExecC.nc"
--- 1186,1190 ----
static inline void TOSBootM$startupSequence(void);
! #line 234
int main(void);
# 36 "msp430/ExecC.nc"
***************
*** 1208,1218 ****
static void LedsC$Leds$set(uint8_t ledsOn);
# 78 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/interfaces/StdControl.nc"
static result_t PowerOffM$SubControl$stop(void);
! # 32 "Leds.nc"
! static void PowerOffM$Leds$set(uint8_t arg_0x1a8d78d0);
# 43 "msp430/PowerOffM.nc"
static inline void PowerOffM$haltsystem(void);
! #line 67
static inline result_t PowerOffM$StdControl$init(void);
--- 1220,1234 ----
static void LedsC$Leds$set(uint8_t ledsOn);
+ #line 58
+ static void LedsC$Leds$flash(uint8_t a);
+ #line 70
+ static void LedsC$Leds$glow(uint8_t a, uint8_t b);
# 78 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/interfaces/StdControl.nc"
static result_t PowerOffM$SubControl$stop(void);
! # 34 "Leds.nc"
! static void PowerOffM$Leds$glow(uint8_t arg_0x1a8d61b0, uint8_t arg_0x1a8d6328);
# 43 "msp430/PowerOffM.nc"
static inline void PowerOffM$haltsystem(void);
! #line 60
static inline result_t PowerOffM$StdControl$init(void);
***************
*** 1220,1224 ****
static inline result_t PowerOffM$StdControl$start(void);
! #line 86
static inline result_t PowerOffM$StdControl$stop(void);
# 6 "msp430/HPLUSARTControl.nc"
--- 1236,1240 ----
static inline result_t PowerOffM$StdControl$start(void);
! #line 79
static inline result_t PowerOffM$StdControl$stop(void);
# 6 "msp430/HPLUSARTControl.nc"
***************
*** 1227,1231 ****
static result_t STM25PM$USARTControl$isTxIntrPending(void);
! static void STM25PM$USARTControl$tx(uint8_t arg_0x1a981908);
static uint8_t STM25PM$USARTControl$rx(void);
#line 9
--- 1243,1247 ----
static result_t STM25PM$USARTControl$isTxIntrPending(void);
! static void STM25PM$USARTControl$tx(uint8_t arg_0x1a980ce0);
static uint8_t STM25PM$USARTControl$rx(void);
#line 9
***************
*** 1313,1319 ****
}
! # 67 "msp430/PowerOffM.nc"
static inline result_t PowerOffM$StdControl$init(void)
! #line 67
{
return SUCCESS;
--- 1329,1335 ----
}
! # 60 "msp430/PowerOffM.nc"
static inline result_t PowerOffM$StdControl$init(void)
! #line 60
{
return SUCCESS;
***************
*** 1449,1466 ****
}
#line 63
! # 6 "msp430/hardware.h"
! static inline void wait(uint16_t t)
! #line 6
! {
! for (; t > 0; t--) ;
! }
!
! # 32 "Leds.nc"
! inline static void PowerOffM$Leds$set(uint8_t arg_0x1a8d78d0){
! #line 32
! LedsC$Leds$set(arg_0x1a8d78d0);
! #line 32
}
! #line 32
# 78 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/interfaces/StdControl.nc"
inline static result_t PowerOffM$SubControl$stop(void){
--- 1465,1475 ----
}
#line 63
! # 34 "Leds.nc"
! inline static void PowerOffM$Leds$glow(uint8_t arg_0x1a8d61b0, uint8_t arg_0x1a8d6328){
! #line 34
! LedsC$Leds$glow(arg_0x1a8d61b0, arg_0x1a8d6328);
! #line 34
}
! #line 34
# 78 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/interfaces/StdControl.nc"
inline static result_t PowerOffM$SubControl$stop(void){
***************
*** 1484,1488 ****
uint16_t _lpmreg;
- int i;
TOSH_SET_PIN_DIRECTIONS();
--- 1493,1496 ----
***************
*** 1490,1500 ****
PowerOffM$SubControl$stop();
! PowerOffM$Leds$set(0);
! for (i = 1536; i > 0; i -= 4) {
! PowerOffM$Leds$set(0x7);
! wait(i);
! PowerOffM$Leds$set(0);
! wait(1536 - i);
! }
_lpmreg = 0x0080 + 0x0040 + 0x0020 + 0x0010;
--- 1498,1502 ----
PowerOffM$SubControl$stop();
! PowerOffM$Leds$glow(0x7, 0x0);
_lpmreg = 0x0080 + 0x0040 + 0x0020 + 0x0010;
***************
*** 1525,1531 ****
}
! # 71 "msp430/PowerOffM.nc"
static inline result_t PowerOffM$StdControl$start(void)
! #line 71
{
--- 1527,1540 ----
}
! #line 6
! static inline void wait(uint16_t t)
! #line 6
! {
! for (; t > 0; t--) ;
! }
!
! # 64 "msp430/PowerOffM.nc"
static inline result_t PowerOffM$StdControl$start(void)
! #line 64
{
***************
*** 1696,1702 ****
}
#line 3
! # 86 "msp430/PowerOffM.nc"
static inline result_t PowerOffM$StdControl$stop(void)
! #line 86
{
return SUCCESS;
--- 1705,1711 ----
}
#line 3
! # 79 "msp430/PowerOffM.nc"
static inline result_t PowerOffM$StdControl$stop(void)
! #line 79
{
return SUCCESS;
***************
*** 1720,1726 ****
}
#line 78
! # 203 "TOSBootM.nc"
static inline void TOSBootM$runApp(void)
! #line 203
{
TOSBootM$SubControl$stop();
--- 1729,1735 ----
}
#line 78
! # 176 "TOSBootM.nc"
static inline void TOSBootM$runApp(void)
! #line 176
{
TOSBootM$SubControl$stop();
***************
*** 1743,1749 ****
}
#line 35
! # 198 "TOSBootM.nc"
static inline void TOSBootM$reboot(void)
! #line 198
{
WDTCTL = (((0x5A00 | 0x0008) | 0x0004) | 0x0002) | 0x0001;
--- 1752,1758 ----
}
#line 35
! # 171 "TOSBootM.nc"
static inline void TOSBootM$reboot(void)
! #line 171
{
WDTCTL = (((0x5A00 | 0x0008) | 0x0004) | 0x0002) | 0x0001;
***************
*** 1751,1754 ****
--- 1760,1770 ----
}
+ # 33 "Leds.nc"
+ inline static void TOSBootM$Leds$flash(uint8_t arg_0x1a8d7d30){
+ #line 33
+ LedsC$Leds$flash(arg_0x1a8d7d30);
+ #line 33
+ }
+ #line 33
# 149 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/system/tos.h"
static inline void *nmemcpy(void *to, const void *from, size_t n)
***************
*** 1836,1842 ****
}
#line 32
! # 208 "TOSBootM.nc"
static inline void TOSBootM$startupSequence(void)
! #line 208
{
--- 1852,1858 ----
}
#line 32
! # 181 "TOSBootM.nc"
static inline void TOSBootM$startupSequence(void)
! #line 181
{
***************
*** 1848,1852 ****
if (!TOSBootM$Voltage$okToProgram()) {
! TOSBootM$codeNotify(TOSBootM$LEDS_LOWBATT);
TOSBootM$startupLeds();
TOSBootM$runApp();
--- 1864,1868 ----
if (!TOSBootM$Voltage$okToProgram()) {
! TOSBootM$Leds$flash(TOSBootM$LEDS_LOWBATT);
TOSBootM$startupLeds();
TOSBootM$runApp();
***************
*** 1859,1863 ****
if (++ args.gestureCount >= TOSBOOT_GESTURE_MAX_COUNT - 1) {
! TOSBootM$codeNotify(TOSBootM$LEDS_GESTURE);
--- 1875,1879 ----
if (++ args.gestureCount >= TOSBOOT_GESTURE_MAX_COUNT - 1) {
! TOSBootM$Leds$flash(TOSBootM$LEDS_GESTURE);
***************
*** 1870,1874 ****
}
else
! #line 237
{
--- 1886,1890 ----
}
else
! #line 210
{
***************
*** 1894,1904 ****
}
! # 32 "Leds.nc"
! inline static void TOSBootM$Leds$set(uint8_t arg_0x1a8d78d0){
! #line 32
! LedsC$Leds$set(arg_0x1a8d78d0);
! #line 32
}
! #line 32
# 27 "msp430/hardware.h"
static inline void TOSH_SET_FLASH_CS_PIN(void)
--- 1910,1920 ----
}
! # 34 "Leds.nc"
! inline static void TOSBootM$Leds$glow(uint8_t arg_0x1a8d61b0, uint8_t arg_0x1a8d6328){
! #line 34
! LedsC$Leds$glow(arg_0x1a8d61b0, arg_0x1a8d6328);
! #line 34
}
! #line 34
# 27 "msp430/hardware.h"
static inline void TOSH_SET_FLASH_CS_PIN(void)
***************
*** 1964,1985 ****
# 32 "TOSBootExtFlash.nc"
! inline static void TOSBootM$ExtFlash$startRead(uint32_t arg_0x1a8d3d20){
#line 32
! STM25PM$TOSBootExtFlash$startRead(arg_0x1a8d3d20);
#line 32
}
#line 32
! # 96 "TOSBootM.nc"
static inline bool TOSBootM$verifyImage(uint32_t startAddr)
! #line 96
{
uint16_t crcTarget = 0;
! #line 98
uint16_t crcTmp = 0;
uint16_t addr;
! #line 99
uint16_t len;
- uint16_t j;
pgnum_t numPgs;
uint8_t i;
--- 1980,2000 ----
# 32 "TOSBootExtFlash.nc"
! inline static void TOSBootM$ExtFlash$startRead(uint32_t arg_0x1a8d2918){
#line 32
! STM25PM$TOSBootExtFlash$startRead(arg_0x1a8d2918);
#line 32
}
#line 32
! # 73 "TOSBootM.nc"
static inline bool TOSBootM$verifyImage(uint32_t startAddr)
! #line 73
{
uint16_t crcTarget = 0;
! #line 75
uint16_t crcTmp = 0;
uint16_t addr;
! #line 76
uint16_t len;
pgnum_t numPgs;
uint8_t i;
***************
*** 2002,2007 ****
TOSBootM$ExtFlash$startRead(startAddr + i * sizeof(uint16_t ));
! crcTarget = 0;
! crcTarget |= (uint16_t )(TOSBootM$ExtFlash$readByte() & 0xff);
crcTarget |= (uint16_t )(TOSBootM$ExtFlash$readByte() & 0xff) << 8;
TOSBootM$ExtFlash$stopRead();
--- 2017,2021 ----
TOSBootM$ExtFlash$startRead(startAddr + i * sizeof(uint16_t ));
! crcTarget = (uint16_t )(TOSBootM$ExtFlash$readByte() & 0xff);
crcTarget |= (uint16_t )(TOSBootM$ExtFlash$readByte() & 0xff) << 8;
TOSBootM$ExtFlash$stopRead();
***************
*** 2009,2013 ****
TOSBootM$ExtFlash$startRead(startAddr + addr);
! for (j = 0, crcTmp = 0; j < len; j++)
crcTmp = crcByte(crcTmp, TOSBootM$ExtFlash$readByte());
TOSBootM$ExtFlash$stopRead();
--- 2023,2027 ----
TOSBootM$ExtFlash$startRead(startAddr + addr);
! for (crcTmp = 0; len; len--)
crcTmp = crcByte(crcTmp, TOSBootM$ExtFlash$readByte());
TOSBootM$ExtFlash$stopRead();
***************
*** 2015,2020 ****
addr = (uint16_t )(i + 1) * DELUGE_BYTES_PER_PAGE;
len = DELUGE_BYTES_PER_PAGE;
-
- TOSBootM$Leds$set(i);
}
--- 2029,2032 ----
***************
*** 2057,2063 ****
# 10 "msp430/HPLUSARTControl.nc"
! inline static void STM25PM$USARTControl$tx(uint8_t arg_0x1a981908){
#line 10
! HPLUSART0M$HPLUSARTControl$tx(arg_0x1a981908);
#line 10
}
--- 2069,2075 ----
# 10 "msp430/HPLUSARTControl.nc"
! inline static void STM25PM$USARTControl$tx(uint8_t arg_0x1a980ce0){
#line 10
! HPLUSART0M$HPLUSARTControl$tx(arg_0x1a980ce0);
#line 10
}
***************
*** 2140,2143 ****
--- 2152,2162 ----
}
#line 9
+ # 32 "Leds.nc"
+ inline static void TOSBootM$Leds$set(uint8_t arg_0x1a8d78d0){
+ #line 32
+ LedsC$Leds$set(arg_0x1a8d78d0);
+ #line 32
+ }
+ #line 32
# 39 "msp430/ProgFlashM.nc"
static inline result_t ProgFlashM$ProgFlash$write(uint32_t addr, uint8_t *buf, uint16_t len)
***************
*** 2174,2178 ****
# 32 "TOSBootProgFlash.nc"
! inline static result_t TOSBootM$ProgFlash$write(uint32_t arg_0x1a8e6928, uint8_t *arg_0x1a8e6ac0, uint16_t arg_0x1a8e6c40){
#line 32
unsigned char result;
--- 2193,2197 ----
# 32 "TOSBootProgFlash.nc"
! inline static result_t TOSBootM$ProgFlash$write(uint32_t arg_0x1a8e5528, uint8_t *arg_0x1a8e56c0, uint16_t arg_0x1a8e5840){
#line 32
unsigned char result;
***************
*** 2180,2184 ****
#line 32
! result = ProgFlashM$ProgFlash$write(arg_0x1a8e6928, arg_0x1a8e6ac0, arg_0x1a8e6c40);
#line 32
--- 2199,2203 ----
#line 32
! result = ProgFlashM$ProgFlash$write(arg_0x1a8e5528, arg_0x1a8e56c0, arg_0x1a8e5840);
#line 32
***************
*** 2188,2194 ****
}
#line 32
! # 261 "TOSBootM.nc"
int main(void)
! #line 261
{
--- 2207,2213 ----
}
#line 32
! # 234 "TOSBootM.nc"
int main(void)
! #line 234
{
***************
*** 2258,2262 ****
}
! # 43 "LedsC.nc"
static void LedsC$Leds$set(uint8_t ledsOn)
#line 43
--- 2277,2296 ----
}
! # 70 "LedsC.nc"
! static void LedsC$Leds$glow(uint8_t a, uint8_t b)
! #line 70
! {
! int i;
!
! #line 72
! for (i = 1536; i > 0; i -= 4) {
! LedsC$Leds$set(a);
! wait(i);
! LedsC$Leds$set(b);
! wait(1536 - i);
! }
! }
!
! #line 43
static void LedsC$Leds$set(uint8_t ledsOn)
#line 43
***************
*** 2287,2304 ****
}
! # 73 "TOSBootM.nc"
! static void TOSBootM$codeNotify(uint8_t output)
! #line 73
{
-
uint8_t i;
! #line 75
uint8_t j;
for (i = 3; i; i--) {
! TOSBootM$Leds$set(output);
for (j = 4; j; j--)
wait(0xffff);
! TOSBootM$Leds$set(0);
for (j = 4; j; j--)
wait(0xffff);
--- 2321,2338 ----
}
! #line 58
! static void LedsC$Leds$flash(uint8_t a)
! #line 58
{
uint8_t i;
! #line 59
uint8_t j;
+ #line 60
for (i = 3; i; i--) {
! LedsC$Leds$set(a);
for (j = 4; j; j--)
wait(0xffff);
! LedsC$Leds$set(0);
for (j = 4; j; j--)
wait(0xffff);
***************
*** 2306,2310 ****
}
! #line 55
static void TOSBootM$startupLeds(void)
#line 55
--- 2340,2344 ----
}
! # 55 "TOSBootM.nc"
static void TOSBootM$startupLeds(void)
#line 55
***************
*** 2313,2327 ****
uint8_t output = 0x7;
uint8_t i;
- uint16_t j;
! TOSBootM$Leds$set(0x7);
! for (i = 3; i; i--, output >>= 1) {
! for (j = 1536; j > 0; j -= 4) {
! TOSBootM$Leds$set(output);
! wait(j);
! TOSBootM$Leds$set(output >> 0x1);
! wait(1536 - j);
! }
! }
}
--- 2347,2353 ----
uint8_t output = 0x7;
uint8_t i;
! for (i = 3; i; i--, output >>= 1)
! TOSBootM$Leds$glow(output, output >> 1);
}
***************
*** 2347,2358 ****
}
! # 143 "TOSBootM.nc"
static result_t TOSBootM$programImage(uint32_t startAddr)
! #line 143
{
uint8_t buf[TOSBOOT_INT_PAGE_SIZE];
uint16_t pageAddr;
! #line 146
uint16_t newPageAddr;
uint32_t intAddr;
--- 2373,2384 ----
}
! # 116 "TOSBootM.nc"
static result_t TOSBootM$programImage(uint32_t startAddr)
! #line 116
{
uint8_t buf[TOSBOOT_INT_PAGE_SIZE];
uint16_t pageAddr;
! #line 119
uint16_t newPageAddr;
uint32_t intAddr;
***************
*** 2397,2401 ****
if (
! #line 186
TOSBootM$ProgFlash$write(pageAddr * TOSBOOT_INT_PAGE_SIZE, buf,
TOSBOOT_INT_PAGE_SIZE) == FAIL) {
--- 2423,2427 ----
if (
! #line 159
TOSBootM$ProgFlash$write(pageAddr * TOSBOOT_INT_PAGE_SIZE, buf,
TOSBOOT_INT_PAGE_SIZE) == FAIL) {
***************
*** 2440,2451 ****
}
! # 88 "TOSBootM.nc"
static uint32_t TOSBootM$extFlashRead32(void)
! #line 88
{
uint32_t result = 0;
uint8_t i;
! #line 91
for (i = 0; i < 4; i++)
result |= ((uint32_t )TOSBootM$ExtFlash$readByte() & 0xff) << i * 8;
--- 2466,2477 ----
}
! # 65 "TOSBootM.nc"
static uint32_t TOSBootM$extFlashRead32(void)
! #line 65
{
uint32_t result = 0;
uint8_t i;
! #line 68
for (i = 0; i < 4; i++)
result |= ((uint32_t )TOSBootM$ExtFlash$readByte() & 0xff) << i * 8;
Index: ident_flags.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/ident_flags.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ident_flags.txt 12 Jul 2005 20:09:11 -0000 1.15
--- ident_flags.txt 12 Jul 2005 22:10:33 -0000 1.16
***************
*** 1 ****
! -DIDENT_PROGRAM_NAME=\"TOSBoot\" -DIDENT_USER_ID=\"jwhui\" -DIDENT_HOSTNAME=\"fx08722\" -DIDENT_USER_HASH=0x87916b92L -DIDENT_UNIX_TIME=0x42d421b1L -DIDENT_UID_HASH=0x0b031c61L
--- 1 ----
! -DIDENT_PROGRAM_NAME=\"TOSBoot\" -DIDENT_USER_ID=\"jwhui\" -DIDENT_HOSTNAME=\"fx08722\" -DIDENT_USER_HASH=0x87916b92L -DIDENT_UNIX_TIME=0x42d43f3dL -DIDENT_UID_HASH=0xf1f72920L
Index: main.exe
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/main.exe,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
Binary files /tmp/cvsbJ7nI2 and /tmp/cvsKtLXcO differ
Index: main.ihex
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/main.ihex,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** main.ihex 12 Jul 2005 20:09:11 -0000 1.15
--- main.ihex 12 Jul 2005 22:10:34 -0000 1.16
***************
*** 1,7 ****
! :10400000B240805A20013F40D2473E4000113D401F
:1040100000110D9E0524FE4F00001E530E9DFB2B2C
:104020003F4000113D4000110D9F0524CF4300008B
:104030001F530F9DFB2B3040404030403E4000134B
! :104040003140FE3832C20343B0120041F240070053
:104050005700F240E0FF5600F2D080FF1E00F2D081
:1040600010001E00F2D080FF1D00E2D31B00E2D240
--- 1,7 ----
! :10400000B240805A20013F40A8473E4000113D4049
:1040100000110D9E0524FE4F00001E530E9DFB2B2C
:104020003F4000113D4000110D9F0524CF4300008B
:104030001F530F9DFB2B3040404030403E4000134B
! :104040003140FE3832C20343B012D640F24007007E
:104050005700F240E0FF5600F2D080FF1E00F2D081
:1040600010001E00F2D080FF1D00E2D31B00E2D240
***************
*** 9,128 ****
:104080007100E2437400C2437500C2437300F24002
:1040900040000400D2C37000F2F03F0002003F4332
! :1040A0003F53FE23F2F07F002A00C29328002238FB
! :1040B000B0120041B0125E414F43B012A0413B40EC
! :1040C00000067F400700B012A0410F4B0B93022463
! :1040D0003F53FE234F43B012A0413F4000060F8BD9
! :1040E00002243F53FE232B821B93EB37B140F80091
! :1040F000000022D1B012AA460F4321533040AA47F4
! :10410000C2432600C2432E00C2431B00C2431F000D
! :10411000C2433300C2433700F240E0FF2200C243F3
! :104120002100F2407B002A00F24010002900F240FA
! :10413000F1FF1A00C2431900F240FDFF1E00F240D9
! :10414000DDFF1D00F2433200F2433100F24336003E
! :10415000C2433500C2432500C2432D003041F2F076
! :10416000EFFF1D00F240B9FF7700C2930200083450
! :10417000F2F07F0002001F437FF34F93F627023CCB
! :104180000F43FA3FF2D010001D00F2F0BFFF040011
! :10419000E2C31B00E2C21B00F2C21B001F433041FE
! :1041A0004E4F6FF31624F2F0DFFF31006EB20D2494
! :1041B000F2F0BFFF31005EB30424F2F0EFFF3100F4
! :1041C0003041F2D0100031003041F2D040003100D7
! :1041D000F23FF2D020003100E93F0B120A124A4FA1
! :1041E0007B4003004F4AB012A0416E423F433F5311
! :1041F000FE237E53FB234F43B012A0416E423F4348
! :104200003F53FE237E53FB237B53EC233A413B4138
! :1042100030410B120A1209120812784007007F4041
! :104220000700B012A041794003003B4000064F4810
! :10423000B012A0410F4B0B9302243F53FE234A4878
! :1042400012C34A104F4AB012A0413F4000060F8BE4
! :1042500002243F53FE232B82EA237953484AE52365
! :10426000384139413A413B4130415E427F105F4223
! :10427000FF107E930B247F9307240D434E8F023053
! :104280000F4D30411D43FC3F0F4330411F43304130
! :104290000B120A12091208120712061231800002CC
! :1042A0000A4E0B4FB012AE454F9302201E43683C9E
! :1042B0003A5090010B630E4A0F4BB0129443B01268
! :1042C0004C44064E074FB0124C44084E094F0FDEC7
! :1042D0000F9348240E460F478E108F104EEF0EEFAF
! :1042E0007FF312C30F100E100A4E38930220399339
! :1042F0003C240F463FF0FF010B410B5FB0122044FE
! :10430000CB4F0000165307633853396308930220DC
! :1043100009932D240E460F478E108F104EEF0EEF8F
! :104320007FF312C30F100E100A9E04200893DD23A2
! :104330000993DB234F4AB012A0410E4A0F430A4EA5
! :104340000B4F3C4000020D43B012AE473C40000210
! :104350000D41B01228452E434F9312240893BA23DF
! :104360000993B823F2D010001D000E43093CB0128F
! :104370004C44064E074FB0124C44084E094FCA3FFA
! :104380000F4E3150000236413741384139413A41F0
! :104390003B4130410B120A120B4E0C4FF2F0EFFF73
! :1043A0001D004E43F240ABFF7700C2930200313450
! :1043B000F2F07F0002001F437FF34F93F6275E5316
! :1043C0007E900500EF2BF2D010001D00F2F0EFFF01
! :1043D0001D003CD000036A424D4A0D5D0D5D0D5D30
! :1043E0003D820E4B0F4C0D93052412C30F100E107F
! :1043F0001D83FB23C24E7700C29302000834F2F003
! :104400007F0002001F437FF34F93F627043C0F43C6
! :10441000FA3F0F43D13F7A53DF233A413B413041CA
! :104420005F427600C2437700F2B0400002000824E9
! :10443000F2F0BFFF02001F437FF34F93F527023CCA
! :104440000F43FA3F5F4276007FF330410B120A12AE
! :1044500009120A430B434943B01220444E4F0F4305
! :104460004D490D5D0D5D0D5D0D9304240E5E0F6FC6
! :104470001D83FC230ADE0BDF59536992ED2B0E4A94
! :104480000F4B39413A413B4130410B120A1209129C
! :10449000081207120A4F074D094E3A5000103840D3
! :1044A00000103B400010B0126A424F93292438405C
! :1044B0008010B24084A52A01B24000A52C01B24070
! :1044C00002A52801CB430000B24040A528010E43BD
! :1044D0000B9A04280F4A0F570B9F0E28EB48000039
! :1044E0001E531B5318533E907F00F22B6F485F53AF
! :1044F0007F930B204F43093CEB4900001953F03FD9
! :104500003A5080003B408010D43FCB4F0000B24077
! :1045100000A52801B24010A52C011F4337413841A6
! :1045200039413A413B4130410B120A1209120A4EFD
! :104530000B4F094D0D4E3E8000480F7307280E4C5F
! :104540000F430E5A0F6B1E831F7302280F432B3C21
! :10455000B24084A52A01B24000A52C01B24002A5B8
! :1045600028018A430000B24040A528010E4312C32F
! :104570000C100E9C0C2C3D90FEFF11240F4E0F5F73
! :104580000F59AD4F00001E532D530E9CF42BB2401B
! :1045900000A52801B24010A52C011F43043CBD40DA
! :1045A00000400000F03F39413A413B4130410B129D
! :1045B0000A120912081207120612051204122183A8
! :1045C000084E094F3E5007000F63B0129443B012DB
! :1045D0002044454FF2D010001D004F935B247F9381
! :1045E00059243850100009633B400001B14050038A
! :1045F00000004643469F05280F4346954C201F4325
! :104600004A3C4A460F4A0F5F0E4F0F430E580F6940
! :10461000B0129443B0122044444FB01220447FF3B0
! :104620008F1004DFF2D010001D000E4B0F430E5808
! :104630000F69B01294430B43074327911728F2D018
! :1046400010001D001A533C4050040B430D43B012A0
! :10465000CE470B4EB140500400004F46B012A0416F
! :1046600056534695C92F0497CC27C63FB012204415
! :104670007FF38F100FE77E420F930A340F5F3FE006
! :1046800021107E53F923074F1B532B91EF2BD73F5C
! :104690000F5FF73F0F4321533441354136413741D6
! :1046A000384139413A413B4130410B1231800600DB
! :1046B000B2403002A001B2400002A201F2401B0051
! :1046C00080003F40FF353F50E5FF3FB00080FB37A3
! :1046D000A2D3A00192D3A00192B3A401FD278243EB
! :1046E000A0010F43B290670E400101281F437FF3E2
! :1046F0004F933C243B407010B0126A424F93022407
! :104700003B40F0100D410F4B3E400500ED4F0000C7
! :104710001F531D533E533E93F923D1530400E1939D
! :1047200004000F287F400700B012DA410E433F40DB
! :104730000F00B01290426F932320B2400F5A200115
! :10474000FF3F3D4006000E413F407000B0128A44DA
! :10475000C193050015202E411F410200B012904266
! :104760006F930E20B2400F5A2001FF3F5F43B012FB
! :10477000DA41B0121242B0125E4130400048BA3FF6
! :10478000B0121242F1430400D14305003D4006003F
! :104790000E413F407000B0128A44B0125E4130407A
! :1047A0000048315006003B41304102DFFE3F0E43DE
! :1047B0000F43083C12C30D100C1002280E5A0F6B49
! :1047C0000A5A0B6B0C93F6230D93F42330413040BF
! :0247D000AE47F2
:0400000300004000B9
:00000001FF
--- 9,125 ----
:104080007100E2437400C2437500C2437300F24002
:1040900040000400D2C37000F2F03F0002003F4332
! :1040A0003F53FE23F2F07F002A00C29328000D3810
! :1040B000B012D640B01234414E437F400700B012D8
! :1040C0007641B140F800000022D1B01280460F4383
! :1040D000215330408047C2432600C2432E00C243D2
! :1040E0001B00C2431F00C2433300C2433700F240EB
! :1040F000E0FF2200C2432100F2407B002A00F24090
! :1041000010002900F240F1FF1A00C2431900F240EA
! :10411000FDFF1E00F240DDFF1D00F2433200F243BE
! :104120003100F2433600C2433500C2432500C2438A
! :104130002D003041F2F0EFFF1D00F240B9FF770093
! :10414000C29302000834F2F07F0002001F437FF3A5
! :104150004F93F627023C0F43FA3FF2D010001D00A8
! :10416000F2F0BFFF0400E2C31B00E2C21B00F2C278
! :104170001B001F4330410B120A120912494F4A4ECD
! :104180003B4000064F49B012B4410F4B0B93022441
! :104190003F53FE234F4AB012B4413F4000060F8BFD
! :1041A00002243F53FE232B821B93EC3739413A41C3
! :1041B0003B4130414E4F6FF31624F2F0DFFF3100E8
! :1041C0006EB20D24F2F0BFFF31005EB30424F2F0B2
! :1041D000EFFF31003041F2D0100031003041F2D019
! :1041E00040003100F23FF2D020003100E93F0B12D5
! :1041F0000A124A4F7B4003004F4AB012B4416E424C
! :104200003F433F53FE237E53FB234F43B012B44141
! :104210006E423F433F53FE237E53FB237B53EC23ED
! :104220003A413B4130410B120A127F4007007A406D
! :1042300003004B4F12C34B104E4BB01276417A53D2
! :104240004F4BF7233A413B4130415E427F105F4282
! :10425000FF107E930B247F9307240D434E8F023073
! :104260000F4D30411D43FC3F0F4330411F43304150
! :104270000B120A12091208120712061231800002EC
! :104280000A4E0B4FB0128E454F9302201E43683CDE
! :104290003A5090010B630E4A0F4BB0127443B012A8
! :1042A0002C44064E074FB0122C44084E094F0FDE27
! :1042B0000F9348240E460F478E108F104EEF0EEFCF
! :1042C0007FF312C30F100E100A4E38930220399359
! :1042D0003C240F463FF0FF010B410B5FB01200443E
! :1042E000CB4F0000165307633853396308930220FD
! :1042F00009932D240E460F478E108F104EEF0EEFB0
! :104300007FF312C30F100E100A9E04200893DD23C2
! :104310000993DB234F4AB012B4410E4A0F430A4EB1
! :104320000B4F3C4000020D43B01284473C4000025A
! :104330000D41B01208452E434F9312240893BA231F
! :104340000993B823F2D010001D000E43093CB012AF
! :104350002C44064E074FB0122C44084E094FCA3F5A
! :104360000F4E3150000236413741384139413A4110
! :104370003B4130410B120A120B4E0C4FF2F0EFFF93
! :104380001D004E43F240ABFF7700C2930200313470
! :10439000F2F07F0002001F437FF34F93F6275E5336
! :1043A0007E900500EF2BF2D010001D00F2F0EFFF21
! :1043B0001D003CD000036A424D4A0D5D0D5D0D5D50
! :1043C0003D820E4B0F4C0D93052412C30F100E109F
! :1043D0001D83FB23C24E7700C29302000834F2F023
! :1043E0007F0002001F437FF34F93F627043C0F43E7
! :1043F000FA3F0F43D13F7A53DF233A413B413041EB
! :104400005F427600C2437700F2B040000200082409
! :10441000F2F0BFFF02001F437FF34F93F527023CEA
! :104420000F43FA3F5F4276007FF330410B120A12CE
! :1044300009120A430B434943B01200444E4F0F4345
! :104440004D490D5D0D5D0D5D0D9304240E5E0F6FE6
! :104450001D83FC230ADE0BDF59536992ED2B0E4AB4
! :104460000F4B39413A413B4130410B120A120912BC
! :10447000081207120A4F074D094E3A5000103840F3
! :1044800000103B400010B0124A424F93292438409C
! :104490008010B24084A52A01B24000A52C01B24090
! :1044A00002A52801CB430000B24040A528010E43DD
! :1044B0000B9A04280F4A0F570B9F0E28EB48000059
! :1044C0001E531B5318533E907F00F22B6F485F53CF
! :1044D0007F930B204F43093CEB4900001953F03FF9
! :1044E0003A5080003B408010D43FCB4F0000B24098
! :1044F00000A52801B24010A52C011F4337413841C7
! :1045000039413A413B4130410B120A1209120A4E1D
! :104510000B4F094D0D4E3E8000480F7307280E4C7F
! :104520000F430E5A0F6B1E831F7302280F432B3C41
! :10453000B24084A52A01B24000A52C01B24002A5D8
! :1045400028018A430000B24040A528010E4312C34F
! :104550000C100E9C0C2C3D90FEFF11240F4E0F5F93
! :104560000F59AD4F00001E532D530E9CF42BB2403B
! :1045700000A52801B24010A52C011F43043CBD40FA
! :1045800000400000F03F39413A413B4130410B12BD
! :104590000A120912081207120612051204122183C8
! :1045A000084E094F3E5007000F63B0127443B0121B
! :1045B0000044474FF2D010001D004F9356247F93C4
! :1045C0005424385010000963B140000100003B4002
! :1045D00050034443449F05280F43449747201F43FB
! :1045E000453C4A440F4A0F5F0E4F0F430E580F6968
! :1045F000B0127443B0120044464FB01200447FF32F
! :104600008F1006DFF2D010001D002E410F430E5810
! :104610000F69B012744305430B931420F2D01000BD
! :104620001D001A533C4050040B430D43B012A447E5
! :10463000814E00003B40500454534497CD2F0695C3
! :10464000D027CA3FB01200447FF38F100FE57E429F
! :104650000F9309340F5F3FE021107E53F923054F7C
! :104660003B53F023DB3F0F5FF83F0F4321533441AF
! :10467000354136413741384139413A413B4130417A
! :104680000B1231800600B2403002A001B24000029D
! :10469000A201F2401B0080003F40FF353F50E5FF84
! :1046A0003FB00080FB37A2D3A00192D3A00192B308
! :1046B000A401FD278243A0010F43B290670E400181
! :1046C00001281F437FF34F933C243B407010B012EE
! :1046D0004A424F9302243B40F0100D410F4B3E40A5
! :1046E0000500ED4F00001F531D533E533E93F92329
! :1046F000D1530400E19304000F287F400700B0125B
! :10470000EE410E433F400F00B01270426F932320E2
! :10471000B2400F5A2001FF3F3D4006000E413F408E
! :104720007000B0126A44C193050015202E411F414C
! :104730000200B01270426F930E20B2400F5A200157
! :10474000FF3F5F43B012EE41B0122642B012344137
! :1047500030400048BA3FB0122642F1430400D14332
! :1047600005003D4006000E413F407000B0126A4413
! :10477000B012344130400048315006003B413041D6
! :1047800002DFFE3F0E430F43083C12C30D100C1016
! :1047900002280E5A0F6B0A5A0B6B0C93F6230D93DB
! :0847A000F4233041304084474E
:0400000300004000B9
:00000001FF
More information about the Tinyos-beta-commits
mailing list