diff --git a/trunk/VCProj/bsr_trunk.sdf b/trunk/VCProj/bsr_trunk.sdf index fc6b3cc..9857835 100644 Binary files a/trunk/VCProj/bsr_trunk.sdf and b/trunk/VCProj/bsr_trunk.sdf differ diff --git a/trunk/VCProj/bsr_trunk.suo b/trunk/VCProj/bsr_trunk.suo index 89dc08b..baeb123 100644 Binary files a/trunk/VCProj/bsr_trunk.suo and b/trunk/VCProj/bsr_trunk.suo differ diff --git a/trunk/bsr.hex b/trunk/bsr.hex index e91f04f..7253a6d 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,13 +1,13 @@ -:02000000F40CFE -:040010002A482C4806 -:02001C00D849C1 -:020024007F4A11 -:02002A00CA4AC0 -:08003400F74B9A4BF34B384ED9 -:02004A002E483E -:02005A006848F4 -:02006200F64D59 -:060080008B4CC44C0E4D38 +:02000000FC0CF6 +:040010002D482F4800 +:02001C00DB49BE +:02002400824A0E +:02002A00CD4ABD +:08003400FA4B9D4BF64B3B4ECD +:02004A0031483B +:02005A006B48F1 +:02006200F94D56 +:060080008E4CC74C114D2F :0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A @@ -15,13 +15,13 @@ :1000EE007110A6FB710006F9EF0B8C015C80D161DB :1000FE00E8710006F98F06F931030EF6B1BBF66111 :10010E004900DD05618900EFF5FDF401FD3101FDCA -:10011E008901FD9B09FDD208FDB02FFDA92CEFA58D +:10011E008901FDA309FDDA08FDB02FFDA92CEFA57D :10012E00C0C6D7C7360000674C09DE3F318E04F6D5 :10013E000FC1317B9EFDC411897267318E04F64F5B :10014E0014896142DF03F6EF01E660610667318EC6 :10015E00124900207267318E04F64F14896142DF16 :10016E0003F6EF01E660610687EFBC40F84F3A6197 -:10017E00E88666D161E8FD3F06C6D751065B0C31B5 +:10017E00E88666D161E8FD4706C6D751065B0C31AD :10018E001A9F08F9D508F9DF06710009F9EF047115 :10019E000809F98F09F9310505CD3707EF03CD377A :1001AE0005D908F9FD4D298F06F95CE39F06F95133 @@ -35,219 +35,219 @@ :10022E000511CF350002CF370019CF530006CBEEA4 :10023E00FEFFCE3831CE3970CF38050A308700BF79 :10024E001801BF1A01BF1C01BF1E01D7D7C7F61672 -:10025E00FD7F04717BFA31329508713295717AFA0D +:10025E00FD8704717BFA31329508713295717AFA05 :10026E00EF0C717AFAA7F647DFE95203EF01F2C6F7 :10027E00D7C7C1C1FBF8FF17A1C1E0C18C0A70C17D :10028E008C0270FDA0021006629D528C0172100449 :10029E00C6D7C7C1FBF8FFFD5B02D2DD045203EFE8 -:1002AE00618B70FDCC03D2DD077133955202EF5294 -:1002BE008C0870FDE803FD33048B6C0170FDE803C0 +:1002AE00698B70FDD403D2DD077133955202EF5A7C +:1002BE008C0870FDF003FD3B048B6C0170FDF003A8 :1002CE00300400BF2401301740BF1C01300400BFB2 :1002DE0022018C0A91DF04F6BF2A01710BE2CE4493 :1002EE00FF3182E202EFFAAC0C148E449961790C64 -:1002FE0061690A8C0AD1DFDAFD5C04710BE271339D -:10030E0095F2C0C6D7C7C1FBF8FFFD5B02D2DD0474 -:10031E005203EF25710AE68B70FDCC03D2DD077117 -:10032E0033955202EF138C0870FDE8038C0A70FDB2 -:10033E00E803FD5C04713395F2C0C6D7C7C1FBF864 -:10034E00FFFD5B02D2DD045203EF70710AE6710B02 -:10035E00E28B70FDCC03D2DD077133955202EF5B59 -:10036E00710BE231229544C73422FBAC0C165204B9 -:10037E008B99A5A792DFF9C68B9D4F8C089D508C4B -:10038E000A9D513184BD02EFFA717ABDCEB144CBD4 -:10039E00B422FB8C0A318EBEB8CEBB48714BE171D4 -:1003AE004BE5710ABD8C089E44EF0F710BE68C086D -:1003BE009E448C0A9D4EAC0CBD4CF2C0C6D7C716DF -:1003CE00FD0B04AF0401BF0C0117FDE803D2DD07DE -:1003DE00FD5C045202EF01F2C6D7C716710AE67130 -:1003EE000BE2669E443182E202EFFAF6420401DD30 -:1003FE0009AF0401BF0C01E2EF01F2C6D7AF28012D -:10040E00085CFB08BF2801FD5A02AF28015CFBBF48 -:10041E002801300400BF2A01301780BF1C013004B0 -:10042E0000BF2201D7AF2401086C0408BF2401AF1E -:10043E0028016C0F086C0B08BF2801FD5A02AF2A69 -:10044E0001085CFB08BF2A01FD5A02ED0B043004C3 -:10045E0000BF2401F6BF2A01300B0BBF2801FD5A45 -:10046E0002300B0FBF2801FD5A02300F0FBF2801BB -:10047E00D731449501D77132956A0E03713B2571C0 -:10048E003B23E0FDAE097120F000FD5A02F6BF26B7 -:10049E00015024BF1401CB440014300F0FBF2801AC -:1004AE00712395710BE2710AE6FD0B04CE44FF3108 -:1004BE0082E202EFFAFD5C04AF0401BF0C0171335E -:1004CE0095714295D731349502EFFAFD3304713AA6 -:1004DE0025713A235A0EFC7128F000714395D7C747 -:1004EE002008FBF8FFFD3A085014C15008FD6C07B8 -:1004FE00C0CC07048C074C14DE0C8C07318EFDD655 -:10050E0009615907EFEECC07048C074C1461C8ED56 -:10051E00DB05CC06008C064C0461C8EDBA05300A2A -:10052E00F9BC02F6BBCEABAC31B2D109C736410530 -:10053E007184C6DEF3F1C73641057184C661DC9C59 -:10054E0005713BD1AC02148F400599715050056175 -:10055E007902617900F0E1614900DD09C736410594 -:10056E007184C6DEC3F1C73641057184C661DC0EE7 -:10057E00059C055040C18C07318E31AD128C063171 -:10058E008E318D03BDD831FFBDDADADAADD8FDA2DA -:10059E000CC0D2DD0C5008C15014FD6C07C0FD5FBD -:1005AE000B8C05D1DF06615906ED23058C07318EC4 -:1005BE00FDDA09D2DD0C5008C15014FD6C07C0FDE8 -:1005CE005F0B8C05D1DF06615907ED170571605081 -:1005DE0005CC0400CC05008C054C09DE2B8C0531B6 -:1005EE008E04F61FC1317B9EFDC41189728C0531BC -:1005FE008E04F64F14896142DF03F6EF01E6600EBA -:10060E00049C04615905EFCF41001140F81F3A6177 -:10061E00E86159048C04D1DF08FD600BFD720CEF0C -:10062E000C5008C15014FD6C07C0FD5F0B1008C6BE -:10063E00D7C72004FBF8FF712B24CC0100F6BC02B7 -:10064E00AC02440900DE3EAC0204F60F1441001168 -:10065E008972AC020C5014896142DF03F6EF01E699 -:10066E00600E019C01AC021249005072AC0204F6FD -:10067E007F14896142DF03F6EF01E6600E019C01F3 -:10068E00617902EFBB40F67FFF61F86159018C0181 -:10069E00D161F8ED3807CC0100717AFAFD7F047153 -:1006AE001300711B20710303710205E0C15003FD9D -:1006BE00622BC05013FDAE09D83BC1E0FD622BC0CA -:1006CE00CEABAC6159018C0191DD068C014C03DF80 -:1006DE0003E6EF01F66061FB7121048C014C0861A9 -:1006EE00F8CC010031320705A024FCEF03F524FC01 -:1006FE004024FC11DC22F524FCF0C15003FD622BDA -:10070E00C0CE3708CBE4FFFFCBE6FFF7CED4FFCF4A -:10071E00370008F5120561FDE6BC02F6614902DDFF -:10072E009F00000000617902EFF1FD3A08D2DFFA76 -:10073E005008C15014FD6C07C0D2FD5F0B1004C6EB -:10074E00D73184BD02EFFA717BBDCBE4FFFFCBE660 -:10075E00FFFFCBD4FFFF717ABED7717BBED7C7C167 -:10076E00200CFBF8FF8C0C318E31ADC1317B9DD44A -:10077E00C0BC068DD49C088C149C0B8C14318E043A -:10078E000C00128C0B318EBDD813FD310F61C8EDEC -:10079E003508CEABACCC05068C0B318EFDD209D212 -:1007AE00DD158C0B318EFDD6096169058C05D1DF07 -:1007BE00E7FD6807E2EF71CC0A008C0A4C04DE54A8 -:1007CE00F6BC02300AF9BBAC06148C089EFD1189EA -:1007DE0072AB146299AC06A1BC0661790061790214 -:1007EE00F0E1614902DFE05040C18C0B318E31AD3A -:1007FE00128C0A318E318D03BDD831FFBDDADADAB3 -:10080E00ADD8FDA20CC0D2DD06FD6807E2EF19617E -:10081E00590AEFA68C0B318EFDDA09D2DD03E2EF19 -:10082E000761590BED8907F2100EC6D7C7717B9D74 -:10083E00717BFAFD4F07300AF9FD850AFD100AC6D5 -:10084E00D7FD3A08FD5F0BFD6807F5ABFFF2D7C782 -:10085E00310499067110B3FBEF047118B3FB8FB31B -:10086E00FB7B8C76D1DD5B8FB3FB9D8C4004F90353 -:10087E00DF22665C10D1DD1C8FB3FB5C10D1DD0B6B -:10088E005080C15011FDD434C0EF095040C15011F9 -:10089E00FDD434C04004F903DD064004F904DF2220 -:1008AE00665C02D1DD1C8FB3FB5C02D1DD0B5040C8 -:1008BE00C15010FDD434C0EF095020C15010FDD4EA -:1008CE0034C0C6D7C7360000665C80D1DD10675CC9 -:1008DE0080D1DF05713398EF0B713298EF067104FA -:1008EE0007713198665C40D1DD10675C40D1DF0541 -:1008FE00714398EF0B714298EF0671140571419890 -:10090E00665C01D1DD10675C01D1DF05715398EF94 -:10091E000B715298EF06713407715198665C02D1D3 -:10092E00DD10675C02D1DF05716398EF1D7162986F -:10093E00EF184007F901DF08710402716198EF0AA0 -:10094E00C736100571C4C6716198665C04D1DD109E -:10095E00675C04D1DF05717398EF0B717298EF0627 -:10096E00714407717198665C08D1DD10675C08D11F -:10097E00DF05710399EF0B710299EF067114077180 -:10098E000199665C10D161E8715AD1C6D7F5F6FBB4 -:10099E00F5F8FBCFFEFBFFCFFAFBFFCFFBFBFFD73C -:1009AE00C7C1C1FBF8FFCEABAC8C02D1DD126169C1 -:1009BE0002305C03BBF6614900DDEE618900EFF5A4 -:0409CE001004C6D774 -:1009D2005208EF065203EF025206FEE600FE1B002B -:1009E200DC16089F03088F0408089F040862FE248F -:1009F20000089F0408EEBF00EEBA00C1C514410E04 -:100A020011D9D0FF118FD1FF312E45C4C0D7F23199 -:100A1200A2C401E2D79DE261DD4C09DF12717BFACB -:100A2200C18F06089F25FDC0CF060800EE270031C2 -:100A3200F2FA04CF0608004C00DF05D50008DD16E7 -:100A420061DD717BFAD50608DD0ACDE31F61CD6158 -:100A5200CDEE160061CDFED40061FFFE9A00FCF8D7 -:100A6200FF0EFEB20061CDFED5004C09DF0EC18F34 -:100A720006086F25FD9F0608C0EE0400CF06080099 -:100A8200F8E3D75200EF025202FE3700CF24FD00F6 -:100A9200CF060800BF0408C716629F000841001174 -:100AA2008F1A209B4100118F1B209F0108C6510005 -:100AB200FE62FFEF025205CF060800C1510CFE0A8A -:100AC20000C0D7C1511DFE0200C0D761DD717BFAA3 -:100AD20070CEC0A59EC47CFF9EC4609EC461CDD76B -:100AE20061DD717BFAC18EC45C1BFED6FFCF0608A6 -:100AF20001FED7FFC061CDD731F2FA1AC1AEE4BF11 -:100B020016FDAEE6BF18FDAED4BF1AFD30FFFFBE24 -:100B1200E4BEE6BED4C0D731F2FA11C1AF16FDBEB3 -:100B2200E4AF18FDBEE6AF1AFDBED4C0D7C1BF1CEC -:100B3200FD13BF1EFD15BF20FD17BF22FDC0D7AF9D -:100B42001CFDDB1EFDEB20FDFB22FDD7534B30527B -:100B52005430324E323030475631323000FFC150BD -:100B6200FEFEAB0061DD717BFACF060800FE0A00D3 -:100B7200FEA4FF61CDF8E3EECF00C7FB0408BF1669 -:100B8200FD8FC0009C05C5C337040600BF18FD35A4 -:100B920036C40B300000522BFE6600C2C4C630724F -:100BA2000BB800300000B8022004AF18FDB80030C6 -:100BB2000F00B802AF16FD61FF520AFE3AFFECF8D1 -:100BC200FF0E717BFAC1C7FB04088C05C65C80FE70 -:100BD2000200C0D761DD717BFA70CFC0FFA59FC054 -:100BE200007CFF9FC000609FC00061CDD7618BFE7B -:100BF200E2FF717BBE410011FB000017CEFC0061D9 -:100C0200CB089EFDF31161C999A58392DFF7D7FE48 -:100C1200B1FED524FDDF23C1CF0308035109FEF441 -:100C2200FDC0D2DF37FE3800A20408CF0308075107 -:100C320009FEE1FDD2B20408DF22C7FB04083183BA -:100C420002C6D7C6510AFECCFD624C1FDF06CF2476 -:100C5200FD01EF04CF24FD00C0EE5BFEC0EE55FEA9 -:100C6200C7C1FB04088B31196C0161589BC0C6D700 -:100C7200717BFAFE4DFEAF0408040600C11436D69D -:100C82000B300000522DF3FE77FF8FC000FE2BFECB -:100C920061CF5C807C8073C0041900CEFC0F61CBF5 -:100CA200C55404EF03C55417FE18FEC7360008BB2F -:100CB200629C0288089C03D1DD334C41DE2F70F127 -:100CC200312DB161090033081C000851FF612A412E -:100CD2000E118FD0FF613B118FD1FF6138DC0E8B7B -:100CE2005C03DF0964C6C4FE2BFDEECAFDC6C4EE7A -:020CF200C3FD40 -:100CF40061CF5100718C7109FECBF800FEFCDE015E -:100D040000F6BF00F953C0F693935820FEDFF94173 -:100D14000036484E34CCFCEF05118B99A7A5174437 -:100D2400924EDFF53602F930CCFCEF04CC0000A77C -:100D340047DFF9410036924E3420FEEF05118B99BE -:100D4400A7A51744A24EDFF53630FE3094FEEF041B -:100D5400CC0000A747DFF9FCCE0000EFFE61DD7197 -:100D64007BFABEF0ADD8BEF200AEF661CDD7C3615A -:100D7400DD717BFABEF0ADD8BEF200DBF6FFADDC70 -:100D8400BEF000AEF6BDD8AEF40312ADDABEF2008A -:100D9400AEF661CD03BDDAC2D7C3F33174D908838B -:100DA400C1F626D8BDD8C031750683C312F623C256 -:100DB400FDBF0D93DF0312F623C2D7440000DD26E6 -:100DC40061DD717BFACFE80080BEF6F6BEF4BEF2B8 -:100DD400ADD8BEF0CFE800818FE8003103FAAEF061 -:100DE400F5E80061CDD7B1D7C3F33174D90883C115 -:100DF400F626D8BDD8C0317505C312F623C2FD0D41 -:100E04000E93DF0312F623C2D7440000DD2761DD11 -:100E1400717BFACFE80080BEF6F6BEF4BEF2ADD820 -:100E2400BEF0CFE800818FE8003103FAAFE000F5AF -:100E3400E80061CDD7ADD8D7C3F33174DB0F83C1DC -:100E4400F626D8BDD861317026DABDDAC031750D09 -:100E540083C312F626DCBDDC61317023C2FD750E3E -:100E640093DF0CF626D8BDD861317026DABDDAC21C -:100E7400D7C161686BDC6BDDC0DD2F61DD717BFA8E -:100E8400CFE80080BEF4ADDCBEF6ADD8BEF0ADDA7E -:100E9400BEF2CFE800818FE8003103FAAEF0BDD88E -:100EA400AEF2BDDAF5E80061CDD7F6BDD8BDDAD72C -:100EB4008292DD2B61DD717BFACFE80080BEF0F613 -:100EC400BEF2BEF46208BEF6CFE800818FE80031BE -:100ED40003FAAFE0006072AEF0F5E80061CDD760D0 -:100EE40072F6B1D706DABDDAADDC06D8BDD861D862 -:100EF400A6DAD7D1DD17C1C3DAD89DD8ADDA311C53 -:100F040061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDE5 -:100F14001BC1C3DADA9DDAADD8311E33311E337109 -:100F2400F9B4DADFF4BDD813BDDAC2C0D746D8DDD0 -:100F34000771FF7177D971C0D75BDB9DDB605BDA2A -:100F44009DDAADDC5BD9085BD808BDD8D7C3C7F33D -:100F5400728EFDC162314C4100363E4E1161A07269 -:070F6400C09EFD62C6C2D76A -:0A0FF60031383A31343A3531000049 -:0A20000031383A31343A353100002E +:1002FE0061690A8C0AD1DFDA8B4CA461F8FD1B48C8 +:10030E00FD6404710BE2713395F2C0C6D7C7C1FB11 +:10031E00F8FFFD5B02D2DD045203EF25710AE68B76 +:10032E0070FDD403D2DD077133955202EF138C08A2 +:10033E0070FDF0038C0A70FDF003FD6404713395BB +:10034E00F2C0C6D7C7C1FBF8FFFD5B02D2DD045277 +:10035E0003EF70710AE6710BE28B70FDD403D2DDF0 +:10036E00077133955202EF5B710BE231229544C750 +:10037E003422FBAC0C1652048B99A5A792DFF9C65A +:10038E008B9D4F8C089D508C0A9D513184BD02EF80 +:10039E00FA717ABDCEB144CBB422FB8C0A318EBE3B +:1003AE00B8CEBB48714BE1714BE5710ABD8C089E0E +:1003BE0044EF0F710BE68C089E448C0A9D4EAC0CDC +:1003CE00BD4CF2C0C6D7C716FD1304AF0401BF0C57 +:1003DE000117FDF003D2DD07FD64045202EF01F2B6 +:1003EE00C6D7C716710AE6710BE2669E443182E2E9 +:1003FE0002EFFAF6420401DD09AF0401BF0C01E27F +:10040E00EF01F2C6D7AF2801085CFB08BF2801FD3B +:10041E005A02AF28015CFBBF2801300400BF2A013D +:10042E00301780BF1C01300400BF2201D7AF24015A +:10043E00086C0408BF2401AF28016C0F086C0B0870 +:10044E00BF2801FD5A02AF2A01085CFB08BF2A0132 +:10045E00FD5A02ED1304300400BF2401F6BF2A0139 +:10046E00300B0BBF2801FD5A02300B0FBF2801FDC8 +:10047E005A02300F0FBF2801D731449501D7713280 +:10048E00956A0E03713B25713B23E0FDB609712081 +:10049E00F000FD5A02F6BF26015024BF1401CB44D2 +:1004AE000014300F0FBF2801712395710BE2710AF2 +:1004BE00E6FD1304CE44FF3182E202EFFAFD64043E +:1004CE00AF0401BF0C01713395714295D73134954C +:1004DE0002EFFAFD3B04713A25713A235A0EFC7174 +:1004EE0028F000714395D7C72008FBF8FFFD42089E +:1004FE005014C15008FD7407C0CC07048C074C146F +:10050E00DE0C8C07318EFDDE09615907EFEECC074C +:10051E00048C074C1461C8EDE305CC06008C064C28 +:10052E000461C8EDC205300AF9BC02F6BBCEABAC15 +:10053E0031B2D109C73641057184C6DEF3F1C73633 +:10054E0041057184C661DC9C05713BD1AC02148FF0 +:10055E0040059971505005617902617900F0E161B1 +:10056E004900DD09C73641057184C6DEC3F1C736C1 +:10057E0041057184C661DC0E059C055040C18C0797 +:10058E00318E31AD128C06318E318D03BDD831FFD7 +:10059E00BDDADADAADD8FDAA0CC0D2DD0C5008C136 +:1005AE005014FD7407C0FD670B8C05D1DF06615931 +:1005BE0006ED2B058C07318EFDE209D2DD0C5008BD +:1005CE00C15014FD7407C0FD670B8C05D1DF0661A9 +:1005DE005907ED1F0571605005CC0400CC05008C49 +:1005EE00054C09DE2B8C05318E04F61FC1317B9E26 +:1005FE00FDC41189728C05318E04F64F1489614247 +:10060E00DF03F6EF01E6600E049C04615905EFCF9F +:10061E0041001140F81F3A61E86159048C04D1DFA2 +:10062E0008FD680BFD7A0CEF0C5008C15014FD74D8 +:10063E0007C0FD670B1008C6D7C72004FBF8FF7173 +:10064E002B24CC0100F6BC02AC02440900DE3EAC09 +:10065E000204F60F144100118972AC020C50148979 +:10066E006142DF03F6EF01E6600E019C01AC02125F +:10067E0049005072AC0204F67F14896142DF03F622 +:10068E00EF01E6600E019C01617902EFBB40F67F3F +:10069E00FF61F86159018C01D161F8ED4007CC0181 +:1006AE0000717AFAFD8704711300711B2071030328 +:1006BE00710205E0C15003FD622BC05013FDB60957 +:1006CE00D83BC1E0FD622BC0CEABAC6159018C01B1 +:1006DE0091DD068C014C03DF03E6EF01F66061FB52 +:1006EE007121048C014C0861F8CC010031320705F0 +:1006FE00A024FCEF03F524FC4024FC11DC22F5249D +:10070E00FCF0C15003FD622BC0CE3708CBE4FFFFD7 +:10071E00CBE6FFF7CED4FFCF370008F5120561FD0B +:10072E00E6BC02F6614902DD9F000000006179021D +:10073E00EFF1FD4208D2DFFA5008C15014FD7407E4 +:10074E00C0D2FD670B1004C6D73184BD02EFFA711B +:10075E007BBDCBE4FFFFCBE6FFFFCBD4FFFF717A6F +:10076E00BED7717BBED7C7C1200CFBF8FF8C0C31F6 +:10077E008E31ADC1317B9DD4C0BC068DD49C088C0E +:10078E00149C0B8C14318E040C00128C0B318EBD0C +:10079E00D813FD390F61C8ED3D08CEABACCC0506C4 +:1007AE008C0B318EFDDA09D2DD158C0B318EFDDE10 +:1007BE00096169058C05D1DFE7FD7007E2EF71CCA9 +:1007CE000A008C0A4C04DE54F6BC02300AF9BBACAB +:1007DE0006148C089EFD118972AB146299AC06A1A9 +:1007EE00BC06617900617902F0E1614902DFE050F7 +:1007FE0040C18C0B318E31AD128C0A318E318D038E +:10080E00BDD831FFBDDADADAADD8FDAA0CC0D2DD23 +:10081E0006FD7007E2EF1961590AEFA68C0B318EB7 +:10082E00FDE209D2DD03E2EF0761590BED9107F20C +:10083E00100EC6D7C7717B9D717BFAFD5707300A24 +:10084E00F9FD8D0AFD180AC6D7FD4208FD670BFD9E +:10085E007007F5ABFFF2D7C7310499067110B3FBE1 +:10086E00EF047118B3FB8FB3FB7B8C76D1DD5B8FFE +:10087E00B3FB9D8C4004F903DF22665C10D1DD1CB6 +:10088E008FB3FB5C10D1DD0B5080C15011FDD43401 +:10089E00C0EF095040C15011FDD434C04004F903DB +:1008AE00DD064004F904DF22665C02D1DD1C8FB345 +:1008BE00FB5C02D1DD0B5040C15010FDD434C0EFB3 +:1008CE00095020C15010FDD434C0C6D7C736000021 +:1008DE00665C80D1DD10675C80D1DF05713398EFE7 +:1008EE000B713298EF06710407713198665C40D136 +:1008FE00DD10675C40D1DF05714398EF0B714298B4 +:10090E00EF06711405714198665C01D1DD10675CCC +:10091E0001D1DF05715398EF0B715298EF067134C8 +:10092E0007715198665C02D1DD10675C02D1DF055C +:10093E00716398EF1D716298EF184007F901DF0897 +:10094E00710402716198EF0AC736100571C4C67141 +:10095E006198665C04D1DD10675C04D1DF057173AC +:10096E0098EF0B717298EF06714407717198665C7F +:10097E0008D1DD10675C08D1DF05710399EF0B71AB +:10098E000299EF06711407710199665C10D161E846 +:10099E00715AD1C6D7F5F6FBF5F8FBCFFEFBFFCFAC +:1009AE00FAFBFFCFFBFBFFD7C7C1C1FBF8FFCEABF6 +:1009BE00AC8C02D1DD12616902305C03BBF6614979 +:0C09CE0000DDEE618900EFF51004C6D7D3 +:1009DA005208EF065203EF025206FEE600FE1B0023 +:1009EA00DC16089F03088F0408089F040862FE2487 +:1009FA0000089F0408EEBF00EEBA00C1C514410EFC +:100A0A0011D9D0FF118FD1FF312E45C4C0D7F23191 +:100A1A00A2C401E2D79DE261DD4C09DF12717BFAC3 +:100A2A00C18F06089F25FDC0CF060800EE270031BA +:100A3A00F2FA04CF0608004C00DF05D50008DD16DF +:100A4A0061DD717BFAD50608DD0ACDE31F61CD6150 +:100A5A00CDEE160061CDFED40061FFFE9A00FCF8CF +:100A6A00FF0EFEB20061CDFED5004C09DF0EC18F2C +:100A7A0006086F25FD9F0608C0EE0400CF06080091 +:100A8A00F8E3D75200EF025202FE3700CF24FD00EE +:100A9A00CF060800BF0408C716629F00084100116C +:100AAA008F1A209B4100118F1B209F0108C65100FD +:100ABA00FE62FFEF025205CF060800C1510CFE0A82 +:100ACA0000C0D7C1511DFE0200C0D761DD717BFA9B +:100ADA0070CEC0A59EC47CFF9EC4609EC461CDD763 +:100AEA0061DD717BFAC18EC45C1BFED6FFCF06089E +:100AFA0001FED7FFC061CDD731F2FA1AC1AEE4BF09 +:100B0A0016FDAEE6BF18FDAED4BF1AFD30FFFFBE1C +:100B1A00E4BEE6BED4C0D731F2FA11C1AF16FDBEAB +:100B2A00E4AF18FDBEE6AF1AFDBED4C0D7C1BF1CE4 +:100B3A00FD13BF1EFD15BF20FD17BF22FDC0D7AF95 +:100B4A001CFDDB1EFDEB20FDFB22FDD7534B305273 +:100B5A005430324E323030475631323000FFC150B5 +:100B6A00FEFEAB0061DD717BFACF060800FE0A00CB +:100B7A00FEA4FF61CDF8E3EECF00C7FB0408BF1661 +:100B8A00FD8FC0009C05C5C337040600BF18FD359C +:100B9A0036CC0B300000522BFE6600C2C4C6307A37 +:100BAA000BB800300000B8022004AF18FDB80030BE +:100BBA000F00B802AF16FD61FF520AFE3AFFECF8C9 +:100BCA00FF0E717BFAC1C7FB04088C05C65C80FE68 +:100BDA000200C0D761DD717BFA70CFC0FFA59FC04C +:100BEA00007CFF9FC000609FC00061CDD7618BFE73 +:100BFA00E2FF717BBE410011FB000017CEFC0061D1 +:100C0A00CB089EFDF31161C999A58392DFF7D7FE40 +:100C1A00B1FED524FDDF23C1CF0308035109FEF439 +:100C2A00FDC0D2DF37FE3800A20408CF03080751FF +:100C3A0009FEE1FDD2B20408DF22C7FB04083183B2 +:100C4A0002C6D7C6510AFECCFD624C1FDF06CF246E +:100C5A00FD01EF04CF24FD00C0EE5BFEC0EE55FEA1 +:100C6A00C7C1FB04088B31196C0161589BC0C6D7F8 +:100C7A00717BFAFE4DFEAF0408040600C11436DE8D +:100C8A000B300000522DF3FE77FF8FC000FE2BFEC3 +:100C9A0061CF5C807C8073C0041900CEFC0F61CBED +:100CAA00C55404EF03C55417FE18FEC7360008BB27 +:100CBA00629C0288089C03D1DD334C41DE2F70F11F +:100CCA00312DB161090033081C000851FF612A4126 +:100CDA000E118FD0FF613B118FD1FF6138DC0E8B73 +:100CEA005C03DF0964C6C4FE2BFDEECAFDC6C4EE72 +:020CFA00C3FD38 +:100CFC0061CF5100718C7109FECBF800FEFCDE0156 +:100D0C0000F6BF00F953C0F693935820FEDFF9416B +:100D1C0000364C4E34CCFCEF05118B99A7A517442B +:100D2C00964EDFF53602F930CCFCEF04CC0000A770 +:100D3C0047DFF9410036964E3420FEEF05118B99B2 +:100D4C00A7A51744A64EDFF53630FE3094FEEF040F +:100D5C00CC0000A747DFF9FCCE0000EFFE61DD718F +:100D6C007BFABEF0ADD8BEF200AEF661CDD7C36152 +:100D7C00DD717BFABEF0ADD8BEF200DBF6FFADDC68 +:100D8C00BEF000AEF6BDD8AEF40312ADDABEF20082 +:100D9C00AEF661CD03BDDAC2D7C3F33174D9088383 +:100DAC00C1F626D8BDD8C031750683C312F623C24E +:100DBC00FDC70D93DF0312F623C2D7440000DD26D6 +:100DCC0061DD717BFACFE80080BEF6F6BEF4BEF2B0 +:100DDC00ADD8BEF0CFE800818FE8003103FAAEF059 +:100DEC00F5E80061CDD7B1D7C3F33174D90883C10D +:100DFC00F626D8BDD8C0317505C312F623C2FD1531 +:100E0C000E93DF0312F623C2D7440000DD2761DD09 +:100E1C00717BFACFE80080BEF6F6BEF4BEF2ADD818 +:100E2C00BEF0CFE800818FE8003103FAAFE000F5A7 +:100E3C00E80061CDD7ADD8D7C3F33174DB0F83C1D4 +:100E4C00F626D8BDD861317026DABDDAC031750D01 +:100E5C0083C312F626DCBDDC61317023C2FD7D0E2E +:100E6C0093DF0CF626D8BDD861317026DABDDAC214 +:100E7C00D7C161686BDC6BDDC0DD2F61DD717BFA86 +:100E8C00CFE80080BEF4ADDCBEF6ADD8BEF0ADDA76 +:100E9C00BEF2CFE800818FE8003103FAAEF0BDD886 +:100EAC00AEF2BDDAF5E80061CDD7F6BDD8BDDAD724 +:100EBC008292DD2B61DD717BFACFE80080BEF0F60B +:100ECC00BEF2BEF46208BEF6CFE800818FE80031B6 +:100EDC0003FAAFE0006072AEF0F5E80061CDD760C8 +:100EEC0072F6B1D706DABDDAADDC06D8BDD861D85A +:100EFC00A6DAD7D1DD17C1C3DAD89DD8ADDA311C4B +:100F0C0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDDD +:100F1C001BC1C3DADA9DDAADD8311E33311E337101 +:100F2C00F9B4DADFF4BDD813BDDAC2C0D746D8DDC8 +:100F3C000771FF7177D971C0D75BDB9DDB605BDA22 +:100F4C009DDAADDC5BD9085BD808BDD8D7C3C7F335 +:100F5C00728EFDC162314C410036424E1161A0725D +:070F6C00C09EFD62C6C2D762 +:0A0FF60031383A31353A3335000046 +:0A20000031383A31353A333500002B :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -309,9 +309,9 @@ :10239C00FBDF095020C15011FDD434C0C0C6D78D0D :1023AC00209D40FDED23FD7E2BD507F9DD04710347 :1023BC0094D78D404B2061F83164941C716394FD6B -:1023CC007F044A4007DD054A40FFDF098F06F931DB +:1023CC0087044A4007DD054A40FFDF098F06F931D3 :1023DC000303FD7C24FD90247102943073256194D9 -:1023EC00D7C77162017172015003FDAE095008FD2F +:1023EC00D7C77162017172015003FDB6095008FD27 :1023FC005137629D305009FD51376276716301711E :10240C001806F94A30F1DC0BE507F9F508F9CD3778 :10241C0007EF224A3004DE1ACF07F9025008C150E8 @@ -320,8 +320,8 @@ :10244C00710B22710302CD20075700674C08DE1078 :10245C0073090A20614EDC05679D20EF0387EFEBC3 :10246C004A2007DF09D507F961F8CF07F903C6D76A -:10247C00500AFDAE09304000C15006FD2D2BC05056 -:10248C0096EDAE09C72006FBF8FFD507F961E8ED1C +:10247C00500AFDB609304000C15006FD2D2BC0504E +:10248C0096EDB609C72006FBF8FFD507F961E8ED14 :10249C006F25304A57C1503EFD2D2BC0D2DD077140 :1024AC0000B2FBED6F257108B2FB17040200C1509E :1024BC0004C1500CC1506CFDA0021006EA38AA48A9 @@ -329,19 +329,19 @@ :1024DC00FD2D2BC0F690C1500CFD2D2BC0CC010056 :1024EC008C014C04DE2831349502EFFA712295EA06 :1024FC00388C015010D605C15010C18C01D6044047 -:10250C0000C1506CFD4A031006615901EFD250A571 -:10251C00FDAE09EA38AA48318D12AA48318E616B9A -:10252C0008616A08C1500EFD2D2BC050A5FDAE09E7 +:10250C0000C1506CFD52031006615901EFD250A569 +:10251C00FDB609EA38AA48318D12AA48318E616B92 +:10252C0008616A08C1500EFD2D2BC050A5FDB609DF :10253C005004C1506CFD7F02C0629C01EA388A4B8A :10254C004E0161C3048A4A4E0117040200C15004B3 -:10255C00C1500CC1506CFD4A031006F6C1503EFD33 +:10255C00C1500CC1506CFD52031006F6C1503EFD2B :10256C002D2BC01006C6D7C78D414B3061F8ED122C :10257C00264A4328DE05A443ED1226F4438D309DF4 :10258C00418D305070D612307351230480001231BB :10259C00FF318E039D429FAEFBF68D427C804C95A5 :1025AC00DC1B8D42318F241400EA38BDD8AA44FDBF -:1025BC00610D1231FF318E03318F16EF198D4231BF -:1025CC008F241400EA38BDD8AA46FD610D1231FFE4 +:1025BC00690D1231FF318E03318F16EF198D4231B7 +:1025CC008F241400EA38BDD8AA46FD690D1231FFDC :1025DC00318E03318F16EA388A427217F303164490 :1025EC00000171FE61C836FF001701DE02F61617F6 :1025FC00BD7AC7500CFD2D2BC0D2DF068D309D410E @@ -351,7 +351,7 @@ :10263C000563CC0400EF4617040600FD252CD2DD03 :10264C000F7100B2FB710394CC0500711295EF2D44 :10265C007108B2FB8C06318E318D080E07081C00F8 -:10266C00BBEA388A4072ABFDB40EBB8C019C05D121 +:10266C00BBEA388A4072ABFDBC0EBB8C019C05D119 :10267C00DF08CC0501CC0400EF038B9C0417040687 :10268C0000FD302CD2DD06CC06C8CC07008C069F92 :10269C00B1FB8C06318E318D080E07081C00BD3441 @@ -368,10 +368,10 @@ :10274C00DF0DD446DD095020C15011FDD434C08FAB :10275C00AFFB9D46FDEF2B1008C6D7C75601D837E7 :10276C00C15002FD622BC08F09F93105075012FDD3 -:10277C00AE09EF0E500AFDAE09712010055008FD90 -:10278C00AE098D376C0870C15002FD622BC050032E -:10279C00FDAE098D376C1870C15002FD622BC05014 -:1027AC0016FDAE095003FD732B625C01D1DD0F7178 +:10277C00B609EF0E500AFDB609712010055008FD80 +:10278C00B6098D376C0870C15002FD622BC0500326 +:10279C00FDB6098D376C1870C15002FD622BC0500C +:1027AC0016FDB6095003FD732B625C01D1DD0F7170 :1027BC0070B3FB5002C15013FDD434C05600667286 :1027CC00C6D7C75004FD732B625C03D1DD40501497 :1027DC00FD652834B3FB895C9F998A0C7CFF50FF04 @@ -379,9 +379,9 @@ :1027FC00616A997162075600316207058666D1DFFE :10280C00F7716307716B2734C6FB895CEB99500237 :10281C00FD732BD2DD398D376C1070C15002FD6207 -:10282C002BC0E0FDAE09D837C15002FD622BC05061 -:10283C0033FDAE098F09F931030971281005500ACF -:10284C00FDAE09F0C15002FD622BC07178B3FBE004 +:10282C002BC0E0FDB609D837C15002FD622BC05059 +:10283C0033FDB6098F09F931030971281005500AC7 +:10284C00FDB609F0C15002FD622BC07178B3FBE0FC :10285C00C15013FDD434C0C6D7C7C12004FBF8FF48 :10286C00CC02005004FD732B629C038C045C20D1C1 :10287C00DD0E8C036C019C038C026C209C02EF130C @@ -389,7 +389,7 @@ :10289C00109C028C045C08D1DD0E8C036C029C0332 :1028AC008C026C089C02EF138C045C04D1DD0C8C44 :1028BC00035CFD9C038C026C049C028C03D1DD0533 -:1028CC00501AFDAE098C0370C15004FD622BC08FF1 +:1028CC00501AFDB6098C0370C15004FD622BC08FE9 :1028DC00B3FB5C9F728C03318E316D148C03318E83 :1028EC00314D616D08616C5C606162629FB3FB8FFE :1028FC00BFFB7CFF50FF5E02D1DD278FBFFB7CFF4F @@ -399,16 +399,16 @@ :10293C00C0D9A8FBC15007FD622BC0D7FD3329F2CB :10294C00D7C716664C02DF08CD3A10CD3B0BEF050E :10295C00F43ACD3B0FC6D7C7711300711B2071031E -:10296C0003710205E0C15003FD622BC05013FDAE94 +:10296C0003710205E0C15003FD622BC05013FDB68C :10297C0009D83AC15005FD622BC0D83BC1E0FD62BD -:10298C002BC0500AFDAE097103055008FDAE098D30 -:10299C003B6C1070C1E0FD622BC05012FDAE0950B3 +:10298C002BC0500AFDB6097103055008FDB6098D20 +:10299C003B6C1070C1E0FD622BC05012FDB60950AB :1029AC0003FD732B625C01D1DF03E2EF24F0FD73B6 :1029BC002B629D363602F9C75008FD4A2BC05003D6 :1029CC00C1FD622BC0710203711A20FD0A2BF43178 :1029DC00F2C6D75003FD732B625C01D1DD15501488 -:1029EC00FD6528FDCE275014FDAE09E0C15003FD56 -:1029FC00622BC0711300711B207103035014FDAEC8 +:1029EC00FD6528FDCE275014FDB609E0C15003FD4E +:1029FC00622BC0711300711B207103035014FDB6C0 :102A0C0009F0C1E0FD622BC0F0C15003FD622BC088 :102A1C00D7C72004FBF8FFCC02008D319C0350106B :102A2C00C150A4FD7F02C0629D31D452DD04F2ED91 @@ -425,13 +425,13 @@ :102ADC00BED831C15010FD7847C0F21004C6D7FDE6 :102AEC006727F2D7FDCE27F2D7C78FC6FB7617FD27 :102AFC006528664FC6FBDFF2F5C6FBF2C6D75064FD -:102B0C00FDAE09FD3B2C6261FB711194F1711494C3 +:102B0C00FDB609FD3B2C6261FB711194F1711494BB :102B1C0061DC70C15012FD7847C0FD8236CD610377 :102B2C00D7C7C1C1FBF8FFAC0ABB17C15002C18C9F -:102B3C000270C1506CFD4A0310061004C6D7C7C101 +:102B3C000270C1506CFD520310061004C6D7C7C1F9 :102B4C00FBF8FFAC08C15002C18B70C1506CFDA0EA :102B5C00021006C0C6D7C78806166770C1C7508456 -:102B6C00FD13031004C6D7C716C75084FD7F02C0DF +:102B6C00FD1B031004C6D7C716C75084FD7F02C0D7 :102B7C00C6D7C74A2004DE045600EF0256014008AF :102B8C00F901DF048686EF0A4008F902DF045104DC :102B9C00610666318F12504CD633514CD6610A0403 @@ -451,7 +451,7 @@ :102C7C00050B7130510571205105713BD5717050A8 :102C8C00058F11055CFC9F11058F10055CFC9F10D6 :102C9C0005F422D77178500571080105D7FD7C38F1 -:102CAC00FD7F04717AFAFDAB23F504F98F06F93137 +:102CAC00FD8704717AFAFDAB23F504F98F06F9312F :102CBC00051B5003FD732B625C01D161E8CF04F955 :102CCC0002CFAFFB64710407714194EF10F67104ED :102CDC0007611012F6B1236061FB714194FD9030D5 @@ -464,8 +464,8 @@ :102D4C005CFC9E265A06FC71603002D7717830020A :102D5C007148F000D7C788061666614FDD096761B8 :102D6C004EDE0396EF01866672C6D7C7161714AAF5 -:102D7C000412A943DD29AA0412A923FDA24EC3AC57 -:102D8C0002FDA24E13C2BDD813FD310FDE0C171479 +:102D7C000412A943DD29AA0412A923FDA64EC3AC53 +:102D8C0002FDA64E13C2BDD813FD390FDE0C17146D :102D9C00AA0212AA0403BA04EF051714A9BA04ACC8 :102DAC00041231FF319E03317F087208C6D77100BF :102DBC00F200304400BFB601300188BF90013009E9 @@ -486,7 +486,7 @@ :102EAC005603D7C7161714F6B9AA0412F623123113 :102EBC00FF31AE03316FBA02C6D7C7C1FBF8FF8C26 :102ECC00085080D612AB1413B9AB14AA0412A92360 -:102EDC0012D927FBF133BDD813FD9D0DBA02C0C624 +:102EDC0012D927FBF133BDD813FDA50DBA02C0C61C :102EEC00D731049601D74004F902DF10F6BE64BE58 :102EFC006EBE6ABF8EFBBF94FBBF9AFB31749514F8 :102F0C00308AFBFDAF2E3090FBFDAF2E3096FBFDD3 @@ -515,7 +515,7 @@ :10307C004396717B9E8FDCFB9E9A8FDDFB9E9B7132 :10308C007A9EC6D7CFA7FB5CCFA8FB5FCFC8FB5DF2 :10309C00CFFCFB36CFFDFBC9D7C7CFA4FB12CFA506 -:1030AC00FB26CFCCFBFFF5CDFBF5CEFBF5CFFBF52F +:1030AC00FB27CFCCFBFFF5CDFBF5CEFBF5CFFBF52E :1030BC00D0FB5600664C64DE08723826FB0086EFA7 :1030CC00F3F5E3FB710A20711A20710203C6D7C70E :1030DC0088061617F1E73403002361E3ED0C342363 @@ -627,9 +627,9 @@ :10377C00710BE772C6D7C7C1C1FBF8FF8FFCFB4EBC :10378C0002DC03F2EF318C024FFDFBDC0452FFEF45 :10379C00268C022FFCFB706131318D128FFDFB2FBB -:1037AC00FCFB70613133BDD813FDBF0DBB44000170 +:1037AC00FCFB70613133BDD813FDC70DBB44000168 :1037BC00DC03F690BB8B721004C6D7C7C1FBF8FFB5 -:1037CC00AC0814A91489708B6128706131FDA24E6C +:1037CC00AC0814A91489708B6128706131FDA64E68 :1037DC001344030071FEDC23AC08148A04819A04A0 :1037EC00AC08148A044C11DC10A9148B99AC081485 :1037FC00CA0200AC0814CA0310EF72AC0814CA0455 @@ -645,7 +645,7 @@ :10389C000600C15006C150A8C15030FDA002100650 :1038AC00D2DD1B4A6A04DE05A46AE2EF7034E4FB45 :1038BC00895CFC99FD60397110B2FBF2EF5F717B92 -:1038CC00FA300600C117040600C130E9FBFDAA4E10 +:1038CC00FA300600C117040600C130E9FBFDAE4E0C :1038DC001004717AFAF46A8FE4FB5C01D1DD2640A6 :1038EC0004F903DF205010C180FDD434C0C736105A :1038FC000571D4C6DE0F17C15006C150A8C1503097 @@ -653,12 +653,12 @@ :10391C000B8FE4FB5C02D161E8FD5E40F2100CC63B :10392C00D7D9E5FBC15030FD7F02C0629FE8FB5048 :10393C0008C15011FDD434C0F2D7D9E8FBC1D9E786 -:10394C00FBC15030FD130310045008C15011FDD4BD +:10394C00FBC15030FD1B0310045008C15011FDD4B5 :10395C0034C0F2D7C7200CFBF8FFCC09004007F9A4 :10396C0001DF05CC0A02EF03CC0A10CC0B808FE4EC :10397C00FB5C039C07D1DF08717AD5CC0807EF06F6 :10398C00717BD5CC082F17040800C15004C150A07E -:10399C00C15030FD4A031006624C02DF077110B2B1 +:10399C00C15030FD52031006624C02DF077110B2A9 :1039AC00FBF2EF357118B2FBF46AC736100571D40F :1039BC00C6DE164004F903DF1017A1C15006C15032 :1039CC00A8C15030FDA0021006717BFA8FE4FB5C9D @@ -697,7 +697,7 @@ :103BDC00FD622BC0711300711B20710303665C0422 :103BEC00D1DD11711300711B20D503FC61F8710339 :103BFC0003FD2235665C08D161E87103035005FDB5 -:103C0C00AE097102035003C1FD622BC0711A20FD75 +:103C0C00B6097102035003C1FD622BC0711A20FD6D :103C1C000A2BF2C6D7C756FF4A481361C8EDD73CEA :103C2C008F06F9311505300400EF0F8F06F9314579 :103C3C0005300500EF04D907F9F1609F28FC8D7A57 @@ -710,13 +710,13 @@ :103CAC0001F6C2616B08616A9F2CFCF171240461FE :103CBC00DC9F26FCF171540761DC9F27FCD848F18E :103CCC000104ECFC14A9148976A4486672C6D7C703 -:103CDC00FDD2088F04F9318FE724000061F8EDB3B1 +:103CDC00FDDA088F04F9318FE724000061F8EDB3A9 :103CEC003E23DD1B2361F8EDBF3D2361F8ED383E2B :103CFC002361F8ED813E2361F8ED533FEDB03EF6C4 :103D0C00BD727113954005F901DF2C3134981B46B7 :103D1C006CDD04F424EF02A4244A2465DC0FF6BD08 :103D2C006CF504F9712297EDD43FFDAB23AD6C44D7 -:103D3C000A0061D8EDD43F714297FD7F0471639402 +:103D3C000A0061D8EDD43F714297FD8704716394FA :103D4C00FDAB234007F903DF09712297F504F9ED68 :103D5C00D43FFD152640B1FB9BDE09712297F5047B :103D6C00F9EDD43F714A277140110571301105717D @@ -726,7 +726,7 @@ :103DAC00F5CDFBEF04CFCDFB03CF04F902FD332996 :103DBC00EDD43FFD452CFDFE2C714A9D712B21FD50 :103DCC002235FDA530F537FF712BE0F505F9712291 -:103DDC0097CBE43FEFCBE6F6F0FD7F04713BD48F3D +:103DDC0097CBE43FEFCBE6F6F0FD8704713BD48F35 :103DEC0006F93105285004FD732B625C03318E31CA :103DFC005D34B3FB896168995002FD732BD2DD06EB :103E0C007170B3FBEF047178B3FBFDAB23FDBA2DDE @@ -737,7 +737,7 @@ :103E5C002BE05027C15005FD622BC0CF04F9047133 :103E6C002297FD3F408F06F931250731349803F531 :103E7C0004F9EDD43FFDD63F31020C15D83AC150B0 -:103E8C0005FD622BC05005FDAE09FD4A40CF04F97B +:103E8C0005FD622BC05005FDB609FD4A40CF04F973 :103E9C0003FD3F408F06F931250731349803F504B3 :103EAC00F9EDD43FF504F9CFCDFB03F5CEFBF5D0FE :103EBC00FB717295F6426CFF61E8EDD43FF6BD7272 @@ -749,13 +749,13 @@ :103F1C00714307714B2771481005714811057138B1 :103F2C00100571381105713302713B227153027106 :103F3C005B227158100571581105CF04F9057142B7 -:103F4C0097F6BD6CFD9B09F505F9F4243134980402 +:103F4C0097F6BD6CFDA309F505F9F42431349804FA :103F5C00D432DD20E505F9E504F98F06F931256841 -:103F6C00F5F8FBF5F6FB502EFDAE09CF05F903E590 -:103F7C0004F9EF54FDD304FD3E2371730171320437 +:103F6C00F5F8FBF5F6FB502EFDB609CF05F903E588 +:103F7C0004F9EF54FDDB04FD3E237173017132042F :103F8C0071430271039471629431949E02EFFA7141 :103F9C002AE7CEA409F5F3003104070261FDE5F32D -:103FAC0000F468FDD208CEA40831329806CF04F98B +:103FAC0000F468FDDA08CEA40831329806CF04F983 :103FBC0005EF09714397E505F9E504F9712BE78FD6 :103FCC0006F9312503F504F9C6D78FE3FB5C01D163 :103FDC00DF60D47DDF19310200585003FD732B6272 @@ -765,25 +765,25 @@ :10401C00FFDD1FA47DD7F0C15004FD622BC08FB310 :10402C00FB5C9F9FB3FB7110C4FB30AB3B6194CD29 :10403C007DF0D731149506F504F9712297D7716389 -:10404C0097F47C717207FD5A02717307D7FDED046A +:10404C0097F47C717207FD5A02717307D7FDF50462 :10405C00F2D7717BFAC7200CFBF8FF8FEAFBF0F963 -:10406C00E9FBF303FDA24E13BC048FECFBF0F9EB60 -:10407C00FBF303FDA24E13BC028FEEFBF0F9EDFB3C -:10408C00F303FDA24E13BB717AFAAC04BDD8F6BD96 -:10409C00DAAC04311EBDDCF6BDDEFD720DADD8BD53 +:10406C00E9FBF303FDA64E13BC048FECFBF0F9EB5C +:10407C00FBF303FDA64E13BC028FEEFBF0F9EDFB38 +:10408C00F303FDA64E13BB717AFAAC04BDD8F6BD92 +:10409C00DAAC04311EBDDCF6BDDEFD7A0DADD8BD4B :1040AC00DCADDABDDEAC02BDD8F6BDDAAC02311E39 -:1040BC00DADCC3DADEC3BDDCF6BDDEFD720DC0BDDD -:1040CC00DEC0BDDCADDEFDE80EADD8BDDCADDABDCD +:1040BC00DADCC3DADEC3BDDCF6BDDEFD7A0DC0BDD5 +:1040CC00DEC0BDDCADDEFDF00EADD8BDDCADDABDC5 :1040DC00DEABBDD8F6BDDAAB311EDADCC3DADEC33B -:1040EC00BDDCF6BDDEFD720DC0BDDEC0BDDCADDEDF -:1040FC00FDE80EDADAADD8FD2D44C3C58D8A5C3FE0 +:1040EC00BDDCF6BDDEFD7A0DC0BDDEC0BDDCADDED7 +:1040FC00FDF00EDADAADD8FD2D44C3C58D8A5C3FD8 :10410C00F0317E0440FC14C2C0B9A48AF6BC08BCD1 :10411C000A9C078C074C2EDD3D8D8A0E0770F161D1 :10412C00DC605C3FF0317E127940FCBDD8F6BDDA24 -:10413C008C0773095C22318FBDDC70BDDEFD720D06 -:10414C00AC08BDDCAC0AFDE80EADDABC0AADD8BCDF +:10413C008C0773095C22318FBDDC70BDDEFD7A0DFE +:10414C00AC08BDDCAC0AFDF00EADDABC0AADD8BCD7 :10415C0008615907EFBDAC08BDD8AC0ABDDAC9DCA3 -:10416C000004F6FD3C0EC9DCFFFFF6FD3D0FADD89B +:10416C000004F6FD440EC9DCFFFFF6FD450FADD88B :10417C00BD84AF3AFC4684DD11AF3CFCBF3EFCAFC6 :10418C003AFCBF3CFCAD84BF3AFCAF3CFC423EFC6D :10419C00DC46AF3AFC423CFCDE3EAD26423AFCDE4D @@ -796,7 +796,7 @@ :10420C0086FF61E8A486100CC6D7717BFAC7710AC9 :10421C009E31929E02EFFA8E949F34FC8E969F35BF :10422C00FC8E979F36FC8E989F37FC8E939F38FCA4 -:10423C008E929F39FC710B9E717AFA8F37FCFD516F +:10423C008E929F39FC710B9E717AFA8F37FCFD5967 :10424C000F76FDAB4313BD82D5EFFBDF0AD5F0FB38 :10425C00DF05D5F1FBDD25F6B14682DF11C98237CA :10426C0022665C0391DF060A82181A83009617FDFA @@ -819,9 +819,9 @@ :10437C00790AF9BB311298058B9C03EF0F8C019CC9 :10438C0003D48BDF05CD8BA7EF02B48B7180711733 :10439C009861DC61FB7111988C03721004C6D7C74D -:1043AC002008FBF8FF8F37FCFD510F9C078F36FC64 -:1043BC00FD510F9C068F35FCFD510F9C058F34FC75 -:1043CC00FD510F9C048F38FC9C038F39FC9C028C94 +:1043AC002008FBF8FF8F37FCFD590F9C078F36FC5C +:1043BC00FD590F9C068F35FCFD590F9C058F34FC65 +:1043CC00FD590F9C048F38FC9C038F39FC9C028C8C :1043DC0006318E0112791A20BB8C075C03D1DF09E0 :1043EC008C064C0361C86179008C05318EB1610972 :1043FC0000BB313D120103BB8B0E04708C011C0001 @@ -831,13 +831,13 @@ :10443C004908DF07F7340000EDCA44E6BC04F6BCBB :10444C0006AC0ABC02AC08BBAC06614902AC046108 :10445C00F8614900DE28AC04BDD8AC06BDDAE1FD3C -:10446C00F70EADDABC06ADD8BC04ABBDD8AC02BD02 -:10447C00DAE1FD120FADDABC02ADD8BBEFCAAC0667 +:10446C00FF0EADDABC06ADD8BC04ABBDD8AC02BDFA +:10447C00DAE1FD1A0FADDABC02ADD8BBEFCAAC065F :10448C00BC02AC04BBAC08BDD8AC0ABDDAAC04BDF4 -:10449C00DCAC06FD750EAC04BDDCAC06FDE80EE133 -:1044AC00FD120FADDABC06ADD8BC04AC06614902F6 +:10449C00DCAC06FD7D0EAC04BDDCAC06FDF00EE123 +:1044AC00FD1A0FADDABC06ADD8BC04AC06614902EE :1044BC00AC0461F8614900DCC5AC0214AB12100C01 -:1044CC00C6D7C7C12004FBF8FF8F31FCFD510F9CF0 +:1044CC00C6D7C7C12004FBF8FF8F31FCFD590F9CE8 :1044DC00034E04DF1CAD804682DE07AD82268012BF :1044EC00EF40F64682DF074680DD03E7EF34F7EF57 :1044FC00318C04318EB1128C03318E43DF1830387D @@ -868,7 +868,7 @@ :10468C00CAFCFDEC46D2DF0ED9CCFBC1AE6CFD6191 :10469C002DC0F313BE6CD7FDEC46D2DD0DCD2E47ED :1046AC00F490AE6C317DBFCAFCD7E8900934205031 -:1046BC0080D6BFC6FC22CAFCBDD8304700FD9D0D7C +:1046BC0080D6BFC6FC22CAFCBDD8304700FDA50D74 :1046CC00BFC8FC30C6FCFD772DF313BE6CB42ED4E2 :1046DC002EDF0CCD2E47A4904A901F61C8F490D7C2 :1046EC0040AFFB0BDC05712304F2D740AFFB066136 @@ -876,7 +876,7 @@ :10470C006C712204EF03FD1747E2D7710296F0C1DA :10471C00AE6CFD612DC0F313BE6CA4914A9140DCCC :10472C0037F491D892F1313F0412FD14D892F1BDB7 -:10473C00D85008FDEC0D087208E6D2DD040192DFBA +:10473C00D85008FDF40D087208E6D2DD040192DFB2 :10474C00FC896158D1DD05712204EF03712304A4A7 :10475C00924A922061C8F492D7C73026FDC6D77111 :10476C0080717DFADE035201D75200D7C7C12004F5 @@ -887,119 +887,120 @@ :1047BC00A1C1E0C15010C150A4FDA0021006629C22 :1047CC0002D1DD058C0272EF178C015C7DD1DD030B :1047DC00F2EF0D8C0370C15010FDF047C0629C02CB -:1047EC001006C6D7C7880616710AE650A4FDCC037E -:1047FC00D2DD077133955202EF2217FDE803677083 -:10480C00FDE803FD330450A4FDE8035020FDE8034C -:0E481C0050AAFDE803FD5C04713395F2C6D787 -:10482A0061FC61FCC1C3C5C7520C929269D4FEC136 -:10483A00DFF88EFD708EFCC1717AFA4004F903DF4D -:10484A0005301D2A6194C09EFC609EFD34D4FE5240 -:10485A0006C0B9A5A592DFF9C6C4C2C061FC61DF72 -:10486A00520C929269D4FEC1DFF88EFD708EFCC1A3 -:10487A008F4105775C04D1DD06675C01D1DD5031DB -:10488A005496367162077153968FB4FB5FBCFBD1A5 -:10489A00DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE9F -:1048AA00FBD1DF098FB7FB5FBFFBD1DD0C3162079C -:1048BA0002EFFA716307716B27711398FD5130F497 -:1048CA00227148500571605005717AFAEDC4496742 -:1048DA005C02D1DD16D422DD124A2202DD0DF42259 -:1048EA007148500571605005717AFA717AFA8D2211 -:1048FA00318FE7240000DD0823DD1423DD2CEF4A85 -:10490A00F4487140500571505005E422EDC4498FB6 -:10491A0040059D49715050058D499D4BD849FD1A56 -:10492A0034629D4ACD2202EDC449675C02D1DD178B -:10493A00675C10D1DD05CD2203EF0F714850057178 -:10494A00605005F422EF73CD22044A2203DF108D52 -:10495A004A9F4005D84AC1D849FDA634C0EF1F8FE7 -:10496A00400576717449DC054A4902DE06716050D9 -:10497A0005EF47C7D849FDDB30C071505005D84B09 -:10498A00F1242900DD27240400DD22242200DD1D74 -:10499A00241100DD0C240100DD13241E00DD0EEFBE -:1049AA000A4A4960DF07CD4961EF02A4494A220356 -:1049BA00DF08D849FD1A34629D4AC09EFC609EFDFC -:1049CA0034D4FE5206C0B9A5A592DFF961FCC1C371 -:1049DA00C5C7520C929269D4FEC1DFF88EFD708E63 -:1049EA00FCC1717AFA51405F0401D1DD06F616A7BF -:1049FA0047DFF2300400BF2401F6BF2A01300B0B57 -:104A0A00BF2801FD5A02300B0FBF2801FD5A0230A0 -:104A1A000F0FBF2801710AE6F6420C01DD33AF041D -:104A2A0001BF0C0131529529715295710BE2D84F91 -:104A3A00FDCC033184BD02EFFACBB422FBD851F18D -:104A4A00BEB8714BE1714BE5710ABD8D509E44EFC2 -:104A5A000C715395714AE5717BBD713395C09EFC0B -:104A6A00609EFD34D4FE5206C0B9A5A592DFF9C6F0 -:104A7A00C4C2C061FCC1C5717AFAD44EDD0BEA4CDE -:104A8A00899E44A64CB44EEF33710AE6300400BF47 -:104A9A002401F6BF2A01300B0BBF280100000000D9 -:104AAA0000000000510FBF280100000000000000B4 -:104ABA0000500FBF2801712395713395C4C061FC62 -:104ACA0061EF520C929269D4FEC1DFF88EFD708EAE -:104ADA00FCC12006FBF8FF71503002CEABACCC040F -:104AEA0000F6BB31B2E210617900F6614900DFF3EA -:104AFA0071603002ED844B8E519C03713BE28C0352 -:104B0A005C02D1DD1E8C035C08D1DF0971503002D2 -:104B1A00CC0400EFCC8C0570FD8835629E50CC0425 -:104B2A0002EFBE8C035C03D1DF408E509C027150B1 -:104B3A0030028C04D1DF0E8C0270FDCE35629C05EA -:104B4A00CC0401EF328C044C02DF0671603002EFB4 -:104B5A0029CF34025A716030028C0270C18C057000 -:104B6A00FD3035C0CF34024AEF108C035C01D1DD31 -:104B7A000671603002EF03EDEB4A1006C09EFC603E -:104B8A009EFD34D4FE5206C0B9A5A592DFF961FC98 -:104B9A00C1C3C5C7520C929269D4FEC1DFF88EFD1B -:104BAA00708EFCC1710A9E31929E02EFFA8FDEFB73 -:104BBA004F96FFDF198FDFFB4F97FFDF118FE0FB67 -:104BCA004F98FFDF095004C15011FDD434C0710B56 -:104BDA009EC09EFC609EFD34D4FE5206C0B9A5A5B7 -:104BEA0092DFF9C6C4C2C061FCE46861FCC1C3C5F6 -:104BFA00C7520C929269D4FEC1DFF88EFD708EFC0A -:104C0A00C1C1FBF8FF8D1F9C018E31318EE724064E -:104C1A0000DD0823DD0E23DD22EF38717AFA8C01DC -:104C2A009D60EF2F717AFA4007F901DF068C019D2A -:104C3A005FEF2051FF2E019D5FEF18717AFA8C0108 -:104C4A009D304004F903DD064004F904DF053073A2 -:104C5A002561944031FF09DE05A031FFEF07715845 -:104C6A00F000716296710BE3C0C09EFC609EFD3439 -:104C7A00D4FE5206C0B9A5A592DFF9C6C4C2C06166 -:104C8A00FC717BFAC7D46861F8312497277123979E -:104C9A00D468DD05B468CEABAC717AFA5600664CBE -:104CAA000ADD1172F3311C79D8FCCEFC0061CA61AD -:104CBA00A486EFEA717AFAF2C6D7C7C1C1FBF8FF38 -:104CCA00CC01008C014C0ADE36717BFA8C01F03182 -:104CDA007E0410FC14A96168DF09AC02B9717AFA82 -:104CEA00F2EF1D8C01F0317E127910FC614902DF6E -:104CFA0006717AFAE2EF09717AFA615901EFC4E2B0 -:104D0A001004C6D7C72004FBF8FFF64210FC61F86E -:104D1A00EDF04D717BFA9C038C034C0ADE3C8C034C -:104D2A00F0317E0410FC14A96168DF05717AFAEF8C -:104D3A0029717AFA8C0372F3311C7910FCCEFC00CB -:104D4A0061CA629C02D1DF0A8C03F0317E12E678D6 -:104D5A0010FC717BFA615903EFBECC0200CC010151 -:104D6A008C02F0317E0410FC14A96168DD788C0293 -:104D7A00F0317E127910FCE743DF658C014C0ADEC4 -:104D8A005F8C01F0317E127910FCE743DD4D717BB7 -:104D9A00FA8C01F0317E0410FC14A96168DF1861F5 -:104DAA0069018C01F0317E12F67810FC8C024E01FA -:104DBA00DCED717AFAEF2F8C01F0317E0410FC14CD -:104DCA00A9128C02F0317E337810FC8C01F0317E0E -:104DDA0012E67810FC615902717AFA615901EF9B67 -:104DEA00615902ED6A4D00F21004C6D761FF520CF8 -:104DFA00929269D4FEC1DFF88EFD708EFCC1717A81 -:104E0A00FA8FE4FB5C03D1DD114004F903DD0640AF -:104E1A0004F904DF053094386194C09EFC609EFD5D -:104E2A0034D4FE5206C0B9A5A592DFF961FC61FC33 -:044E3A0061FC61FCBA -:0A4E3E0000060C12181E242A30365C -:104E4800ACFB0000000064FE00000000E9391B36DE -:104E58008C22F6453E2EED2E32451A3B5D08DB3C92 -:104E680028FC36FE20FE02F903F929FC30FE2AFC54 -:104E78002BFC08F926FC6CFF1AFF6EFF6AFF64FF23 -:0A4E880027FC66FF2CFC555555551C -:104E9200FF0000000000983AF82AFF0000004700D7 -:104EA200317503F7332312D714AEF8C716AC0612C6 -:104EB200C5AC0416F643DD078B99A7A5B3EFF5C27F -:024EC200C6D751 -:024FF400325633 -:0A4FF60031383A31343A3531000009 +:1047EC001006C6D7C7880616710AE650A4FDD40376 +:1047FC00D2DD077133955202EF1317FDF00367708A +:10480C00FDF003FD1B48FD6404713395F2C6D7FD22 +:10481C003B0450A4FDF0035020FDF00350AAEDF032 +:01482C000388 +:10482D0061FC61FCC1C3C5C7520C929269D4FEC133 +:10483D00DFF88EFD708EFCC1717AFA4004F903DF4A +:10484D0005301D2A6194C09EFC609EFD34D4FE523D +:10485D0006C0B9A5A592DFF9C6C4C2C061FC61DF6F +:10486D00520C929269D4FEC1DFF88EFD708EFCC1A0 +:10487D008F4105775C04D1DD06675C01D1DD5031D8 +:10488D005496367162077153968FB4FB5FBCFBD1A2 +:10489D00DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE9C +:1048AD00FBD1DF098FB7FB5FBFFBD1DD0C31620799 +:1048BD0002EFFA716307716B27711398FD5130F494 +:1048CD00227148500571605005717AFAEDC749673C +:1048DD005C02D1DD16D422DD124A2202DD0DF42256 +:1048ED007148500571605005717AFA717AFA8D220E +:1048FD00318FE7240000DD0823DD1423DD2CEF4A82 +:10490D00F4487140500571505005E422EDC7498FB0 +:10491D0040059D49715050058D499D4BD849FD1A53 +:10492D0034629D4ACD2202EDC749675C02D1DD1785 +:10493D00675C10D1DD05CD2203EF0F714850057175 +:10494D00605005F422EF73CD22044A2203DF108D4F +:10495D004A9F4005D84AC1D849FDA634C0EF1F8FE4 +:10496D00400576717449DC054A4902DE06716050D6 +:10497D0005EF47C7D849FDDB30C071505005D84B06 +:10498D00F1242900DD27240400DD22242200DD1D71 +:10499D00241100DD0C240100DD13241E00DD0EEFBB +:1049AD000A4A4960DF07CD4961EF02A4494A220353 +:1049BD00DF08D849FD1A34629D4AC09EFC609EFDF9 +:1049CD0034D4FE5206C0B9A5A592DFF961FCC1C36E +:1049DD00C5C7520C929269D4FEC1DFF88EFD708E60 +:1049ED00FCC1717AFA51405F0401D1DD06F616A7BC +:1049FD0047DFF2300400BF2401F6BF2A01300B0B54 +:104A0D00BF2801FD5A02300B0FBF2801FD5A02309D +:104A1D000F0FBF2801710AE6F6420C01DD33AF041A +:104A2D0001BF0C0131529529715295710BE2D84F8E +:104A3D00FDD4033184BD02EFFACBB422FBD851F182 +:104A4D00BEB8714BE1714BE5710ABD8D509E44EFBF +:104A5D000C715395714AE5717BBD713395C09EFC08 +:104A6D00609EFD34D4FE5206C0B9A5A592DFF9C6ED +:104A7D00C4C2C061FCC1C5717AFAD44EDD0BEA4CDB +:104A8D00899E44A64CB44EEF33710AE6300400BF44 +:104A9D002401F6BF2A01300B0BBF280100000000D6 +:104AAD0000000000510FBF280100000000000000B1 +:104ABD0000500FBF2801712395713395C4C061FC5F +:104ACD0061EF520C929269D4FEC1DFF88EFD708EAB +:104ADD00FCC12006FBF8FF71503002CEABACCC040C +:104AED0000F6BB31B2E210617900F6614900DFF3E7 +:104AFD0071603002ED874B8E519C03713BE28C034C +:104B0D005C02D1DD1E8C035C08D1DF0971503002CF +:104B1D00CC0400EFCC8C0570FD8835629E50CC0422 +:104B2D0002EFBE8C035C03D1DF408E509C027150AE +:104B3D0030028C04D1DF0E8C0270FDCE35629C05E7 +:104B4D00CC0401EF328C044C02DF0671603002EFB1 +:104B5D0029CF34025A716030028C0270C18C0570FD +:104B6D00FD3035C0CF34024AEF108C035C01D1DD2E +:104B7D000671603002EF03EDEE4A1006C09EFC6038 +:104B8D009EFD34D4FE5206C0B9A5A592DFF961FC95 +:104B9D00C1C3C5C7520C929269D4FEC1DFF88EFD18 +:104BAD00708EFCC1710A9E31929E02EFFA8FDEFB70 +:104BBD004F96FFDF198FDFFB4F97FFDF118FE0FB64 +:104BCD004F98FFDF095004C15011FDD434C0710B53 +:104BDD009EC09EFC609EFD34D4FE5206C0B9A5A5B4 +:104BED0092DFF9C6C4C2C061FCE46861FCC1C3C5F3 +:104BFD00C7520C929269D4FEC1DFF88EFD708EFC07 +:104C0D00C1C1FBF8FF8D1F9C018E31318EE724064B +:104C1D0000DD0823DD0E23DD22EF38717AFA8C01D9 +:104C2D009D60EF2F717AFA4007F901DF068C019D27 +:104C3D005FEF2051FF2E019D5FEF18717AFA8C0105 +:104C4D009D304004F903DD064004F904DF0530739F +:104C5D002561944031FF09DE05A031FFEF07715842 +:104C6D00F000716296710BE3C0C09EFC609EFD3436 +:104C7D00D4FE5206C0B9A5A592DFF9C6C4C2C06163 +:104C8D00FC717BFAC7D46861F8312497277123979B +:104C9D00D468DD05B468CEABAC717AFA5600664CBB +:104CAD000ADD1172F3311C79D8FCCEFC0061CA61AA +:104CBD00A486EFEA717AFAF2C6D7C7C1C1FBF8FF35 +:104CCD00CC01008C014C0ADE36717BFA8C01F0317F +:104CDD007E0410FC14A96168DF09AC02B9717AFA7F +:104CED00F2EF1D8C01F0317E127910FC614902DF6B +:104CFD0006717AFAE2EF09717AFA615901EFC4E2AD +:104D0D001004C6D7C72004FBF8FFF64210FC61F86B +:104D1D00EDF34D717BFA9C038C034C0ADE3C8C0346 +:104D2D00F0317E0410FC14A96168DF05717AFAEF89 +:104D3D0029717AFA8C0372F3311C7910FCCEFC00C8 +:104D4D0061CA629C02D1DF0A8C03F0317E12E678D3 +:104D5D0010FC717BFA615903EFBECC0200CC01014E +:104D6D008C02F0317E0410FC14A96168DD788C0290 +:104D7D00F0317E127910FCE743DF658C014C0ADEC1 +:104D8D005F8C01F0317E127910FCE743DD4D717BB4 +:104D9D00FA8C01F0317E0410FC14A96168DF1861F2 +:104DAD0069018C01F0317E12F67810FC8C024E01F7 +:104DBD00DCED717AFAEF2F8C01F0317E0410FC14CA +:104DCD00A9128C02F0317E337810FC8C01F0317E0B +:104DDD0012E67810FC615902717AFA615901EF9B64 +:104DED00615902ED6D4D00F21004C6D761FF520CF2 +:104DFD00929269D4FEC1DFF88EFD708EFCC1717A7E +:104E0D00FA8FE4FB5C03D1DD114004F903DD0640AC +:104E1D0004F904DF053094386194C09EFC609EFD5A +:104E2D0034D4FE5206C0B9A5A592DFF961FC61FC30 +:044E3D0061FC61FCB7 +:0A4E420000060C12181E242A303658 +:104E4C00ACFB0000000064FE00000000E9391B36DA +:104E5C008C22F6453E2EED2E32451A3B6508DB3C86 +:104E6C0028FC36FE20FE02F903F929FC30FE2AFC50 +:104E7C002BFC08F926FC6CFF1AFF6EFF6AFF64FF1F +:0A4E8C0027FC66FF2CFC5555555518 +:104E9600FF0000000000983AF82AFF0000004700D3 +:104EA600317503F7332312D714AEF8C716AC0612C2 +:104EB600C5AC0416F643DD078B99A7A5B3EFF5C27B +:024EC600C6D74D +:024FF400325732 +:0A4FF60031383A31353A3335000006 :00000001FF  \ No newline at end of file diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 0a526a7..c9efdc2 100644 Binary files a/trunk/bsr.lmf and b/trunk/bsr.lmf differ diff --git a/trunk/bsr_k0r.map b/trunk/bsr_k0r.map index 1f20de8..7dfe860 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date: 2 Aug 2012 Page: 1 +78K0R Linker W1.33 Date:10 Aug 2012 Page: 1 Command: -yC:\Program Files (x86)\NEC Electronics Tools\DEV -_msgoff - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C @@ -26,8 +26,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 73 output segment(s) - 3DA5H byte(s) real data - 6320 symbol(s) defined + 3DB0H byte(s) real data + 6326 symbol(s) defined *** Memory map *** @@ -152,55 +152,55 @@ Direc-file:bsr_mcu.dr LDR_CODL util_funcs 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 00904H CSEG + LDR_CODE 000CEH 0090CH CSEG LDR_CODE loader 000CEH 0018CH LDR_CODE WDT 0025AH 00000H - LDR_CODE i2c_mcu 0025AH 00293H + LDR_CODE i2c_mcu 0025AH 0029BH LDR_CODE self_flash - 004EDH 00370H + 004F5H 00370H LDR_CODE task_debug - 0085DH 00000H + 00865H 00000H LDR_CODE task_status - 0085DH 00075H - LDR_CODE hal 008D2H 000DCH + 00865H 00075H + LDR_CODE hal 008DAH 000DCH LDR_CODE util_funcs - 009AEH 00024H - FSL_CODE 009D2H 00322H CSEG + 009B6H 00024H + FSL_CODE 009DAH 00322H CSEG FSL_CODE fsl_block_cmd - 009D2H 0002BH + 009DAH 0002BH FSL_CODE fsl_block_check - 009FDH 00013H + 00A05H 00013H FSL_CODE fsl_common - 00A10H 0014FH + 00A18H 0014FH FSL_CODE fsl_reset - 00B5FH 00001H + 00B67H 00001H FSL_CODE fsl_si_ibf - 00B60H 00064H + 00B68H 00064H FSL_CODE fsl_phySwap - 00BC4H 0004DH + 00BCCH 0004DH FSL_CODE fsl_si_common - 00C11H 00061H - FSL_CODE fsl_swap 00C72H 00030H + 00C19H 00061H + FSL_CODE fsl_swap 00C7AH 00030H FSL_CODE fsl_write - 00CA2H 00052H - @@LCODE 00CF4H 00277H CSEG - @@LCODE @cstart 00CF4H 0006DH - @@LCODE @imul 00D61H 00011H - @@LCODE @lumul 00D72H 0002BH - @@LCODE @isdiv 00D9DH 00022H - @@LCODE @iudiv 00DBFH 0002DH - @@LCODE @isrem 00DECH 00021H - @@LCODE @iurem 00E0DH 0002FH - @@LCODE @lsdiv 00E3CH 00039H - @@LCODE @ludiv 00E75H 0003FH - @@LCODE @divuw 00EB4H 00034H - @@LCODE @ladd 00EE8H 0000FH - @@LCODE @llsh 00EF7H 0001BH - @@LCODE @lursh 00F12H 0001FH - @@LCODE @iscmp 00F31H 0000CH - @@LCODE @lband 00F3DH 00014H - @@LCODE @bcdtob 00F51H 0001AH -* gap * 00F6BH 0008BH + 00CAAH 00052H + @@LCODE 00CFCH 00277H CSEG + @@LCODE @cstart 00CFCH 0006DH + @@LCODE @imul 00D69H 00011H + @@LCODE @lumul 00D7AH 0002BH + @@LCODE @isdiv 00DA5H 00022H + @@LCODE @iudiv 00DC7H 0002DH + @@LCODE @isrem 00DF4H 00021H + @@LCODE @iurem 00E15H 0002FH + @@LCODE @lsdiv 00E44H 00039H + @@LCODE @ludiv 00E7DH 0003FH + @@LCODE @divuw 00EBCH 00034H + @@LCODE @ladd 00EF0H 0000FH + @@LCODE @llsh 00EFFH 0001BH + @@LCODE @lursh 00F1AH 0001FH + @@LCODE @iscmp 00F39H 0000CH + @@LCODE @lband 00F45H 00014H + @@LCODE @bcdtob 00F59H 0001AH +* gap * 00F73H 00083H MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -254,7 +254,7 @@ Direc-file:bsr_mcu.dr 0228CH 00000H @@CNST i2c_mcu-sub 0228CH 00000H - ROM_CODE 0228CH 0259EH CSEG + ROM_CODE 0228CH 025A1H CSEG ROM_CODE pm 0228CH 009B9H ROM_CODE i2c_ctr 02C45H 00064H ROM_CODE main 02CA9H 00055H @@ -281,275 +281,276 @@ Direc-file:bsr_mcu.dr 04765H 00006H ROM_CODE get_ei 0476BH 0000DH ROM_CODE i2c_mcu-sub - 04778H 000B2H - @@BASE 0482AH 00614H CSEG BASE - @@BASE loader 0482AH 00000H - @@BASE pm 0482AH 0003EH - @@BASE i2c_ctr 04868H 00170H - @@BASE main 049D8H 00000H - @@BASE magic 049D8H 00000H - @@BASE WDT 049D8H 00000H - @@BASE i2c_mcu 049D8H 000F2H - @@BASE i2c_twl 04ACAH 000D0H - @@BASE led 04B9AH 00000H - @@BASE rtc 04B9AH 0005DH - @@BASE vreg_ctr 04BF7H 00000H - @@BASE vreg_twl 04BF7H 00000H - @@BASE adc 04BF7H 00094H - @@BASE renge 04C8BH 0016BH - @@BASE accero 04DF6H 00042H + 04778H 000B5H + @@BASE 0482DH 00614H CSEG BASE + @@BASE loader 0482DH 00000H + @@BASE pm 0482DH 0003EH + @@BASE i2c_ctr 0486BH 00170H + @@BASE main 049DBH 00000H + @@BASE magic 049DBH 00000H + @@BASE WDT 049DBH 00000H + @@BASE i2c_mcu 049DBH 000F2H + @@BASE i2c_twl 04ACDH 000D0H + @@BASE led 04B9DH 00000H + @@BASE rtc 04B9DH 0005DH + @@BASE vreg_ctr 04BFAH 00000H + @@BASE vreg_twl 04BFAH 00000H + @@BASE adc 04BFAH 00094H + @@BASE renge 04C8EH 0016BH + @@BASE accero 04DF9H 00042H @@BASE self_flash - 04E38H 00000H - @@BASE sw 04E38H 00000H + 04E3BH 00000H + @@BASE sw 04E3BH 00000H @@BASE task_debug - 04E38H 00000H + 04E3BH 00000H @@BASE task_misc - 04E38H 00000H - @@BASE task_sys 04E38H 00000H + 04E3BH 00000H + @@BASE task_sys 04E3BH 00000H @@BASE pedo_alg_thre_det2 - 04E38H 00000H - @@BASE ini_VECT 04E38H 00006H + 04E3BH 00000H + @@BASE ini_VECT 04E3BH 00006H @@BASE task_status - 04E3EH 00000H - @@BASE led_cam 04E3EH 00000H - @@BASE led_pow 04E3EH 00000H - @@BASE hal 04E3EH 00000H + 04E41H 00000H + @@BASE led_cam 04E41H 00000H + @@BASE led_pow 04E41H 00000H + @@BASE hal 04E41H 00000H @@BASE batt_params - 04E3EH 00000H - @@BASE voltable 04E3EH 00000H + 04E41H 00000H + @@BASE voltable 04E41H 00000H @@BASE pedo_lpf_coeff - 04E3EH 00000H + 04E41H 00000H @@BASE kanaria_c - 04E3EH 00000H + 04E41H 00000H @@BASE util_funcs - 04E3EH 00000H + 04E41H 00000H @@BASE i2c_mcu-sub - 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL @cstart 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL pm 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL main 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL led 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL rtc 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL adc 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL renge 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL accero 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL sw 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP + 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL pm 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL main 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL led 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL rtc 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL adc 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL renge 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL accero 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL sw 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL task_sys 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP + 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL led_cam 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL led_pow 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP + 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL led_cam 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL led_pow 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP @@CNSTL batt_params - 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP - @@CNSTL voltable 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP + 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP + @@CNSTL voltable 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP @@CNSTL pedo_lpf_coeff - 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP + 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP @@CNSTL kanaria_c - 04E3EH 00000H - @@CNSTL 04E3EH 00000H CSEG PAGE64KP + 04E41H 00000H + @@CNSTL 04E41H 00000H CSEG PAGE64KP @@CNSTL i2c_mcu-sub - 04E3EH 00000H - @@CNSTL 04E3EH 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04E3EH 0000AH - @@R_INIT 04E48H 0004AH CSEG UNIT64KP - @@R_INIT @cstart 04E48H 00000H - @@R_INIT loader 04E48H 00000H - @@R_INIT pm 04E48H 00000H - @@R_INIT i2c_ctr 04E48H 00000H - @@R_INIT main 04E48H 00000H - @@R_INIT magic 04E48H 00000H - @@R_INIT WDT 04E48H 00000H - @@R_INIT i2c_mcu 04E48H 00000H - @@R_INIT i2c_twl 04E48H 00000H - @@R_INIT led 04E48H 00000H - @@R_INIT rtc 04E48H 00000H - @@R_INIT vreg_ctr 04E48H 00000H - @@R_INIT vreg_twl 04E48H 00000H - @@R_INIT adc 04E48H 0000CH - @@R_INIT renge 04E54H 00014H - @@R_INIT accero 04E68H 00000H - @@R_INIT self_flash - 04E68H 00000H - @@R_INIT sw 04E68H 00000H - @@R_INIT task_debug - 04E68H 00000H - @@R_INIT task_misc - 04E68H 00026H - @@R_INIT task_sys 04E8EH 00000H - @@R_INIT pedo_alg_thre_det2 - 04E8EH 00000H - @@R_INIT ini_VECT 04E8EH 00000H - @@R_INIT task_status - 04E8EH 00000H - @@R_INIT led_cam 04E8EH 00000H - @@R_INIT led_pow 04E8EH 00004H - @@R_INIT hal 04E92H 00000H - @@R_INIT batt_params - 04E92H 00000H - @@R_INIT voltable 04E92H 00000H - @@R_INIT pedo_lpf_coeff - 04E92H 00000H - @@R_INIT kanaria_c - 04E92H 00000H - @@R_INIT util_funcs - 04E92H 00000H - @@R_INIT i2c_mcu-sub - 04E92H 00000H - @@R_INIT @rom 04E92H 00000H - @@R_INIS 04E92H 00010H CSEG UNIT64KP - @@R_INIS @cstart 04E92H 00000H - @@R_INIS loader 04E92H 00000H - @@R_INIS pm 04E92H 00002H - @@R_INIS i2c_ctr 04E94H 00002H - @@R_INIS main 04E96H 00000H - @@R_INIS magic 04E96H 00000H - @@R_INIS WDT 04E96H 00000H - @@R_INIS i2c_mcu 04E96H 00000H - @@R_INIS i2c_twl 04E96H 00000H - @@R_INIS led 04E96H 00000H - @@R_INIS rtc 04E96H 00000H - @@R_INIS vreg_ctr 04E96H 00000H - @@R_INIS vreg_twl 04E96H 00000H - @@R_INIS adc 04E96H 00000H - @@R_INIS renge 04E96H 00000H - @@R_INIS accero 04E96H 00000H - @@R_INIS self_flash - 04E96H 00000H - @@R_INIS sw 04E96H 00000H - @@R_INIS task_debug - 04E96H 00000H - @@R_INIS task_misc - 04E96H 00000H - @@R_INIS task_sys 04E96H 00002H - @@R_INIS pedo_alg_thre_det2 - 04E98H 00006H - @@R_INIS ini_VECT 04E9EH 00000H - @@R_INIS task_status - 04E9EH 00000H - @@R_INIS led_cam 04E9EH 00002H - @@R_INIS led_pow 04EA0H 00002H - @@R_INIS hal 04EA2H 00000H - @@R_INIS batt_params - 04EA2H 00000H - @@R_INIS voltable 04EA2H 00000H - @@R_INIS pedo_lpf_coeff - 04EA2H 00000H - @@R_INIS kanaria_c - 04EA2H 00000H - @@R_INIS util_funcs - 04EA2H 00000H - @@R_INIS i2c_mcu-sub - 04EA2H 00000H - @@R_INIS @rom 04EA2H 00000H - @@RLINIT 04EA2H 00000H CSEG UNIT64KP - @@RLINIT loader 04EA2H 00000H - @@RLINIT pm 04EA2H 00000H - @@RLINIT i2c_ctr 04EA2H 00000H - @@RLINIT main 04EA2H 00000H - @@RLINIT magic 04EA2H 00000H - @@RLINIT WDT 04EA2H 00000H - @@RLINIT i2c_mcu 04EA2H 00000H - @@RLINIT i2c_twl 04EA2H 00000H - @@RLINIT led 04EA2H 00000H - @@RLINIT rtc 04EA2H 00000H - @@RLINIT vreg_ctr 04EA2H 00000H - @@RLINIT vreg_twl 04EA2H 00000H - @@RLINIT adc 04EA2H 00000H - @@RLINIT renge 04EA2H 00000H - @@RLINIT accero 04EA2H 00000H + 04E41H 00000H + @@RLINIT 04E41H 00000H CSEG UNIT64KP + @@RLINIT loader 04E41H 00000H + @@RLINIT pm 04E41H 00000H + @@RLINIT i2c_ctr 04E41H 00000H + @@RLINIT main 04E41H 00000H + @@RLINIT magic 04E41H 00000H + @@RLINIT WDT 04E41H 00000H + @@RLINIT i2c_mcu 04E41H 00000H + @@RLINIT i2c_twl 04E41H 00000H + @@RLINIT led 04E41H 00000H + @@RLINIT rtc 04E41H 00000H + @@RLINIT vreg_ctr 04E41H 00000H + @@RLINIT vreg_twl 04E41H 00000H + @@RLINIT adc 04E41H 00000H + @@RLINIT renge 04E41H 00000H + @@RLINIT accero 04E41H 00000H @@RLINIT self_flash - 04EA2H 00000H - @@RLINIT sw 04EA2H 00000H + 04E41H 00000H + @@RLINIT sw 04E41H 00000H @@RLINIT task_debug - 04EA2H 00000H + 04E41H 00000H @@RLINIT task_misc - 04EA2H 00000H - @@RLINIT task_sys 04EA2H 00000H + 04E41H 00000H + @@RLINIT task_sys 04E41H 00000H @@RLINIT pedo_alg_thre_det2 - 04EA2H 00000H - @@RLINIT ini_VECT 04EA2H 00000H + 04E41H 00000H + @@RLINIT ini_VECT 04E41H 00000H @@RLINIT task_status - 04EA2H 00000H - @@RLINIT led_cam 04EA2H 00000H - @@RLINIT led_pow 04EA2H 00000H - @@RLINIT hal 04EA2H 00000H + 04E41H 00000H + @@RLINIT led_cam 04E41H 00000H + @@RLINIT led_pow 04E41H 00000H + @@RLINIT hal 04E41H 00000H @@RLINIT batt_params - 04EA2H 00000H - @@RLINIT voltable 04EA2H 00000H + 04E41H 00000H + @@RLINIT voltable 04E41H 00000H @@RLINIT pedo_lpf_coeff - 04EA2H 00000H + 04E41H 00000H @@RLINIT kanaria_c - 04EA2H 00000H + 04E41H 00000H @@RLINIT util_funcs - 04EA2H 00000H + 04E41H 00000H @@RLINIT i2c_mcu-sub - 04EA2H 00000H - @@RLINIT @rom 04EA2H 00000H - @@CODEL 04EA2H 00000H CSEG - @@CODEL pm 04EA2H 00000H - @@CODEL i2c_ctr 04EA2H 00000H - @@CODEL main 04EA2H 00000H - @@CODEL magic 04EA2H 00000H - @@CODEL i2c_twl 04EA2H 00000H - @@CODEL led 04EA2H 00000H - @@CODEL rtc 04EA2H 00000H - @@CODEL vreg_ctr 04EA2H 00000H - @@CODEL vreg_twl 04EA2H 00000H - @@CODEL adc 04EA2H 00000H - @@CODEL renge 04EA2H 00000H - @@CODEL accero 04EA2H 00000H - @@CODEL sw 04EA2H 00000H + 04E41H 00000H + @@RLINIT @rom 04E41H 00000H + @@CODEL 04E41H 00000H CSEG + @@CODEL pm 04E41H 00000H + @@CODEL i2c_ctr 04E41H 00000H + @@CODEL main 04E41H 00000H + @@CODEL magic 04E41H 00000H + @@CODEL i2c_twl 04E41H 00000H + @@CODEL led 04E41H 00000H + @@CODEL rtc 04E41H 00000H + @@CODEL vreg_ctr 04E41H 00000H + @@CODEL vreg_twl 04E41H 00000H + @@CODEL adc 04E41H 00000H + @@CODEL renge 04E41H 00000H + @@CODEL accero 04E41H 00000H + @@CODEL sw 04E41H 00000H @@CODEL task_misc - 04EA2H 00000H - @@CODEL task_sys 04EA2H 00000H + 04E41H 00000H + @@CODEL task_sys 04E41H 00000H @@CODEL pedo_alg_thre_det2 - 04EA2H 00000H - @@CODEL ini_VECT 04EA2H 00000H - @@CODEL led_cam 04EA2H 00000H - @@CODEL led_pow 04EA2H 00000H + 04E41H 00000H + @@CODEL ini_VECT 04E41H 00000H + @@CODEL led_cam 04E41H 00000H + @@CODEL led_pow 04E41H 00000H @@CODEL batt_params - 04EA2H 00000H - @@CODEL voltable 04EA2H 00000H + 04E41H 00000H + @@CODEL voltable 04E41H 00000H @@CODEL pedo_lpf_coeff - 04EA2H 00000H + 04E41H 00000H @@CODEL kanaria_c - 04EA2H 00000H + 04E41H 00000H @@CODEL i2c_mcu-sub + 04E41H 00000H +* gap * 04E41H 00001H + @@CNSTL 04E42H 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04E42H 0000AH + @@R_INIT 04E4CH 0004AH CSEG UNIT64KP + @@R_INIT @cstart 04E4CH 00000H + @@R_INIT loader 04E4CH 00000H + @@R_INIT pm 04E4CH 00000H + @@R_INIT i2c_ctr 04E4CH 00000H + @@R_INIT main 04E4CH 00000H + @@R_INIT magic 04E4CH 00000H + @@R_INIT WDT 04E4CH 00000H + @@R_INIT i2c_mcu 04E4CH 00000H + @@R_INIT i2c_twl 04E4CH 00000H + @@R_INIT led 04E4CH 00000H + @@R_INIT rtc 04E4CH 00000H + @@R_INIT vreg_ctr 04E4CH 00000H + @@R_INIT vreg_twl 04E4CH 00000H + @@R_INIT adc 04E4CH 0000CH + @@R_INIT renge 04E58H 00014H + @@R_INIT accero 04E6CH 00000H + @@R_INIT self_flash + 04E6CH 00000H + @@R_INIT sw 04E6CH 00000H + @@R_INIT task_debug + 04E6CH 00000H + @@R_INIT task_misc + 04E6CH 00026H + @@R_INIT task_sys 04E92H 00000H + @@R_INIT pedo_alg_thre_det2 + 04E92H 00000H + @@R_INIT ini_VECT 04E92H 00000H + @@R_INIT task_status + 04E92H 00000H + @@R_INIT led_cam 04E92H 00000H + @@R_INIT led_pow 04E92H 00004H + @@R_INIT hal 04E96H 00000H + @@R_INIT batt_params + 04E96H 00000H + @@R_INIT voltable 04E96H 00000H + @@R_INIT pedo_lpf_coeff + 04E96H 00000H + @@R_INIT kanaria_c + 04E96H 00000H + @@R_INIT util_funcs + 04E96H 00000H + @@R_INIT i2c_mcu-sub + 04E96H 00000H + @@R_INIT @rom 04E96H 00000H + @@R_INIS 04E96H 00010H CSEG UNIT64KP + @@R_INIS @cstart 04E96H 00000H + @@R_INIS loader 04E96H 00000H + @@R_INIS pm 04E96H 00002H + @@R_INIS i2c_ctr 04E98H 00002H + @@R_INIS main 04E9AH 00000H + @@R_INIS magic 04E9AH 00000H + @@R_INIS WDT 04E9AH 00000H + @@R_INIS i2c_mcu 04E9AH 00000H + @@R_INIS i2c_twl 04E9AH 00000H + @@R_INIS led 04E9AH 00000H + @@R_INIS rtc 04E9AH 00000H + @@R_INIS vreg_ctr 04E9AH 00000H + @@R_INIS vreg_twl 04E9AH 00000H + @@R_INIS adc 04E9AH 00000H + @@R_INIS renge 04E9AH 00000H + @@R_INIS accero 04E9AH 00000H + @@R_INIS self_flash + 04E9AH 00000H + @@R_INIS sw 04E9AH 00000H + @@R_INIS task_debug + 04E9AH 00000H + @@R_INIS task_misc + 04E9AH 00000H + @@R_INIS task_sys 04E9AH 00002H + @@R_INIS pedo_alg_thre_det2 + 04E9CH 00006H + @@R_INIS ini_VECT 04EA2H 00000H + @@R_INIS task_status 04EA2H 00000H - @@LCODEL 04EA2H 00022H CSEG - @@LCODEL abs 04EA2H 00008H - @@LCODEL memcpy_n 04EAAH 0001AH -* gap * 04EC4H 00130H + @@R_INIS led_cam 04EA2H 00002H + @@R_INIS led_pow 04EA4H 00002H + @@R_INIS hal 04EA6H 00000H + @@R_INIS batt_params + 04EA6H 00000H + @@R_INIS voltable 04EA6H 00000H + @@R_INIS pedo_lpf_coeff + 04EA6H 00000H + @@R_INIS kanaria_c + 04EA6H 00000H + @@R_INIS util_funcs + 04EA6H 00000H + @@R_INIS i2c_mcu-sub + 04EA6H 00000H + @@R_INIS @rom 04EA6H 00000H + @@LCODEL 04EA6H 00022H CSEG + @@LCODEL abs 04EA6H 00008H + @@LCODEL memcpy_n 04EAEH 0001AH +* gap * 04EC8H 0012CH MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT diff --git a/trunk/config.h b/trunk/config.h index 61df72d..037a163 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -7,7 +7,7 @@ */ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x26 +#define MCU_VER_MINOR 0x27 // デバッグ向けスイッチ diff --git a/trunk/hoge.bin b/trunk/hoge.bin index b235118..2c26863 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/i2c_mcu-sub.c b/trunk/i2c_mcu-sub.c index 2cebe19..1a23304 100644 --- a/trunk/i2c_mcu-sub.c +++ b/trunk/i2c_mcu-sub.c @@ -105,13 +105,7 @@ static i2c_err iic_mcu_codec_write_low( u8 adrs, u8 dat ) iic_mcu_send_a_byte( dat ); // TIワークアラウンド - // re-stでダミーライト - { - iic_mcu_send_re_st( ); - iic_mcu_send_a_byte( IIC_SLA_CODEC ); // ダミーライト - iic_mcu_send_a_byte( 0x20 ); // ゴミを書いても問題ないアドレス - iic_mcu_send_a_byte( 0xAA ); // 何でもよい - } + codec_dummy_write(); iic_mcu_send_sp( ); iic_mcu_busy = false; @@ -119,3 +113,12 @@ static i2c_err iic_mcu_codec_write_low( u8 adrs, u8 dat ) } +// re-stでダミーライト +void codec_dummy_write() +{ + iic_mcu_send_re_st( ); + iic_mcu_send_a_byte( IIC_SLA_CODEC ); // ダミーライト + iic_mcu_send_a_byte( 0x20 ); // ゴミを書いても問題ないアドレス + iic_mcu_send_a_byte( 0xAA ); // 何でもよい +} + diff --git a/trunk/i2c_mcu.c b/trunk/i2c_mcu.c index 50916e0..db007b3 100644 --- a/trunk/i2c_mcu.c +++ b/trunk/i2c_mcu.c @@ -209,6 +209,11 @@ i2c_err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8 * dest ) } while( len != 0 ); + if( slave == IIC_SLA_CODEC ) + { + codec_dummy_write(); + } + iic_mcu_send_sp( ); IICIF10 = 0; diff --git a/trunk/i2c_mcu_sub.h b/trunk/i2c_mcu_sub.h index c674000..a03faba 100644 --- a/trunk/i2c_mcu_sub.h +++ b/trunk/i2c_mcu_sub.h @@ -1,6 +1,7 @@ #ifndef __ic2_mcu_sub__ #define __ic2_mcu_sub__ -i2c_err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ); +i2c_err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ); +void codec_dummy_write( void ); #endif diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index c63b8df..45829a8 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -3,15 +3,16 @@ 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\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 batt_params.c -batt_params.c(64) : CC78K0R warning W0401: Conversion may lose significant digits -batt_params.c(64) : CC78K0R warning W0401: Conversion may lose significant digits -batt_params.c(82) : CC78K0R warning W0401: Conversion may lose significant digits -batt_params.c(101) : CC78K0R warning W0401: Conversion may lose significant digits -batt_params.c(101) : CC78K0R warning W0401: Conversion may lose significant digits -batt_params.c(119) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 6 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\batt_params.asm +"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 adc.c +adc.c(104) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(190) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(241) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(308) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(434) : CC78K0R warning W0745: Expected function prototype +adc.c(463) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(468) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 7 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\adc.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 i2c_mcu-sub.rel RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K' @@ -40,4 +41,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 21 +Build Total error(s) : 0 Total warning(s) : 22 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 1f22087..04ee94e 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -4,14 +4,14 @@ FrameX=36 FrameY=209 FrameCX=1447 FrameCY=919 -OpenFile1=config.h,0,974,359,2565,1066,29,10,29,0 -OpenFile2=kanaria_c.c,0,87,284,782,915,25,2,25,0 -OpenFile3=ProjectWindow +OpenFile1=kanaria_c.c,0,87,284,782,915,25,2,25,0 +OpenFile2=ProjectWindow PrjPos=0,0,706,0,291 -OpenFile4=OutputWindow +OpenFile3=i2c_ctr.c,0,655,120,1628,751,14,7,14,0 +OpenFile4=config.h,0,216,85,1393,610,29,10,29,0 +OpenFile5=i2c_mcu_sub.h,0,125,125,1302,650,0,5,6,0 +OpenFile6=OutputWindow OutputPos=0,200,778,258,926 -OpenFile5=i2c_ctr.c,0,655,120,1628,751,14,7,14,0 -OpenFile6=config.h,0,216,85,1393,610,29,10,0,0 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index dc75def..7c3ff98 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -40,14 +40,14 @@ T=4e647b08 7=i2c_mcu.h 8=pool.h [magic.c] -T=50079f46 +T=5024d04b 1=magic.h 2=config.h [WDT.c] T=4e649146 1=incs_loader.h [i2c_mcu.c] -T=4eeed909 +T=5024cbbe 1=incs_loader.h 2=i2c_mcu.h 3=loader.h @@ -68,7 +68,7 @@ T=4f13d418 T=4e647eec 1=incs.h [vreg_ctr.c] -T=50079f22 +T=501a45b7 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -89,7 +89,7 @@ T=4e6491f4 4=vreg_twl.h 5=adc.h [adc.c] -T=4fcdd1ab +T=5024d12e 1=incs.h 2=adc.h 3=pm.h @@ -219,7 +219,7 @@ T=4e68724a 1=incs_loader.h 2=WDT.h [i2c_mcu-sub.c] -T=4f210a14 +T=5024cb0a 1=incs.h 2=i2c_mcu.h 3=loader.h @@ -243,7 +243,7 @@ T=4e559884 T=4fd7f6f9 1=config.h [config.h] -T=50079f24 +T=5024cb96 [jhl_defs.h] T=4e647343 [user_define.h] @@ -332,4 +332,4 @@ T=4e409e19 [util_funcs.h] T=4e687249 [i2c_mcu_sub.h] -T=4eeed7e6 +T=5024cbb4