[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb app.c, 1.6, 1.7 ident_flags.txt, 1.6, 1.7 main.exe, 1.6, 1.7 main.ihex, 1.6, 1.7

Tue May 17 13:48:26 PDT 2005

Update of /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19131/build/telosb

Modified Files:
	app.c ident_flags.txt main.exe main.ihex 
Log Message:
- Now verifies the image by checking CRCs across the image before
reprogramming. Was badly needed, since earlier versions did not check
whether the binary was valid.

- Since there is no hardware protection for the bootloader section on
the msp430, software checks help ensure that the bootloader is not
overwritten.

- Handles errors better:
1) If an image is inavlid, don't reprogram.
2) If an image started to program but fails in the middle, try
   reprogramming again. If reprogramming still fails after three
   times, try reprogramming with golden image.
3) If golden image is invalid, don't reprogram.
4) If golden image started to program but fails in the middle, try
   reprogramming again.

- Additional improvements in code size means the added functionality
is implemented in the same code size (just under 2K).

Index: app.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/app.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** app.c	2 May 2005 05:37:18 -0000	1.6
--- app.c	17 May 2005 20:48:23 -0000	1.7
***************
*** 466,470 ****
  volatile unsigned char U0CTL __asm ("0x0070");

! 

--- 466,470 ----
  volatile unsigned char U0CTL __asm ("0x0070");

! volatile unsigned char U0TCTL __asm ("0x0071");

[...3369 lines suppressed...]
!   FCTL1 = 0xA500 + 0x0040;
! 
!   for (i = 0; i < InternalFlashC$IFLASH_SIZE - 1; i++, newPtr++, oldPtr++) {
!       if ((uint16_t )newPtr < (uint16_t )addr || (uint16_t )addr + size <= (uint16_t )newPtr) {
!         *newPtr = *oldPtr;
!         }
!       else {
! #line 90
!         *newPtr = * bufPtr++;
!         }
!     }
! #line 92
!   *newPtr = *oldPtr + 1;
! 
!   FCTL1 = 0xA500;
!   FCTL3 = 0xA500 + 0x0010;
! 
!   return SUCCESS;
  }

Index: ident_flags.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/ident_flags.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ident_flags.txt	2 May 2005 05:37:18 -0000	1.6
--- ident_flags.txt	17 May 2005 20:48:23 -0000	1.7
***************
*** 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=0x4275bc34L
--- 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=0x428a4176L

Index: main.exe
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/main.exe,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
Binary files /tmp/cvslKQsGG and /tmp/cvsPwwemX differ

Index: main.ihex
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/main.ihex,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** main.ihex	2 May 2005 05:37:18 -0000	1.6
--- main.ihex	17 May 2005 20:48:23 -0000	1.7
***************
*** 1,131 ****
! :10400000B240805A20013F4010483E4000113D40E0
  :1040100000110D9E0524FE4F00001E530E9DFB2B2C
! :104020003F4000113D4012110D9F0524CF43000079
! :104030001F530F9DFB2B3040684030403E40001323
! :104040005D4210114E4D0E5E3E5000118E930000E9
! :1040500009205D537DF00700C24D10118E4F000006
! :104060001F4330410F4330413140FE3832C20343D9
! :10407000B0128E41F24007005700F240E0FF5600B8
! :10408000F2D080FF1E00F2D010001E00F2F03F00C0
! :104090000400F2F0EFFF1B00F2F0DFFF1B00F2F074
! :1040A000DAFF7000E2D31B00E2D21B00F2D21B0049
! :1040B000F2F03F000000D2437000F2D01600700012
! :1040C000F2F0DFFF7000E2437100F2D080FF710078
! :1040D000F2F0CFFF7100F2D020007100E2437400D3
! :1040E000C2437500C2437300F2F03F000400F2D0F7
! :1040F00040000400D2C37000F2F03F000200F2F072
! :104100003F000000F2F0BFFF0000F2F07F0000006F
! :10411000F2F07F002A00C29328001F38B0128E41AF
! :10412000B012EC414F43B0123A423B4000047F4092
! :104130000700B0123A420F4BB01222464F43B01262
! :104140003A423F4000040F8BB01222462B821B9351
! :10415000EE37B140F800000022D1C2431111F2D075
! :1041600010003200F2D040003200F2D020003200C5
! :10417000F2D010003100F2D040003100F2D0200027
! :104180003100B01256460F4321533040EC47C24332
! :104190002600C2432E00C2431B00C2431F00C2437D
! :1041A0003300C2433700F240E0FF2200C243210047
! :1041B000F2407B002A00F24010002900F240F1FF9B
! :1041C0001A00C2431900F240FDFF1E00F240DDFF5D
! :1041D0001D00F2433200F2433100F2433600C24385
! :1041E0003500C2432500C2432D003041F2F0EFFFFD
! :1041F0001D00F2D080FF1D00F240B9FF7700C2938E
! :1042000002000834F2F07F0002001F437FF34F9357
! :10421000F627023C0F43FA3FF2D010001D00F2F0E7
! :104220007F001D00F2F0BFFF0400E2C31B00E2C2EA
! :104230001B00F2C21B001F4330414E4F7EF00700AF
! :10424000C24E11116FF31824F2F0DFFF31005E420D
! :1042500011116EB20D24F2F0BFFF31005EB30424E1
! :10426000F2F0EFFF31000C3CF2D010003100083CBE
! :10427000F2D040003100F23FF2D020003100E73FA1
! :104280001F4330410B120A120C4F0B4E0A4D3C508B
! :1042900000100D435F427F108F115E42FF108E11A0
! :1042A0000F8E1F9312384D9302243C5080000E4B0A
! :1042B0000F4C0D4A3D533D930A24EE4F00001F530F
! :1042C0001E533D533D93F923023C1D43EC3F1F43D6
! :1042D0003A413B4130410B120A12091208120C4FAD
! :1042E000084D0B4E0F4C0F5D3F90810002280F438D
! :1042F000483C3C500010394000103D4000100A433B
! :104300005F427F108F115E42FF108E110F8E1F9340
! :1043100036384A932F2439408010B24084A52A01B0
! :10432000B24000A52C01B24002A52801CD430000F7
! :10433000B24040A528010E430D9C04280F4C0F5895
! :104340000D9F1428ED4900001E531D5319533E9034
! :104350007F00F22B69495953CD490000B24000A5B6
! :104360002801B24010A52C011F430B3CED4B00006F
! :104370001B53EA3F3C5080003D408010CE3F1A4323
! :10438000C83F384139413A413B4130410B120A1292
! :1043900009120812071206120512041231800002D7
! :1043A0000A4E0B4FF2F0EFFF1D00F2D080FF1D0010
! :1043B000F240ABFF7700C2930200F334F2F07F00CB
! :1043C00002001F437FF34F93F6274E43C24377000B
! :1043D000C2930200E434F2F07F0002001F437FF337
! :1043E0004F93F6275E537E900300F02B5F427600DA
! :1043F000C2437700F2B040000200CF24F2F0BFFFCA
! :1044000002001F437FF34F93F5275F427600F2D0FF
! :1044100010001D00F2F07F001D00F2F0EFFF1D0004
! :10442000F2D080FF1D00F24003007700C29302002B
! :10443000B234F2F07F0002001F437FF34F93F62760
! :104440007C4003004D4C0D5D0D5D0D5D3D820E4ABF
! :104450000F4B0D93052412C30F100E101D83FB2369
! :10446000C24E7700C29302009434F2F07F00020043
! :104470001F437FF34F93F6277C53E4235F4276007C
! :10448000B012BC45044E054FB012BC45084E094F52
! :104490000FDE0F936A24064407458610871046E70F
! :1044A00006E777F312C307100610389302203993FA
! :1044B0006E240E440F453EF0FF010FF30B410B5EDF
! :1044C00014530563B012FA45CB4F00000A440B4564
! :1044D0008A108B104AEB0AEB7BF312C30B100A1005
! :1044E000385339630893022009934824069A06201A
! :1044F000079B04200893D9230993D7234F46B01272
! :104500003A420A460B473C4000020D43B012F047C6
! :104510000D4E0B410C43B24084A52A01B24000A5C8
! :104520002C01B24002A528018E430000B24040A5F4
! :1045300028013E9000FE02200F931C243D90FEFFB8
! :1045400006240F4C0F5F0F5BAD4F00002D531C5323
! :104550003C900001F32BB24000A52801B24010A509
! :104560002C010893982309939623F2D010001D0084
! :104570001F43193CB2400040FEFFE03FB012BC4573
! :10458000044E054FB012BC45084E094FAF3F0F43D4
! :104590000A3C0F436E3F0F43503F0F43333F0F43DF
! :1045A0001E3F0F430F3F3150000234413541364129
! :1045B0003741384139413A413B4130410B120A12EF
! :1045C00009120A430B434943B012FA454E4F0F43B9
! :1045D0004D490D5D0D5D0D5D0D9304240E5E0F6F55
! :1045E0001D83FC230ADE0BDF59536992ED2B0E4A23
! :1045F0000F4B39413A413B413041C2437700F2B061
! :10460000400002000824F2F0BFFF02001F437FF3C6
! :104610004F93F527023C0F43FA3F5F4276007FF34A
! :1046200030413F90F4010C2C2E430E9F082C034385
! :104630000343034303431E530E9FF92B3041304184
! :104640000E430E9FFC2F03430343034303431E53B8
! :104650000E9FF92BF43F0B120A1209120812318037
! :104660000C001D430E413F407000B01284426F4168
! :104670007F93A5245F53C14F0000094119531D4387
! :104680000E493F407E00B0128442F19003000000CA
! :104690004F28D1B301004C207A4007004B434F4ACA
! :1046A000B0123A424E430F430343034303430343D1
! :1046B00003430343034303430343034303430343CA
! :1046C00003430343034303430343034303430343BA
! :1046D00003430343034303430343034303430343AA
! :1046E0003F5007003F90FF7FDF2B5E536E92DB2B26
! :1046F0005B537AE37B900600D22BB140800102002D
! :10470000B1400F0004002D420E412E533F40710076
! :10471000B012D6423E4080013F400F00B0128C43A1
! :104720004F930420B2400F5A2001FF3FF143000095
! :104730001D430E413F407000B012D642E1B301006C
! :104740001C202D420E413E5006003F407100B01229
! :1047500084421E4106001F410800B0128C434F9353
! :104760000420B2400F5A2001FF3FE1D301001D4356
! :104770000E493F407E00B012D642784007007F408D
! :104780000700B0123A4249433B4000044F48B01280
! :104790003A420F4BB01222464A4812C34A104F4ABF
! :1047A000B0123A423F4000040F8BB01222462B82D7
! :1047B000ED23484A595379900300E62B023C5F43AE
! :1047C0005A3FF1430A001D430E413E500A003F404C
! :1047D0007000B012D642B012EC413040005031505F
! :1047E0000C00384139413A413B41304102DFFE3F44
! :1047F0000E430F43083C12C30D100C1002280E5A32
! :104800000F6B0A5A0B6B0C93F6230D93F423304174
  :0400000300004000B9
  :00000001FF
--- 1,130 ----
! :10400000B240805A20013F40F4473E4000113D40FD
  :1040100000110D9E0524FE4F00001E530E9DFB2B2C
! :104020003F4000113D4000110D9F0524CF4300008B
! :104030001F530F9DFB2B3040404030403E4000134B
! :104040003140FE3832C20343B012F440F240070060
! :104050005700F240E0FF5600F2D080FF1E00F2D081
! :1040600010001E00E2D31B00E2D21B00F2D21B00A4
! :10407000F24017007000F240A2FF7100E2437400AA
! :10408000C2437500C2437300F24040000400D2C333
! :104090007000F2F03F000200F2F07F002A00C293AD
! :1040A00028002238B012F440B01252414F43B012EF
! :1040B00098413B4000043A4000047F400700B012A2
! :1040C00098410F4BB012C8444F43B01298410F4A69
! :1040D0000F8BB012C8442B821B93EF37B140F00016
! :1040E0000000B1D2000022D1B0126E460F4321531E
! :1040F0003040CC47C2432600C2432E00C2431B00BF
! :10410000C2431F00C2433300C2433700F240E0FF06
! :104110002200C2432100F2407B002A00F24010003E
! :104120002900F240F1FF1A00C2431900F240FDFFDE
! :104130001E00F240DDFF1D00F2433200F243310069
! :10414000F2433600C2433500C2432500C2432D006E
! :104150003041F2F0EFFF1D00F2D080FF1D00F24071
! :10416000B9FF7700C29302000534F2F07F0002002D
! :104170001F43013C0F437FF34F93F427F2D010000D
! :104180001D00F2F0BFFF0400E2C31B00E2C21B00EF
! :10419000F2C21B001F4330414E4F6FF30424F2F074
! :1041A000DFFF3100033CF2D0200031004F4E6FF2B0
! :1041B0000424F2F0BFFF3100033CF2D04000310094
! :1041C0004F4E5FF30424F2F0EFFF31003041F2D0A4
! :1041D0001000310030410B120A120C4F0B4E0A4DE9
! :1041E0003C5000100D435F427F108F115E42FF1064
! :1041F0008E110F8E1F9301341D434D9302243C50AA
! :1042000080000E4B0F4C0D4A3D533D930724EE4F5B
! :1042100000001F531E533D533D93F9231F433A4162
! :104220003B4130410B120A12091208120712061202
! :10423000318000020A4E0B4FB01288454F93022086
! :104240001E43653C3A5090010B630E4A0F4BB0126F
! :104250002243B012E043064E074FB012E043084E2F
! :10426000094F0FDE0F934F240E460F478E108F100D
! :104270004EEF0EEF7FF312C30F100E100A4E38935D
! :104280000220399343240E460F473EF0FF010FF3FF
! :104290000B410B5E16530763B012B443CB4F0000C3
! :1042A0003853396308930A2009930820B012E04379
! :1042B000064E074FB012E043084E094F0E460F4717
! :1042C0008E108F104EEF0EEF7FF312C30F100E10F3
! :1042D0000A9E04200893D3230993D1234F4AB01296
! :1042E00098410B433C4000020D43B012D0473C4084
! :1042F00000020D41B012FA442E434F930824089354
! :10430000B3230993B123F2D010001D000E430F4ECA
! :104310003150000236413741384139413A413B4141
! :1043200030410B120A120A4E0B4FF2F0EFFF1D0044
! :10433000F2D080FF1D004E43F240ABFF7700C293E6
! :1043400002000534F2F07F0002001F43013C0F43DE
! :104350007FF34F93F4275E537E900500ED2BF2D050
! :1043600010001D00F2F0EFFF1D003BD000036C4277
! :104370004F4C0F5F0F5F0F5F0D4F3D820E4A0F4B8B
! :104380000D93052412C30F100E101D83FB23C24E84
! :104390007700C29302000534F2F07F0002001F4351
! :1043A000013C0F437FF34F93F4277C53E1233A41C1
! :1043B0003B4130415F427600C24377005F420200DA
! :1043C0007FF040000524F2F0BFFF02001F43013CD4
! :1043D0000F437FF34F93F2275F4276007FF3304124
! :1043E0000B120A12091209430A434B43B012B44399
! :1043F0004D4F0E434F4B0F5F0F5F0C4F0C5C0F4E3A
! :104400000E4D0C9304240E5E0F6F1C83FC2309DEFB
! :104410000ADF5B536B92EA2B0E490F4A39413A414E
! :104420003B4130410B120A12091208120B4F084D82
! :104430000A4E3B5000103D4000103C400010094324
! :104440005E427F108E115F42FF108F110E8F1E9300
! :1044500001341943499303243D508000043C3B50F0
! :1044600080003C508000B24084A52A01B24000A5E3
! :104470002C01B24002A52801CC430000B24040A567
! :1044800028010F430E4B0E580C9B02280C9E03284C
! :10449000EC4D0000033CEC4A00001A531F531C5320
! :1044A0001D533F907F00F02B6D4D5D53CC4D0000B0
! :1044B000B24000A52801B24010A52C011F4338418D
! :1044C00039413A413B4130413F90F4010B2C2E439E
! :1044D0000E9F122C03430343034303431E530E9FBB
! :1044E000F92B30410E430E9F072C03430343034334
! :1044F00003431E530E9FF92B30410B120A1209126F
! :104500000A4E0B4F0F4D0D4A094F0E4A0F4B3E807E
! :1045100000500F7307280E4C0F430E5A0F6B1E836B
! :104520001F7302280F432C3CB24084A52A01B240DD
! :1045300000A52C01B24002A528018A430000B24028
! :1045400040A528010B430F4C12C30F100B9F112CD9
! :104550000C4F3D90FEFF06240F4B0F5F0F59AD4FE0
! :104560000000033CBD40004000001B532D530B9C3A
! :10457000F02BB24000A52801B24010A52C011F432A
! :1045800039413A413B4130410B120A1209120812DB
! :104590000712061205120412074E084F3E50030080
! :1045A0000F63B0122243B012B443444FF2D0100054
! :1045B0001D003750100008633B4000013A40500393
! :1045C0004643469F472C4F460F5F0E4F0F430E57F3
! :1045D0000F68B0122243B012B443454FB012B44337
! :1045E0007FF38F1005DFF2D010001D000E4B0F433C
! :1045F0000E570F68B01222430B430943099A132C3C
! :10460000B012B4437FF38F100FE97E420F9304344E
! :104610000F5F3FE02110013C0F5F7E53F723094FEE
! :104620001B530B9AED2BF2D010001D004F461F5369
! :104630000A4F3C4050040B430D43B012F0470B4E61
! :104640003A4050044F46B012984156534694022CBB
! :104650000599B9270F43469401201F433441354142
! :1046600036413741384139413A413B4130410B12E3
! :104670000A120912318006001D430E413F407000AE
! :10468000B012D641D1530000E193000026287940B2
! :1046900007004A433B40FF7F4F49B01298414E43C9
! :1046A0000F430F9B072C03430343034303431F5351
! :1046B0000F9BF92B5E536E92F32B5A5379E37A904A
! :1046C0000600EA2B0E433F400F00B01224426F93C6
! :1046D0000420B2400F5A2001FF3F1D430E413F40CE
! :1046E0007000B01224441D430E411E533F407E0013
! :1046F000B012D6415F4101006FF31F20E19300002B
! :104700001C2C2D420E412E533F407100B012D64159
! :104710001E4102001F410400B01224426F93042086
! :10472000B2400F5A2001FF3FE1D301001D430E416B
! :104730001E533F407E00B01224447A4007007F4061
! :104740000700B012984149433B4000044F4AB01261
! :1047500098410E4B3B90F4010B2C2F430F9B122CD6
! :1047600003430343034303431F530F9EF92B0A3CA8
! :104770000F430F9B072C03430343034303431F5380
! :104780000F9EF92B4F4A12C34F10B01298413F4071
! :1047900000040F8BB012C8442B82D823595312C384
! :1047A0004A1079900300D02BF14300001D430E41C5
! :1047B0003F407000B0122444B012524130400050CB
! :1047C0003150060039413A413B41304102DFFE3F62
! :1047D0000E430F43083C12C30D100C1002280E5A52
! :1047E0000F6B0A5A0B6B0C93F6230D93F423304195
! :0447F0003040D0473E
  :0400000300004000B9
  :00000001FF