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

Tue Jul 12 13:09:18 PDT 2005

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

Modified Files:
	app.c ident_flags.txt main.exe main.ihex 
Log Message:
- Reduced code size of TOSBoot yet again by reducing number of
internal flash command calls. TOSBoot is currently at 2002 bytes. The
starting address for the app is now moved to 0x4800 leaving 46KB for
the application.


Index: app.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/app.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** app.c	30 Jun 2005 05:01:17 -0000	1.14
--- app.c	12 Jul 2005 20:09:09 -0000	1.15
***************
*** 22,26 ****
  typedef int16_t intptr_t;
  typedef uint16_t uintptr_t;
! # 187 "C:/tinyos/cygwin/opt/nesc-1.2alpha10/lib/ncc/nesc_nx.h"
  typedef struct { char data[1]; } __attribute__((packed)) nx_int8_t;
  typedef struct { char data[2]; } __attribute__((packed)) nx_int16_t;
--- 22,26 ----
  typedef int16_t intptr_t;
  typedef uint16_t uintptr_t;
! # 187 "C:/tinyos/cygwin/opt/nesc-1.2alpha11/lib/ncc/nesc_nx.h"
  typedef struct { char data[1]; } __attribute__((packed)) nx_int8_t;
[...2423 lines suppressed...]
  
! #line 91
    for (i = 0; i < 4; i++) 
      result |= ((uint32_t )TOSBootM$ExtFlash$readByte() & 0xff) << i * 8;
***************
*** 2484,2490 ****
  }
  
- static  
  # 68 "msp430/InternalFlashC.nc"
! result_t InternalFlashC$InternalFlash$write(void *addr, void *buf, uint16_t size)
  #line 68
  {
--- 2453,2458 ----
  }
  
  # 68 "msp430/InternalFlashC.nc"
! static  result_t InternalFlashC$InternalFlash$write(void *addr, void *buf, uint16_t size)
  #line 68
  {

Index: ident_flags.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/ident_flags.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ident_flags.txt	30 Jun 2005 05:01:17 -0000	1.14
--- ident_flags.txt	12 Jul 2005 20:09:11 -0000	1.15
***************
*** 1 ****
! -DIDENT_PROGRAM_NAME=\"TOSBoot\" -DIDENT_USER_ID=\"jwhui\" -DIDENT_HOSTNAME=\"fx08722\" -DIDENT_USER_HASH=0x87916b92L -DIDENT_UNIX_TIME=0x42c37c31L -DIDENT_UID_HASH=0x7d7a04dbL
--- 1 ----
! -DIDENT_PROGRAM_NAME=\"TOSBoot\" -DIDENT_USER_ID=\"jwhui\" -DIDENT_HOSTNAME=\"fx08722\" -DIDENT_USER_HASH=0x87916b92L -DIDENT_UNIX_TIME=0x42d421b1L -DIDENT_UID_HASH=0x0b031c61L

Index: main.exe
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/main.exe,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
Binary files /tmp/cvsQ5r2lA and /tmp/cvs5ttZjW differ

Index: main.ihex
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/build/telosb/main.ihex,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** main.ihex	30 Jun 2005 05:01:17 -0000	1.14
--- main.ihex	12 Jul 2005 20:09:11 -0000	1.15
***************
*** 1,133 ****
! :10400000B240805A20013F4030483E4000113D40C0
  :1040100000110D9E0524FE4F00001E530E9DFB2B2C
  :104020003F4000113D4000110D9F0524CF4300008B
  :104030001F530F9DFB2B3040404030403E4000134B
! :104040003140FE3832C20343B012FE40F240070056
  :104050005700F240E0FF5600F2D080FF1E00F2D081
! :1040600010001E00E2D31B00E2D21B00F2D21B00A4
! :10407000F24017007000F240A2FF7100E2437400AA
! :10408000C2437500C2437300F24040000400D2C333
! :104090007000F2F03F0002003F433F53FE23F2F076
! :1040A0007F002A00C29328002438B012FE40B012CC
! :1040B0005C414F43B012A2413B4000067F400700E5
! :1040C000B012A2410F4B0B9302243F53FE234F43E8
! :1040D000B012A2413F4000060F8B02243F53FE2343
! :1040E0002B821B93EB37B140F0000000B1D20000EF
! :1040F00022D1B012FA460F43215330400848C24340
! :104100002600C2432E00C2431B00C2431F00C2430D
! :104110003300C2433700F240E0FF2200C2432100D7
! :10412000F2407B002A00F24010002900F240F1FF2B
! :104130001A00C2431900F240FDFF1E00F240DDFFED
! :104140001D00F2433200F2433100F2433600C24315
! :104150003500C2432500C2432D003041F2F0EFFF8D
! :104160001D00F2D080FF1D00F240B9FF7700C2931E
! :1041700002000534F2F07F0002001F43013C0F43B0
! :104180007FF34F93F427F2D010001D00F2F0BFFF31
! :104190000400E2C31B00E2C21B00F2C21B001F436B
! :1041A00030414E4F6FF30424F2F0DFFF3100033C47
! :1041B000F2D0200031004F4E6FF20424F2F0BFFF26
! :1041C0003100033CF2D0400031004F4E5FF3042435
! :1041D000F2F0EFFF31003041F2D0100031003041F9
! :1041E0000B120A124A4F7B4003004F4AB012A24101
! :1041F0006E423F433F53FE237E53FB234F43B01297
! :10420000A2416E423F433F53FE237E53FB237B5329
! :10421000EC233A413B4130410B120A1209127A4019
! :1042200007007F400700B012A241794003003B40E5
! :1042300000064F4AB012A2410F4B0B9302243F538A
! :10424000FE234F4A12C34F10B012A2413F40000656
! :104250000F8B02243F53FE232B82EB23795312C38F
! :104260004A104993E42339413A413B4130410B1212
! :104270000A1209120B4F0A4E094D3B500010B012A2
! :10428000AE424F9302243B5080000E4A0F4B0D4923
! :104290003D533D930724EE4F00001F531E533D53E3
! :1042A0003D93F9231F4339413A413B4130415E423E
! :1042B0007F105F42FF107E9302201F4330417F93A7
! :1042C00002200F4330410D434E8F7EB080000134F9
! :1042D0001D430F4D30410B120A120912081207122A
! :1042E0000612318000020A4E0B4FB01200464F9367
! :1042F00002201E43653C3A5090010B630E4A0F4B5F
! :10430000B012D443B0129244064E074FB0129244FA
! :10431000084E094F0FDE0F934F240E460F478E10A5
! :104320008F104EEF0EEF7FF312C30F100E100A4ED8
! :1043300038930220399343240E460F473EF0FF0185
! :104340000FF30B410B5E16530763B0126644CB4F5D
! :1043500000003853396308930A2009930820B012EB
! :104360009244064E074FB0129244084E094F0E4633
! :104370000F478E108F104EEF0EEF7FF312C30F100A
! :104380000E100A9E04200893D3230993D1234F4A89
! :10439000B012A2410B433C4000020D43B0120C4846
! :1043A0003C4000020D41B01272452E434F93082449
! :1043B0000893B3230993B123F2D010001D000E43DC
! :1043C0000F4E3150000236413741384139413A41B0
! :1043D0003B4130410B120A120A4E0B4FF2F0EFFF35
! :1043E0001D00F2D080FF1D004E43F240ABFF77006E
! :1043F000C29302000534F2F07F0002001F43013C2B
! :104400000F437FF34F93F4275E537E900500ED2B0F
! :10441000F2D010001D00F2F0EFFF1D003BD00003B2
! :104420006C424F4C0F5F0F5F0F5F0D4F3D820E4A86
! :104430000F4B0D93052412C30F100E101D83FB2389
! :10444000C24E7700C29302000534F2F07F000200F2
! :104450001F43013C0F437FF34F93F4277C53E12329
! :104460003A413B4130415F427600C24377005F42B0
! :1044700002007FF040000524F2F0BFFF02001F435E
! :10448000013C0F437FF34F93F2275F4276007FF3A7
! :1044900030410B120A12091209430A434B43B0126E
! :1044A00066444D4F0E434F4B0F5F0F5F0C4F0C5C3C
! :1044B0000F4E0E4D0C9304240E5E0F6F1C83FC23D5
! :1044C00009DE0ADF5B536B92EA2B0E490F4A394132
! :1044D0003A413B4130410B120A12091208120712ED
! :1044E000094F074D084E395000103A4000103B402C
! :1044F0000010B012AE424F9303243A408010043CA7
! :10450000395080003B508000B24084A52A01B2405F
! :1045100000A52C01B24002A52801CB430000B24007
! :1045200040A528010F430D490D570B9902280B9DFB
! :104530000328EB4A0000033CEB48000018531F53CC
! :104540001B531A533F907F00F02B6F4A5F537F93AA
! :1045500001204F43CB4F0000B24000A52801B240DC
! :1045600010A52C011F433741384139413A413B41A5
! :1045700030410B120A1209120A4E0B4F0F4D0D4A11
! :10458000094F0E4A0F4B3E80004A0F7307280E4C0E
! :104590000F430E5A0F6B1E831F7302280F432C3CD0
! :1045A000B24084A52A01B24000A52C01B24002A568
! :1045B00028018A430000B24040A528010B430F4C5C
! :1045C00012C30F100B9F112C0C4F3D90FEFF0624C1
! :1045D0000F4B0F5F0F59AD4F0000033CBD40004033
! :1045E00000001B532D530B9CF02BB24000A528015B
! :1045F000B24010A52C011F4339413A413B413041A3
! :104600000B120A12091208120712061205120412DE
! :10461000084E094F044305433E5007000F63B01294
! :10462000D443B0126644474FF2D010001D004F93A0
! :1046300002247F9302200F43573C38501000096337
! :104640003B4000013A4050034643469F492C0495A5
! :1046500047204F460F5F0E4F0F430E580F69B012A1
! :10466000D443B0126644444FB01266447FF38F10B7
! :1046700004DFF2D010001D000E4B0F430E580F69DF
! :10468000B012D4430B430543059A132CB012664471
! :104690007FF38F100FE57E420F9304340F5F3FE0EE
! :1046A0002110013C0F5F7E53F723054F1B530B9ADC
! :1046B000ED2BF2D010001D004F461F530A4F3C4017
! :1046C00050040B430D43B0122C480B4E3A4050049B
! :1046D0004F46B012A24156534697022C0495B92773
! :1046E0000F43469701201F4334413541364137413E
! :1046F000384139413A413B41304131800600B240B6
! :104700003002A001B2400002A201F2401B00800072
! :104710000F431F533F900036FC3BA2D3A00192D31E
! :10472000A0011F42A4011FF3FC278243A0010F43F5
! :10473000B290670E400101281F437FF34F93092079
! :104740005F43B012E041B0121842B0125C413040F9
! :10475000004A1D430E413F407000B0126E42D153DB
! :104760000000E19300000F287F400700B012E041F5
! :104770000E433F400F00B012D6426F930420B24068
! :104780000F5A2001FF3F1D430E413F407000B01201
! :10479000D6441D430E411E533F407E00B0126E4270
! :1047A0005F4101006FF31F20E19300001C2C2D429C
! :1047B0000E412E533F407100B0126E421E41020066
! :1047C0001F410400B012D6426F930420B2400F5A2A
! :1047D0002001FF3FE1D301001D430E411E533F4026
! :1047E0007E00B012D644B0121842F14300001D43BF
! :1047F0000E413F407000B012D644B0125C413040D0
! :10480000004A31500600304102DFFE3F0E430F43A5
! :10481000083C12C30D100C1002280E5A0F6B0A5AD6
! :104820000B6B0C93F6230D93F423304130400C486E
  :0400000300004000B9
  :00000001FF
--- 1,128 ----
! :10400000B240805A20013F40D2473E4000113D401F
  :1040100000110D9E0524FE4F00001E530E9DFB2B2C
  :104020003F4000113D4000110D9F0524CF4300008B
  :104030001F530F9DFB2B3040404030403E4000134B
! :104040003140FE3832C20343B0120041F240070053
  :104050005700F240E0FF5600F2D080FF1E00F2D081
! :1040600010001E00F2D080FF1D00E2D31B00E2D240
! :104070001B00F2D21B00F24017007000F240A2FFBA
! :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