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

Tue May 17 19:55:25 PDT 2005

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

Modified Files:
	app.c ident_flags.txt main.exe main.ihex 
Log Message:
- TOSBoot waits a short period before sampling the user interrupt pin
since it takes a while to stabilize.
- TOSH_uwait replaced with for loops, reducing code size by nearly 100
bytes.


Index: app.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/app.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** app.c	17 May 2005 20:48:23 -0000	1.7
--- app.c	18 May 2005 02:55:23 -0000	1.8
***************
*** 659,683 ****
  #line 71
  volatile unsigned char ME1 __asm ("0x0004");
- static 
- # 174 "C:/tinyos/cygwin/opt/tinyos-1.x/tos/platform/msp430/msp430hardware.h"
- __inline void TOSH_uwait(uint16_t u);
  static inline 
! #line 196
  void __nesc_disable_interrupt(void);
  #line 212
  typedef bool __nesc_atomic_t;
[...1240 lines suppressed...]
  {
    uint32_t result = 0;
    uint8_t i;
  
! #line 85
    for (i = 0; i < 4; i++) 
      result |= ((uint32_t )TOSBootM$ExtFlash$readByte() & 0xff) << i * 8;
--- 2347,2358 ----
  
  static 
! # 79 "TOSBootM.nc"
  uint32_t TOSBootM$extFlashRead32(void)
! #line 79
  {
    uint32_t result = 0;
    uint8_t i;
  
! #line 82
    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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ident_flags.txt	17 May 2005 20:48:23 -0000	1.7
--- ident_flags.txt	18 May 2005 02:55:23 -0000	1.8
***************
*** 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
--- 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=0x428aa70bL

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

Index: main.ihex
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/main.ihex,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** main.ihex	17 May 2005 20:48:23 -0000	1.7
--- main.ihex	18 May 2005 02:55:23 -0000	1.8
***************
*** 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
--- 1,124 ----
! :10400000B240805A20013F4094473E4000113D405D
  :1040100000110D9E0524FE4F00001E530E9DFB2B2C
  :104020003F4000113D4000110D9F0524CF4300008B
  :104030001F530F9DFB2B3040404030403E4000134B
! :104040003140FE3832C20343B012FE40F240070056
! :104050005700F240E0FF56003F433F53FE23F2D0AB
! :1040600080FF1E00F2D010001E00E2D31B00E2D23F
! :104070001B00F2D21B00F24017007000F240A2FFBA
! :104080007100E2437400C2437500C2437300F24002
! :1040900040000400D2C37000F2F03F000200F2F0D2
! :1040A0007F002A00C29328002438B012FE40B012CC
! :1040B0005C414F43B012A2413B4000067F400700E5
! :1040C000B012A2410F4B0B9302243F53FE234F43E8
! :1040D000B012A2413F4000060F8B02243F53FE2343
! :1040E0002B821B93EB37B140F0000000B1D20000EF
! :1040F00022D1B01246460F43215330406C47C24391
! :104100002600C2432E00C2431B00C2431F00C2430D
! :104110003300C2433700F240E0FF2200C2432100D7
! :10412000F2407B002A00F24010002900F240F1FF2B
! :104130001A00C2431900F240FDFF1E00F240DDFFED
! :104140001D00F2433200F2433100F2433600C24315
! :104150003500C2432500C2432D003041F2F0EFFF8D
! :104160001D00F2D080FF1D00F240B9FF7700C2931E
! :1041700002000534F2F07F0002001F43013C0F43B0
! :104180007FF34F93F427F2D010001D00F2F0BFFF31
! :104190000400E2C31B00E2C21B00F2C21B001F436B
! :1041A00030414E4F6FF30424F2F0DFFF3100033C47
! :1041B000F2D0200031004F4E6FF20424F2F0BFFF26
! :1041C0003100033CF2D0400031004F4E5FF3042435
! :1041D000F2F0EFFF31003041F2D0100031003041F9
! :1041E0000B120A120C4F0B4E0A4D3C5000100D439F
! :1041F0005F427F108F115E42FF108E110F8E1F9352
! :1042000001341D434D9302243C5080000E4B0F4C53
! :104210000D4A3D533D930724EE4F00001F531E539C
! :104220003D533D93F9231F433A413B4130410B122B
! :104230000A120912081207120612318000020A4EF1
! :104240000B4FB01260454F9302201E43653C3A501D
! :1042500090010B630E4A0F4BB0122C43B012EA438D
! :10426000064E074FB012EA43084E094F0FDE0F9378
! :104270004F240E460F478E108F104EEF0EEF7FF338
! :1042800012C30F100E100A4E3893022039934324A4
! :104290000E460F473EF0FF010FF30B410B5E165326
! :1042A0000763B012BE43CB4F000038533963089305
! :1042B0000A2009930820B012EA43064E074FB012B5
! :1042C000EA43084E094F0E460F478E108F104EEFEF
! :1042D0000EEF7FF312C30F100E100A9E04200893F6
! :1042E000D3230993D1234F4AB012A2410B433C4040
! :1042F00000020D43B01270473C4000020D41B01265
! :10430000D2442E434F9308240893B3230993B12337
! :10431000F2D010001D000E430F4E31500002364106
! :104320003741384139413A413B4130410B120A1281
! :104330000A4E0B4FF2F0EFFF1D00F2D080FF1D0080
! :104340004E43F240ABFF7700C29302000534F2F017
! :104350007F0002001F43013C0F437FF34F93F4277C
! :104360005E537E900500ED2BF2D010001D00F2F0A0
! :10437000EFFF1D003BD000036C424F4C0F5F0F5FFF
! :104380000F5F0D4F3D820E4A0F4B0D93052412C354
! :104390000F100E101D83FB23C24E7700C293020044
! :1043A0000534F2F07F0002001F43013C0F437FF30E
! :1043B0004F93F4277C53E1233A413B4130415F4224
! :1043C0007600C24377005F4202007FF04000052480
! :1043D000F2F0BFFF02001F43013C0F437FF34F93F6
! :1043E000F2275F4276007FF330410B120A12091266
! :1043F00009430A434B43B012BE434D4F0E434F4B4C
! :104400000F5F0F5F0C4F0C5C0F4E0E4D0C9304248E
! :104410000E5E0F6F1C83FC2309DE0ADF5B536B9279
! :10442000EA2B0E490F4A39413A413B4130410B12C8
! :104430000A12091208120B4F084D0A4E3B50001089
! :104440003D4000103C40001009435E427F108E1139
! :104450005F42FF108F110E8F1E9301341943499351
! :1044600003243D508000043C3B5080003C508000C1
! :10447000B24084A52A01B24000A52C01B24002A599
! :104480002801CC430000B24040A528010F430E4B49
! :104490000E580C9B02280C9E0328EC4D0000033C98
! :1044A000EC4A00001A531F531C531D533F907F00CA
! :1044B000F02B6D4D5D53CC4D0000B24000A528019E
! :1044C000B24010A52C011F43384139413A413B41CC
! :1044D00030410B120A1209120A4E0B4F0F4D0D4AB2
! :1044E000094F0E4A0F4B3E8000500F7307280E4CA9
! :1044F0000F430E5A0F6B1E831F7302280F432C3C71
! :10450000B24084A52A01B24000A52C01B24002A508
! :1045100028018A430000B24040A528010B430F4CFC
! :1045200012C30F100B9F112C0C4F3D90FEFF062461
! :104530000F4B0F5F0F59AD4F0000033CBD400040D3
! :1045400000001B532D530B9CF02BB24000A52801FB
! :10455000B24010A52C011F4339413A413B41304143
! :104560000B120A120912081207120612051204127F
! :10457000074E084F3E5003000F63B0122C43B01299
! :10458000BE43444FF2D010001D00375010000863A6
! :104590003B4000013A4050034643469F472C4F465C
! :1045A0000F5F0E4F0F430E570F68B0122C43B0121F
! :1045B000BE43454FB012BE437FF38F1005DFF2D0EC
! :1045C00010001D000E4B0F430E570F68B0122C4306
! :1045D0000B430943099A132CB012BE437FF38F108B
! :1045E0000FE97E420F9304340F5F3FE02110013C3E
! :1045F0000F5F7E53F723094F1B530B9AED2BF2D01D
! :1046000010001D004F461F530A4F3C4050040B43FF
! :104610000D43B01290470B4E3A4050044F46B01233
! :10462000A24156534694022C0599B9270F4346944C
! :1046300001201F433441354136413741384139412A
! :104640003A413B4130410B120A12091231800600F7
! :104650001D430E413F407000B012E041D1530000B5
! :10466000E19300001D287A4007004B434F4AB012E7
! :10467000A2414E433F433F53FE235E536E92FA2BBB
! :104680005B537AE37B900600F12B0E433F400F0013
! :10469000B0122E426F930420B2400F5A2001FF3F08
! :1046A0001D430E413F407000B0122E441D430E4189
! :1046B0001E533F407E00B012E0415F4101006FF3A6
! :1046C0001F20E19300001C2C2D420E412E533F4031
! :1046D0007100B012E0411E4102001F410400B012FF
! :1046E0002E426F930420B2400F5A2001FF3FE1D3C6
! :1046F00001001D430E411E533F407E00B0122E4468
! :104700007A4007007F400700B012A24149433B4076
! :1047100000064F4AB012A2410F4B0B9302243F53A5
! :10472000FE234F4A12C34F10B012A2413F40000671
! :104730000F8B02243F53FE232B82EB23595312C3CA
! :104740004A1079900300E32BF14300001D430E4112
! :104750003F407000B0122E44B0125C413040005017
! :104760003150060039413A413B41304102DFFE3FC2
! :104770000E430F43083C12C30D100C1002280E5AB2
! :104780000F6B0A5A0B6B0C93F6230D93F4233041F5
! :0447900030407047FE
  :0400000300004000B9
  :00000001FF