[Tinyos-beta-commits]
CVS: tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb
app.c, 1.12, 1.13 ident_flags.txt, 1.12, 1.13 main.exe, 1.12, 1.13
Jonathan Hui
jwhui at users.sourceforge.net
Tue Jun 28 23:47:08 PDT 2005
Update of /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32731/build/telosb
Modified Files:
app.c ident_flags.txt main.exe
Log Message:
Fixed a bug in error checking.
Index: app.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/app.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** app.c 16 Jun 2005 17:22:31 -0000 1.12
--- app.c 29 Jun 2005 06:46:50 -0000 1.13
***************
*** 851,854 ****
--- 851,855 ----
typedef struct DelugeImgDesc {
+ uint32_t uid;
imgvnum_t vNum;
imgnum_t imgNum;
***************
*** 858,865 ****
uint8_t reserved;
} DelugeImgDesc;
! # 36 "C:/tinyos/cygwin/opt/tinyos-1.x/beta/Deluge/Deluge/Deluge.h"
enum __nesc_unnamed4263 {
DELUGE_VERSION = 2,
- DELUGE_NUM_IMAGES = 3,
DELUGE_MIN_ADV_PERIOD_LOG2 = 8,
DELUGE_MAX_ADV_PERIOD_LOG2 = 20,
--- 859,865 ----
uint8_t reserved;
} DelugeImgDesc;
! # 40 "C:/tinyos/cygwin/opt/tinyos-1.x/beta/Deluge/Deluge/Deluge.h"
enum __nesc_unnamed4263 {
DELUGE_VERSION = 2,
DELUGE_MIN_ADV_PERIOD_LOG2 = 8,
DELUGE_MAX_ADV_PERIOD_LOG2 = 20,
***************
*** 889,905 ****
DELUGE_INVALID_PGNUM = 0xff
};
-
- enum __nesc_unnamed4264 {
- DELUGE_VOLUME_ID_0 = 0U,
- DELUGE_VOLUME_ID_1 = 1U,
- DELUGE_VOLUME_ID_2 = 2U
- };
# 31 "C:/tinyos/cygwin/opt/tinyos-1.x/beta/STM25P/STM25P/Storage.h"
! enum __nesc_unnamed4265 {
STORAGE_OK,
STORAGE_FAIL
};
! enum __nesc_unnamed4266 {
STORAGE_INVALID_ADDR = (uint32_t )0xffff
};
--- 889,899 ----
DELUGE_INVALID_PGNUM = 0xff
};
# 31 "C:/tinyos/cygwin/opt/tinyos-1.x/beta/STM25P/STM25P/Storage.h"
! enum __nesc_unnamed4264 {
STORAGE_OK,
STORAGE_FAIL
};
! enum __nesc_unnamed4265 {
STORAGE_INVALID_ADDR = (uint32_t )0xffff
};
***************
*** 909,913 ****
typedef uint8_t storage_result_t;
# 33 "C:/tinyos/cygwin/opt/tinyos-1.x/beta/STM25P/STM25P/HALSTM25P.h"
! enum __nesc_unnamed4267 {
STM25P_PAGE_SIZE = 256,
STM25P_SECTOR_SIZE_LOG2 = 16,
--- 903,907 ----
typedef uint8_t storage_result_t;
# 33 "C:/tinyos/cygwin/opt/tinyos-1.x/beta/STM25P/STM25P/HALSTM25P.h"
! enum __nesc_unnamed4266 {
STM25P_PAGE_SIZE = 256,
STM25P_SECTOR_SIZE_LOG2 = 16,
***************
*** 917,921 ****
};
! enum __nesc_unnamed4268 {
STM25P_INVALID_SIG = 0xff,
STM25P_INVALID_VOLUME_ID = 0xff,
--- 911,915 ----
};
! enum __nesc_unnamed4267 {
STM25P_INVALID_SIG = 0xff,
STM25P_INVALID_VOLUME_ID = 0xff,
***************
*** 923,927 ****
};
! enum __nesc_unnamed4269 {
STM25P_CMD_SIZE = 1,
STM25P_ADDR_SIZE = 3,
--- 917,921 ----
};
! enum __nesc_unnamed4268 {
STM25P_CMD_SIZE = 1,
STM25P_ADDR_SIZE = 3,
***************
*** 940,944 ****
} stm25p_cmd_t;
! enum __nesc_unnamed4270 {
STM25P_WREN = 0,
STM25P_WRDI = 1,
--- 934,938 ----
} stm25p_cmd_t;
! enum __nesc_unnamed4269 {
STM25P_WREN = 0,
STM25P_WRDI = 1,
***************
*** 959,985 ****
typedef uint8_t stm25p_sig_t;
! typedef struct __nesc_unnamed4271 {
volume_id_t volumeId;
} SectorMetadata;
! typedef struct __nesc_unnamed4272 {
SectorMetadata sector[STM25P_NUM_SECTORS];
uint16_t crc;
} SectorTable;
! enum __nesc_unnamed4273 {
STM25P_INVALID_VERSION = 0xffff
};
! enum __nesc_unnamed4274 {
STM25P_INVALID_ADDR = 0xffffffff
};
! enum __nesc_unnamed4275 {
STORAGE_BLOCK_SIZE = STM25P_SECTOR_SIZE
};
typedef stm25p_addr_t storage_addr_t;
! # 75 "C:/tinyos/cygwin/opt/tinyos-1.x/beta/Deluge/Deluge/Deluge.h"
struct deluge_image_t {
imgnum_t imageNum;
--- 953,979 ----
typedef uint8_t stm25p_sig_t;
! typedef struct __nesc_unnamed4270 {
volume_id_t volumeId;
} SectorMetadata;
! typedef struct __nesc_unnamed4271 {
SectorMetadata sector[STM25P_NUM_SECTORS];
uint16_t crc;
} SectorTable;
! enum __nesc_unnamed4272 {
STM25P_INVALID_VERSION = 0xffff
};
! enum __nesc_unnamed4273 {
STM25P_INVALID_ADDR = 0xffffffff
};
! enum __nesc_unnamed4274 {
STORAGE_BLOCK_SIZE = STM25P_SECTOR_SIZE
};
typedef stm25p_addr_t storage_addr_t;
! # 72 "C:/tinyos/cygwin/opt/tinyos-1.x/beta/Deluge/Deluge/Deluge.h"
struct deluge_image_t {
imgnum_t imageNum;
***************
*** 987,996 ****
};
- struct deluge_image_t;
-
-
-
-
-
typedef struct DelugeAdvTimer {
uint32_t timer : 32;
--- 981,984 ----
***************
*** 1006,1009 ****
--- 994,1007 ----
uint16_t crc;
} DelugeNodeDesc;
+
+ enum __nesc_unnamed4275 {
+ DELUGE_VOLUME_ID_0 = 0U,
+
+ DELUGE_VOLUME_ID_1 = 1U,
+
+ DELUGE_VOLUME_ID_2 = 2U
+ };
+ #line 116
+ struct deluge_image_t;
# 41 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/platform/telosb/TOSBoot.h"
enum __nesc_unnamed4276 {
***************
*** 1024,1034 ****
USART_I2C = 5
} msp430_usartmode_t;
! static result_t InternalFlashC$InternalFlash$read(void *arg_0x2275610, void *arg_0x2275798, uint16_t arg_0x2275910);
! static result_t InternalFlashC$InternalFlash$write(void *arg_0x2276e28, void *arg_0x2275010, uint16_t arg_0x2275188);
! static void LedsC$Leds$set(uint8_t arg_0x2270010);
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_0x2284640);
static void STM25PM$TOSBootExtFlash$stopRead(void);
static uint8_t STM25PM$TOSBootExtFlash$readByte(void);
--- 1022,1032 ----
USART_I2C = 5
} msp430_usartmode_t;
! static result_t InternalFlashC$InternalFlash$read(void *arg_0x2260ed8, void *arg_0x2277088, uint16_t arg_0x2277200);
! static result_t InternalFlashC$InternalFlash$write(void *arg_0x2260750, void *arg_0x22608d8, uint16_t arg_0x2260a50);
! static void LedsC$Leds$set(uint8_t arg_0x2273668);
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_0x2288ae0);
static void STM25PM$TOSBootExtFlash$stopRead(void);
static uint8_t STM25PM$TOSBootExtFlash$readByte(void);
***************
*** 1039,1053 ****
static void HPLUSART0M$HPLUSARTControl$setModeSPI(void);
static result_t HPLUSART0M$HPLUSARTControl$isTxIntrPending(void);
! static void HPLUSART0M$HPLUSARTControl$tx(uint8_t arg_0x2333088);
static uint8_t HPLUSART0M$HPLUSARTControl$rx(void);
static result_t HPLUSART0M$HPLUSARTControl$isRxIntrPending(void);
! static result_t ProgFlashM$ProgFlash$write(uint32_t arg_0x2298410, uint8_t *arg_0x22985a0, uint16_t arg_0x2298718);
static bool VoltageC$Voltage$okToProgram(void);
static
# 32 "TOSBootProgFlash.nc"
! result_t TOSBootM$ProgFlash$write(uint32_t arg_0x2298410, uint8_t *arg_0x22985a0, uint16_t arg_0x2298718);
static
# 32 "TOSBootExtFlash.nc"
! void TOSBootM$ExtFlash$startRead(uint32_t arg_0x2284640);
static
void TOSBootM$ExtFlash$stopRead(void);
--- 1037,1051 ----
static void HPLUSART0M$HPLUSARTControl$setModeSPI(void);
static result_t HPLUSART0M$HPLUSARTControl$isTxIntrPending(void);
! static void HPLUSART0M$HPLUSARTControl$tx(uint8_t arg_0x2339830);
static uint8_t HPLUSART0M$HPLUSARTControl$rx(void);
static result_t HPLUSART0M$HPLUSARTControl$isRxIntrPending(void);
! static result_t ProgFlashM$ProgFlash$write(uint32_t arg_0x22836c0, uint8_t *arg_0x2283850, uint16_t arg_0x22839c8);
static bool VoltageC$Voltage$okToProgram(void);
static
# 32 "TOSBootProgFlash.nc"
! result_t TOSBootM$ProgFlash$write(uint32_t arg_0x22836c0, uint8_t *arg_0x2283850, uint16_t arg_0x22839c8);
static
# 32 "TOSBootExtFlash.nc"
! void TOSBootM$ExtFlash$startRead(uint32_t arg_0x2288ae0);
static
void TOSBootM$ExtFlash$stopRead(void);
***************
*** 1078,1088 ****
static
# 32 "Leds.nc"
! void TOSBootM$Leds$set(uint8_t arg_0x2270010);
static
# 36 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/interfaces/InternalFlash.nc"
! result_t TOSBootM$IntFlash$read(void *arg_0x2275610, void *arg_0x2275798, uint16_t arg_0x2275910);
static
#line 35
! result_t TOSBootM$IntFlash$write(void *arg_0x2276e28, void *arg_0x2275010, uint16_t arg_0x2275188);
# 43 "TOSBootM.nc"
enum TOSBootM$__nesc_unnamed4278 {
--- 1076,1086 ----
static
# 32 "Leds.nc"
! void TOSBootM$Leds$set(uint8_t arg_0x2273668);
static
# 36 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/interfaces/InternalFlash.nc"
! result_t TOSBootM$IntFlash$read(void *arg_0x2260ed8, void *arg_0x2277088, uint16_t arg_0x2277200);
static
#line 35
! result_t TOSBootM$IntFlash$write(void *arg_0x2260750, void *arg_0x22608d8, uint16_t arg_0x2260a50);
# 43 "TOSBootM.nc"
enum TOSBootM$__nesc_unnamed4278 {
***************
*** 1166,1170 ****
static
# 32 "Leds.nc"
! void PowerOffM$Leds$set(uint8_t arg_0x2270010);
static inline
# 43 "msp430/PowerOffM.nc"
--- 1164,1168 ----
static
# 32 "Leds.nc"
! void PowerOffM$Leds$set(uint8_t arg_0x2273668);
static inline
# 43 "msp430/PowerOffM.nc"
***************
*** 1186,1190 ****
static result_t STM25PM$USARTControl$isTxIntrPending(void);
static
! void STM25PM$USARTControl$tx(uint8_t arg_0x2333088);
static uint8_t STM25PM$USARTControl$rx(void);
static
--- 1184,1188 ----
static result_t STM25PM$USARTControl$isTxIntrPending(void);
static
! void STM25PM$USARTControl$tx(uint8_t arg_0x2339830);
static uint8_t STM25PM$USARTControl$rx(void);
static
***************
*** 1427,1433 ****
# 32 "Leds.nc"
! inline static void PowerOffM$Leds$set(uint8_t arg_0x2270010){
#line 32
! LedsC$Leds$set(arg_0x2270010);
#line 32
}
--- 1425,1431 ----
# 32 "Leds.nc"
! inline static void PowerOffM$Leds$set(uint8_t arg_0x2273668){
#line 32
! LedsC$Leds$set(arg_0x2273668);
#line 32
}
***************
*** 1713,1717 ****
# 35 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/interfaces/InternalFlash.nc"
! inline static result_t TOSBootM$IntFlash$write(void *arg_0x2276e28, void *arg_0x2275010, uint16_t arg_0x2275188){
#line 35
unsigned char result;
--- 1711,1715 ----
# 35 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/interfaces/InternalFlash.nc"
! inline static result_t TOSBootM$IntFlash$write(void *arg_0x2260750, void *arg_0x22608d8, uint16_t arg_0x2260a50){
#line 35
unsigned char result;
***************
*** 1719,1723 ****
#line 35
! result = InternalFlashC$InternalFlash$write(arg_0x2276e28, arg_0x2275010, arg_0x2275188);
#line 35
--- 1717,1721 ----
#line 35
! result = InternalFlashC$InternalFlash$write(arg_0x2260750, arg_0x22608d8, arg_0x2260a50);
#line 35
***************
*** 1737,1741 ****
# 36 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/interfaces/InternalFlash.nc"
! inline static result_t TOSBootM$IntFlash$read(void *arg_0x2275610, void *arg_0x2275798, uint16_t arg_0x2275910){
#line 36
unsigned char result;
--- 1735,1739 ----
# 36 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/interfaces/InternalFlash.nc"
! inline static result_t TOSBootM$IntFlash$read(void *arg_0x2260ed8, void *arg_0x2277088, uint16_t arg_0x2277200){
#line 36
unsigned char result;
***************
*** 1743,1747 ****
#line 36
! result = InternalFlashC$InternalFlash$read(arg_0x2275610, arg_0x2275798, arg_0x2275910);
#line 36
--- 1741,1745 ----
#line 36
! result = InternalFlashC$InternalFlash$read(arg_0x2260ed8, arg_0x2277088, arg_0x2277200);
#line 36
***************
*** 1877,1883 ****
# 32 "Leds.nc"
! inline static void TOSBootM$Leds$set(uint8_t arg_0x2270010){
#line 32
! LedsC$Leds$set(arg_0x2270010);
#line 32
}
--- 1875,1881 ----
# 32 "Leds.nc"
! inline static void TOSBootM$Leds$set(uint8_t arg_0x2273668){
#line 32
! LedsC$Leds$set(arg_0x2273668);
#line 32
}
***************
*** 1950,1956 ****
# 32 "TOSBootExtFlash.nc"
! inline static void TOSBootM$ExtFlash$startRead(uint32_t arg_0x2284640){
#line 32
! STM25PM$TOSBootExtFlash$startRead(arg_0x2284640);
#line 32
}
--- 1948,1954 ----
# 32 "TOSBootExtFlash.nc"
! inline static void TOSBootM$ExtFlash$startRead(uint32_t arg_0x2288ae0){
#line 32
! STM25PM$TOSBootExtFlash$startRead(arg_0x2288ae0);
#line 32
}
***************
*** 1977,1981 ****
TOSBootM$ExtFlash$stopRead();
! if (numPgs == 0 && numPgs == 0xff) {
return FALSE;
}
--- 1975,1979 ----
TOSBootM$ExtFlash$stopRead();
! if (numPgs == 0 || numPgs == 0xff) {
return FALSE;
}
***************
*** 2046,2052 ****
# 10 "msp430/HPLUSARTControl.nc"
! inline static void STM25PM$USARTControl$tx(uint8_t arg_0x2333088){
#line 10
! HPLUSART0M$HPLUSARTControl$tx(arg_0x2333088);
#line 10
}
--- 2044,2050 ----
# 10 "msp430/HPLUSARTControl.nc"
! inline static void STM25PM$USARTControl$tx(uint8_t arg_0x2339830){
#line 10
! HPLUSART0M$HPLUSARTControl$tx(arg_0x2339830);
#line 10
}
***************
*** 2183,2187 ****
# 32 "TOSBootProgFlash.nc"
! inline static result_t TOSBootM$ProgFlash$write(uint32_t arg_0x2298410, uint8_t *arg_0x22985a0, uint16_t arg_0x2298718){
#line 32
unsigned char result;
--- 2181,2185 ----
# 32 "TOSBootProgFlash.nc"
! inline static result_t TOSBootM$ProgFlash$write(uint32_t arg_0x22836c0, uint8_t *arg_0x2283850, uint16_t arg_0x22839c8){
#line 32
unsigned char result;
***************
*** 2189,2193 ****
#line 32
! result = ProgFlashM$ProgFlash$write(arg_0x2298410, arg_0x22985a0, arg_0x2298718);
#line 32
--- 2187,2191 ----
#line 32
! result = ProgFlashM$ProgFlash$write(arg_0x22836c0, arg_0x2283850, arg_0x22839c8);
#line 32
Index: ident_flags.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/ident_flags.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ident_flags.txt 16 Jun 2005 17:22:31 -0000 1.12
--- ident_flags.txt 29 Jun 2005 06:46:50 -0000 1.13
***************
*** 1 ****
! -DIDENT_PROGRAM_NAME="TOSBoot" -DIDENT_PROGRAM_NAME_BYTES="84,79,83,66,111,111,116,0" -DIDENT_USER_ID="jwhui" -DIDENT_USER_ID_BYTES="106,119,104,117,105,0" -DIDENT_HOSTNAME="fx08722" -DIDENT_HOSTNAME_BYTES="102,120,48,56,55,50,50,0" -DIDENT_USER_HASH=0x87916b92L -DIDENT_UNIX_TIME=0x42b1b196L
--- 1 ----
! -DIDENT_PROGRAM_NAME=\"TOSBoot\" -DIDENT_USER_ID=\"jwhui\" -DIDENT_HOSTNAME=\"fx08722\" -DIDENT_USER_HASH=0x87916b92L -DIDENT_UNIX_TIME=0x42c2412dL -DIDENT_UID_HASH=0x93e0a8f3L
Index: main.exe
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/main.exe,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
Binary files /tmp/cvshoREpC and /tmp/cvsJnlZw5 differ
More information about the Tinyos-beta-commits
mailing list