diff --git a/branches/2.0f_codectest/bsr.hex b/branches/2.0f_codectest/bsr.hex index fed659d..5f46013 100644 --- a/branches/2.0f_codectest/bsr.hex +++ b/branches/2.0f_codectest/bsr.hex @@ -1,4 +1,4 @@ -:02000000F10C01 +:02000000040DED :0400100039473B47EA :02001C00E748B3 :020024008E4903 @@ -15,13 +15,13 @@ :1000EE007110A6FB710006F9EF0B8C015C80D161DB :1000FE00E8710006F98F06F931030EF6B1BBF66111 :10010E004900DD05618900EFF5FDDF01FD3101FDDF -:10011E008901FD9809FDCF08FD772FFD752CEFA500 +:10011E008901FDAB09FDE208FD772FFD752CEFA5DA :10012E00C0C6D7C7360000674C09DE3F318E04F6D5 :10013E000FC1317B9EFDC411897267318E04F64F5B :10014E0014896142DF03F6EF01E660610667318EC6 :10015E00124900207267318E04F64F14896142DF16 :10016E0003F6EF01E660610687EFBC40F84F3A6197 -:10017E00E88666D161E8FD7006C6D751065B0C3184 +:10017E00E88666D161E8FD8306C6D751065B0C3171 :10018E001A9F08F94008F901DF05CD3705EF03CDB9 :10019E0037078F06F95CE39F06F951035B04318E36 :1001AE00E7240000DD1023DD0823DF0E712006F9A1 @@ -33,221 +33,222 @@ :10020E00275FCE2EFCCF1105F8CF120511CF35008A :10021E0002CF370019CF530006CBEEFEFFCE38319A :10022E00CE3970CF38050A308700BF1801BF1A01CA -:10023E00BF1C01BF1E01D7D7C7F616FD6A04717B1E -:10024E00FA31329308713293717AFAEF0C717AFAAD -:10025E00A7F647DFE95203EF01F2C6D7C7C1C1FBCC -:10026E00F8FF17A1C1E0C18C0A70C18C0270FD8B22 -:10027E00021006629D508C01721004C6D7C7C1FBD6 -:10028E00F8FFFD4602D2DD045203EF618B70FDB71D -:10029E0003D2DD077133935202EF528C0870FDD3F7 -:1002AE0003FD1E048B6C0170FDD303300400BF24CC -:1002BE0001301740BF1C01300400BF22018C0A918F -:1002CE00DF04F6BF2A01710BE2CE44FF3182E20257 -:1002DE00EFFAAC0C148E449961790C61690A8C0AA0 -:1002EE00D1DFDAFD4704710BE2713393F2C0C6D74A -:1002FE00C7C1FBF8FFFD4602D2DD045203EF2571A4 -:10030E000AE68B70FDB703D2DD077133935202EF0D -:10031E00138C0870FDD3038C0A70FDD303FD4704C4 -:10032E00713393F2C0C6D7C7C1FBF8FFFD4602D2A8 -:10033E00DD045203EF70710AE6710BE28B70FDB7AC -:10034E0003D2DD077133935202EF5B710BE2312260 -:10035E009344C73422FBAC0C1652048B99A5A7927A -:10036E00DFF9C68B9D4D8C089D4E8C0A9D4F3184B6 -:10037E00BD02EFFA717ABDCEB144CBB422FB8C0A2A -:10038E00318EBEB8CEBB48714BE1714BE5710ABDE3 -:10039E008C089E44EF0F710BE68C089E448C0A9DD0 -:1003AE004CAC0CBD4AF2C0C6D7C716FDF603AF045F -:1003BE0001BF0C0117FDD303D2DD07FD4704520226 -:1003CE00EF01F2C6D7C716710AE6710BE2669E44BC -:1003DE003182E202EFFAF6420401DD09AF0401BFF9 -:1003EE000C01E2EF01F2C6D7AF2801085CFB08BF93 -:1003FE002801FD4502AF28015CFBBF280130040037 -:10040E00BF2A01301780BF1C01300400BF2201D764 -:10041E00AF2401086C0408BF2401AF28016C0F083B -:10042E006C0B08BF2801FD4502AF2A01085CFB08D2 -:10043E00BF2A01FD4502EDF603300400BF2401F68C -:10044E00BF2A01300B0BBF2801FD4502300B0FBF39 -:10045E002801FD4502300F0FBF2801D7314493010B -:10046E00D77132936A0E03713B25713B23E0FDABCE -:10047E00097120F000FD4502F6BF26015024BF147D -:10048E0001CB440014300F0FBF2801712393710B61 -:10049E00E2710AE6FDF603CE44FF3182E202EFFA84 -:1004AE00FD4704AF0401BF0C01713393714293D722 -:1004BE0031349302EFFAFD1E04713A25713A235A34 -:1004CE000EFC7128F000714393D7C7880616FD46BF -:1004DE0002D2DD045203EF36710AE650A4FDB703D3 -:1004EE00D2DD077133935202EF2417FDD3036770E9 -:1004FE00FDD303FD1E0450A4FDD3035020FDD303F2 -:10050E00D851FDD303A451FD4704713393F2C6D7DE -:10051E00C72008FBF8FFFD6B085014C15008FD9D65 -:10052E0007C0CC07048C074C14DE0C8C07318EFDF3 -:10053E00D309615907EFEECC07048C074C1461C840 -:10054E00ED0C06CC06008C064C0461C8EDEB0530B4 -:10055E000AF9BC02F6BBCEABAC31B2D109C73641FB -:10056E00057184C6DEF3F1C73641057184C661DCC0 -:10057E009C05713BD1AC02148F400599715050050A -:10058E00617902617900F0E1614900DD09C7364108 -:10059E00057184C6DEC3F1C73641057184C661DCC0 -:1005AE000E059C055040C18C07318E31AD128C0664 -:1005BE00318E318D03BDD831FFBDDADADAADD8FD1B -:1005CE009F0CC0D2DD0C5008C15014FD9D07C0FD1C -:1005DE005C0B8C05D1DF06615906ED54058C073195 -:1005EE008EFDD709D2DD0C5008C15014FD9D07C0F9 -:1005FE00FD5C0B8C05D1DF06615907ED4805716076 -:10060E005005CC0400CC05008C054C09DE2B8C0566 -:10061E00318E04F61FC1317B9EFDC41189728C058B -:10062E00318E04F64F14896142DF03F6EF01E66066 -:10063E000E049C04615905EFCF41001140F81F3A9A -:10064E0061E86159048C04D1DF08FD5D0BFD6F0C70 -:10065E00EF0C5008C15014FD9D07C0FD5C0B100837 -:10066E00C6D7C72004FBF8FF712B24CC0100F6BCC3 -:10067E0002AC02440900DE3EAC0204F60F14410047 -:10068E00118972AC020C5014896142DF03F6EF013E -:10069E00E6600E019C01AC021249005072AC0204DD -:1006AE00F67F14896142DF03F6EF01E6600E019CCE -:1006BE0001617902EFBB40F67FFF61F86159018C51 -:1006CE0001D161F8ED6907CC0100717AFAFD6A0477 -:1006DE00711300711B20710303710205E0C15003F9 -:1006EE00FD362BC05013FDAB09500FC1E0FD362B6C -:1006FE00C0CEABAC6159018C0191DD068C014C036F -:10070E00DF03E6EF01F66061FB7121048C014C08FA -:10071E0061F8CC010031320705A024FCEF03F5246B -:10072E00FC4024FC11DC22F524FCF0C15003FD3604 -:10073E002BC0CE3708CBE4FFFFCBE6FFF7CED4FFBE -:10074E00CF370008F5120561FDE6BC02F6614902DD -:10075E00DD9F00000000617902EFF1FD6B08D2DF32 -:10076E00FA5008C15014FD9D07C0D2FD5C0B100459 -:10077E00C6D73184BD02EFFA717BBDCBE4FFFFCB50 -:10078E00E6FFFFCBD4FFFF717ABED7717BBED7C712 -:10079E00C1200CFBF8FF8C0C318E31ADC1317B9D2D -:1007AE00D4C0BC068DD49C088C149C0B8C14318E3A -:1007BE00040C00128C0B318EBDD813FD2E0F61C8A8 -:1007CE00ED6608CEABACCC05068C0B318EFDCF0999 -:1007DE00D2DD158C0B318EFDD3096169058C05D1E7 -:1007EE00DFE7FD9907E2EF71CC0A008C0A4C04DEBC -:1007FE0054F6BC02300AF9BBAC06148C089EFD11EF -:10080E008972AB146299AC06A1BC0661790061795C -:10081E0002F0E1614902DFE05040C18C0B318E31B4 -:10082E00AD128C0A318E318D03BDD831FFBDDADAAF -:10083E00DAADD8FD9F0CC0D2DD06FD9907E2EF19A7 -:10084E0061590AEFA68C0B318EFDD709D2DD03E27A -:10085E00EF0761590BEDBA07F2100EC6D7C7717BC1 -:10086E009D717BFAFD8007300AF9FD820AFD0D0AA3 -:10087E00C6D7FD6B08FD5C0BFD9907F5ABFFF2D7F4 -:10088E00C7310497067110B3FBEF047118B3FB8FD9 -:10089E00B3FB7B8A76D1DD278FB3FB9D8A665C0224 -:1008AE00D1DD1C8FB3FB5C02D1DD0B5040C150106B -:1008BE00FD8634C0EF095020C15010FD8634C0C6ED -:1008CE00D7C7360000665C80D1DD10675C80D1DF53 -:1008DE0005713396EF0B713296EF06710407713185 -:1008EE0096665C40D1DD10675C40D1DF05714396A2 -:1008FE00EF0B714296EF06711405714196665C011D -:10090E00D1DD10675C01D1DF05715396EF0B71528B -:10091E0096EF06713407715196665C02D1DD106751 -:10092E005C02D1DF05716396EF1D716296EF184080 -:10093E0007F901DF08710402716196EF0AC73610DC -:10094E000571C4C6716196665C04D1DD10675C04E6 -:10095E00D1DF05717396EF0B717296EF0671440736 -:10096E00717196665C08D1DD10675C08D1DF057188 -:10097E000397EF0B710297EF0671140771019766DB -:10098E005C10D161E8715AD1C6D7F5F6FBF5F8FBCC -:10099E00CFFEFBFFCFFAFBFFCFFBFBFFD7C7C1C1DB -:1009AE00FBF8FFCEABAC8C02D1DD12616902305C7C -:1009BE0003BBF6614900DDEE618900EFF51004C658 -:0109CE00D751 -:1009CF005208EF065203EF025206FEE600FE1B002E -:1009DF00DC16089F03088F0408089F040862FE2492 -:1009EF0000089F0408EEBF00EEBA00C1C514410E07 -:1009FF0011D9D0FF118FD1FF312E45C4C0D7F2319D -:100A0F00A2C401E2D79DE261DD4C09DF12717BFACE -:100A1F00C18F06089F25FDC0CF060800EE270031C5 -:100A2F00F2FA04CF0608004C00DF05D50008DD16EA -:100A3F0061DD717BFAD50608DD0ACDE31F61CD615B -:100A4F00CDEE160061CDFED40061FFFE9A00FCF8DA -:100A5F00FF0EFEB20061CDFED5004C09DF0EC18F37 -:100A6F0006086F25FD9F0608C0EE0400CF0608009C -:100A7F00F8E3D75200EF025202FE3700CF24FD00F9 -:100A8F00CF060800BF0408C716629F000841001177 -:100A9F008F1A209B4100118F1B209F0108C6510008 -:100AAF00FE62FFEF025205CF060800C1510CFE0A8D -:100ABF0000C0D7C1511DFE0200C0D761DD717BFAA6 -:100ACF0070CEC0A59EC47CFF9EC4609EC461CDD76E -:100ADF0061DD717BFAC18EC45C1BFED6FFCF0608A9 -:100AEF0001FED7FFC061CDD731F2FA1AC1AEE4BF14 -:100AFF0016FDAEE6BF18FDAED4BF1AFD30FFFFBE28 -:100B0F00E4BEE6BED4C0D731F2FA11C1AF16FDBEB6 -:100B1F00E4AF18FDBEE6AF1AFDBED4C0D7C1BF1CEF -:100B2F00FD13BF1EFD15BF20FD17BF22FDC0D7AFA0 -:100B3F001CFDDB1EFDEB20FDFB22FDD7534B30527E -:100B4F005430324E323030475631323000FFC150C0 -:100B5F00FEFEAB0061DD717BFACF060800FE0A00D6 -:100B6F00FEA4FF61CDF8E3EECF00C7FB0408BF166C -:100B7F00FD8FC0009C05C5C337040600BF18FD35A7 -:100B8F0036C10B300000522BFE6600C2C4C6306F58 -:100B9F000BB800300000B8022004AF18FDB80030C9 -:100BAF000F00B802AF16FD61FF520AFE3AFFECF8D4 -:100BBF00FF0E717BFAC1C7FB04088C05C65C80FE73 -:100BCF000200C0D761DD717BFA70CFC0FFA59FC057 -:100BDF00007CFF9FC000609FC00061CDD7618BFE7E -:100BEF00E2FF717BBE410011FB000017CEFC0061DC -:100BFF00CB089EFDF31161C999A58392DFF7D7FE4C -:100C0F00B1FED524FDDF23C1CF0308035109FEF444 -:100C1F00FDC0D2DF37FE3800A20408CF030807510A -:100C2F0009FEE1FDD2B20408DF22C7FB04083183BD -:100C3F0002C6D7C6510AFECCFD624C1FDF06CF2479 -:100C4F00FD01EF04CF24FD00C0EE5BFEC0EE55FEAC -:100C5F00C7C1FB04088B31196C0161589BC0C6D703 -:100C6F00717BFAFE4DFEAF0408040600C11436D3A3 -:100C7F000B300000522DF3FE77FF8FC000FE2BFECE -:100C8F0061CF5C807C8073C0041900CEFC0F61CBF8 -:100C9F00C55404EF03C55417FE18FEC7360008BB32 -:100CAF00629C0288089C03D1DD334C41DE2F70F12A -:100CBF00312DB161090033081C000851FF612A4131 -:100CCF000E118FD0FF613B118FD1FF6138DC0E8B7E -:100CDF005C03DF0964C6C4FE2BFDEECAFDC6C4EE7D -:020CEF00C3FD43 -:100CF10061CF5100718C7109FECBF800FEFCC90176 -:100D010000F6BF00F953C0F693935820FEDFF94176 -:100D11000036584D34CCFCEF05118B99A7A517442B -:100D2100A24DDFF53602F930CCFCEF04CC0000A770 -:100D310047DFF9410036A24D3420FEEF05118B99B2 -:100D4100A7A51744B24DDFF53630FE3092FEEF0411 -:100D5100CC0000A747DFF9FCCE0000EFFE61DD719A -:100D61007BFABEF0ADD8BEF200AEF661CDD7C3615D -:100D7100DD717BFABEF0ADD8BEF200DBF6FFADDC73 -:100D8100BEF000AEF6BDD8AEF40312ADDABEF2008D -:100D9100AEF661CD03BDDAC2D7C3F33174D908838E -:100DA100C1F626D8BDD8C031750683C312F623C259 -:100DB100FDBC0D93DF0312F623C2D7440000DD26EC -:100DC10061DD717BFACFE80080BEF6F6BEF4BEF2BB -:100DD100ADD8BEF0CFE800818FE8003103FAAEF064 -:100DE100F5E80061CDD7B1D7C3F33174D90883C118 -:100DF100F626D8BDD8C0317505C312F623C2FD0A47 -:100E01000E93DF0312F623C2D7440000DD2761DD14 -:100E1100717BFACFE80080BEF6F6BEF4BEF2ADD823 -:100E2100BEF0CFE800818FE8003103FAAFE000F5B2 -:100E3100E80061CDD7ADD8D7C3F33174DB0F83C1DF -:100E4100F626D8BDD861317026DABDDAC031750D0C -:100E510083C312F626DCBDDC61317023C2FD720E44 -:100E610093DF0CF626D8BDD861317026DABDDAC21F -:100E7100D7C161686BDC6BDDC0DD2F61DD717BFA91 -:100E8100CFE80080BEF4ADDCBEF6ADD8BEF0ADDA81 -:100E9100BEF2CFE800818FE8003103FAAEF0BDD891 -:100EA100AEF2BDDAF5E80061CDD7F6BDD8BDDAD72F -:100EB1008292DD2B61DD717BFACFE80080BEF0F616 -:100EC100BEF2BEF46208BEF6CFE800818FE80031C1 -:100ED10003FAAFE0006072AEF0F5E80061CDD760D3 -:100EE10072F6B1D706DABDDAADDC06D8BDD861D865 -:100EF100A6DAD7D1DD17C1C3DAD89DD8ADDA311C56 -:100F010061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDE8 -:100F11001BC1C3DADA9DDAADD8311E33311E33710C -:100F2100F9B4DADFF4BDD813BDDAC2C0D746D8DDD3 -:100F31000771FF7177D971C0D75BDB9DDB605BDA2D -:100F41009DDAADDC5BD9085BD808BDD8D7C3C7F340 -:100F5100728EFDC162314C4100364E4D1161A0725D -:070F6100C09EFD62C6C2D76D -:0A0FF60031373A31343A333200004B -:0A20000031373A31343A3332000030 +:10023E00BF1C01BF1E01D7D7C7F6164004F903DD58 +:10024E00064004F904DF073132020300EFF9FD7DA9 +:10025E0004717BFA31329308713293717AFAEF0C92 +:10026E00717AFAA7F647DFE95203EF01F2C6D7C754 +:10027E00C1C1FBF8FF17A1C1E0C18C0A70C18C028D +:10028E0070FD9E021006629D508C01721004C6D73E +:10029E00C7C1FBF8FFFD4602D2DD045203EF618BAE +:1002AE0070FDCA03D2DD077133935202EF528C08F0 +:1002BE0070FDE603FD31048B6C0170FDE603300426 +:1002CE0000BF2401301740BF1C01300400BF2201C3 +:1002DE008C0A91DF04F6BF2A01710BE2CE44FF3186 +:1002EE0082E202EFFAAC0C148E449961790C6169CA +:1002FE000A8C0AD1DFDAFD5A04710BE2713393F2E4 +:10030E00C0C6D7C7C1FBF8FFFD4602D2DD045203BB +:10031E00EF25710AE68B70FDCA03D2DD07713393A8 +:10032E005202EF138C0870FDE6038C0A70FDE60393 +:10033E00FD5A04713393F2C0C6D7C7C1FBF8FFFD57 +:10034E004602D2DD045203EF70710AE6710BE28BA6 +:10035E0070FDCA03D2DD077133935202EF5B710B4E +:10036E00E231229344C73422FBAC0C1652048B9913 +:10037E00A5A792DFF9C68B9D4D8C089D4E8C0A9DCC +:10038E004F3184BD02EFFA717ABDCEB144CBB422A7 +:10039E00FB8C0A318EBEB8CEBB48714BE1714BE57A +:1003AE00710ABD8C089E44EF0F710BE68C089E44BB +:1003BE008C0A9D4CAC0CBD4AF2C0C6D7C716FD09BF +:1003CE0004AF0401BF0C0117FDE603D2DD07FD5A91 +:1003DE00045202EF01F2C6D7C716710AE6710BE29C +:1003EE00669E443182E202EFFAF6420401DD09AF65 +:1003FE000401BF0C01E2EF01F2C6D7AF2801085C81 +:10040E00FB08BF2801FD4502AF28015CFBBF280198 +:10041E00300400BF2A01301780BF1C01300400BF1A +:10042E002201D7AF2401086C0408BF2401AF2801B4 +:10043E006C0F086C0B08BF2801FD4502AF2A01089E +:10044E005CFB08BF2A01FD4502ED0904300400BF24 +:10045E002401F6BF2A01300B0BBF2801FD450230E7 +:10046E000B0FBF2801FD4502300F0FBF2801D731FA +:10047E00449301D77132936A0E03713B25713B236E +:10048E00E0FDBE097120F000FD4502F6BF260150C9 +:10049E0024BF1401CB440014300F0FBF2801712369 +:1004AE0093710BE2710AE6FD0904CE44FF3182E23C +:1004BE0002EFFAFD5A04AF0401BF0C0171339371C0 +:1004CE004293D731349302EFFAFD3104713A25711C +:1004DE003A235A0EFC7128F000714393D7C7880651 +:1004EE0016FD4602D2DD045203EF36710AE650A421 +:1004FE00FDCA03D2DD077133935202EF2417FDE6D6 +:10050E00036770FDE603FD310450A4FDE6035020A1 +:10051E00FDE603D851FDE603A451FD5A0471339351 +:10052E00F2C6D7C72008FBF8FFFD7E085014C15055 +:10053E0008FDB007C0CC07048C074C14DE0C8C07EA +:10054E00318EFDE609615907EFEECC07048C074C9E +:10055E001461C8ED1F06CC06008C064C0461C8ED74 +:10056E00FE05300AF9BC02F6BBCEABAC31B2D109F6 +:10057E00C73641057184C6DEF3F1C7364105718475 +:10058E00C661DC9C05713BD1AC02148F400599719C +:10059E00505005617902617900F0E1614900DD0991 +:1005AE00C73641057184C6DEC3F1C7364105718475 +:1005BE00C661DC0E059C055040C18C07318E31ADF5 +:1005CE00128C06318E318D03BDD831FFBDDADADAE9 +:1005DE00ADD8FDB20CC0D2DD0C5008C15014FDB028 +:1005EE0007C0FD6F0B8C05D1DF06615906ED67055F +:1005FE008C07318EFDEA09D2DD0C5008C15014FD76 +:10060E00B007C0FD6F0B8C05D1DF06615907ED5B9E +:10061E000571605005CC0400CC05008C054C09DE3C +:10062E002B8C05318E04F61FC1317B9EFDC41189C2 +:10063E00728C05318E04F64F14896142DF03F6EF9A +:10064E0001E6600E049C04615905EFCF4100114094 +:10065E00F81F3A61E86159048C04D1DF08FD700B74 +:10066E00FD820CEF0C5008C15014FDB007C0FD6F99 +:10067E000B1008C6D7C72004FBF8FF712B24CC0142 +:10068E0000F6BC02AC02440900DE3EAC0204F60FDA +:10069E00144100118972AC020C5014896142DF03BF +:1006AE00F6EF01E6600E019C01AC02124900507299 +:1006BE00AC0204F67F14896142DF03F6EF01E660B7 +:1006CE000E019C01617902EFBB40F67FFF61F8617C +:1006DE0059018C01D161F8ED7C07CC0100717AFAD9 +:1006EE00FD7D04711300711B20710303710205E07F +:1006FE00C15003FD362BC05013FDBE09500FC1E093 +:10070E00FD362BC0CEABAC6159018C0191DD068C50 +:10071E00014C03DF03E6EF01F66061FB7121048CEF +:10072E00014C0861F8CC010031320705A024FCEF22 +:10073E0003F524FC4024FC11DC22F524FCF0C1500E +:10074E0003FD362BC0CE3708CBE4FFFFCBE6FFF719 +:10075E00CED4FFCF370008F5120561FDE6BC02F6D8 +:10076E00614902DD9F00000000617902EFF1FD7E1C +:10077E0008D2DFFA5008C15014FDB007C0D2FD6F89 +:10078E000B1004C6D73184BD02EFFA717BBDCBE4EA +:10079E00FFFFCBE6FFFFCBD4FFFF717ABED7717B95 +:1007AE00BED7C7C1200CFBF8FF8C0C318E31ADC10A +:1007BE00317B9DD4C0BC068DD49C088C149C0B8CB4 +:1007CE0014318E040C00128C0B318EBDD813FD41EA +:1007DE000F61C8ED7908CEABACCC05068C0B318E13 +:1007EE00FDE209D2DD158C0B318EFDE6096169053E +:1007FE008C05D1DFE7FDAC07E2EF71CC0A008C0A65 +:10080E004C04DE54F6BC02300AF9BBAC06148C085C +:10081E009EFD118972AB146299AC06A1BC0661797A +:10082E0000617902F0E1614902DFE05040C18C0BBA +:10083E00318E31AD128C0A318E318D03BDD831FF20 +:10084E00BDDADADAADD8FDB20CC0D2DD06FDAC07EA +:10085E00E2EF1961590AEFA68C0B318EFDEA09D22F +:10086E00DD03E2EF0761590BEDCD07F2100EC6D78F +:10087E00C7717B9D717BFAFD9307300AF9FD950ACE +:10088E00FD200AC6D7FD7E08FD6F0BFDAC07F5AB4C +:10089E00FFF2D7C7310497067110B3FBEF0471183E +:1008AE00B3FB8FB3FB7B8A76D1DD278FB3FB9D8A9B +:1008BE00665C02D1DD1C8FB3FB5C02D1DD0B5040B8 +:1008CE00C15010FD8634C0EF095020C15010FD8676 +:1008DE0034C0C6D7C7360000665C80D1DD10675CB9 +:1008EE0080D1DF05713396EF0B713296EF067104EE +:1008FE0007713196665C40D1DD10675C40D1DF0533 +:10090E00714396EF0B714296EF0671140571419685 +:10091E00665C01D1DD10675C01D1DF05715396EF86 +:10092E000B715296EF06713407715196665C02D1C7 +:10093E00DD10675C02D1DF05716396EF1D71629663 +:10094E00EF184007F901DF08710402716196EF0A92 +:10095E00C736100571C4C6716196665C04D1DD1090 +:10096E00675C04D1DF05717396EF0B717296EF061B +:10097E00714407717196665C08D1DD10675C08D111 +:10098E00DF05710397EF0B710297EF067114077174 +:10099E000197665C10D161E8715AD1C6D7F5F6FBA6 +:1009AE00F5F8FBCFFEFBFFCFFAFBFFCFFBFBFFD72C +:1009BE00C7C1C1FBF8FFCEABAC8C02D1DD126169B1 +:1009CE0002305C03BBF6614900DDEE618900EFF594 +:0409DE001004C6D764 +:1009E2005208EF065203EF025206FEE600FE1B001B +:1009F200DC16089F03088F0408089F040862FE247F +:100A020000089F0408EEBF00EEBA00C1C514410EF3 +:100A120011D9D0FF118FD1FF312E45C4C0D7F23189 +:100A2200A2C401E2D79DE261DD4C09DF12717BFABB +:100A3200C18F06089F25FDC0CF060800EE270031B2 +:100A4200F2FA04CF0608004C00DF05D50008DD16D7 +:100A520061DD717BFAD50608DD0ACDE31F61CD6148 +:100A6200CDEE160061CDFED40061FFFE9A00FCF8C7 +:100A7200FF0EFEB20061CDFED5004C09DF0EC18F24 +:100A820006086F25FD9F0608C0EE0400CF06080089 +:100A9200F8E3D75200EF025202FE3700CF24FD00E6 +:100AA200CF060800BF0408C716629F000841001164 +:100AB2008F1A209B4100118F1B209F0108C65100F5 +:100AC200FE62FFEF025205CF060800C1510CFE0A7A +:100AD20000C0D7C1511DFE0200C0D761DD717BFA93 +:100AE20070CEC0A59EC47CFF9EC4609EC461CDD75B +:100AF20061DD717BFAC18EC45C1BFED6FFCF060896 +:100B020001FED7FFC061CDD731F2FA1AC1AEE4BF00 +:100B120016FDAEE6BF18FDAED4BF1AFD30FFFFBE14 +:100B2200E4BEE6BED4C0D731F2FA11C1AF16FDBEA3 +:100B3200E4AF18FDBEE6AF1AFDBED4C0D7C1BF1CDC +:100B4200FD13BF1EFD15BF20FD17BF22FDC0D7AF8D +:100B52001CFDDB1EFDEB20FDFB22FDD7534B30526B +:100B62005430324E323030475631323000FFC150AD +:100B7200FEFEAB0061DD717BFACF060800FE0A00C3 +:100B8200FEA4FF61CDF8E3EECF00C7FB0408BF1659 +:100B9200FD8FC0009C05C5C337040600BF18FD3594 +:100BA20036D40B300000522BFE6600C2C4C630821F +:100BB2000BB800300000B8022004AF18FDB80030B6 +:100BC2000F00B802AF16FD61FF520AFE3AFFECF8C1 +:100BD200FF0E717BFAC1C7FB04088C05C65C80FE60 +:100BE2000200C0D761DD717BFA70CFC0FFA59FC044 +:100BF200007CFF9FC000609FC00061CDD7618BFE6B +:100C0200E2FF717BBE410011FB000017CEFC0061C8 +:100C1200CB089EFDF31161C999A58392DFF7D7FE38 +:100C2200B1FED524FDDF23C1CF0308035109FEF431 +:100C3200FDC0D2DF37FE3800A20408CF03080751F7 +:100C420009FEE1FDD2B20408DF22C7FB04083183AA +:100C520002C6D7C6510AFECCFD624C1FDF06CF2466 +:100C6200FD01EF04CF24FD00C0EE5BFEC0EE55FE99 +:100C7200C7C1FB04088B31196C0161589BC0C6D7F0 +:100C8200717BFAFE4DFEAF0408040600C11436E67D +:100C92000B300000522DF3FE77FF8FC000FE2BFEBB +:100CA20061CF5C807C8073C0041900CEFC0F61CBE5 +:100CB200C55404EF03C55417FE18FEC7360008BB1F +:100CC200629C0288089C03D1DD334C41DE2F70F117 +:100CD200312DB161090033081C000851FF612A411E +:100CE2000E118FD0FF613B118FD1FF6138DC0E8B6B +:100CF2005C03DF0964C6C4FE2BFDEECAFDC6C4EE6A +:020D0200C3FD2F +:100D040061CF5100718C7109FECBF800FEFCC90162 +:100D140000F6BF00F953C0F693935820FEDFF94163 +:100D24000036584D34CCFCEF05118B99A7A5174418 +:100D3400A24DDFF53602F930CCFCEF04CC0000A75D +:100D440047DFF9410036A24D3420FEEF05118B999F +:100D5400A7A51744B24DDFF53630FE3092FEEF04FE +:100D6400CC0000A747DFF9FCCE0000EFFE61DD7187 +:100D74007BFABEF0ADD8BEF200AEF661CDD7C3614A +:100D8400DD717BFABEF0ADD8BEF200DBF6FFADDC60 +:100D9400BEF000AEF6BDD8AEF40312ADDABEF2007A +:100DA400AEF661CD03BDDAC2D7C3F33174D908837B +:100DB400C1F626D8BDD8C031750683C312F623C246 +:100DC400FDCF0D93DF0312F623C2D7440000DD26C6 +:100DD40061DD717BFACFE80080BEF6F6BEF4BEF2A8 +:100DE400ADD8BEF0CFE800818FE8003103FAAEF051 +:100DF400F5E80061CDD7B1D7C3F33174D90883C105 +:100E0400F626D8BDD8C0317505C312F623C2FD1D20 +:100E14000E93DF0312F623C2D7440000DD2761DD01 +:100E2400717BFACFE80080BEF6F6BEF4BEF2ADD810 +:100E3400BEF0CFE800818FE8003103FAAFE000F59F +:100E4400E80061CDD7ADD8D7C3F33174DB0F83C1CC +:100E5400F626D8BDD861317026DABDDAC031750DF9 +:100E640083C312F626DCBDDC61317023C2FD850E1E +:100E740093DF0CF626D8BDD861317026DABDDAC20C +:100E8400D7C161686BDC6BDDC0DD2F61DD717BFA7E +:100E9400CFE80080BEF4ADDCBEF6ADD8BEF0ADDA6E +:100EA400BEF2CFE800818FE8003103FAAEF0BDD87E +:100EB400AEF2BDDAF5E80061CDD7F6BDD8BDDAD71C +:100EC4008292DD2B61DD717BFACFE80080BEF0F603 +:100ED400BEF2BEF46208BEF6CFE800818FE80031AE +:100EE40003FAAFE0006072AEF0F5E80061CDD760C0 +:100EF40072F6B1D706DABDDAADDC06D8BDD861D852 +:100F0400A6DAD7D1DD17C1C3DAD89DD8ADDA311C42 +:100F140061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDD5 +:100F24001BC1C3DADA9DDAADD8311E33311E3371F9 +:100F3400F9B4DADFF4BDD813BDDAC2C0D746D8DDC0 +:100F44000771FF7177D971C0D75BDB9DDB605BDA1A +:100F54009DDAADDC5BD9085BD808BDD8D7C3C7F32D +:100F6400728EFDC162314C4100364E4D1161A0724A +:070F7400C09EFD62C6C2D75A +:0A0FF60031383A31343A313400004A +:0A20000031383A31343A313400002F :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -309,39 +310,39 @@ :10239C00FBDF095020C15011FD8634C0C0C6D78D5B :1023AC00209D3EFDED23FD522BD507F9DD04710375 :1023BC0092D78D3E4B2061F83164921C716392FD73 -:1023CC006A044A3E07DD054A3EFFDF098F06F931F4 +:1023CC007D044A3E07DD054A3EFFDF098F06F931E1 :1023DC000303FD7624FD8A24710292306D256194ED -:1023EC00D7C77162017172015003FDAB095008FD32 +:1023EC00D7C77162017172015003FDBE095008FD1F :1023FC000337629D305009FD0337627671630171BA :10240C001806F94A30F1DC05E507F9EF224A3004E9 -:10241C00DE1ACF07F9025008C1506CFD6A02C09257 +:10241C00DE1ACF07F9025008C1506CFD7D02C09244 :10242C00DF0DD450DF09711006F9EF03F507F94001 :10243C0007F901DF05710A22EF06710B2271030205 :10244C00CD20075700674C08DE1073090A20614E37 :10245C00DC05679D20EF0387EFEB4A2007DF09D5EA -:10246C0007F961F8CF07F903C6D7500AFDAB09305D -:10247C004000C15006FD012BC05096EDAB09C720A2 +:10246C0007F961F8CF07F903C6D7500AFDBE09304A +:10247C004000C15006FD012BC05096EDBE09C7208F :10248C0006FBF8FFD507F961E8ED6925304A57C11D :10249C00503EFD012BC0D2DD077100B2FBED69256A :1024AC007108B2FB17040200C15004C1500CC1509A -:1024BC006CFD8B021006EA38AA48318D12AA4831FD +:1024BC006CFD9E021006EA38AA48318D12AA4831EA :1024CC008E616B08616A08C1500EFD012BC0F6903D :1024DC00C1500CFD012BC0CC01008C014C04DE283A :1024EC0031349302EFFA712293EA388C015010D6F2 -:1024FC0005C15010C18C01D6044000C1506CFD3593 -:10250C00031006615901EFD250A5FDAB09EA38AAB8 +:1024FC0005C15010C18C01D6044000C1506CFD4880 +:10250C00031006615901EFD250A5FDBE09EA38AAA5 :10251C0048318D12AA48318E616B08616A08C1502E -:10252C000EFD012BC050A5FDAB095004C1506CFD34 -:10253C006A02C0629C01EA388A4B4E0161C3048A6C +:10252C000EFD012BC050A5FDBE095004C1506CFD21 +:10253C007D02C0629C01EA388A4B4E0161C3048A59 :10254C004A4E0117040200C15004C1500CC1506C1A -:10255C00FD35031006F6C1503EFD012BC01006C61A +:10255C00FD48031006F6C1503EFD012BC01006C607 :10256C00D7C78D3F4B3061F8ED0C264A4128DE056C :10257C00A441ED0C26F4418D309D3F8D305070D62A :10258C0012307351230480001231FF318E039D40B1 :10259C009FAEFBF68D407C804C95DC1B8D40318FC3 -:1025AC00241400EA38BDD8AA44FD5E0D1231FF3167 +:1025AC00241400EA38BDD8AA44FD710D1231FF3154 :1025BC008E03318F16EF198D40318F241400EA38B9 -:1025CC00BDD8AA46FD5E0D1231FF318E03318F1638 +:1025CC00BDD8AA46FD710D1231FF318E03318F1625 :1025DC00EA388A427217F3031644000171FE61C88F :1025EC0036FF001701DE02F61617BD78C7500CFD3A :1025FC00012BC0D2DF068D309D3FEF047100B2FB82 @@ -351,7 +352,7 @@ :10263C004617040600FDF92BD2DD0F7100B2FB71B9 :10264C000392CC0500711293EF2D7108B2FB8C062E :10265C00318E318D080E07081C00BBEA388A407297 -:10266C00ABFDB10EBB8C019C05D1DF08CC0501CCB8 +:10266C00ABFDC40EBB8C019C05D1DF08CC0501CCA5 :10267C000400EF038B9C0417040600FD042CD2DD30 :10268C0006CC06C8CC07008C069FB1FB8C06318E9D :10269C00318D080E07081C00BD34AD344401A5DC97 @@ -367,10 +368,10 @@ :10273C00DE054A4406DE09D5AFFBDF0DD444DD09C6 :10274C005020C15011FD8634C08FAFFB9D44FDC39A :10275C002B1008C6D7C75601D837C15002FD362BEF -:10276C00C04008F90161F8712010055012FDAB0949 -:10277C008D376C0870C15002FD362BC05003FDAB79 +:10276C00C04008F90161F8712010055012FDBE0936 +:10277C008D376C0870C15002FD362BC05003FDBE66 :10278C00098D376C1870C15002FD362BC05016FDE8 -:10279C00AB095003FD472B625C01D1DD0F7170B3A7 +:10279C00BE095003FD472B625C01D1DD0F7170B394 :1027AC00FB5002C15013FD8634C056006672C6D76A :1027BC00C75004FD472B625C03D1DD405014FD5320 :1027CC002834B3FB895C9F998A0C7CFF50FF5C1406 @@ -378,8 +379,8 @@ :1027EC00997162075600316207058666D1DFF77171 :1027FC006307716B2734C6FB895CEB997128100554 :10280C005002FD472BD2DD354008F901DF05500A97 -:10281C00FDAB098D376C1070C15002FD362BC0E03A -:10282C00FDAB09D837C15002FD362BC05033FDAB80 +:10281C00FDBE098D376C1070C15002FD362BC0E027 +:10282C00FDBE09D837C15002FD362BC05033FDBE5A :10283C0009F0C15002FD362BC07178B3FBE0C150DA :10284C0013FD8634C0C6D7C7C12004FBF8FFCC02E9 :10285C00005004FD472B629C038C045C20D1DD0EE0 @@ -388,7 +389,7 @@ :10288C00028C045C08D1DD0E8C036C029C038C0260 :10289C006C089C02EF138C045C04D1DD0C8C035C83 :1028AC00FD9C038C026C049C028C03D1DD05501A38 -:1028BC00FDAB098C0370C15004FD362BC08FB3FBEC +:1028BC00FDBE098C0370C15004FD362BC08FB3FBD9 :1028CC005C9F728C03318E316D148C03318E314DC3 :1028DC00616D08616C5C606162629FB3FB8FBFFBD2 :1028EC007CFF50FF5E02D1DD278FBFFB7CFF5E02B9 @@ -397,18 +398,18 @@ :10291C00F21006C6D7D9A7FBC15006FD362BC0D97D :10292C00A8FBC15007FD362BC0D7FD2129F2D7C714 :10293C00711300711B20710303710205E0C1500378 -:10294C00FD362BC05013FDAB09F0C15005FD362BE5 -:10295C00C0500FC1E0FD362BC0500AFDAB0971030E -:10296C00055008FDAB09501FC1E0FD362BC05012BD -:10297C00FDAB095003FD472B625C01D1DF03E2EF95 +:10294C00FD362BC05013FDBE09F0C15005FD362BD2 +:10295C00C0500FC1E0FD362BC0500AFDBE097103FB +:10296C00055008FDBE09501FC1E0FD362BC05012AA +:10297C00FDBE095003FD472B625C01D1DF03E2EF82 :10298C0024F0FD472B629D363602F9C75008FD1E18 :10299C002BC05003C1FD362BC0710203711A20FDF0 :1029AC00DE2AF431F2C6D75003FD472B625C01D10D -:1029BC00DD155014FD5328FDBC275014FDAB09E068 +:1029BC00DD155014FD5328FDBC275014FDBE09E055 :1029CC00C15003FD362BC0711300711B2071030322 -:1029DC005014FDAB09F0C1E0FD362BC0F0C1500323 +:1029DC005014FDBE09F0C1E0FD362BC0F0C1500310 :1029EC00FD362BC0D7C72004FBF8FFCC02008D317D -:1029FC009C035010C150A4FD6A02C0629D31D4509A +:1029FC009C035010C150A4FD7D02C0629D31D45087 :102A0C00DD04F2EDBB2A8C037B315C08D1DD0F8D2C :102A1C00315C08D1DF05CC0210EF03CC02208C0313 :102A2C007B315C04D1DD158D315C04D1DF088C0267 @@ -419,17 +420,17 @@ :102A7C00D1DFF4716307716B278D315C40D1DD09B7 :102A8C005002C15012FD8634C08D315C01D1DD087D :102A9C00E0C15012FD8634C0717AFA8D315C41D19F -:102AAC00DD0C5A31BED831C15010FDD804C0F21023 +:102AAC00DD0C5A31BED831C15010FDEB04C0F21010 :102ABC0004C6D7FD6127F2D7FDBC27F2D7C78FC656 :102ACC00FB7617FD5328664FC6FBDFF2F5C6FBF20B -:102ADC00C6D75064FDAB09FD0F2C6261FB711192DE -:102AEC00F171149261DC70C15012FDD804C0FD3438 +:102ADC00C6D75064FDBE09FD0F2C6261FB711192CB +:102AEC00F171149261DC70C15012FDEB04C0FD3425 :102AFC0036CD5F03D7C7C1C1FBF8FFAC0ABB17C10A -:102B0C005002C18C0270C1506CFD350310061004CC +:102B0C005002C18C0270C1506CFD480310061004B9 :102B1C00C6D7C7C1FBF8FFAC08C15002C18B70C14E -:102B2C00506CFD8B021006C0C6D7C788061667709E -:102B3C00C1C75084FDFE021004C6D7C716C7508407 -:102B4C00FD6A02C0C6D7C74A2004DE045600EF0255 +:102B2C00506CFD9E021006C0C6D7C788061667708B +:102B3C00C1C75084FD11031004C6D7C716C75084F3 +:102B4C00FD7D02C0C6D7C74A2004DE045600EF0242 :102B5C0056014008F901DF048686EF0A4008F902A5 :102B6C00DF045104610666318F12504CD633514C40 :102B7C00D6610A045420BD38C6D740AFFB3DDC05F6 @@ -439,7 +440,7 @@ :102BBC0004FCD7F504FCD7D504F9DF04717392D764 :102BCC00FD0F2C6261FB710193711492710793617B :102BDC00C831729217717292710493711192F171E2 -:102BEC00049361DC70C15012FDD804C0D7C716C75E +:102BEC00049361DC70C15012FDEB04C0D7C716C74B :102BFC005004FD1E2BC0C6D7C716C75002FD1E2B96 :102C0C00C0C6D740AFFB0BDE02E2D7F2D771000192 :102C1C000571785005713AD5713BD18F10055CFC6C @@ -447,7 +448,7 @@ :102C3C004205714850057130500571205005CF5335 :102C4C000505CF52050A7130510571205105713BB4 :102C5C00D5717050058F11055CFC9F1105F422D7BE -:102C6C007178500571080105D7FD2E38FD6A047185 +:102C6C007178500571080105D7FD2E38FD7D047172 :102C7C007AFAFDAB23F504F98F06F931051B5003E5 :102C8C00FD472B625C01D161E8CF04F902CFAFFBA9 :102C9C0064710407714192EF10F671040761101210 @@ -462,7 +463,7 @@ :102D2C0066614FDD0967614EDE0396EF01866672C0 :102D3C00C6D7C7161714AA0412A943DD29AA041270 :102D4C00A923FDB24DC3AC02FDB24D13C2BDD813C5 -:102D5C00FD2E0FDE0C1714AA0212AA0403BA04EFFC +:102D5C00FD410FDE0C1714AA0212AA0403BA04EFE9 :102D6C00051714A9BA04AC041231FF319E03317F4C :102D7C00087208C6D77100F200304400BFB60130AB :102D8C000188BF9001300984BF9E01BF9C01BF9A8E @@ -483,7 +484,7 @@ :102E7C00AA0412F6231231FF31AE03316FBA02C627 :102E8C00D7C7C1FBF8FF8C085080D612AB1413B90E :102E9C00AB14AA0412A92312D927FBF133BDD81302 -:102EAC00FD9A0DBA02C0C6D731049401D74004F97B +:102EAC00FDAD0DBA02C0C6D731049401D74004F968 :102EBC0002DF10F6BE64BE6EBE6ABF8EFBBF94FB13 :102ECC00BF9AFB31749314308AFBFD762E3090FB45 :102EDC00FD762E3096FBFD762EEF713114940D712C @@ -511,7 +512,7 @@ :10303C000B9E31449413714394717B9E8FDCFB9EE9 :10304C009A8FDDFB9E9B717A9EC6D7CFA7FB5CCF78 :10305C00A8FB5FCFC8FB5DCFFCFB36CFFDFBC9E502 -:10306C00D3FBD7C7CFA4FB12CFA5FB0FCFCCFBFF55 +:10306C00D3FBD7C7CFA4FB12CFA5FB10CFCCFBFF54 :10307C00F5CDFBF5CEFBF5CFFBF5D0FB5600664C42 :10308C0064DE08723826FB0086EFF3C6D7C78806C5 :10309C001617F1E73403002361E3EDBE332361F827 @@ -610,7 +611,7 @@ :10366C0064EF0A8F06FC5002D6A1609D648D649DA8 :10367C0063EF0E311495068D649D63EF048D619D8F :10368C00638D639FADFBD863FDA636E863091C22EE -:10369C0070C15013FDD804C0F2D7C7C1C1FBF8FFED +:10369C0070C15013FDEB04C0F2D7C7C1C1FBF8FFDA :1036AC008C02D1DF05F506FCEF1A8C024C05DE0608 :1036BC00CF06FC02EF0E8C02318E1231FE03311F4D :1036CC00609F06FC8D654F06FCDD28CC011F8F0624 @@ -622,7 +623,7 @@ :10372C00F000710BE772C6D7C7C1C1FBF8FF8FFC65 :10373C00FB4E02DC03F2EF318C024FFDFBDC04523A :10374C00FFEF268C022FFCFB706131318D128FFD47 -:10375C00FB2FFCFB70613133BDD813FDBC0DBB449A +:10375C00FB2FFCFB70613133BDD813FDCF0DBB4487 :10376C000001DC03F690BB8B721004C6D7C7C1FBFB :10377C00F8FFAC0814A91489708B6128706131FDB5 :10378C00B24D1344030071FEDC23AC08148A04818F @@ -637,25 +638,25 @@ :10381C00146299AC0814CA0200AC0814CA0310C094 :10382C00C6D7ED3138C75600664C0ADE0BF0317E38 :10383C0012F67810FC86EFF0C6D7C7200CFBF8FF09 -:10384C0017040600C15006C150A8C15030FD8B02B0 +:10384C0017040600C15006C150A8C15030FD9E029D :10385C001006D2DD1B4A6804DE05A468E2EF68346A :10386C00E4FB895CFC99FD0A397110B2FBF2EF574D :10387C00717BFA300600C117040600C130E9FBFD6C :10388C00BA4D1004717AFAF4688FE4FB5C01D1DD57 :10389C00264004F903DF205010C180FD8634C0C7D8 :1038AC0036100571D4C6DE0F17C15006C150A8C121 -:1038BC005030FD8B0210064004F903DD064004F97C +:1038BC005030FD9E0210064004F903DD064004F969 :1038CC000461F8FD1F40F2100CC6D7D9E5FBC150BE -:1038DC0030FD6A02C0629FE8FB5008C15011FD86A2 -:1038EC0034C0F2D7D9E8FBC1D9E7FBC15030FDFE9B -:1038FC000210045008C15011FD8634C0F2D7C72005 +:1038DC0030FD7D02C0629FE8FB5008C15011FD868F +:1038EC0034C0F2D7D9E8FBC1D9E7FBC15030FD1188 +:1038FC000310045008C15011FD8634C0F2D7C72004 :10390C000CFBF8FFCC09004007F901DF05CC0A02DB :10391C00EF03CC0A10CC0B808FE4FB5C039C07D12B :10392C00DF08717AD5CC0807EF06717BD5CC082F50 -:10393C0017040800C15004C150A0C15030FD35031C +:10393C0017040800C15004C150A0C15030FD480309 :10394C001006624C02DF077110B2FBF2EF357118F2 :10395C00B2FBF468C736100571D4C6DE164004F904 -:10396C0003DF1017A1C15006C150A8C15030FD8B08 +:10396C0003DF1017A1C15006C150A8C15030FD9EF5 :10397C00021006717BFA8FE4FB5C034E07DD03E259 :10398C00EF01F2100CC6D7D504F9DF03F6BD6A407F :10399C0004F901DD0AD474DD03B474D7CD74038F3C @@ -690,7 +691,7 @@ :103B6C00F504F9EF4C665C02D1DD11E0C15003FDA8 :103B7C00362BC0711300711B20710303665C04D1DA :103B8C00DD11711300711B20D503FC61F871030367 -:103B9C00FDD434665C08D161E87103035005FDABBC +:103B9C00FDD434665C08D161E87103035005FDBEA9 :103BAC00097102035003C1FD362BC0711A20FDDED2 :103BBC002AF2C6D7C756FF4A461361C8ED9A3C8F06 :103BCC0006F9311505300400EF0F8F06F931450564 @@ -706,13 +707,13 @@ :103C6C0003E6EF01F6C2616B08616A9F2CFCF171EF :103C7C00240461DC9F26FCF171540761DC9F27FC56 :103C8C00D846F10104ECFC14A9148976A44666729A -:103C9C00C6D7C7FDCF088F04F9318FE72400006128 +:103C9C00C6D7C7FDE2088F04F9318FE72400006115 :103CAC00F8ED783E23DD1B2361F8ED823D2361F8AE :103CBC00EDFE3D2361F8ED473E2361F8ED1B3FED32 :103CCC00753EF6BD707113934005F901DF2C31344C :103CDC00961B466ADD04F424EF02A4244A2465DC16 :103CEC000FF6BD6AF504F9712295ED9D3FFDAB23EE -:103CFC00AD6A440A0061D8ED9D3F714295FD6A049E +:103CFC00AD6A440A0061D8ED9D3F714295FD7D048B :103D0C00716392FDAB234007F903DF09712295F52E :103D1C0004F9ED9D3FFD0F2640B1FB9BDE0971229E :103D2C0095F504F9ED9D3F714A27714011057130ED @@ -722,7 +723,7 @@ :103D6C0003DF05F5CDFBEF04CFCDFB03CF04F90248 :103D7C00FD2129ED9D3FFD192CFDCA2C714A9DFD9D :103D8C00D434FD6F30F537FF712BE0F505F9712256 -:103D9C0095CBE43FEFCBE6F6F0FD6A04713BD471B2 +:103D9C0095CBE43FEFCBE6F6F0FD7D04713BD4719F :103DAC0012027123028F06F93105285004FD472BAE :103DBC00625C03318E315D34B3FB896168995002CA :103DCC00FD472BD2DD067170B3FBEF047178B3FBAA @@ -733,7 +734,7 @@ :103E1C001731040C13712BE05027C15005FD362BC4 :103E2C00C0CF04F904712295FD00408F06F93125AD :103E3C000731349603F504F9ED9D3FFD9F3F3102A8 -:103E4C000C14F0C15005FD362BC05005FDAB09FD1F +:103E4C000C14F0C15005FD362BC05005FDBE09FD0C :103E5C000B40CF04F903FD00408F06F931250731E3 :103E6C00349603F504F9ED9D3FF504F9CFCDFB0332 :103E7C00F5CEFBF5D0FB717293F6426CFF61E8ED69 @@ -745,13 +746,13 @@ :103EDC00BED0716A27FDB329714307714B27714816 :103EEC0010057148110571381005713811057133C1 :103EFC0002713B22715302715B227158100571588B -:103F0C001105CF04F905714295F6BD6AFD9809F5C6 +:103F0C001105CF04F905714295F6BD6AFDAB09F5B3 :103F1C0005F9F42431349604D432DD20E505F9E5B5 :103F2C0004F98F06F9312569F5F8FBF5F6FB502EEF -:103F3C00FDAB09CF05F903E504F9EF55FDBE04FD12 +:103F3C00FDBE09CF05F903E504F9EF55FDD104FDEC :103F4C003E237173017132047143027103927162E9 :103F5C009231949E02EFFA712AE7CEA409F5F30090 -:103F6C003104070261FDCFF30080F466FDCF08CE6B +:103F6C003104070261FDCFF30080F466FDE208CE58 :103F7C00A40831329606CF04F905EF09714395E593 :103F8C0005F9E504F9712BE78F06F9312503F504E2 :103F9C00F9C6D7D47BDF19310200585003FD472BEB @@ -761,25 +762,25 @@ :103FDC007BFFDD1FA47BD7F0C15004FD362BC08FB7 :103FEC00B3FB5C9F9FB3FB7110C4FB304A3B6194E5 :103FFC00CD7BF0D731149306F504F9712295D77166 -:10400C006395F47A717207FD4502717307D7FD1E33 +:10400C006395F47A717207FD4502717307D7FD3120 :10401C0005F2D7717BFAC7200CFBF8FF8FEAFBF097 :10402C00F9E9FBF303FDB24D13BC048FECFBF0F983 :10403C00EBFBF303FDB24D13BC028FEEFBF0F9ED7D :10404C00FBF303FDB24D13BB717AFAAC04BDD8F689 -:10405C00BDDAAC04311EBDDCF6BDDEFD6F0DADD896 +:10405C00BDDAAC04311EBDDCF6BDDEFD820DADD883 :10406C00BDDCADDABDDEAC02BDD8F6BDDAAC0231DA -:10407C001EDADCC3DADEC3BDDCF6BDDEFD6F0DC0BF -:10408C00BDDEC0BDDCADDEFDE50EADD8BDDCADDA10 +:10407C001EDADCC3DADEC3BDDCF6BDDEFD820DC0AC +:10408C00BDDEC0BDDCADDEFDF80EADD8BDDCADDAFD :10409C00BDDEABBDD8F6BDDAAB311EDADCC3DADE81 -:1040AC00C3BDDCF6BDDEFD6F0DC0BDDEC0BDDCAD3D -:1040BC00DEFDE50EDADAADD8FDEE43C3C58D885CC6 +:1040AC00C3BDDCF6BDDEFD820DC0BDDEC0BDDCAD2A +:1040BC00DEFDF80EDADAADD8FDEE43C3C58D885CB3 :1040CC003FF0317E0440FC14C2C0B9A488F6BC0891 :1040DC00BC0A9C078C074C2EDD3D8D880E0770F1B9 :1040EC0061DC605C3FF0317E127940FCBDD8F6BDDE -:1040FC00DA8C0773095C22318FBDDC70BDDEFD6F7D -:10410C000DAC08BDDCAC0AFDE50EADDABC0AADD8D1 +:1040FC00DA8C0773095C22318FBDDC70BDDEFD826A +:10410C000DAC08BDDCAC0AFDF80EADDABC0AADD8BE :10411C00BC08615907EFBDAC08BDD8AC0ABDDAC903 -:10412C00DC0004F6FD390EC9DCFFFFF6FD3A0FADDD +:10412C00DC0004F6FD4C0EC9DCFFFFF6FD4D0FADB7 :10413C00D8BD82AF3AFC4682DD11AF3CFCBF3EFCE1 :10414C00AF3AFCBF3CFCAD82BF3AFCAF3CFC423EFC :10415C00FCDC46AF3AFC423CFCDE3EAD26423AFC6F @@ -793,7 +794,7 @@ :1041DC000A9E31929E02EFFA8E949F34FC8E969F2B :1041EC0035FC8E979F36FC8E989F37FC8E939F38AC :1041FC00FC8E929F39FC710B9E717AFA8F37FCFD05 -:10420C004E0F76FD6C4313BD80D5EFFBDF0AD5F066 +:10420C00610F76FD6C4313BD80D5EFFBDF0AD5F053 :10421C00FBDF05D5F1FBDD25F6B14680DF11C9804A :10422C003722665C0391DF060A80181A8100961704 :10423C00FD8F4413FDAF4231049602EF615206929A @@ -815,9 +816,9 @@ :10433C001C790AF9BB311296058B9C03EF0F8C018B :10434C009C03D489DF05CD89A7EF02B489718071F4 :10435C00179661DC61FB7111968C03721004C6D741 -:10436C00C72008FBF8FF8F37FCFD4E0F9C078F36DC -:10437C00FCFD4E0F9C068F35FCFD4E0F9C058F34BB -:10438C00FCFD4E0F9C048F38FC9C038F39FC9C0267 +:10436C00C72008FBF8FF8F37FCFD610F9C078F36C9 +:10437C00FCFD610F9C068F35FCFD610F9C058F3495 +:10438C00FCFD610F9C048F38FC9C038F39FC9C0254 :10439C008C06318E0112791A20BB8C075C03D1DF9D :1043AC00098C064C0361C86179008C05318EB161B2 :1043BC000900BB313D120103BB8B0E04708C011C38 @@ -827,13 +828,13 @@ :1043FC00614908DF07F7340000ED8B44E6BC04F696 :10440C00BC06AC0ABC02AC08BBAC06614902AC04ED :10441C0061F8614900DE28AC04BDD8AC06BDDAE118 -:10442C00FDF40EADDABC06ADD8BC04ABBDD8AC0205 -:10443C00BDDAE1FD0F0FADDABC02ADD8BBEFCAACF3 +:10442C00FD070FADDABC06ADD8BC04ABBDD8AC02F1 +:10443C00BDDAE1FD220FADDABC02ADD8BBEFCAACE0 :10444C0006BC02AC04BBAC08BDD8AC0ABDDAAC04EB -:10445C00BDDCAC06FD720EAC04BDDCAC06FDE50E9D -:10446C00E1FD0F0FADDABC06ADD8BC04AC0661495A +:10445C00BDDCAC06FD850EAC04BDDCAC06FDF80E77 +:10446C00E1FD220FADDABC06ADD8BC04AC06614947 :10447C0002AC0461F8614900DCC5AC0214AB12104B -:10448C000CC6D7C7C12004FBF8FF8F31FCFD4E0FC3 +:10448C000CC6D7C7C12004FBF8FF8F31FCFD610FB0 :10449C009C034E04DF1CAD7E4680DE07AD80267E7D :1044AC0012EF40F64680DF07467EDD03E7EF34F778 :1044BC00EF318C04318EB1128C03318E43DF183006 @@ -864,7 +865,7 @@ :10464C00BFCAFCFDAD46D2DF0ED9CCFBC1AE6CFDB2 :10465C00282DC0F313BE6CD7FDAD46D2DD0DCD2E8B :10466C0047F48EAE6C317DBFCAFCD7E88E0934207E -:10467C005080D6BFC6FC22CAFCBDD8304700FD9A7C +:10467C005080D6BFC6FC22CAFCBDD8304700FDAD69 :10468C000DBFC8FC30C6FCFD3E2DF313BE6CB42E22 :10469C00D42EDF0CCD2E47A48E4A8E1F61C8F48E0B :1046AC00D740AFFB0BDC05712304F2D740AFFB0600 @@ -872,7 +873,7 @@ :1046CC00BE6C712204EF03FDD846E2D7710294F060 :1046DC00C1AE6CFD282DC0F313BE6CA48F4A8F4065 :1046EC00DC37F48FD890F1313F0412FD14D890F1DF -:1046FC00BDD85008FDE90D087208E6D2DD04019220 +:1046FC00BDD85008FDFC0D087208E6D2DD0401920D :10470C00DFFC896158D1DD05712204EF03712304AC :10471C00A4904A902061C8F490D7C73026FDC6D724 :0D472C007180717DFADE035201D75200D773 @@ -909,7 +910,7 @@ :10491900BF2801FD4502300B0FBF2801FD450230BC :104929000F0FBF2801710AE6F6420C01DD33AF040F :1049390001BF0C0131529329715293710BE2D84D89 -:10494900FDB7033184BD02EFFACBB422FBD84FF196 +:10494900FDCA033184BD02EFFACBB422FBD84FF183 :10495900BEB8714BE1714BE5710ABD8D4E9E44EFB6 :104969000C715393714AE5717BBD713393C09EFC01 :10497900609EFD34D4FE5206C0B9A5A592DFF9C6E2 @@ -976,7 +977,7 @@ :044D490061FC61FCAC :0A4D4E0000060C12181E242A30364D :104D5800ACFB0000000062FE000000009339CD3576 -:104D68008C22B745052EB42EF344B93A8E089E3CE2 +:104D68008C22B745052EB42EF344B93AA1089E3CCF :104D780028FC36FE20FE02F903F929FC30FE2AFC45 :104D88002BFC08F926FC6CFF1AFF6EFF6AFF64FF14 :0A4D980027FC66FF2CFC555555550D @@ -984,7 +985,7 @@ :104DB200317503F7332312D714AEF8C716AC0612B7 :104DC200C5AC0416F643DD078B99A7A5B3EFF5C270 :024DD200C6D742 -:024FF400323F4A -:0A4FF60031373A31343A333200000B +:024FF400324049 +:0A4FF60031383A31343A313400000A :00000001FF  \ No newline at end of file diff --git a/branches/2.0f_codectest/bsr.lmf b/branches/2.0f_codectest/bsr.lmf index 4e46c24..1084178 100644 Binary files a/branches/2.0f_codectest/bsr.lmf and b/branches/2.0f_codectest/bsr.lmf differ diff --git a/branches/2.0f_codectest/bsr_k0r.map b/branches/2.0f_codectest/bsr_k0r.map index 30feb62..9513ff3 100644 --- a/branches/2.0f_codectest/bsr_k0r.map +++ b/branches/2.0f_codectest/bsr_k0r.map @@ -1,22 +1,22 @@ -78K0R Linker W1.33 Date: 8 Sep 2011 Page: 1 +78K0R Linker W1.33 Date:13 Sep 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C - C78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr - _k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro - nics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0r - m.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronics T - ools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w2 loader.rel pm - .rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_t - wl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel reng - e.rel accero.rel self_flash.rel sw.rel task_debug.rel task_mi - sc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_ - status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel vo - ltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_e - i.rel util_funcs.rel + obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool + s\CC78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -p + bsr_k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Elec + tronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bc + l0rm.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronic + s Tools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w2 loader.rel + pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2 + c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel r + enge.rel accero.rel self_flash.rel sw.rel task_debug.rel task + _misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel ta + sk_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel + voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel ge + t_ei.rel util_funcs.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -26,8 +26,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 72 output segment(s) - 3CB1H byte(s) real data - 6072 symbol(s) defined + 3CC4H byte(s) real data + 6140 symbol(s) defined *** Memory map *** @@ -150,55 +150,55 @@ Direc-file:bsr_mcu.dr LDR_CODL util_funcs 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 00901H CSEG + LDR_CODE 000CEH 00914H CSEG LDR_CODE loader 000CEH 00177H LDR_CODE WDT 00245H 00000H - LDR_CODE i2c_mcu 00245H 002D9H + LDR_CODE i2c_mcu 00245H 002ECH LDR_CODE self_flash - 0051EH 00370H + 00531H 00370H LDR_CODE task_debug - 0088EH 00000H + 008A1H 00000H LDR_CODE task_status - 0088EH 00041H - LDR_CODE hal 008CFH 000DCH + 008A1H 00041H + LDR_CODE hal 008E2H 000DCH LDR_CODE util_funcs - 009ABH 00024H - FSL_CODE 009CFH 00322H CSEG + 009BEH 00024H + FSL_CODE 009E2H 00322H CSEG FSL_CODE fsl_block_cmd - 009CFH 0002BH + 009E2H 0002BH FSL_CODE fsl_block_check - 009FAH 00013H + 00A0DH 00013H FSL_CODE fsl_common - 00A0DH 0014FH + 00A20H 0014FH FSL_CODE fsl_reset - 00B5CH 00001H + 00B6FH 00001H FSL_CODE fsl_si_ibf - 00B5DH 00064H + 00B70H 00064H FSL_CODE fsl_phySwap - 00BC1H 0004DH + 00BD4H 0004DH FSL_CODE fsl_si_common - 00C0EH 00061H - FSL_CODE fsl_swap 00C6FH 00030H + 00C21H 00061H + FSL_CODE fsl_swap 00C82H 00030H FSL_CODE fsl_write - 00C9FH 00052H - @@LCODE 00CF1H 00277H CSEG - @@LCODE @cstart 00CF1H 0006DH - @@LCODE @imul 00D5EH 00011H - @@LCODE @lumul 00D6FH 0002BH - @@LCODE @isdiv 00D9AH 00022H - @@LCODE @iudiv 00DBCH 0002DH - @@LCODE @isrem 00DE9H 00021H - @@LCODE @iurem 00E0AH 0002FH - @@LCODE @lsdiv 00E39H 00039H - @@LCODE @ludiv 00E72H 0003FH - @@LCODE @divuw 00EB1H 00034H - @@LCODE @ladd 00EE5H 0000FH - @@LCODE @llsh 00EF4H 0001BH - @@LCODE @lursh 00F0FH 0001FH - @@LCODE @iscmp 00F2EH 0000CH - @@LCODE @lband 00F3AH 00014H - @@LCODE @bcdtob 00F4EH 0001AH -* gap * 00F68H 0008EH + 00CB2H 00052H + @@LCODE 00D04H 00277H CSEG + @@LCODE @cstart 00D04H 0006DH + @@LCODE @imul 00D71H 00011H + @@LCODE @lumul 00D82H 0002BH + @@LCODE @isdiv 00DADH 00022H + @@LCODE @iudiv 00DCFH 0002DH + @@LCODE @isrem 00DFCH 00021H + @@LCODE @iurem 00E1DH 0002FH + @@LCODE @lsdiv 00E4CH 00039H + @@LCODE @ludiv 00E85H 0003FH + @@LCODE @divuw 00EC4H 00034H + @@LCODE @ladd 00EF8H 0000FH + @@LCODE @llsh 00F07H 0001BH + @@LCODE @lursh 00F22H 0001FH + @@LCODE @iscmp 00F41H 0000CH + @@LCODE @lband 00F4DH 00014H + @@LCODE @bcdtob 00F61H 0001AH +* gap * 00F7BH 0007BH MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH diff --git a/branches/2.0f_codectest/config.h b/branches/2.0f_codectest/config.h index f1c14ad..1922eb6 100644 --- a/branches/2.0f_codectest/config.h +++ b/branches/2.0f_codectest/config.h @@ -3,7 +3,7 @@ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x0F +#define MCU_VER_MINOR 0x10 // デバッグ向けスイッチ diff --git a/branches/2.0f_codectest/hoge.bin b/branches/2.0f_codectest/hoge.bin index 88579b1..46be8a1 100644 Binary files a/branches/2.0f_codectest/hoge.bin and b/branches/2.0f_codectest/hoge.bin differ diff --git a/branches/2.0f_codectest/i2c_mcu.c b/branches/2.0f_codectest/i2c_mcu.c index 0a093e5..309fbe6 100644 --- a/branches/2.0f_codectest/i2c_mcu.c +++ b/branches/2.0f_codectest/i2c_mcu.c @@ -17,6 +17,8 @@ #include "loader.h" #include "util_funcs.h" +#include "user_define.h" + // ======================================================== // レジスタのビット名 // プリフィックスbだが、一部のビット名がレジスタ名にかぶるため... @@ -102,6 +104,16 @@ static i2c_err iic_mcu_wait_free() { u16 tot = 0; + // SELを押してるときはブロックする + if( system_status.pwr_state == ON || system_status.pwr_state == SLEEP ) + { + while( !SW_SEL_n ) + { + NOP(); + } + } + + iic_mcu_start( ); while( 1 ) { diff --git a/branches/2.0f_codectest/yav_mcu_bsr.plg b/branches/2.0f_codectest/yav_mcu_bsr.plg index ee56d42..a5a4b93 100644 --- a/branches/2.0f_codectest/yav_mcu_bsr.plg +++ b/branches/2.0f_codectest/yav_mcu_bsr.plg @@ -3,7 +3,12 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_mcu.c +i2c_mcu.c(195) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_mcu.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K' Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\ RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K' @@ -28,4 +33,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 13 +Build Total error(s) : 0 Total warning(s) : 14 diff --git a/branches/2.0f_codectest/yav_mcu_bsr.prj b/branches/2.0f_codectest/yav_mcu_bsr.prj index bb26148..843a191 100644 --- a/branches/2.0f_codectest/yav_mcu_bsr.prj +++ b/branches/2.0f_codectest/yav_mcu_bsr.prj @@ -1,6 +1,6 @@ [ProjectManager] Version=6.00 -Path=C:\78k_data\yav-mcu-basara\trunk\ +Path=C:\78k_data\yav-mcu-basara\branches\2.0f_codectest\ Title=yav-mcu Series=78K0R.PM Device=uPD79F0104 @@ -1075,45 +1075,6 @@ Source30=kanaria.asm Source31=kanaria_c.c Source32=get_ei.asm Source33=util_funcs.c -[IncFile] -Include1=incs_loader.h -Include2=sim\simOnWin.h -Include3=sim\sfrAlias.h -Include4=config.h -Include5=jhl_defs.h -Include6=user_define.h -Include7=hal.h -Include8=bsr_system.h -Include9=renge\renge.h -Include10=renge\renge_defs.h -Include11=renge\renge_task_immediate.h -Include12=vreg_ctr.h -Include13=vreg_twl.h -Include14=loader.h -Include15=i2c_mcu.h -Include16=WDT.h -Include17=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h -Include18=fsl_user.h -Include19=i2c_ctr.h -Include20=pm.h -Include21=rtc.h -Include22=reboot.h -Include23=magic.h -Include24=incs.h -Include25=i2c_twl.h -Include26=accero.h -Include27=pedometer.h -Include28=sw.h -Include29=adc.h -Include30=led.h -Include31=batt_params.h -Include32=pool.h -Include33=i2c_twl_defs.h -Include34=renge\renge_task_intval.h -Include35=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h -Include36=self_flash.h -Include37=sim\sim_interrupt_decrare.c -Include38=util_funcs.h [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -1232,7 +1193,7 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara\trunk\bsr.lmf +OFILE=C:\78k_data\yav-mcu-basara\branches\2.0f_codectest\bsr.lmf [Options.LK78K0R 3] Version=100 O0=bsr_bsr.lmf @@ -1407,3 +1368,39 @@ DefaultMode2=1 DefaultMode3=1 DefaultMode4=1 DefaultMode5=1 +[IncFile] +Include1=incs_loader.h +Include2=config.h +Include3=jhl_defs.h +Include4=user_define.h +Include5=hal.h +Include6=bsr_system.h +Include7=renge\renge.h +Include8=renge\renge_defs.h +Include9=renge\renge_task_immediate.h +Include10=vreg_ctr.h +Include11=vreg_twl.h +Include12=loader.h +Include13=i2c_mcu.h +Include14=WDT.h +Include15=fsl_user.h +Include16=i2c_ctr.h +Include17=pm.h +Include18=rtc.h +Include19=reboot.h +Include20=magic.h +Include21=incs.h +Include22=i2c_twl.h +Include23=accero.h +Include24=pedometer.h +Include25=sw.h +Include26=adc.h +Include27=led.h +Include28=batt_params.h +Include29=pool.h +Include30=i2c_twl_defs.h +Include31=renge\renge_task_intval.h +Include32=self_flash.h +Include33=util_funcs.h +Include34=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +Include35=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h diff --git a/branches/2.0f_codectest/yav_mcu_bsr.prk b/branches/2.0f_codectest/yav_mcu_bsr.prk index 7d3f78e..d08a024 100644 --- a/branches/2.0f_codectest/yav_mcu_bsr.prk +++ b/branches/2.0f_codectest/yav_mcu_bsr.prk @@ -1,23 +1,22 @@ [ProjectManager] FrameMax=0 -FrameX=25 -FrameY=25 -FrameCX=1440 -FrameCY=850 +FrameX=2314 +FrameY=141 +FrameCX=1022 +FrameCY=766 OpenFile1=i2c_ctr.c,0,655,120,1628,751,0,1,0,0 -OpenFile2=kanaria_c.c,0,68,138,763,769,8,5,8,0 -OpenFile3=ProjectWindow +OpenFile2=ProjectWindow PrjPos=0,0,706,0,291 -OpenFile4=pm.c,0,373,197,1346,828,35,374,32,0 -OpenFile5=accero.c,0,200,200,1016,818,109,227,2,0 -OpenFile6=i2c_mcu.h,0,671,375,1487,993,16,7,16,0 -OpenFile7=task_sys.c,0,225,225,1471,947,0,445,0,0 -OpenFile8=loader.c,0,250,250,1841,957,6,157,1,0 -OpenFile9=config.h,0,75,75,902,478,29,6,29,0 -OpenFile10=i2c_mcu.c,0,175,175,1036,939,1,453,1,0 -OpenFile11=main.c,0,402,105,1713,812,0,68,0,0 -OpenFile12=OutputWindow -OutputPos=0,260,711,278,1155 +OpenFile3=pm.c,0,373,197,1346,828,35,374,32,0 +OpenFile4=accero.c,0,200,200,1016,818,109,227,2,0 +OpenFile5=i2c_mcu.h,0,671,375,1487,993,16,7,16,0 +OpenFile6=task_sys.c,0,225,225,1471,947,0,445,0,0 +OpenFile7=loader.c,0,250,250,1841,957,6,157,1,0 +OpenFile8=i2c_mcu.c,0,175,175,1036,939,1,453,1,0 +OpenFile9=main.c,0,402,105,1713,812,0,68,0,0 +OpenFile10=config.h,0,75,75,902,478,18,2,18,0 +OpenFile11=OutputWindow +OutputPos=0,228,679,379,1256 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/branches/2.0f_codectest/yav_mcu_bsr.sdb b/branches/2.0f_codectest/yav_mcu_bsr.sdb index 20998a5..6b1ffa6 100644 --- a/branches/2.0f_codectest/yav_mcu_bsr.sdb +++ b/branches/2.0f_codectest/yav_mcu_bsr.sdb @@ -1,66 +1,74 @@ [SdbInfo] Ver=5 [loader.c] -T=4e5db4bc +T=4e69c5e0 1=incs_loader.h -2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 3=fsl_user.h 4=i2c_ctr.h 5=i2c_mcu.h 6=pm.h 7=rtc.h 8=reboot.h -9=magic.h +9=WDT.h +10=magic.h [pm.c] -T=4e5dbf8d +T=4e69c5e2 1=incs.h 2=adc.h 3=led.h 4=pm.h 5=renge\renge.h 6=batt_params.h -7=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +7=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 8=fsl_user.h +9=vreg_twl.h +10=i2c_mcu.h [i2c_ctr.c] -T=4e532b68 -1=config.h -2=incs.h +T=4e69c5e2 +1=incs.h +2=rtc.h +3=pedometer.h [main.c] -T=4e5dbf8d -1=incs_loader.h -2=WDT.h -3=rtc.h -4=pm.h -5=accero.h -6=led.h -7=adc.h +T=4e69c5e2 +1=incs.h +2=rtc.h +3=pm.h +4=accero.h +5=led.h +6=adc.h +7=i2c_mcu.h 8=pool.h [magic.c] -T=4e5dbfb4 -1=config.h -2=magic.h +T=4e69c7b1 +1=magic.h +2=config.h [WDT.c] -T=4e424710 +T=4e69c5e1 1=incs_loader.h [i2c_mcu.c] -T=4e56f834 +T=4e69cd4e 1=incs_loader.h 2=i2c_mcu.h +3=loader.h +4=util_funcs.h +5=user_define.h [i2c_twl.c] -T=4e4e1d71 -1=config.h -2=incs.h -3=i2c_twl_defs.h -4=i2c_twl.h +T=4e69c5e0 +1=incs.h +2=i2c_twl_defs.h +3=i2c_twl.h +4=vreg_twl.h +5=WDT.h [led.c] -T=4e5b390f +T=4e69c5e2 1=incs.h 2=led.h [rtc.c] -T=4e423614 +T=4e69c5e2 1=incs.h [vreg_ctr.c] -T=4e5c39a6 +T=4e69c5e2 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -68,48 +76,56 @@ T=4e5c39a6 5=accero.h 6=pm.h 7=pool.h -8=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h -9=fsl_user.h +8=vreg_twl.h +9=sw.h +10=WDT.h +11=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +12=fsl_user.h [vreg_twl.c] -T=4e530e07 +T=4e69c5e0 1=incs.h 2=jhl_defs.h 3=led.h 4=vreg_twl.h -5=vreg_ctr.h +5=adc.h [adc.c] -T=4e531196 +T=4e69c5e0 1=incs.h 2=adc.h 3=pm.h 4=led.h 5=vreg_twl.h +6=i2c_mcu.h [renge\renge.c] -T=4e54a654 +T=4e69c5dd 1=renge\renge.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h 4=WDT.h 5=config.h 6=user_define.h -7=sim\simOnWin.h +7=util_funcs.h 8=bsr_system.h [accero.c] -T=4e5c3a75 -1=config.h -2=incs.h -3=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h +T=4e69c5e0 +1=incs.h +2=accero.h +3=i2c_mcu.h +4=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h [self_flash.c] -T=4e409e18 +T=4e69c5e0 1=incs_loader.h -2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 3=fsl_user.h 4=i2c_ctr.h -5=pool.h -6=magic.h -7=pm.h +5=i2c_mcu.h +6=pool.h +7=magic.h +8=pm.h +9=WDT.h +10=util_funcs.h [sw.c] -T=4e54ca66 +T=4e69c5e0 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -118,13 +134,13 @@ T=4e54ca66 6=rtc.h 7=sw.h [task_debug.c] -T=4e5c398f +T=4e69c5e2 1=incs_loader.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=4e5dc039 +T=4e69c5e0 1=incs.h 2=renge\renge.h 3=pm.h @@ -134,7 +150,7 @@ T=4e5dc039 7=led.h 8=vreg_twl.h [task_sys.c] -T=4e5dbf8d +T=4e69c5e0 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -145,168 +161,153 @@ T=4e5dbf8d 8=sw.h 9=adc.h 10=self_flash.h +11=i2c_mcu.h +12=vreg_twl.h [pedo_alg_thre_det2.c] -T=4e522ab6 +T=4e69c5e2 1=incs.h -2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h +2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h 3=accero.h 4=pedometer.h 5=pool.h [ini_VECT.c] -T=4e409e1a +T=4e69c5e2 1=config.h -2=sim\sim_interrupt_decrare.c [task_status.c] -T=4e532a61 +T=4e69c5e2 1=incs_loader.h 2=renge\renge.h -3=hal.h -4=pm.h -5=accero.h -6=adc.h -7=i2c_mcu.h -8=led.h +3=pm.h +4=accero.h +5=adc.h +6=i2c_mcu.h +7=led.h [led_cam.c] -T=4e55dd12 +T=4e69c5e2 1=incs.h 2=led.h +3=vreg_twl.h [led_pow.c] -T=4e530e07 +T=4e69c5e2 1=incs.h 2=led.h +3=pm.h [hal.c] -T=4e532b4c +T=4e69c5e2 1=incs_loader.h [batt_params.c] -T=4e409e1b +T=4e69c5e2 1=jhl_defs.h 2=batt_params.h [voltable.c] -T=4e422f23 +T=4e69c5e2 1=incs.h [pedo_lpf_coeff.c] -T=4e422f1d +T=4e69c5e2 1=incs.h [kanaria.asm] T=4e4226a2 [kanaria_c.c] -T=4e522dba +T=4e6489de 1=incs.h [get_ei.asm] T=4e5223c3 +[util_funcs.c] +T=4e69c5e0 +1=incs_loader.h +2=WDT.h [incs_loader.h] -T=4e409e1d -1=sim\simOnWin.h -2=jhl_defs.h -3=user_define.h -4=hal.h -5=bsr_system.h -6=renge\renge.h -7=vreg_ctr.h -8=vreg_twl.h -9=loader.h -10=i2c_mcu.h -11=WDT.h -[sim\simOnWin.h] -T=4e559884 -1=sim\sfrAlias.h -[sim\sfrAlias.h] -T=4e5b0fa2 -1=config.h +T=4e69c5e2 +1=jhl_defs.h +2=user_define.h +3=hal.h +4=bsr_system.h +5=renge\renge.h +6=vreg_ctr.h +7=vreg_twl.h [config.h] -T=4e5cbce4 +T=4e69c7b0 [jhl_defs.h] -T=4df82cd1 -1=config.h +T=4e69c5e0 [user_define.h] -T=4e5b1041 +T=4e69c5e3 [hal.h] -T=4e5229fb +T=4e69c5e2 [bsr_system.h] -T=4e409e1a +T=4e69c5e2 [renge\renge.h] -T=4e54e394 +T=4e69c5dd 1=renge\renge_defs.h 2=renge\renge_task_immediate.h [renge\renge_defs.h] -T=4c073c5a +T=4e69c5dd [renge\renge_task_immediate.h] -T=4e54ab05 +T=4e69c5dd 1=renge\renge_defs.h [vreg_ctr.h] -T=4e409e1c +T=4e69c5e2 1=config.h [vreg_twl.h] -T=4d42202e +T=4e69c5e0 [loader.h] -T=4c318e0f +T=4e69c5e0 [i2c_mcu.h] -T=4e55a31b +T=4e69c5e0 [WDT.h] -T=4c319dfc -[..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h] -T=49a3bd4e +T=4e69c5e2 [fsl_user.h] -T=4e409e62 +T=4e69c5e0 [i2c_ctr.h] -T=4bf0d1e1 +T=4e69c5e2 [pm.h] -T=4e5dbf8d +T=4e69c5e2 [rtc.h] -T=4e409e1c +T=4e69c5e2 [reboot.h] -T=4bf0d1e1 +T=4e69c5e2 [magic.h] -T=4caab849 +T=4e69c5e2 [incs.h] -T=4e409e18 -1=sim\simOnWin.h -2=jhl_defs.h -3=user_define.h -4=hal.h -5=bsr_system.h -6=renge\renge.h -7=loader.h -8=vreg_ctr.h -9=vreg_twl.h -10=i2c_mcu.h -11=i2c_twl.h -12=rtc.h -13=accero.h -14=pm.h -15=sw.h -16=adc.h -17=WDT.h +T=4e69c5e0 +1=jhl_defs.h +2=user_define.h +3=hal.h +4=bsr_system.h +5=renge\renge.h +6=vreg_ctr.h +7=util_funcs.h [i2c_twl.h] -T=4bf4e29e +T=4e69c5e0 [accero.h] -T=4e54ab05 +T=4e69c5e2 1=jhl_defs.h 2=pedometer.h [pedometer.h] -T=4e409e19 +T=4e69c5e0 [sw.h] -T=4df2001a +T=4e69c5e0 1=config.h [adc.h] -T=4dd5c8b2 +T=4e69c5e0 1=jhl_defs.h [led.h] -T=4e530d97 +T=4e69c5e2 [batt_params.h] -T=4e409e1c +T=4e69c5e2 1=jhl_defs.h [pool.h] -T=4c072cf1 +T=4e69c5e0 1=pedometer.h [i2c_twl_defs.h] -T=4bf0d1e1 +T=4e69c5e2 [renge\renge_task_intval.h] -T=4e530e07 +T=4e69c5dd 1=renge\renge_defs.h -[..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h] -T=45f12258 [self_flash.h] -T=4bf0d1e0 -[sim\sim_interrupt_decrare.c] -T=4e409e19 +T=4e69c5e0 +[util_funcs.h] +T=4e69c5e0 +[..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h] +T=49a3bd4e +[..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h] +T=45f12258