diff --git a/branches/2.15_yamaha_taisaku/bsr.hex b/branches/2.15_yamaha_taisaku/bsr.hex index 040efc1..eed6381 100644 --- a/branches/2.15_yamaha_taisaku/bsr.hex +++ b/branches/2.15_yamaha_taisaku/bsr.hex @@ -1,13 +1,13 @@ -:02000000250DCC -:0400100041474347DA -:02001C00EF48AB -:020024009649FB -:02002A00E149AA -:080034000E4BB14A0A4B4F4D7F -:02004A00454728 -:02005A007F47DE -:020062000D4D42 -:06008000A24BDB4B254CF6 +:02000000DF0C13 +:04001000E447E64794 +:02001C00924907 +:02002400394A57 +:02002A00844A06 +:08003400B14B544BAD4BF24DF2 +:02004A00E84785 +:02005A0022483A +:02006200B04D9F +:06008000454C7E4CC84C0B :0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A @@ -15,13 +15,13 @@ :1000EE007110A6FB710006F9EF0B8C015C80D161DB :1000FE00E8710006F98F06F931030EF6B1BBF66111 :10010E004900DD05618900EFF5FDDF01FD3101FDDF -:10011E008901FDCC09FD0309FD772FFD752CEFA597 +:10011E008901FD8609FDBD08FD772FFD752CEFA524 :10012E00C0C6D7C7360000674C09DE3F318E04F6D5 :10013E000FC1317B9EFDC411897267318E04F64F5B :10014E0014896142DF03F6EF01E660610667318EC6 :10015E00124900207267318E04F64F14896142DF16 :10016E0003F6EF01E660610687EFBC40F84F3A6197 -:10017E00E88666D161E8FD7006C6D751065B0C3184 +:10017E00E88666D161E8FD2A06C6D751065B0C31CA :10018E001A9F08F94008F901DF05CD3705EF03CDB9 :10019E0037078F06F95CE39F06F951035B04318E36 :1001AE00E7240000DD1023DD0823DF0E712006F9A1 @@ -68,189 +68,184 @@ :10043E00BF2A01FD4502EDF603300400BF2401F68C :10044E00BF2A01300B0BBF2801FD4502300B0FBF39 :10045E002801FD4502300F0FBF2801D7314493010B -:10046E00D77132936A0E03713B25713B23E0FDDF9A +:10046E00D77132936A0E03713B25713B23E0FD99E0 :10047E00097120F000FD4502F6BF26015024BF147D :10048E0001CB440014300F0FBF2801712393710B61 :10049E00E2710AE6FDF603CE44FF3182E202EFFA84 :1004AE00FD4704AF0401BF0C01713393714293D722 :1004BE0031349302EFFAFD1E04713A25713A235A34 -:1004CE000EFC7128F000714393D7C7880616FD46BF -:1004DE0002D2DD045203EF36710AE650A4FDB703D3 -:1004EE00D2DD077133935202EF2417FDD3036770E9 -:1004FE00FDD303FD1E0450A4FDD3035020FDD303F2 -:10050E00D851FDD303A451FD4704713393F2C6D7DE -:10051E00C72008FBF8FFFD6B085014C15008FD9D65 -:10052E0007C0CC07048C074C14DE0C8C07318EFDF3 -:10053E00070A615907EFEECC07048C074C1461C80B -:10054E00ED0C06CC06008C064C0461C8EDEB0530B4 -:10055E000AF9BC02F6BBCEABAC31B2D109C73641FB -:10056E00057184C6DEF3F1C73641057184C661DCC0 -:10057E009C05713BD1AC02148F400599715050050A -:10058E00617902617900F0E1614900DD09C7364108 -:10059E00057184C6DEC3F1C73641057184C661DCC0 -:1005AE000E059C055040C18C07318E31AD128C0664 -:1005BE00318E318D03BDD831FFBDDADADAADD8FD1B -:1005CE00D30CC0D2DD0C5008C15014FD9D07C0FDE8 -:1005DE00900B8C05D1DF06615906ED54058C073161 -:1005EE008EFD0B0AD2DD0C5008C15014FD9D07C0C4 -:1005FE00FD900B8C05D1DF06615907ED4805716042 -:10060E005005CC0400CC05008C054C09DE2B8C0566 -:10061E00318E04F61FC1317B9EFDC41189728C058B -:10062E00318E04F64F14896142DF03F6EF01E66066 -:10063E000E049C04615905EFCF41001140F81F3A9A -:10064E0061E86159048C04D1DF08FD910BFDA30C08 -:10065E00EF0C5008C15014FD9D07C0FD900B100803 -:10066E00C6D7C72004FBF8FF712B24CC0100F6BCC3 -:10067E0002AC02440900DE3EAC0204F60F14410047 -:10068E00118972AC020C5014896142DF03F6EF013E -:10069E00E6600E019C01AC021249005072AC0204DD -:1006AE00F67F14896142DF03F6EF01E6600E019CCE -:1006BE0001617902EFBB40F67FFF61F86159018C51 -:1006CE0001D161F8ED6907CC0100717AFAFD6A0477 -:1006DE00711300711B20710303710205E0C15003F9 -:1006EE00FD362BC05013FDDF09500FC1E0FD362B38 -:1006FE00C0CEABAC6159018C0191DD068C014C036F -:10070E00DF03E6EF01F66061FB7121048C014C08FA -:10071E0061F8CC010031320705A024FCEF03F5246B -:10072E00FC4024FC11DC22F524FCF0C15003FD3604 -:10073E002BC0CE3708CBE4FFFFCBE6FFF7CED4FFBE -:10074E00CF370008F5120561FDE6BC02F6614902DD -:10075E00DD9F00000000617902EFF1FD6B08D2DF32 -:10076E00FA5008C15014FD9D07C0D2FD900B100425 -:10077E00C6D73184BD02EFFA717BBDCBE4FFFFCB50 -:10078E00E6FFFFCBD4FFFF717ABED7717BBED7C712 -:10079E00C1200CFBF8FF8C0C318E31ADC1317B9D2D -:1007AE00D4C0BC068DD49C088C149C0B8C14318E3A -:1007BE00040C00128C0B318EBDD813FD620F61C874 -:1007CE00ED6608CEABACCC05068C0B318EFD030A64 -:1007DE00D2DD158C0B318EFD070A6169058C05D1B2 -:1007EE00DFE7FD9907E2EF71CC0A008C0A4C04DEBC -:1007FE0054F6BC02300AF9BBAC06148C089EFD11EF -:10080E008972AB146299AC06A1BC0661790061795C -:10081E0002F0E1614902DFE05040C18C0B318E31B4 -:10082E00AD128C0A318E318D03BDD831FFBDDADAAF -:10083E00DAADD8FDD30CC0D2DD06FD9907E2EF1973 -:10084E0061590AEFA68C0B318EFD0B0AD2DD03E245 -:10085E00EF0761590BEDBA07F2100EC6D7C7717BC1 -:10086E009D717BFAFD8007300AF9FDB60AFD410A3B -:10087E00C6D7FD6B08FD900BFD9907F5ABFFF2D7C0 -:10088E00C7310497067110B3FBEF047118B3FB8FD9 -:10089E00B3FB7B8A76D1DD5B8FB3FB9D8A4004F977 -:1008AE0003DF22665C10D1DD1C8FB3FB5C10D1DD43 -:1008BE000B5080C15011FD8634C0EF095040C1501D -:1008CE0011FD8634C04004F903DD064004F904DF4F -:1008DE0022665C02D1DD1C8FB3FB5C02D1DD0B50B6 -:1008EE0040C15010FD8634C0EF095020C15010FD9C -:1008FE008634C0C6D7C7360000665C80D1DD10676F -:10090E005C80D1DF05713396EF0B713296EF067175 -:10091E000407713196665C40D1DD10675C40D1DF13 -:10092E0005714396EF0B714296EF067114057141F6 -:10093E0096665C01D1DD10675C01D1DF05715396BF -:10094E00EF0B715296EF06713407715196665C0289 -:10095E00D1DD10675C02D1DF05716396EF1D716208 -:10096E0096EF184007F901DF08710402716196EFE6 -:10097E000AC736100571C4C6716196665C04D1DD76 -:10098E0010675C04D1DF05717396EF0B717296EFF1 -:10099E0006714407717196665C08D1DD10675C08BC -:1009AE00D1DF05710397EF0B710297EF06711407F4 -:1009BE00710197665C10D161E8715AD1C6D7F5F610 -:1009CE00FBF5F8FBCFFEFBFFCFFAFBFFCFFBFBFFE8 -:1009DE00D7C7C1C1FBF8FFCEABAC8C02D1DD126123 -:1009EE006902305C03BBF6614900DDEE618900EF00 -:0509FE00F51004C6D74E -:100A03005208EF065203EF025206FEE600FE1B00F9 -:100A1300DC16089F03088F0408089F040862FE245D -:100A230000089F0408EEBF00EEBA00C1C514410ED2 -:100A330011D9D0FF118FD1FF312E45C4C0D7F23168 -:100A4300A2C401E2D79DE261DD4C09DF12717BFA9A -:100A5300C18F06089F25FDC0CF060800EE27003191 -:100A6300F2FA04CF0608004C00DF05D50008DD16B6 -:100A730061DD717BFAD50608DD0ACDE31F61CD6127 -:100A8300CDEE160061CDFED40061FFFE9A00FCF8A6 -:100A9300FF0EFEB20061CDFED5004C09DF0EC18F03 -:100AA30006086F25FD9F0608C0EE0400CF06080068 -:100AB300F8E3D75200EF025202FE3700CF24FD00C5 -:100AC300CF060800BF0408C716629F000841001143 -:100AD3008F1A209B4100118F1B209F0108C65100D4 -:100AE300FE62FFEF025205CF060800C1510CFE0A59 -:100AF30000C0D7C1511DFE0200C0D761DD717BFA72 -:100B030070CEC0A59EC47CFF9EC4609EC461CDD739 -:100B130061DD717BFAC18EC45C1BFED6FFCF060874 -:100B230001FED7FFC061CDD731F2FA1AC1AEE4BFDF -:100B330016FDAEE6BF18FDAED4BF1AFD30FFFFBEF3 -:100B4300E4BEE6BED4C0D731F2FA11C1AF16FDBE82 -:100B5300E4AF18FDBEE6AF1AFDBED4C0D7C1BF1CBB -:100B6300FD13BF1EFD15BF20FD17BF22FDC0D7AF6C -:100B73001CFDDB1EFDEB20FDFB22FDD7534B30524A -:100B83005430324E323030475631323000FFC1508C -:100B9300FEFEAB0061DD717BFACF060800FE0A00A2 -:100BA300FEA4FF61CDF8E3EECF00C7FB0408BF1638 -:100BB300FD8FC0009C05C5C337040600BF18FD3573 -:100BC30036F50B300000522BFE6600C2C4C630A3BC -:100BD3000BB800300000B8022004AF18FDB8003095 -:100BE3000F00B802AF16FD61FF520AFE3AFFECF8A0 -:100BF300FF0E717BFAC1C7FB04088C05C65C80FE3F -:100C03000200C0D761DD717BFA70CFC0FFA59FC022 -:100C1300007CFF9FC000609FC00061CDD7618BFE49 -:100C2300E2FF717BBE410011FB000017CEFC0061A7 -:100C3300CB089EFDF31161C999A58392DFF7D7FE17 -:100C4300B1FED524FDDF23C1CF0308035109FEF410 -:100C5300FDC0D2DF37FE3800A20408CF03080751D6 -:100C630009FEE1FDD2B20408DF22C7FB0408318389 -:100C730002C6D7C6510AFECCFD624C1FDF06CF2445 -:100C8300FD01EF04CF24FD00C0EE5BFEC0EE55FE78 -:100C9300C7C1FB04088B31196C0161589BC0C6D7CF -:100CA300717BFAFE4DFEAF0408040600C11436073B -:100CB3000C300000522DF3FE77FF8FC000FE2BFE99 -:100CC30061CF5C807C8073C0041900CEFC0F61CBC4 -:100CD300C55404EF03C55417FE18FEC7360008BBFE -:100CE300629C0288089C03D1DD334C41DE2F70F1F6 -:100CF300312DB161090033081C000851FF612A41FD -:100D03000E118FD0FF613B118FD1FF6138DC0E8B49 -:100D13005C03DF0964C6C4FE2BFDEECAFDC6C4EE48 -:020D2300C3FD0E -:100D250061CF5100718C7109FECBF800FEFCC90141 -:100D350000F6BF00F953C0F693935820FEDFF94142 -:100D45000036604D34CCFCEF05118B99A7A51744EF -:100D5500AA4DDFF53602F930CCFCEF04CC0000A734 -:100D650047DFF9410036AA4D3420FEEF05118B9976 -:100D7500A7A51744BA4DDFF53630FE3092FEEF04D5 -:100D8500CC0000A747DFF9FCCE0000EFFE61DD7166 -:100D95007BFABEF0ADD8BEF200AEF661CDD7C36129 -:100DA500DD717BFABEF0ADD8BEF200DBF6FFADDC3F -:100DB500BEF000AEF6BDD8AEF40312ADDABEF20059 -:100DC500AEF661CD03BDDAC2D7C3F33174D908835A -:100DD500C1F626D8BDD8C031750683C312F623C225 -:100DE500FDF00D93DF0312F623C2D7440000DD2684 -:100DF50061DD717BFACFE80080BEF6F6BEF4BEF287 -:100E0500ADD8BEF0CFE800818FE8003103FAAEF02F -:100E1500F5E80061CDD7B1D7C3F33174D90883C1E3 -:100E2500F626D8BDD8C0317505C312F623C2FD3EDE -:100E35000E93DF0312F623C2D7440000DD2761DDE0 -:100E4500717BFACFE80080BEF6F6BEF4BEF2ADD8EF -:100E5500BEF0CFE800818FE8003103FAAFE000F57E -:100E6500E80061CDD7ADD8D7C3F33174DB0F83C1AB -:100E7500F626D8BDD861317026DABDDAC031750DD8 -:100E850083C312F626DCBDDC61317023C2FDA60EDC -:100E950093DF0CF626D8BDD861317026DABDDAC2EB -:100EA500D7C161686BDC6BDDC0DD2F61DD717BFA5D -:100EB500CFE80080BEF4ADDCBEF6ADD8BEF0ADDA4D -:100EC500BEF2CFE800818FE8003103FAAEF0BDD85D -:100ED500AEF2BDDAF5E80061CDD7F6BDD8BDDAD7FB -:100EE5008292DD2B61DD717BFACFE80080BEF0F6E2 -:100EF500BEF2BEF46208BEF6CFE800818FE800318D -:100F050003FAAFE0006072AEF0F5E80061CDD7609E -:100F150072F6B1D706DABDDAADDC06D8BDD861D830 -:100F2500A6DAD7D1DD17C1C3DAD89DD8ADDA311C21 -:100F350061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDB4 -:100F45001BC1C3DADA9DDAADD8311E33311E3371D8 -:100F5500F9B4DADFF4BDD813BDDAC2C0D746D8DD9F -:100F65000771FF7177D971C0D75BDB9DDB605BDAF9 -:100F75009DDAADDC5BD9085BD808BDD8D7C3C7F30C -:100F8500728EFDC162314C410036564D1161A07221 -:070F9500C09EFD62C6C2D739 -:0A0FF60030393A35313A3434000046 -:0A20000030393A35313A343400002B +:1004CE000EFC7128F000714393D7C72008FBF8FF8C +:1004DE00FD25085014C15008FD5707C0CC07048CE9 +:1004EE00074C14DE0C8C07318EFDC109615907EFE4 +:1004FE00EECC07048C074C1461C8EDC605CC060083 +:10050E008C064C0461C8EDA505300AF9BC02F6BB99 +:10051E00CEABAC31B2D109C73641057184C6DEF31C +:10052E00F1C73641057184C661DC9C05713BD1ACC7 +:10053E0002148F400599715050056179026179005E +:10054E00F0E1614900DD09C73641057184C6DEC39D +:10055E00F1C73641057184C661DC0E059C0550401D +:10056E00C18C07318E31AD128C06318E318D03BDAB +:10057E00D831FFBDDADADAADD8FD8D0CC0D2DD0C84 +:10058E005008C15014FD5707C0FD4A0B8C05D1DF32 +:10059E0006615906ED0E058C07318EFDC509D2DDBB +:1005AE000C5008C15014FD5707C0FD4A0B8C05D1E5 +:1005BE00DF06615907ED020571605005CC0400CCD1 +:1005CE0005008C054C09DE2B8C05318E04F61FC1FF +:1005DE00317B9EFDC41189728C05318E04F64F1449 +:1005EE00896142DF03F6EF01E6600E049C04615957 +:1005FE0005EFCF41001140F81F3A61E86159048CB4 +:10060E0004D1DF08FD4B0BFD5D0CEF0C5008C15003 +:10061E0014FD5707C0FD4A0B1008C6D7C72004FBB0 +:10062E00F8FF712B24CC0100F6BC02AC0244090089 +:10063E00DE3EAC0204F60F144100118972AC020CBE +:10064E005014896142DF03F6EF01E6600E019C0152 +:10065E00AC021249005072AC0204F67F148961425A +:10066E00DF03F6EF01E6600E019C01617902EFBB3C +:10067E0040F67FFF61F86159018C01D161F8ED23DD +:10068E0007CC0100717AFAFD6A04711300711B2008 +:10069E00710303710205E0C15003FD362BC05013E8 +:1006AE00FD9909500FC1E0FD362BC0CEABAC6159A0 +:1006BE00018C0191DD068C014C03DF03E6EF01F6A0 +:1006CE006061FB7121048C014C0861F8CC01003192 +:1006DE00320705A024FCEF03F524FC4024FC11DCBA +:1006EE0022F524FCF0C15003FD362BC0CE3708CBCB +:1006FE00E4FFFFCBE6FFF7CED4FFCF370008F512AD +:10070E000561FDE6BC02F6614902DD9F00000000B6 +:10071E00617902EFF1FD2508D2DFFA5008C15014BD +:10072E00FD5707C0D2FD4A0B1004C6D73184BD0257 +:10073E00EFFA717BBDCBE4FFFFCBE6FFFFCBD4FF1F +:10074E00FF717ABED7717BBED7C7C1200CFBF8FFF5 +:10075E008C0C318E31ADC1317B9DD4C0BC068DD495 +:10076E009C088C149C0B8C14318E040C00128C0B78 +:10077E00318EBDD813FD1C0F61C8ED2008CEABAC79 +:10078E00CC05068C0B318EFDBD09D2DD158C0B31DF +:10079E008EFDC1096169058C05D1DFE7FD5307E2C6 +:1007AE00EF71CC0A008C0A4C04DE54F6BC02300AFF +:1007BE00F9BBAC06148C089EFD118972AB146299BC +:1007CE00AC06A1BC06617900617902F0E1614902D3 +:1007DE00DFE05040C18C0B318E31AD128C0A318E60 +:1007EE00318D03BDD831FFBDDADADAADD8FD8D0C0F +:1007FE00C0D2DD06FD5307E2EF1961590AEFA68C50 +:10080E000B318EFDC509D2DD03E2EF0761590BED09 +:10081E007407F2100EC6D7C7717B9D717BFAFD3A35 +:10082E0007300AF9FD700AFDFB09C6D7FD2508FD44 +:10083E004A0BFD5307F5ABFFF2D7C731049706718C +:10084E0010B3FBEF047118B3FB8FB3FB7B8A76D129 +:10085E00DD5B8FB3FB9D8A4004F903DF22665C10DB +:10086E00D1DD1C8FB3FB5C10D1DD0B5080C150115C +:10087E00FD8634C0EF095040C15011FD8634C04092 +:10088E0004F903DD064004F904DF22665C02D1DDC3 +:10089E001C8FB3FB5C02D1DD0B5040C15010FD86A6 +:1008AE0034C0EF095020C15010FD8634C0C6D7C7E2 +:1008BE00360000665C80D1DD10675C80D1DF05718B +:1008CE003396EF0B713296EF06710407713196660F +:1008DE005C40D1DD10675C40D1DF05714396EF0BB4 +:1008EE00714296EF06711405714196665C01D1DD79 +:1008FE0010675C01D1DF05715396EF0B715296EFC5 +:10090E0006713407715196665C02D1DD10675C0288 +:10091E00D1DF05716396EF1D716296EF184007F9EE +:10092E0001DF08710402716196EF0AC73610057176 +:10093E00C4C6716196665C04D1DD10675C04D1DFBC +:10094E0005717396EF0B717296EF06714407717114 +:10095E0096665C08D1DD10675C08D1DF05710397E0 +:10096E00EF0B710297EF06711407710197665C1019 +:10097E00D161E8715AD1C6D7F5F6FBF5F8FBCFFE7B +:10098E00FBFFCFFAFBFFCFFBFBFFD7C7C1C1FBF8C5 +:10099E00FFCEABAC8C02D1DD12616902305C03BBC1 +:0F09AE00F6614900DDEE618900EFF51004C6D750 +:1009BD005208EF065203EF025206FEE600FE1B0040 +:1009CD00DC16089F03088F0408089F040862FE24A4 +:1009DD0000089F0408EEBF00EEBA00C1C514410E19 +:1009ED0011D9D0FF118FD1FF312E45C4C0D7F231AF +:1009FD00A2C401E2D79DE261DD4C09DF12717BFAE1 +:100A0D00C18F06089F25FDC0CF060800EE270031D7 +:100A1D00F2FA04CF0608004C00DF05D50008DD16FC +:100A2D0061DD717BFAD50608DD0ACDE31F61CD616D +:100A3D00CDEE160061CDFED40061FFFE9A00FCF8EC +:100A4D00FF0EFEB20061CDFED5004C09DF0EC18F49 +:100A5D0006086F25FD9F0608C0EE0400CF060800AE +:100A6D00F8E3D75200EF025202FE3700CF24FD000B +:100A7D00CF060800BF0408C716629F000841001189 +:100A8D008F1A209B4100118F1B209F0108C651001A +:100A9D00FE62FFEF025205CF060800C1510CFE0A9F +:100AAD0000C0D7C1511DFE0200C0D761DD717BFAB8 +:100ABD0070CEC0A59EC47CFF9EC4609EC461CDD780 +:100ACD0061DD717BFAC18EC45C1BFED6FFCF0608BB +:100ADD0001FED7FFC061CDD731F2FA1AC1AEE4BF26 +:100AED0016FDAEE6BF18FDAED4BF1AFD30FFFFBE3A +:100AFD00E4BEE6BED4C0D731F2FA11C1AF16FDBEC9 +:100B0D00E4AF18FDBEE6AF1AFDBED4C0D7C1BF1C01 +:100B1D00FD13BF1EFD15BF20FD17BF22FDC0D7AFB2 +:100B2D001CFDDB1EFDEB20FDFB22FDD7534B305290 +:100B3D005430324E323030475631323000FFC150D2 +:100B4D00FEFEAB0061DD717BFACF060800FE0A00E8 +:100B5D00FEA4FF61CDF8E3EECF00C7FB0408BF167E +:100B6D00FD8FC0009C05C5C337040600BF18FD35B9 +:100B7D0036AF0B300000522BFE6600C2C4C6305D8E +:100B8D000BB800300000B8022004AF18FDB80030DB +:100B9D000F00B802AF16FD61FF520AFE3AFFECF8E6 +:100BAD00FF0E717BFAC1C7FB04088C05C65C80FE85 +:100BBD000200C0D761DD717BFA70CFC0FFA59FC069 +:100BCD00007CFF9FC000609FC00061CDD7618BFE90 +:100BDD00E2FF717BBE410011FB000017CEFC0061EE +:100BED00CB089EFDF31161C999A58392DFF7D7FE5E +:100BFD00B1FED524FDDF23C1CF0308035109FEF457 +:100C0D00FDC0D2DF37FE3800A20408CF030807511C +:100C1D0009FEE1FDD2B20408DF22C7FB04083183CF +:100C2D0002C6D7C6510AFECCFD624C1FDF06CF248B +:100C3D00FD01EF04CF24FD00C0EE5BFEC0EE55FEBE +:100C4D00C7C1FB04088B31196C0161589BC0C6D715 +:100C5D00717BFAFE4DFEAF0408040600C11436C1C7 +:100C6D000B300000522DF3FE77FF8FC000FE2BFEE0 +:100C7D0061CF5C807C8073C0041900CEFC0F61CB0A +:100C8D00C55404EF03C55417FE18FEC7360008BB44 +:100C9D00629C0288089C03D1DD334C41DE2F70F13C +:100CAD00312DB161090033081C000851FF612A4143 +:100CBD000E118FD0FF613B118FD1FF6138DC0E8B90 +:100CCD005C03DF0964C6C4FE2BFDEECAFDC6C4EE8F +:020CDD00C3FD55 +:100CDF0061CF5100718C7109FECBF800FEFCC90188 +:100CEF0000F6BF00F953C0F693935820FEDFF94189 +:100CFF000036024E34CCFCEF05118B99A7A5174493 +:100D0F004C4EDFF53602F930CCFCEF04CC0000A7D7 +:100D1F0047DFF94100364C4E3420FEEF05118B9919 +:100D2F00A7A517445C4EDFF53630FE3092FEEF0478 +:100D3F00CC0000A747DFF9FCCE0000EFFE61DD71AC +:100D4F007BFABEF0ADD8BEF200AEF661CDD7C3616F +:100D5F00DD717BFABEF0ADD8BEF200DBF6FFADDC85 +:100D6F00BEF000AEF6BDD8AEF40312ADDABEF2009F +:100D7F00AEF661CD03BDDAC2D7C3F33174D90883A0 +:100D8F00C1F626D8BDD8C031750683C312F623C26B +:100D9F00FDAA0D93DF0312F623C2D7440000DD2610 +:100DAF0061DD717BFACFE80080BEF6F6BEF4BEF2CD +:100DBF00ADD8BEF0CFE800818FE8003103FAAEF076 +:100DCF00F5E80061CDD7B1D7C3F33174D90883C12A +:100DDF00F626D8BDD8C0317505C312F623C2FDF86B +:100DEF000D93DF0312F623C2D7440000DD2761DD28 +:100DFF00717BFACFE80080BEF6F6BEF4BEF2ADD836 +:100E0F00BEF0CFE800818FE8003103FAAFE000F5C4 +:100E1F00E80061CDD7ADD8D7C3F33174DB0F83C1F1 +:100E2F00F626D8BDD861317026DABDDAC031750D1E +:100E3F0083C312F626DCBDDC61317023C2FD600E68 +:100E4F0093DF0CF626D8BDD861317026DABDDAC231 +:100E5F00D7C161686BDC6BDDC0DD2F61DD717BFAA3 +:100E6F00CFE80080BEF4ADDCBEF6ADD8BEF0ADDA93 +:100E7F00BEF2CFE800818FE8003103FAAEF0BDD8A3 +:100E8F00AEF2BDDAF5E80061CDD7F6BDD8BDDAD741 +:100E9F008292DD2B61DD717BFACFE80080BEF0F628 +:100EAF00BEF2BEF46208BEF6CFE800818FE80031D3 +:100EBF0003FAAFE0006072AEF0F5E80061CDD760E5 +:100ECF0072F6B1D706DABDDAADDC06D8BDD861D877 +:100EDF00A6DAD7D1DD17C1C3DAD89DD8ADDA311C68 +:100EEF0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDFB +:100EFF001BC1C3DADA9DDAADD8311E33311E33711F +:100F0F00F9B4DADFF4BDD813BDDAC2C0D746D8DDE5 +:100F1F000771FF7177D971C0D75BDB9DDB605BDA3F +:100F2F009DDAADDC5BD9085BD808BDD8D7C3C7F352 +:100F3F00728EFDC162314C410036F84D1161A072C5 +:070F4F00C09EFD62C6C2D77F +:0A0FF60031353A33383A3139000042 +:0A20000031353A33383A3139000027 :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -314,7 +309,7 @@ :1023BC0092D78D3E4B2061F83164921C716392FD73 :1023CC006A044A3E07DD054A3EFFDF098F06F931F4 :1023DC000303FD7624FD8A24710292306D256194ED -:1023EC00D7C77162017172015003FDDF095008FDFE +:1023EC00D7C77162017172015003FD99095008FD44 :1023FC000337629D305009FD0337627671630171BA :10240C001806F94A30F1DC05E507F9EF224A3004E9 :10241C00DE1ACF07F9025008C1506CFD6A02C09257 @@ -322,8 +317,8 @@ :10243C0007F901DF05710A22EF06710B2271030205 :10244C00CD20075700674C08DE1073090A20614E37 :10245C00DC05679D20EF0387EFEB4A2007DF09D5EA -:10246C0007F961F8CF07F903C6D7500AFDDF093029 -:10247C004000C15006FD012BC05096EDDF09C7206E +:10246C0007F961F8CF07F903C6D7500AFD9909306F +:10247C004000C15006FD012BC05096ED9909C720B4 :10248C0006FBF8FFD507F961E8ED6925304A57C11D :10249C00503EFD012BC0D2DD077100B2FBED69256A :1024AC007108B2FB17040200C15004C1500CC1509A @@ -332,9 +327,9 @@ :1024DC00C1500CFD012BC0CC01008C014C04DE283A :1024EC0031349302EFFA712293EA388C015010D6F2 :1024FC0005C15010C18C01D6044000C1506CFD3593 -:10250C00031006615901EFD250A5FDDF09EA38AA84 +:10250C00031006615901EFD250A5FD9909EA38AACA :10251C0048318D12AA48318E616B08616A08C1502E -:10252C000EFD012BC050A5FDDF095004C1506CFD00 +:10252C000EFD012BC050A5FD99095004C1506CFD46 :10253C006A02C0629C01EA388A4B4E0161C3048A6C :10254C004A4E0117040200C15004C1500CC1506C1A :10255C00FD35031006F6C1503EFD012BC01006C61A @@ -342,9 +337,9 @@ :10257C00A441ED0C26F4418D309D3F8D305070D62A :10258C0012307351230480001231FF318E039D40B1 :10259C009FAEFBF68D407C804C95DC1B8D40318FC3 -:1025AC00241400EA38BDD8AA44FD920D1231FF3133 +:1025AC00241400EA38BDD8AA44FD4C0D1231FF3179 :1025BC008E03318F16EF198D40318F241400EA38B9 -:1025CC00BDD8AA46FD920D1231FF318E03318F1604 +:1025CC00BDD8AA46FD4C0D1231FF318E03318F164A :1025DC00EA388A427217F3031644000171FE61C88F :1025EC0036FF001701DE02F61617BD78C7500CFD3A :1025FC00012BC0D2DF068D309D3FEF047100B2FB82 @@ -354,7 +349,7 @@ :10263C004617040600FDF92BD2DD0F7100B2FB71B9 :10264C000392CC0500711293EF2D7108B2FB8C062E :10265C00318E318D080E07081C00BBEA388A407297 -:10266C00ABFDE50EBB8C019C05D1DF08CC0501CC84 +:10266C00ABFD9F0EBB8C019C05D1DF08CC0501CCCA :10267C000400EF038B9C0417040600FD042CD2DD30 :10268C0006CC06C8CC07008C069FB1FB8C06318E9D :10269C00318D080E07081C00BD34AD344401A5DC97 @@ -370,10 +365,10 @@ :10273C00DE054A4406DE09D5AFFBDF0DD444DD09C6 :10274C005020C15011FD8634C08FAFFB9D44FDC39A :10275C002B1008C6D7C75601D837C15002FD362BEF -:10276C00C04008F90161F8712010055012FDDF0915 -:10277C008D376C0870C15002FD362BC05003FDDF45 +:10276C00C04008F90161F8712010055012FD99095B +:10277C008D376C0870C15002FD362BC05003FD998B :10278C00098D376C1870C15002FD362BC05016FDE8 -:10279C00DF095003FD472B625C01D1DD0F7170B373 +:10279C0099095003FD472B625C01D1DD0F7170B3B9 :1027AC00FB5002C15013FD8634C056006672C6D76A :1027BC00C75004FD472B625C03D1DD405014FD5320 :1027CC002834B3FB895C9F998A0C7CFF50FF5C1406 @@ -381,8 +376,8 @@ :1027EC00997162075600316207058666D1DFF77171 :1027FC006307716B2734C6FB895CEB997128100554 :10280C005002FD472BD2DD354008F901DF05500A97 -:10281C00FDDF098D376C1070C15002FD362BC0E006 -:10282C00FDDF09D837C15002FD362BC05033FDDF18 +:10281C00FD99098D376C1070C15002FD362BC0E04C +:10282C00FD9909D837C15002FD362BC05033FD99A4 :10283C0009F0C15002FD362BC07178B3FBE0C150DA :10284C0013FD8634C0C6D7C7C12004FBF8FFCC02E9 :10285C00005004FD472B629C038C045C20D1DD0EE0 @@ -391,7 +386,7 @@ :10288C00028C045C08D1DD0E8C036C029C038C0260 :10289C006C089C02EF138C045C04D1DD0C8C035C83 :1028AC00FD9C038C026C049C028C03D1DD05501A38 -:1028BC00FDDF098C0370C15004FD362BC08FB3FBB8 +:1028BC00FD99098C0370C15004FD362BC08FB3FBFE :1028CC005C9F728C03318E316D148C03318E314DC3 :1028DC00616D08616C5C606162629FB3FB8FBFFBD2 :1028EC007CFF50FF5E02D1DD278FBFFB7CFF5E02B9 @@ -400,16 +395,16 @@ :10291C00F21006C6D7D9A7FBC15006FD362BC0D97D :10292C00A8FBC15007FD362BC0D7FD2129F2D7C714 :10293C00711300711B20710303710205E0C1500378 -:10294C00FD362BC05013FDDF09F0C15005FD362BB1 -:10295C00C0500FC1E0FD362BC0500AFDDF097103DA -:10296C00055008FDDF09501FC1E0FD362BC0501289 -:10297C00FDDF095003FD472B625C01D1DF03E2EF61 +:10294C00FD362BC05013FD9909F0C15005FD362BF7 +:10295C00C0500FC1E0FD362BC0500AFD9909710320 +:10296C00055008FD9909501FC1E0FD362BC05012CF +:10297C00FD99095003FD472B625C01D1DF03E2EFA7 :10298C0024F0FD472B629D363602F9C75008FD1E18 :10299C002BC05003C1FD362BC0710203711A20FDF0 :1029AC00DE2AF431F2C6D75003FD472B625C01D10D -:1029BC00DD155014FD5328FDBC275014FDDF09E034 +:1029BC00DD155014FD5328FDBC275014FD9909E07A :1029CC00C15003FD362BC0711300711B2071030322 -:1029DC005014FDDF09F0C1E0FD362BC0F0C15003EF +:1029DC005014FD9909F0C1E0FD362BC0F0C1500335 :1029EC00FD362BC0D7C72004FBF8FFCC02008D317D :1029FC009C035010C150A4FD6A02C0629D31D4509A :102A0C00DD04F2EDBB2A8C037B315C08D1DD0F8D2C @@ -422,11 +417,11 @@ :102A7C00D1DFF4716307716B278D315C40D1DD09B7 :102A8C005002C15012FD8634C08D315C01D1DD087D :102A9C00E0C15012FD8634C0717AFA8D315C41D19F -:102AAC00DD0C5A31BED831C15010FDD804C0F21023 +:102AAC00DD0C5A31BED831C15010FD4147C0F21077 :102ABC0004C6D7FD6127F2D7FDBC27F2D7C78FC656 :102ACC00FB7617FD5328664FC6FBDFF2F5C6FBF20B -:102ADC00C6D75064FDDF09FD0F2C6261FB711192AA -:102AEC00F171149261DC70C15012FDD804C0FD3438 +:102ADC00C6D75064FD9909FD0F2C6261FB711192F0 +:102AEC00F171149261DC70C15012FD4147C0FD348C :102AFC0036CD5F03D7C7C1C1FBF8FFAC0ABB17C10A :102B0C005002C18C0270C1506CFD350310061004CC :102B1C00C6D7C7C1FBF8FFAC08C15002C18B70C14E @@ -442,7 +437,7 @@ :102BBC0004FCD7F504FCD7D504F9DF04717392D764 :102BCC00FD0F2C6261FB710193711492710793617B :102BDC00C831729217717292710493711192F171E2 -:102BEC00049361DC70C15012FDD804C0D7C716C75E +:102BEC00049361DC70C15012FD4147C0D7C716C7B2 :102BFC005004FD1E2BC0C6D7C716C75002FD1E2B96 :102C0C00C0C6D740AFFB0BDE02E2D7F2D771000192 :102C1C000571785005713AD5713BD18F10055CFC6C @@ -464,8 +459,8 @@ :102D1C003002D7717830027148F000D7C788061698 :102D2C0066614FDD0967614EDE0396EF01866672C0 :102D3C00C6D7C7161714AA0412A943DD29AA041270 -:102D4C00A923FDBA4DC3AC02FDBA4D13C2BDD813B5 -:102D5C00FD620FDE0C1714AA0212AA0403BA04EFC8 +:102D4C00A923FD5C4EC3AC02FD5C4E13C2BDD8136F +:102D5C00FD1C0FDE0C1714AA0212AA0403BA04EF0E :102D6C00051714A9BA04AC041231FF319E03317F4C :102D7C00087208C6D77100F200304400BFB60130AB :102D8C000188BF9001300984BF9E01BF9C01BF9A8E @@ -486,7 +481,7 @@ :102E7C00AA0412F6231231FF31AE03316FBA02C627 :102E8C00D7C7C1FBF8FF8C085080D612AB1413B90E :102E9C00AB14AA0412A92312D927FBF133BDD81302 -:102EAC00FDCE0DBA02C0C6D731049401D74004F947 +:102EAC00FD880DBA02C0C6D731049401D74004F98D :102EBC0002DF10F6BE64BE6EBE6ABF8EFBBF94FB13 :102ECC00BF9AFB31749314308AFBFD762E3090FB45 :102EDC00FD762E3096FBFD762EEF713114940D712C @@ -613,7 +608,7 @@ :10366C0064EF0A8F06FC5002D6A1609D648D649DA8 :10367C0063EF0E311495068D649D63EF048D619D8F :10368C00638D639FADFBD863FDA636E863091C22EE -:10369C0070C15013FDD804C0F2D7C7C1C1FBF8FFED +:10369C0070C15013FD4147C0F2D7C7C1C1FBF8FF41 :1036AC008C02D1DF05F506FCEF1A8C024C05DE0608 :1036BC00CF06FC02EF0E8C02318E1231FE03311F4D :1036CC00609F06FC8D654F06FCDD28CC011F8F0624 @@ -625,10 +620,10 @@ :10372C00F000710BE772C6D7C7C1C1FBF8FF8FFC65 :10373C00FB4E02DC03F2EF318C024FFDFBDC04523A :10374C00FFEF268C022FFCFB706131318D128FFD47 -:10375C00FB2FFCFB70613133BDD813FDF00DBB4466 +:10375C00FB2FFCFB70613133BDD813FDAA0DBB44AC :10376C000001DC03F690BB8B721004C6D7C7C1FBFB :10377C00F8FFAC0814A91489708B6128706131FDB5 -:10378C00BA4D1344030071FEDC23AC08148A048187 +:10378C005C4E1344030071FEDC23AC08148A0481E4 :10379C009A04AC08148A044C11DC10A9148B99AC53 :1037AC000814CA0200AC0814CA0310EF72AC081457 :1037BC00CA0400AC0814A914894DDE0AAC08148A9A @@ -644,7 +639,7 @@ :10385C001006D2DD1B4A6804DE05A468E2EF703462 :10386C00E4FB895CFC99FD12397110B2FBF2EF5F3D :10387C00717BFA300600C117040600C130E9FBFD6C -:10388C00C24D1004717AFAF4688FE4FB5C01D1DD4F +:10388C00644E1004717AFAF4688FE4FB5C01D1DDAC :10389C00264004F903DF205010C180FD8634C0C7D8 :1038AC0036100571D4C6DE0F17C15006C150A8C121 :1038BC005030FD8B0210064004F903DD064004F97C @@ -694,7 +689,7 @@ :103B7C00D1DD11E0C15003FD362BC0711300711B58 :103B8C0020710303665C04D1DD11711300711B20DD :103B9C00D503FC61F8710303FDD434665C08D16174 -:103BAC00E87103035005FDDF097102035003C1FDE9 +:103BAC00E87103035005FD99097102035003C1FD2F :103BBC00362BC0711A20FDDE2AF2C6D7C756FF4A33 :103BCC00461361C8EDA23C8F06F93115053004008F :103BDC00EF0F8F06F9314505300500EF04D907F9D1 @@ -709,7 +704,7 @@ :103C6C0008616A08C131549603E6EF01F6C2616B34 :103C7C0008616A9F2CFCF171240461DC9F26FCF125 :103C8C0071540761DC9F27FCD846F10104ECFC144D -:103C9C00A9148976A4466672C6D7C7FD03098F049A +:103C9C00A9148976A4466672C6D7C7FDBD088F04E1 :103CAC00F9318FE724000061F8ED803E23DD1B2302 :103CBC0061F8ED8A3D2361F8ED063E2361F8ED4F86 :103CCC003E2361F8ED233FED7D3EF6BD70711393FD @@ -737,7 +732,7 @@ :103E2C005027C15005FD362BC0CF04F904712295E3 :103E3C00FD08408F06F931250731349603F504F956 :103E4C00EDA53FFDA73F31020C14F0C15005FD3626 -:103E5C002BC05005FDDF09FD1340CF04F903FD080D +:103E5C002BC05005FD9909FD1340CF04F903FD0853 :103E6C00408F06F931250731349603F504F9EDA599 :103E7C003FF504F9CFCDFB03F5CEFBF5D0FB71720A :103E8C0093F6426CFF61E8EDA53FF6BD707113939C @@ -749,13 +744,13 @@ :103EEC00714307714B2771481005714811057138E2 :103EFC00100571381105713302713B227153027137 :103F0C005B227158100571581105CF04F9057142E7 -:103F1C0095F6BD6AFDCC09F505F9F4243134960407 +:103F1C0095F6BD6AFD8609F505F9F424313496044D :103F2C00D432DD20E505F9E504F98F06F931256970 -:103F3C00F5F8FBF5F6FB502EFDDF09CF05F903E58F +:103F3C00F5F8FBF5F6FB502EFD9909CF05F903E5D5 :103F4C0004F9EF55FDBE04FD3E237173017132047B :103F5C0071430271039271629231949E02EFFA7175 :103F6C002AE7CEA409F5F3003104070261FDCFF373 -:103F7C000080F466FD0309CEA40831329606CF0406 +:103F7C000080F466FDBD08CEA40831329606CF044D :103F8C00F905EF09714395E505F9E504F9712BE79E :103F9C008F06F9312503F504F9C6D7D47BDF193127 :103FAC000200585003FD472B625C01D1DF07F5047A @@ -765,25 +760,25 @@ :103FEC00C15004FD362BC08FB3FB5C9F9FB3FB719C :103FFC0010C4FB30523B6194CD7BF0D73114930647 :10400C00F504F9712295D7716395F47A717207FDF5 -:10401C004502717307D7FD1E05F2D7717BFAC720D5 -:10402C000CFBF8FF8FEAFBF0F9E9FBF303FDBA4D4B -:10403C0013BC048FECFBF0F9EBFBF303FDBA4D134F -:10404C00BC028FEEFBF0F9EDFBF303FDBA4D13BB95 +:10401C004502717307D7FDD804F2D7717BFAC7201C +:10402C000CFBF8FF8FEAFBF0F9E9FBF303FD5C4EA8 +:10403C0013BC048FECFBF0F9EBFBF303FD5C4E13AC +:10404C00BC028FEEFBF0F9EDFBF303FD5C4E13BBF2 :10405C00717AFAAC04BDD8F6BDDAAC04311EBDDC05 -:10406C00F6BDDEFDA30DADD8BDDCADDABDDEAC0218 +:10406C00F6BDDEFD5D0DADD8BDDCADDABDDEAC025E :10407C00BDD8F6BDDAAC02311EDADCC3DADEC3BD64 -:10408C00DCF6BDDEFDA30DC0BDDEC0BDDCADDEFDCE -:10409C00190FADD8BDDCADDABDDEABBDD8F6BDDADF -:1040AC00AB311EDADCC3DADEC3BDDCF6BDDEFDA34C -:1040BC000DC0BDDEC0BDDCADDEFD190FDADAADD84A +:10408C00DCF6BDDEFD5D0DC0BDDEC0BDDCADDEFD14 +:10409C00D30EADD8BDDCADDABDDEABBDD8F6BDDA26 +:1040AC00AB311EDADCC3DADEC3BDDCF6BDDEFD5D92 +:1040BC000DC0BDDEC0BDDCADDEFDD30EDADAADD891 :1040CC00FDF643C3C58D885C3FF0317E0440FC1483 :1040DC00C2C0B9A488F6BC08BC0A9C078C074C2E3D :1040EC00DD3D8D880E0770F161DC605C3FF0317E48 :1040FC00127940FCBDD8F6BDDA8C0773095C22310D -:10410C008FBDDC70BDDEFDA30DAC08BDDCAC0AFDC3 -:10411C00190FADDABC0AADD8BC08615907EFBDACBC -:10412C0008BDD8AC0ABDDAC9DC0004F6FD6D0EC9B9 -:10413C00DCFFFFF6FD6E0FADD8BD82AF3AFC4682B8 +:10410C008FBDDC70BDDEFD5D0DAC08BDDCAC0AFD09 +:10411C00D30EADDABC0AADD8BC08615907EFBDAC03 +:10412C0008BDD8AC0ABDDAC9DC0004F6FD270EC9FF +:10413C00DCFFFFF6FD280FADD8BD82AF3AFC4682FE :10414C00DD11AF3CFCBF3EFCAF3AFCBF3CFCAD828A :10415C00BF3AFCAF3CFC423EFCDC46AF3AFC423C76 :10416C00FCDE3EAD26423AFCDE374A2A16DC1A4A01 @@ -796,7 +791,7 @@ :1041DC000CC6D7717BFAC7710A9E31929E02EFFA18 :1041EC008E949F34FC8E969F35FC8E979F36FC8E5A :1041FC00989F37FC8E939F38FC8E929F39FC710BE5 -:10420C009E717AFA8F37FCFD820F76FD744313BDD5 +:10420C009E717AFA8F37FCFD3C0F76FD744313BD1B :10421C0080D5EFFBDF0AD5F0FBDF05D5F1FBDD2503 :10422C00F6B14680DF11C9803722665C0391DF0648 :10423C000A80181A81009617FD974413FDB7423176 @@ -819,8 +814,8 @@ :10434C00058B9C03EF0F8C019C03D489DF05CD8971 :10435C00A7EF02B489718071179661DC61FB711152 :10436C00968C03721004C6D7C72008FBF8FF8F3752 -:10437C00FCFD820F9C078F36FCFD820F9C068F354F -:10438C00FCFD820F9C058F34FCFD820F9C048F3842 +:10437C00FCFD3C0F9C078F36FCFD3C0F9C068F35DB +:10438C00FCFD3C0F9C058F34FCFD3C0F9C048F38CE :10439C00FC9C038F39FC9C028C06318E0112791A1D :1043AC0020BB8C075C03D1DF098C064C0361C86110 :1043BC0079008C05318EB1610900BB313D120103CE @@ -830,14 +825,14 @@ :1043FC00F8FFF661490A61F8614908DF07F73400F4 :10440C0000ED9344E6BC04F6BC06AC0ABC02AC0856 :10441C00BBAC06614902AC0461F8614900DE28AC12 -:10442C0004BDD8AC06BDDAE1FD280FADDABC06AD93 -:10443C00D8BC04ABBDD8AC02BDDAE1FD430FADDA9C +:10442C0004BDD8AC06BDDAE1FDE20EADDABC06ADDA +:10443C00D8BC04ABBDD8AC02BDDAE1FDFD0EADDAE3 :10444C00BC02ADD8BBEFCAAC06BC02AC04BBAC081A -:10445C00BDD8AC0ABDDAAC04BDDCAC06FDA60EAC16 -:10446C0004BDDCAC06FD190FE1FD430FADDABC0653 +:10445C00BDD8AC0ABDDAAC04BDDCAC06FD600EAC5C +:10446C0004BDDCAC06FDD30EE1FDFD0EADDABC06E1 :10447C00ADD8BC04AC06614902AC0461F8614900DA :10448C00DCC5AC0214AB12100CC6D7C7C12004FBA0 -:10449C00F8FF8F31FCFD820F9C034E04DF1CAD7EB8 +:10449C00F8FF8F31FCFD3C0F9C034E04DF1CAD7EFE :1044AC004680DE07AD80267E12EF40F64680DF07A1 :1044BC00467EDD03E7EF34F7EF318C04318EB11219 :1044CC008C03318E43DF18303822267E0680BB8C5D @@ -868,127 +863,137 @@ :10465C000ED9CCFBC1AE6CFD282DC0F313BE6CD7AC :10466C00FDB546D2DD0DCD2E47F48EAE6C317DBF3F :10467C00CAFCD7E88E0934205080D6BFC6FC22CAAB -:10468C00FCBDD8304700FDCE0DBFC8FC30C6FCFDCC +:10468C00FCBDD8304700FD880DBFC8FC30C6FCFD12 :10469C003E2DF313BE6CB42ED42EDF0CCD2E47A4BE :1046AC008E4A8E1F61C8F48ED740AFFB0BDC0571B0 :1046BC002304F2D740AFFB0661D831229211F0C12E :1046CC00AE6CFD282DC0F313BE6C712204EF03FDFC :1046DC00E046E2D7710294F0C1AE6CFD282DC0F318 :1046EC0013BE6CA48F4A8F40DC37F48FD890F13115 -:1046FC003F0412FD14D890F1BDD85008FD1D0E08D2 +:1046FC003F0412FD14D890F1BDD85008FDD70D0819 :10470C007208E6D2DD040192DFFC896158D1DD0527 :10471C00712204EF03712304A4904A902061C8F421 :10472C0090D7C73026FDC6D77180717DFADE035253 -:05473C0001D75200D777 -:1047410061FC61FCC1C3C5C7520C929269D4FEC120 -:10475100DFF88EFD708EFCC1717AFA4004F903DF37 -:104761000530F1296194C09EFC609EFD34D4FE5257 -:1047710006C0B9A5A592DFF9C6C4C2C061FC61DF5C -:10478100520C929269D4FEC1DFF88EFD708EFCC18D -:104791008F4105775C04D1DD06675C01D1DD5031C5 -:1047A1005494367162077153948FB4FB5FBCFBD193 -:1047B100DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE89 -:1047C100FBD1DF098FB7FB5FBFFBD1DD0C31620786 -:1047D10002EFFA716307716B27711396FD1830F4BC -:1047E100227148500571605005717AFAEDDB486716 -:1047F1005C02D1DD16D422DD124A2202DD0DF42243 -:104801007148500571605005717AFA717AFA8D22FA -:10481100318FE7240000DD0823DD1423DD2CEF4A6E -:10482100F4467140500571505005E422EDDB488F8C -:1048310040059D47715050058D479D49D847FDCC96 -:1048410033629D48CD2202EDDB48675C02D1DD1762 -:10485100675C10D1DD05CD2203EF0F714850057162 -:10486100605005F422EF73CD22044A2203DF108D3C -:10487100489F4005D848C1D847FD5834C0EF1F8F25 -:10488100400576717447DC054A4702DE06716050C7 -:1048910005EF47C7D847FD9930C071505005D84939 -:1048A100F1242900DD27240400DD22242200DD1D5E -:1048B100241100DD0C240100DD13241E00DD0EEFA8 -:1048C1000A4A4760DF07CD4761EF02A4474A220346 -:1048D100DF08D847FDCC33629D48C09EFC609EFD39 -:1048E10034D4FE5206C0B9A5A592DFF961FCC1C35B -:1048F100C5C7520C929269D4FEC1DFF88EFD708E4D -:10490100FCC1717AFA51405F0401D1DD06F616A7A8 -:1049110047DFF2300400BF2401F6BF2A01300B0B40 -:10492100BF2801FD4502300B0FBF2801FD450230B4 -:104931000F0FBF2801710AE6F6420C01DD33AF0407 -:1049410001BF0C0131529329715293710BE2D84D81 -:10495100FDB7033184BD02EFFACBB422FBD84FF18E -:10496100BEB8714BE1714BE5710ABD8D4E9E44EFAE -:104971000C715393714AE5717BBD713393C09EFCF9 -:10498100609EFD34D4FE5206C0B9A5A592DFF9C6DA -:10499100C4C2C061FCC1C5717AFAD44CDD0BEA4ACC -:1049A100899E44A64AB44CEF33710AE6300400BF35 -:1049B1002401F6BF2A01300B0BBF280100000000C3 -:1049C10000000000510FBF2801000000000000009E -:1049D10000500FBF2801712393713393C4C061FC50 -:1049E10061EF520C929269D4FEC1DFF88EFD708E98 -:1049F100FCC12006FBF8FF71503002CEABACCC04F9 -:104A010000F6BB31B2E210617900F6614900DFF3D3 -:104A110071603002ED9B4A8E519C03713BE28C0325 -:104A21005C02D1DD1E8C035C08D1DF0971503002BC -:104A3100CC0400EFCC8C0570FD3A35629E50CC045D -:104A410002EFBE8C035C03D1DF408E509C0271509B -:104A510030028C04D1DF0E8C0270FD8035629C0522 -:104A6100CC0401EF328C044C02DF0671603002EF9E -:104A710029CF34025A716030028C0270C18C0570EA -:104A8100FDE234C0CF34024AEF108C035C01D1DD6A -:104A91000671603002EF03ED024A1006C09EFC6011 -:104AA1009EFD34D4FE5206C0B9A5A592DFF961FC82 -:104AB100C1C3C5C7520C929269D4FEC1DFF88EFD05 -:104AC100708EFCC1710A9E31929E02EFFA8FDEFB5D -:104AD1004F96FFDF198FDFFB4F97FFDF118FE0FB51 -:104AE1004F98FFDF095004C15011FD8634C0710B8E -:104AF1009EC09EFC609EFD34D4FE5206C0B9A5A5A1 -:104B010092DFF9C6C4C2C061FCE46661FCC1C3C5E1 -:104B1100C7520C929269D4FEC1DFF88EFD708EFCF3 -:104B2100C1C1FBF8FF8D1F9C018E31318EE7240638 -:104B310000DD0823DD0E23DD22EF38717AFA8C01C6 -:104B41009D5EEF2F717AFA4007F901DF068C019D16 -:104B51005DEF2051FF2E019D5DEF18717AFA8C01F6 -:104B61009D304004F903DD064004F904DF05306D92 -:104B71002561944031FF09DE05A031FFEF0771582F -:104B8100F000716294710BE3C0C09EFC609EFD3425 -:104B9100D4FE5206C0B9A5A592DFF9C6C4C2C06150 -:104BA100FC717BFAC7D46661F8312495277123958E -:104BB100D466DD05B466CEABAC717AFA5600664CAC -:104BC1000ADD1172F3311C79D8FCCEFC0061CA6197 -:104BD100A486EFEA717AFAF2C6D7C7C1C1FBF8FF22 -:104BE100CC01008C014C0ADE36717BFA8C01F0316C -:104BF1007E0410FC14A96168DF09AC02B9717AFA6C -:104C0100F2EF1D8C01F0317E127910FC614902DF57 -:104C110006717AFAE2EF09717AFA615901EFC4E299 -:104C21001004C6D7C72004FBF8FFF64210FC61F858 -:104C3100ED074D717BFA9C038C034C0ADE3C8C031F -:104C4100F0317E0410FC14A96168DF05717AFAEF76 -:104C510029717AFA8C0372F3311C7910FCCEFC00B5 -:104C610061CA629C02D1DF0A8C03F0317E12E678C0 -:104C710010FC717BFA615903EFBECC0200CC01013B -:104C81008C02F0317E0410FC14A96168DD788C027D -:104C9100F0317E127910FCE743DF658C014C0ADEAE -:104CA1005F8C01F0317E127910FCE743DD4D717BA1 -:104CB100FA8C01F0317E0410FC14A96168DF1861DF -:104CC10069018C01F0317E12F67810FC8C024E01E4 -:104CD100DCED717AFAEF2F8C01F0317E0410FC14B7 -:104CE100A9128C02F0317E337810FC8C01F0317EF8 -:104CF10012E67810FC615902717AFA615901EF9B51 -:104D0100615902ED814C00F21004C6D761FF520CCB -:104D1100929269D4FEC1DFF88EFD708EFCC1717A6A -:104D2100FA8FE4FB5C03D1DD114004F903DD064099 -:104D310004F904DF053046386194C09EFC609EFD95 -:104D410034D4FE5206C0B9A5A592DFF961FC61FC1D -:044D510061FC61FCA4 -:0A4D560000060C12181E242A303645 -:104D6000ACFB0000000062FE000000009B39CD3566 -:104D70008C22BF45052EB42EFB44C13A8E08A63CBA -:104D800028FC36FE20FE02F903F929FC30FE2AFC3D -:104D90002BFC08F926FC6CFF1AFF6EFF6AFF64FF0C -:0A4DA00027FC66FF2CFC5555555505 -:104DAA00FF0000000000983AF82AFF0000004700C0 -:104DBA00317503F7332312D714AEF8C716AC0612AF -:104DCA00C5AC0416F643DD078B99A7A5B3EFF5C268 -:024DDA00C6D73A +:10473C0001D75200D7C7C12004FBF8FF17040300B0 +:10474C00C1E0C15010C150A4FD8B021006629C0246 +:10475C00D1DD058C0272EF428C0C70C18C0470FDA3 +:10476C00AA47C0629C02D1DD058C0272EF2C17A106 +:10477C00C1E0C15010C150A4FD8B021006629C0216 +:10478C00D1DD058C0272EF128C01D1DD03F2EF0A40 +:10479C008C0370C15010FDAA47C01006C6D7C7883D +:1047AC000616710AE650A4FDB703D2DD07713393E8 +:1047BC005202EF2217FDD3036770FDD303FD1E04D5 +:1047CC0050A4FDD3035020FDD30350AAFDD303FD09 +:0847DC004704713393F2C6D7C4 +:1047E40061FC61FCC1C3C5C7520C929269D4FEC17D +:1047F400DFF88EFD708EFCC1717AFA4004F903DF94 +:104804000530F1296194C09EFC609EFD34D4FE52B3 +:1048140006C0B9A5A592DFF9C6C4C2C061FC61DFB8 +:10482400520C929269D4FEC1DFF88EFD708EFCC1E9 +:104834008F4105775C04D1DD06675C01D1DD503121 +:104844005494367162077153948FB4FB5FBCFBD1EF +:10485400DF1B8FB5FB5FBDFBD1DF128FB6FB5FBEE5 +:10486400FBD1DF098FB7FB5FBFFBD1DD0C316207E2 +:1048740002EFFA716307716B27711396FD1830F418 +:10488400227148500571605005717AFAED7E4967CE +:104894005C02D1DD16D422DD124A2202DD0DF4229F +:1048A4007148500571605005717AFA717AFA8D2257 +:1048B400318FE7240000DD0823DD1423DD2CEF4ACB +:1048C400F4467140500571505005E422ED7E498F45 +:1048D40040059D47715050058D479D49D847FDCCF3 +:1048E40033629D48CD2202ED7E49675C02D1DD171B +:1048F400675C10D1DD05CD2203EF0F7148500571BF +:10490400605005F422EF73CD22044A2203DF108D98 +:10491400489F4005D848C1D847FD5834C0EF1F8F81 +:10492400400576717447DC054A4702DE0671605023 +:1049340005EF47C7D847FD9930C071505005D84995 +:10494400F1242900DD27240400DD22242200DD1DBA +:10495400241100DD0C240100DD13241E00DD0EEF04 +:104964000A4A4760DF07CD4761EF02A4474A2203A2 +:10497400DF08D847FDCC33629D48C09EFC609EFD95 +:1049840034D4FE5206C0B9A5A592DFF961FCC1C3B7 +:10499400C5C7520C929269D4FEC1DFF88EFD708EA9 +:1049A400FCC1717AFA51405F0401D1DD06F616A705 +:1049B40047DFF2300400BF2401F6BF2A01300B0B9D +:1049C400BF2801FD4502300B0FBF2801FD45023011 +:1049D4000F0FBF2801710AE6F6420C01DD33AF0464 +:1049E40001BF0C0131529329715293710BE2D84DDE +:1049F400FDB7033184BD02EFFACBB422FBD84FF1EB +:104A0400BEB8714BE1714BE5710ABD8D4E9E44EF0A +:104A14000C715393714AE5717BBD713393C09EFC55 +:104A2400609EFD34D4FE5206C0B9A5A592DFF9C636 +:104A3400C4C2C061FCC1C5717AFAD44CDD0BEA4A28 +:104A4400899E44A64AB44CEF33710AE6300400BF91 +:104A54002401F6BF2A01300B0BBF2801000000001F +:104A640000000000510FBF280100000000000000FA +:104A740000500FBF2801712393713393C4C061FCAC +:104A840061EF520C929269D4FEC1DFF88EFD708EF4 +:104A9400FCC12006FBF8FF71503002CEABACCC0455 +:104AA40000F6BB31B2E210617900F6614900DFF330 +:104AB40071603002ED3E4B8E519C03713BE28C03DE +:104AC4005C02D1DD1E8C035C08D1DF097150300219 +:104AD400CC0400EFCC8C0570FD3A35629E50CC04BA +:104AE40002EFBE8C035C03D1DF408E509C027150F8 +:104AF40030028C04D1DF0E8C0270FD8035629C057F +:104B0400CC0401EF328C044C02DF0671603002EFFA +:104B140029CF34025A716030028C0270C18C057046 +:104B2400FDE234C0CF34024AEF108C035C01D1DDC6 +:104B34000671603002EF03EDA54A1006C09EFC60CA +:104B44009EFD34D4FE5206C0B9A5A592DFF961FCDE +:104B5400C1C3C5C7520C929269D4FEC1DFF88EFD61 +:104B6400708EFCC1710A9E31929E02EFFA8FDEFBB9 +:104B74004F96FFDF198FDFFB4F97FFDF118FE0FBAD +:104B84004F98FFDF095004C15011FD8634C0710BEA +:104B94009EC09EFC609EFD34D4FE5206C0B9A5A5FD +:104BA40092DFF9C6C4C2C061FCE46661FCC1C3C53E +:104BB400C7520C929269D4FEC1DFF88EFD708EFC50 +:104BC400C1C1FBF8FF8D1F9C018E31318EE7240695 +:104BD40000DD0823DD0E23DD22EF38717AFA8C0123 +:104BE4009D5EEF2F717AFA4007F901DF068C019D73 +:104BF4005DEF2051FF2E019D5DEF18717AFA8C0153 +:104C04009D304004F903DD064004F904DF05306DEE +:104C14002561944031FF09DE05A031FFEF0771588B +:104C2400F000716294710BE3C0C09EFC609EFD3481 +:104C3400D4FE5206C0B9A5A592DFF9C6C4C2C061AC +:104C4400FC717BFAC7D46661F831249527712395EA +:104C5400D466DD05B466CEABAC717AFA5600664C08 +:104C64000ADD1172F3311C79D8FCCEFC0061CA61F3 +:104C7400A486EFEA717AFAF2C6D7C7C1C1FBF8FF7E +:104C8400CC01008C014C0ADE36717BFA8C01F031C8 +:104C94007E0410FC14A96168DF09AC02B9717AFAC8 +:104CA400F2EF1D8C01F0317E127910FC614902DFB4 +:104CB40006717AFAE2EF09717AFA615901EFC4E2F6 +:104CC4001004C6D7C72004FBF8FFF64210FC61F8B5 +:104CD400EDAA4D717BFA9C038C034C0ADE3C8C03D9 +:104CE400F0317E0410FC14A96168DF05717AFAEFD3 +:104CF40029717AFA8C0372F3311C7910FCCEFC0012 +:104D040061CA629C02D1DF0A8C03F0317E12E6781C +:104D140010FC717BFA615903EFBECC0200CC010197 +:104D24008C02F0317E0410FC14A96168DD788C02D9 +:104D3400F0317E127910FCE743DF658C014C0ADE0A +:104D44005F8C01F0317E127910FCE743DD4D717BFD +:104D5400FA8C01F0317E0410FC14A96168DF18613B +:104D640069018C01F0317E12F67810FC8C024E0140 +:104D7400DCED717AFAEF2F8C01F0317E0410FC1413 +:104D8400A9128C02F0317E337810FC8C01F0317E54 +:104D940012E67810FC615902717AFA615901EF9BAD +:104DA400615902ED244D00F21004C6D761FF520C84 +:104DB400929269D4FEC1DFF88EFD708EFCC1717AC7 +:104DC400FA8FE4FB5C03D1DD114004F903DD0640F6 +:104DD40004F904DF053046386194C09EFC609EFDF2 +:104DE40034D4FE5206C0B9A5A592DFF961FC61FC7A +:044DF40061FC61FC01 +:0A4DF80000060C12181E242A3036A3 +:104E0200ACFB0000000062FE000000009B39CD35C3 +:104E12008C22BF45052EB42EFB44C13A4808A63C5D +:104E220028FC36FE20FE02F903F929FC30FE2AFC9A +:104E32002BFC08F926FC6CFF1AFF6EFF6AFF64FF69 +:0A4E420027FC66FF2CFC5555555562 +:104E4C00FF0000000000983AF82AFF00000047001D +:104E5C00317503F7332312D714AEF8C716AC06120C +:104E6C00C5AC0416F643DD078B99A7A5B3EFF5C2C5 +:024E7C00C6D797 :024FF400324346 -:0A4FF60030393A35313A3434000006 +:0A4FF60031353A33383A3139000002 :00000001FF  \ No newline at end of file diff --git a/branches/2.15_yamaha_taisaku/bsr.lmf b/branches/2.15_yamaha_taisaku/bsr.lmf index ded11b6..cde265e 100644 Binary files a/branches/2.15_yamaha_taisaku/bsr.lmf and b/branches/2.15_yamaha_taisaku/bsr.lmf differ diff --git a/branches/2.15_yamaha_taisaku/bsr_k0r.map b/branches/2.15_yamaha_taisaku/bsr_k0r.map index b9e5e7e..ff61cc6 100644 --- a/branches/2.15_yamaha_taisaku/bsr_k0r.map +++ b/branches/2.15_yamaha_taisaku/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date:24 Nov 2011 Page: 1 +78K0R Linker W1.33 Date:19 Dec 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool @@ -16,7 +16,7 @@ Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - _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 + t_ei.rel util_funcs.rel i2c_mcu-sub.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -25,9 +25,9 @@ Direc-file:bsr_mcu.dr *** Link information *** - 72 output segment(s) - 3CEDH byte(s) real data - 6152 symbol(s) defined + 73 output segment(s) + 3D4AH byte(s) real data + 6211 symbol(s) defined *** Memory map *** @@ -129,6 +129,8 @@ Direc-file:bsr_mcu.dr 00086H 00000H @@CALT util_funcs 00086H 00000H + @@CALT i2c_mcu-sub + 00086H 00000H * gap * 00086H 0003AH ?CSEGOB0 000C0H 00004H CSEG OPT_BYTE @@CODE 000C4H 00000H CSEG BASE @@ -150,55 +152,55 @@ Direc-file:bsr_mcu.dr LDR_CODL util_funcs 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 00935H CSEG + LDR_CODE 000CEH 008EFH CSEG LDR_CODE loader 000CEH 00177H LDR_CODE WDT 00245H 00000H - LDR_CODE i2c_mcu 00245H 002D9H + LDR_CODE i2c_mcu 00245H 00293H LDR_CODE self_flash - 0051EH 00370H + 004D8H 00370H LDR_CODE task_debug - 0088EH 00000H + 00848H 00000H LDR_CODE task_status - 0088EH 00075H - LDR_CODE hal 00903H 000DCH + 00848H 00075H + LDR_CODE hal 008BDH 000DCH LDR_CODE util_funcs - 009DFH 00024H - FSL_CODE 00A03H 00322H CSEG + 00999H 00024H + FSL_CODE 009BDH 00322H CSEG FSL_CODE fsl_block_cmd - 00A03H 0002BH + 009BDH 0002BH FSL_CODE fsl_block_check - 00A2EH 00013H + 009E8H 00013H FSL_CODE fsl_common - 00A41H 0014FH + 009FBH 0014FH FSL_CODE fsl_reset - 00B90H 00001H + 00B4AH 00001H FSL_CODE fsl_si_ibf - 00B91H 00064H + 00B4BH 00064H FSL_CODE fsl_phySwap - 00BF5H 0004DH + 00BAFH 0004DH FSL_CODE fsl_si_common - 00C42H 00061H - FSL_CODE fsl_swap 00CA3H 00030H + 00BFCH 00061H + FSL_CODE fsl_swap 00C5DH 00030H FSL_CODE fsl_write - 00CD3H 00052H - @@LCODE 00D25H 00277H CSEG - @@LCODE @cstart 00D25H 0006DH - @@LCODE @imul 00D92H 00011H - @@LCODE @lumul 00DA3H 0002BH - @@LCODE @isdiv 00DCEH 00022H - @@LCODE @iudiv 00DF0H 0002DH - @@LCODE @isrem 00E1DH 00021H - @@LCODE @iurem 00E3EH 0002FH - @@LCODE @lsdiv 00E6DH 00039H - @@LCODE @ludiv 00EA6H 0003FH - @@LCODE @divuw 00EE5H 00034H - @@LCODE @ladd 00F19H 0000FH - @@LCODE @llsh 00F28H 0001BH - @@LCODE @lursh 00F43H 0001FH - @@LCODE @iscmp 00F62H 0000CH - @@LCODE @lband 00F6EH 00014H - @@LCODE @bcdtob 00F82H 0001AH -* gap * 00F9CH 0005AH + 00C8DH 00052H + @@LCODE 00CDFH 00277H CSEG + @@LCODE @cstart 00CDFH 0006DH + @@LCODE @imul 00D4CH 00011H + @@LCODE @lumul 00D5DH 0002BH + @@LCODE @isdiv 00D88H 00022H + @@LCODE @iudiv 00DAAH 0002DH + @@LCODE @isrem 00DD7H 00021H + @@LCODE @iurem 00DF8H 0002FH + @@LCODE @lsdiv 00E27H 00039H + @@LCODE @ludiv 00E60H 0003FH + @@LCODE @divuw 00E9FH 00034H + @@LCODE @ladd 00ED3H 0000FH + @@LCODE @llsh 00EE2H 0001BH + @@LCODE @lursh 00EFDH 0001FH + @@LCODE @iscmp 00F1CH 0000CH + @@LCODE @lband 00F28H 00014H + @@LCODE @bcdtob 00F3CH 0001AH +* gap * 00F56H 000A0H MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -250,7 +252,9 @@ Direc-file:bsr_mcu.dr 0228CH 00000H @@CNST util_funcs 0228CH 00000H - ROM_CODE 0228CH 024B5H CSEG + @@CNST i2c_mcu-sub + 0228CH 00000H + ROM_CODE 0228CH 02558H CSEG ROM_CODE pm 0228CH 0098DH ROM_CODE i2c_ctr 02C19H 0005CH ROM_CODE main 02C75H 00055H @@ -276,262 +280,276 @@ Direc-file:bsr_mcu.dr ROM_CODE kanaria_c 0472EH 00006H ROM_CODE get_ei 04734H 0000DH - @@BASE 04741H 00614H CSEG BASE - @@BASE loader 04741H 00000H - @@BASE pm 04741H 0003EH - @@BASE i2c_ctr 0477FH 00170H - @@BASE main 048EFH 00000H - @@BASE magic 048EFH 00000H - @@BASE WDT 048EFH 00000H - @@BASE i2c_mcu 048EFH 000F2H - @@BASE i2c_twl 049E1H 000D0H - @@BASE led 04AB1H 00000H - @@BASE rtc 04AB1H 0005DH - @@BASE vreg_ctr 04B0EH 00000H - @@BASE vreg_twl 04B0EH 00000H - @@BASE adc 04B0EH 00094H - @@BASE renge 04BA2H 0016BH - @@BASE accero 04D0DH 00042H + ROM_CODE i2c_mcu-sub + 04741H 000A3H + @@BASE 047E4H 00614H CSEG BASE + @@BASE loader 047E4H 00000H + @@BASE pm 047E4H 0003EH + @@BASE i2c_ctr 04822H 00170H + @@BASE main 04992H 00000H + @@BASE magic 04992H 00000H + @@BASE WDT 04992H 00000H + @@BASE i2c_mcu 04992H 000F2H + @@BASE i2c_twl 04A84H 000D0H + @@BASE led 04B54H 00000H + @@BASE rtc 04B54H 0005DH + @@BASE vreg_ctr 04BB1H 00000H + @@BASE vreg_twl 04BB1H 00000H + @@BASE adc 04BB1H 00094H + @@BASE renge 04C45H 0016BH + @@BASE accero 04DB0H 00042H @@BASE self_flash - 04D4FH 00000H - @@BASE sw 04D4FH 00000H + 04DF2H 00000H + @@BASE sw 04DF2H 00000H @@BASE task_debug - 04D4FH 00000H + 04DF2H 00000H @@BASE task_misc - 04D4FH 00000H - @@BASE task_sys 04D4FH 00000H + 04DF2H 00000H + @@BASE task_sys 04DF2H 00000H @@BASE pedo_alg_thre_det2 - 04D4FH 00000H - @@BASE ini_VECT 04D4FH 00006H + 04DF2H 00000H + @@BASE ini_VECT 04DF2H 00006H @@BASE task_status - 04D55H 00000H - @@BASE led_cam 04D55H 00000H - @@BASE led_pow 04D55H 00000H - @@BASE hal 04D55H 00000H + 04DF8H 00000H + @@BASE led_cam 04DF8H 00000H + @@BASE led_pow 04DF8H 00000H + @@BASE hal 04DF8H 00000H @@BASE batt_params - 04D55H 00000H - @@BASE voltable 04D55H 00000H + 04DF8H 00000H + @@BASE voltable 04DF8H 00000H @@BASE pedo_lpf_coeff - 04D55H 00000H + 04DF8H 00000H @@BASE kanaria_c - 04D55H 00000H + 04DF8H 00000H @@BASE util_funcs - 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL pm 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL main 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL led 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL rtc 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL adc 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL renge 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL accero 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL sw 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP + 04DF8H 00000H + @@BASE i2c_mcu-sub + 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL pm 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL main 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL led 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL rtc 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL adc 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL renge 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL accero 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL sw 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP + 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL led_cam 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL led_pow 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP + 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL led_cam 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL led_pow 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP @@CNSTL batt_params - 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP - @@CNSTL voltable 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP + 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL voltable 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP @@CNSTL pedo_lpf_coeff - 04D55H 00000H - @@CNSTL 04D55H 00000H CSEG PAGE64KP + 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP @@CNSTL kanaria_c - 04D55H 00000H - @@RLINIT 04D55H 00000H CSEG UNIT64KP - @@RLINIT loader 04D55H 00000H - @@RLINIT pm 04D55H 00000H - @@RLINIT i2c_ctr 04D55H 00000H - @@RLINIT main 04D55H 00000H - @@RLINIT magic 04D55H 00000H - @@RLINIT WDT 04D55H 00000H - @@RLINIT i2c_mcu 04D55H 00000H - @@RLINIT i2c_twl 04D55H 00000H - @@RLINIT led 04D55H 00000H - @@RLINIT rtc 04D55H 00000H - @@RLINIT vreg_ctr 04D55H 00000H - @@RLINIT vreg_twl 04D55H 00000H - @@RLINIT adc 04D55H 00000H - @@RLINIT renge 04D55H 00000H - @@RLINIT accero 04D55H 00000H - @@RLINIT self_flash - 04D55H 00000H - @@RLINIT sw 04D55H 00000H - @@RLINIT task_debug - 04D55H 00000H - @@RLINIT task_misc - 04D55H 00000H - @@RLINIT task_sys 04D55H 00000H - @@RLINIT pedo_alg_thre_det2 - 04D55H 00000H - @@RLINIT ini_VECT 04D55H 00000H - @@RLINIT task_status - 04D55H 00000H - @@RLINIT led_cam 04D55H 00000H - @@RLINIT led_pow 04D55H 00000H - @@RLINIT hal 04D55H 00000H - @@RLINIT batt_params - 04D55H 00000H - @@RLINIT voltable 04D55H 00000H - @@RLINIT pedo_lpf_coeff - 04D55H 00000H - @@RLINIT kanaria_c - 04D55H 00000H - @@RLINIT util_funcs - 04D55H 00000H - @@RLINIT @rom 04D55H 00000H - @@CODEL 04D55H 00000H CSEG - @@CODEL pm 04D55H 00000H - @@CODEL i2c_ctr 04D55H 00000H - @@CODEL main 04D55H 00000H - @@CODEL magic 04D55H 00000H - @@CODEL i2c_twl 04D55H 00000H - @@CODEL led 04D55H 00000H - @@CODEL rtc 04D55H 00000H - @@CODEL vreg_ctr 04D55H 00000H - @@CODEL vreg_twl 04D55H 00000H - @@CODEL adc 04D55H 00000H - @@CODEL renge 04D55H 00000H - @@CODEL accero 04D55H 00000H - @@CODEL sw 04D55H 00000H - @@CODEL task_misc - 04D55H 00000H - @@CODEL task_sys 04D55H 00000H - @@CODEL pedo_alg_thre_det2 - 04D55H 00000H - @@CODEL ini_VECT 04D55H 00000H - @@CODEL led_cam 04D55H 00000H - @@CODEL led_pow 04D55H 00000H - @@CODEL batt_params - 04D55H 00000H - @@CODEL voltable 04D55H 00000H - @@CODEL pedo_lpf_coeff - 04D55H 00000H - @@CODEL kanaria_c - 04D55H 00000H -* gap * 04D55H 00001H - @@CNSTL 04D56H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04D56H 0000AH - @@R_INIT 04D60H 0004AH CSEG UNIT64KP - @@R_INIT @cstart 04D60H 00000H - @@R_INIT loader 04D60H 00000H - @@R_INIT pm 04D60H 00000H - @@R_INIT i2c_ctr 04D60H 00000H - @@R_INIT main 04D60H 00000H - @@R_INIT magic 04D60H 00000H - @@R_INIT WDT 04D60H 00000H - @@R_INIT i2c_mcu 04D60H 00000H - @@R_INIT i2c_twl 04D60H 00000H - @@R_INIT led 04D60H 00000H - @@R_INIT rtc 04D60H 00000H - @@R_INIT vreg_ctr 04D60H 00000H - @@R_INIT vreg_twl 04D60H 00000H - @@R_INIT adc 04D60H 0000CH - @@R_INIT renge 04D6CH 00014H - @@R_INIT accero 04D80H 00000H + 04DF8H 00000H + @@CNSTL 04DF8H 00000H CSEG PAGE64KP + @@CNSTL i2c_mcu-sub + 04DF8H 00000H + @@CNSTL 04DF8H 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04DF8H 0000AH + @@R_INIT 04E02H 0004AH CSEG UNIT64KP + @@R_INIT @cstart 04E02H 00000H + @@R_INIT loader 04E02H 00000H + @@R_INIT pm 04E02H 00000H + @@R_INIT i2c_ctr 04E02H 00000H + @@R_INIT main 04E02H 00000H + @@R_INIT magic 04E02H 00000H + @@R_INIT WDT 04E02H 00000H + @@R_INIT i2c_mcu 04E02H 00000H + @@R_INIT i2c_twl 04E02H 00000H + @@R_INIT led 04E02H 00000H + @@R_INIT rtc 04E02H 00000H + @@R_INIT vreg_ctr 04E02H 00000H + @@R_INIT vreg_twl 04E02H 00000H + @@R_INIT adc 04E02H 0000CH + @@R_INIT renge 04E0EH 00014H + @@R_INIT accero 04E22H 00000H @@R_INIT self_flash - 04D80H 00000H - @@R_INIT sw 04D80H 00000H + 04E22H 00000H + @@R_INIT sw 04E22H 00000H @@R_INIT task_debug - 04D80H 00000H + 04E22H 00000H @@R_INIT task_misc - 04D80H 00026H - @@R_INIT task_sys 04DA6H 00000H + 04E22H 00026H + @@R_INIT task_sys 04E48H 00000H @@R_INIT pedo_alg_thre_det2 - 04DA6H 00000H - @@R_INIT ini_VECT 04DA6H 00000H + 04E48H 00000H + @@R_INIT ini_VECT 04E48H 00000H @@R_INIT task_status - 04DA6H 00000H - @@R_INIT led_cam 04DA6H 00000H - @@R_INIT led_pow 04DA6H 00004H - @@R_INIT hal 04DAAH 00000H + 04E48H 00000H + @@R_INIT led_cam 04E48H 00000H + @@R_INIT led_pow 04E48H 00004H + @@R_INIT hal 04E4CH 00000H @@R_INIT batt_params - 04DAAH 00000H - @@R_INIT voltable 04DAAH 00000H + 04E4CH 00000H + @@R_INIT voltable 04E4CH 00000H @@R_INIT pedo_lpf_coeff - 04DAAH 00000H + 04E4CH 00000H @@R_INIT kanaria_c - 04DAAH 00000H + 04E4CH 00000H @@R_INIT util_funcs - 04DAAH 00000H - @@R_INIT @rom 04DAAH 00000H - @@R_INIS 04DAAH 00010H CSEG UNIT64KP - @@R_INIS @cstart 04DAAH 00000H - @@R_INIS loader 04DAAH 00000H - @@R_INIS pm 04DAAH 00002H - @@R_INIS i2c_ctr 04DACH 00002H - @@R_INIS main 04DAEH 00000H - @@R_INIS magic 04DAEH 00000H - @@R_INIS WDT 04DAEH 00000H - @@R_INIS i2c_mcu 04DAEH 00000H - @@R_INIS i2c_twl 04DAEH 00000H - @@R_INIS led 04DAEH 00000H - @@R_INIS rtc 04DAEH 00000H - @@R_INIS vreg_ctr 04DAEH 00000H - @@R_INIS vreg_twl 04DAEH 00000H - @@R_INIS adc 04DAEH 00000H - @@R_INIS renge 04DAEH 00000H - @@R_INIS accero 04DAEH 00000H + 04E4CH 00000H + @@R_INIT i2c_mcu-sub + 04E4CH 00000H + @@R_INIT @rom 04E4CH 00000H + @@R_INIS 04E4CH 00010H CSEG UNIT64KP + @@R_INIS @cstart 04E4CH 00000H + @@R_INIS loader 04E4CH 00000H + @@R_INIS pm 04E4CH 00002H + @@R_INIS i2c_ctr 04E4EH 00002H + @@R_INIS main 04E50H 00000H + @@R_INIS magic 04E50H 00000H + @@R_INIS WDT 04E50H 00000H + @@R_INIS i2c_mcu 04E50H 00000H + @@R_INIS i2c_twl 04E50H 00000H + @@R_INIS led 04E50H 00000H + @@R_INIS rtc 04E50H 00000H + @@R_INIS vreg_ctr 04E50H 00000H + @@R_INIS vreg_twl 04E50H 00000H + @@R_INIS adc 04E50H 00000H + @@R_INIS renge 04E50H 00000H + @@R_INIS accero 04E50H 00000H @@R_INIS self_flash - 04DAEH 00000H - @@R_INIS sw 04DAEH 00000H + 04E50H 00000H + @@R_INIS sw 04E50H 00000H @@R_INIS task_debug - 04DAEH 00000H + 04E50H 00000H @@R_INIS task_misc - 04DAEH 00000H - @@R_INIS task_sys 04DAEH 00002H + 04E50H 00000H + @@R_INIS task_sys 04E50H 00002H @@R_INIS pedo_alg_thre_det2 - 04DB0H 00006H - @@R_INIS ini_VECT 04DB6H 00000H + 04E52H 00006H + @@R_INIS ini_VECT 04E58H 00000H @@R_INIS task_status - 04DB6H 00000H - @@R_INIS led_cam 04DB6H 00002H - @@R_INIS led_pow 04DB8H 00002H - @@R_INIS hal 04DBAH 00000H + 04E58H 00000H + @@R_INIS led_cam 04E58H 00002H + @@R_INIS led_pow 04E5AH 00002H + @@R_INIS hal 04E5CH 00000H @@R_INIS batt_params - 04DBAH 00000H - @@R_INIS voltable 04DBAH 00000H + 04E5CH 00000H + @@R_INIS voltable 04E5CH 00000H @@R_INIS pedo_lpf_coeff - 04DBAH 00000H + 04E5CH 00000H @@R_INIS kanaria_c - 04DBAH 00000H + 04E5CH 00000H @@R_INIS util_funcs - 04DBAH 00000H - @@R_INIS @rom 04DBAH 00000H - @@LCODEL 04DBAH 00022H CSEG - @@LCODEL abs 04DBAH 00008H - @@LCODEL memcpy_n 04DC2H 0001AH -* gap * 04DDCH 00218H + 04E5CH 00000H + @@R_INIS i2c_mcu-sub + 04E5CH 00000H + @@R_INIS @rom 04E5CH 00000H + @@RLINIT 04E5CH 00000H CSEG UNIT64KP + @@RLINIT loader 04E5CH 00000H + @@RLINIT pm 04E5CH 00000H + @@RLINIT i2c_ctr 04E5CH 00000H + @@RLINIT main 04E5CH 00000H + @@RLINIT magic 04E5CH 00000H + @@RLINIT WDT 04E5CH 00000H + @@RLINIT i2c_mcu 04E5CH 00000H + @@RLINIT i2c_twl 04E5CH 00000H + @@RLINIT led 04E5CH 00000H + @@RLINIT rtc 04E5CH 00000H + @@RLINIT vreg_ctr 04E5CH 00000H + @@RLINIT vreg_twl 04E5CH 00000H + @@RLINIT adc 04E5CH 00000H + @@RLINIT renge 04E5CH 00000H + @@RLINIT accero 04E5CH 00000H + @@RLINIT self_flash + 04E5CH 00000H + @@RLINIT sw 04E5CH 00000H + @@RLINIT task_debug + 04E5CH 00000H + @@RLINIT task_misc + 04E5CH 00000H + @@RLINIT task_sys 04E5CH 00000H + @@RLINIT pedo_alg_thre_det2 + 04E5CH 00000H + @@RLINIT ini_VECT 04E5CH 00000H + @@RLINIT task_status + 04E5CH 00000H + @@RLINIT led_cam 04E5CH 00000H + @@RLINIT led_pow 04E5CH 00000H + @@RLINIT hal 04E5CH 00000H + @@RLINIT batt_params + 04E5CH 00000H + @@RLINIT voltable 04E5CH 00000H + @@RLINIT pedo_lpf_coeff + 04E5CH 00000H + @@RLINIT kanaria_c + 04E5CH 00000H + @@RLINIT util_funcs + 04E5CH 00000H + @@RLINIT i2c_mcu-sub + 04E5CH 00000H + @@RLINIT @rom 04E5CH 00000H + @@CODEL 04E5CH 00000H CSEG + @@CODEL pm 04E5CH 00000H + @@CODEL i2c_ctr 04E5CH 00000H + @@CODEL main 04E5CH 00000H + @@CODEL magic 04E5CH 00000H + @@CODEL i2c_twl 04E5CH 00000H + @@CODEL led 04E5CH 00000H + @@CODEL rtc 04E5CH 00000H + @@CODEL vreg_ctr 04E5CH 00000H + @@CODEL vreg_twl 04E5CH 00000H + @@CODEL adc 04E5CH 00000H + @@CODEL renge 04E5CH 00000H + @@CODEL accero 04E5CH 00000H + @@CODEL sw 04E5CH 00000H + @@CODEL task_misc + 04E5CH 00000H + @@CODEL task_sys 04E5CH 00000H + @@CODEL pedo_alg_thre_det2 + 04E5CH 00000H + @@CODEL ini_VECT 04E5CH 00000H + @@CODEL led_cam 04E5CH 00000H + @@CODEL led_pow 04E5CH 00000H + @@CODEL batt_params + 04E5CH 00000H + @@CODEL voltable 04E5CH 00000H + @@CODEL pedo_lpf_coeff + 04E5CH 00000H + @@CODEL kanaria_c + 04E5CH 00000H + @@CODEL i2c_mcu-sub + 04E5CH 00000H + @@LCODEL 04E5CH 00022H CSEG + @@LCODEL abs 04E5CH 00008H + @@LCODEL memcpy_n 04E64H 0001AH +* gap * 04E7EH 00176H MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT @@ -584,6 +602,8 @@ Direc-file:bsr_mcu.dr FFCCCH 00000H @@DATA util_funcs FFCCCH 00000H + @@DATA i2c_mcu-sub + FFCCCH 00000H @@DATA @rom FFCCCH 00000H @@INIT FFCCCH 0004AH DSEG BASEP @@INIT @cstart FFCCCH 00000H @@ -628,6 +648,8 @@ Direc-file:bsr_mcu.dr FFD16H 00000H @@INIT util_funcs FFD16H 00000H + @@INIT i2c_mcu-sub + FFD16H 00000H @@INIT @rom FFD16H 00000H FSL_DATA FFD16H 00010H DSEG UNITP FSL_DATA fsl_common @@ -674,6 +696,8 @@ Direc-file:bsr_mcu.dr FFD26H 00000H @@INITL util_funcs FFD26H 00000H + @@INITL i2c_mcu-sub + FFD26H 00000H @@INITL @rom FFD26H 00000H @@DATAL FFD26H 00000H DSEG UNIT64KP @@DATAL loader FFD26H 00000H @@ -717,6 +741,8 @@ Direc-file:bsr_mcu.dr FFD26H 00000H @@DATAL util_funcs FFD26H 00000H + @@DATAL i2c_mcu-sub + FFD26H 00000H @@DATAL @rom FFD26H 00000H * gap * FFD26H 000DAH @@ -766,6 +792,8 @@ Direc-file:bsr_mcu.dr FFE30H 00000H @@INIS util_funcs FFE30H 00000H + @@INIS i2c_mcu-sub + FFE30H 00000H @@INIS @rom FFE30H 00000H @@DATS FFE30H 00062H DSEG SADDRP @@DATS @cstart FFE30H 00000H @@ -809,6 +837,8 @@ Direc-file:bsr_mcu.dr FFE92H 00000H @@DATS util_funcs FFE92H 00000H + @@DATS i2c_mcu-sub + FFE92H 00000H @@DATS @rom FFE92H 00000H @@BITS FFE92H 00006H BSEG @@BITS @cstart FFE92H.0 00000H.0 @@ -852,6 +882,8 @@ Direc-file:bsr_mcu.dr FFE97H.1 00000H.0 @@BITS util_funcs FFE97H.1 00000H.0 + @@BITS i2c_mcu-sub + FFE97H.1 00000H.0 * gap * FFE98H 0003CH @@SEGREG FFED4H 00004H DSEG AT @@SEGREG @SEGREG FFED4H 00004H diff --git a/branches/2.15_yamaha_taisaku/hoge.bin b/branches/2.15_yamaha_taisaku/hoge.bin index 628a787..39030d1 100644 Binary files a/branches/2.15_yamaha_taisaku/hoge.bin and b/branches/2.15_yamaha_taisaku/hoge.bin differ diff --git a/branches/2.15_yamaha_taisaku/i2c_mcu-sub.c b/branches/2.15_yamaha_taisaku/i2c_mcu-sub.c new file mode 100644 index 0000000..1e0e804 --- /dev/null +++ b/branches/2.15_yamaha_taisaku/i2c_mcu-sub.c @@ -0,0 +1,108 @@ +/* ======================================================== + 簡易I2C（内蔵ペリフェラル使用）通信 + de JHL 藤田＠開技 + '09 Feb - + $Id$ + ======================================================== */ +#ifndef _WIN32 +#pragma sfr +#pragma di +#pragma ei +#pragma nop +#pragma inline // memcpy()をインライン展開する(の方が小さい！) +#endif + +#include "incs.h" +#include "i2c_mcu.h" +#include "loader.h" +#include "util_funcs.h" + +#include "i2c_mcu_sub.h" +#include "pm.h" /// やりたくなかった…CODECのレジスタ名をひくため + + +// ======================================================== +// ワークアラウンド用 +static void iic_mcu_simple_dummy_write(); +static i2c_err iic_mcu_codec_write_low( u8 adrs, u8 dat ); + +// i2c_mcu.c にいる +extern void iic_mcu_send_re_st( ); +extern void iic_mcu_send_sp( ); +extern i2c_err iic_mcu_send_a_byte( u8 ); +extern i2c_err iic_mcu_call_slave( u8 slave ); + + + +/********************************************//** + コーデックに 『１バイト』 ライト + + iic_mcu_write_a_byte CODEC不具合ワークアラウンド + ***********************************************/ +i2c_err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ) +{ + u8 pm_reg_original; + u8 rv; + + // ヤマハcodecワークアラウンド SPIとの共用レジスタの中身を取得 + if(( rv = iic_mcu_read( IIC_SLA_CODEC, CODEC_REG_PM, 1, &pm_reg_original )) != I2C_ERR_OK ) + { + return( rv ); + } + // phase1 ここまで + + // 書き込み！ + if( ( rv = iic_mcu_codec_write_low( adrs, dat ) ) != I2C_ERR_OK ) + { + return( rv ); + } + + // ヤマハcodecワークアラウンド phase2 + { + // 共有レジスタが 0x00 なら書き戻す + u8 pm_reg_after; + + if(( rv = iic_mcu_read( IIC_SLA_CODEC, CODEC_REG_PM, 1, &pm_reg_after )) != I2C_ERR_OK ) + { + return( rv ); + } + + if( pm_reg_after != 0x00 ) + { + return( I2C_ERR_OK ); + } + + // else { + return iic_mcu_codec_write_low( CODEC_REG_PM, pm_reg_original ); + // リトライなどは無し + } + return( I2C_ERR_OK ); +} + + +static i2c_err iic_mcu_codec_write_low( u8 adrs, u8 dat ) +{ + IICMK10 = 1; // DMA用のISRに飛ばさないためにマスク + if( iic_mcu_call_slave( IIC_SLA_CODEC ) != I2C_ERR_OK ) + { + iic_mcu_busy = false; + return ( I2C_ERR_NOSLAVE ); + } + iic_mcu_send_a_byte( adrs ); + 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 ); // 何でもよい + } + + iic_mcu_send_sp( ); + iic_mcu_busy = false; + return( I2C_ERR_OK ); +} + + diff --git a/branches/2.15_yamaha_taisaku/i2c_mcu.c b/branches/2.15_yamaha_taisaku/i2c_mcu.c index 0a093e5..50916e0 100644 --- a/branches/2.15_yamaha_taisaku/i2c_mcu.c +++ b/branches/2.15_yamaha_taisaku/i2c_mcu.c @@ -17,6 +17,10 @@ #include "loader.h" #include "util_funcs.h" +#include "i2c_mcu_sub.h" + + + // ======================================================== // レジスタのビット名 // プリフィックスbだが、一部のビット名がレジスタ名にかぶるため... @@ -52,14 +56,15 @@ + // ======================================================== static void iic_mcu_send_st( ); -static void iic_mcu_send_re_st( ); -static void iic_mcu_send_sp( ); -static i2c_err iic_mcu_send_a_byte( u8 ); -static i2c_err iic_mcu_call_slave( u8 slave ); - +// *subからしか呼ばない +void iic_mcu_send_re_st( ); +void iic_mcu_send_sp( ); +i2c_err iic_mcu_send_a_byte( u8 ); +i2c_err iic_mcu_call_slave( u8 slave ); // ======================================================== @@ -475,7 +480,7 @@ __interrupt void int_iic10( ) 　NACK →　ストップコンディションを出す。　返：I2C_ERR_NOSLAVE ***********************************************/ -static i2c_err iic_mcu_call_slave( u8 slave ) +i2c_err iic_mcu_call_slave( u8 slave ) { iic_mcu_send_st( ); @@ -504,7 +509,7 @@ static i2c_err iic_mcu_call_slave( u8 slave ) 書き終わるまで帰りません ***********************************************/ -static i2c_err iic_mcu_send_a_byte( u8 dat ) +i2c_err iic_mcu_send_a_byte( u8 dat ) { IICMK10 = 1; IICIF10 = 0; @@ -546,7 +551,7 @@ static void iic_mcu_send_st( ) /********************************************//** リスタート発行 ***********************************************/ -static void iic_mcu_send_re_st( ) +void iic_mcu_send_re_st( ) { ST0 |= 0x0004; SO0 |= 0x0400 | TAUS_MASK; // ( SDA = H ), SCL -> H @@ -565,7 +570,7 @@ static void iic_mcu_send_re_st( ) この前に、「最後のバイトの送受信」の時に前準備が必要です。 ***********************************************/ -static void iic_mcu_send_sp( ) +void iic_mcu_send_sp( ) { ST0 = 0x0004; SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力) @@ -645,44 +650,3 @@ void iic_mcu_stop( ) iic_mcu_initialized = false; } - - - -/********************************************//** - コーデックに 『１バイト』 ライト - - iic_mcu_write_a_byte CODEC不具合ワークアラウンド - ***********************************************/ -i2c_err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ) -{ - static u8 count; - - // １文字の時はDMAとか起動しないでさっさと終わらせる - if( iic_mcu_wait_free() !=I2C_ERR_OK ) - { - return( I2C_ERR_TIMEOUT ); - } - - // スタートコンディションとスレーブの呼び出し... - IICMK10 = 1; - if( iic_mcu_call_slave( IIC_SLA_CODEC ) != I2C_ERR_OK ) - { - iic_mcu_busy = false; - return ( I2C_ERR_NOSLAVE ); - } - iic_mcu_send_a_byte( adrs ); - iic_mcu_send_a_byte( dat ); - - // ワークアラウンドここから - /// リスタートにしてダミーライト - iic_mcu_send_re_st( ); - iic_mcu_send_a_byte( IIC_SLA_CODEC ); // ダミーライト - iic_mcu_send_a_byte( 0x20 ); // ゴミを書いても問題ないアドレス - iic_mcu_send_a_byte( count ); // 何でもよいのだが。メモリ足りなくなったら固定値に - - count ++; - - iic_mcu_send_sp( ); - iic_mcu_busy = false; - return ( I2C_ERR_OK ); -} diff --git a/branches/2.15_yamaha_taisaku/i2c_mcu_sub.h b/branches/2.15_yamaha_taisaku/i2c_mcu_sub.h new file mode 100644 index 0000000..c674000 --- /dev/null +++ b/branches/2.15_yamaha_taisaku/i2c_mcu_sub.h @@ -0,0 +1,6 @@ +#ifndef __ic2_mcu_sub__ +#define __ic2_mcu_sub__ + +i2c_err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ); + +#endif diff --git a/branches/2.15_yamaha_taisaku/yav_mcu_bsr.plg b/branches/2.15_yamaha_taisaku/yav_mcu_bsr.plg index 300c5f8..c1d7005 100644 --- a/branches/2.15_yamaha_taisaku/yav_mcu_bsr.plg +++ b/branches/2.15_yamaha_taisaku/yav_mcu_bsr.plg @@ -1,181 +1,13 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c -"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 loader.c -loader.c(160) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(161) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 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\loader.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 pm.c -pm.c(528) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(828) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(832) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(860) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(880) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(947) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(956) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1160) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1162) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 9 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\pm.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 i2c_ctr.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\i2c_ctr.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 main.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\main.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 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 WDT.c +"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-sub.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\WDT.asm +"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-sub.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 i2c_mcu.c -i2c_mcu.c(183) : 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\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_twl.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\i2c_twl.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 led.c -led.c(89) : CC78K0R warning W0745: Expected function prototype -led.c(354) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 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\led.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 rtc.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\rtc.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 -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_ctr.c -vreg_ctr.c(176) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(177) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(179) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(181) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(182) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(235) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(235) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(239) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(239) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(243) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(243) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(247) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 14 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\vreg_ctr.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 -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_twl.c -vreg_twl.c(68) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_twl.c(72) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 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\vreg_twl.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 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(305) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(429) : CC78K0R warning W0745: Expected function prototype -adc.c(458) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(463) : 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\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 -rd2s2m -qvjl2w -sainter_asm -zpb -no renge\renge.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\renge.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 accero.c -accero.c(121) : CC78K0R warning W0745: Expected function prototype -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\accero.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 -rd2 -qvjl2w -sainter_asm -zpb -no self_flash.c -self_flash.c(289) : CC78K0R warning W0401: Conversion may lose significant digits -self_flash.c(290) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 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\self_flash.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 sw.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\sw.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 task_debug.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\task_debug.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 task_misc.c -task_misc.c(381) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(383) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(395) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 3 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\task_misc.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 task_sys.c -task_sys.c(234) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(570) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 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\task_sys.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 pedo_alg_thre_det2.c -pedo_alg_thre_det2.c(104) : CC78K0R warning W0745: Expected function prototype -pedo_alg_thre_det2.c(120) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 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\pedo_alg_thre_det2.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 ini_VECT.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\ini_VECT.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 task_status.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\task_status.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 led_cam.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\led_cam.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 led_pow.c -led_pow.c(119) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(124) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(177) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(240) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(271) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 5 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\led_pow.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 hal.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\hal.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 -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\batt_params.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 voltable.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\voltable.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 pedo_lpf_coeff.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\pedo_lpf_coeff.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 kanaria_c.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\kanaria_c.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 util_funcs.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\util_funcs.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\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' 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' @@ -195,10 +27,9 @@ Link complete, 0 error(s) and 13 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf Object Conversion Complete, 0 error(s) and 0 warning(s) found. C:\Windows\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb bsr.hex -nec_s_2_bsrbin2.rb:2: warning: variable $KCODE is no longer effective; ignored -4 -intel-HEX to bsr bin converter - file converted! - +4 +intel-HEX to bsr bin converter + file converted! -Build Total error(s) : 0 Total warning(s) : 65 + +Build Total error(s) : 0 Total warning(s) : 13 diff --git a/branches/2.15_yamaha_taisaku/yav_mcu_bsr.prj b/branches/2.15_yamaha_taisaku/yav_mcu_bsr.prj index 240a933..b488ae9 100644 --- a/branches/2.15_yamaha_taisaku/yav_mcu_bsr.prj +++ b/branches/2.15_yamaha_taisaku/yav_mcu_bsr.prj @@ -1,6 +1,6 @@ [ProjectManager] Version=6.00 -Path=C:\78k_data\yav-mcu-basara\branches\2.13_2nup\ +Path=C:\78k_data\yav-mcu-basara\branches\2.15_yamaha_taisaku\ Title=yav-mcu Series=78K0R.PM Device=uPD79F0104 @@ -1041,40 +1041,6 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= -[SrcFile] -Source1=loader.c -Source2=pm.c -Source3=i2c_ctr.c -Source4=main.c -Source5=magic.c -Source6=WDT.c -Source7=i2c_mcu.c -Source8=i2c_twl.c -Source9=led.c -Source10=rtc.c -Source11=vreg_ctr.c -Source12=vreg_twl.c -Source13=adc.c -Source14=renge\renge.c -Source15=accero.c -Source16=self_flash.c -Source17=sw.c -Source18=task_debug.c -Source19=task_misc.c -Source20=task_sys.c -Source21=pedo_alg_thre_det2.c -Source22=ini_VECT.c -Source23=task_status.c -Source24=led_cam.c -Source25=led_pow.c -Source26=hal.c -Source27=batt_params.c -Source28=voltable.c -Source29=pedo_lpf_coeff.c -Source30=kanaria.asm -Source31=kanaria_c.c -Source32=get_ei.asm -Source33=util_funcs.c [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -1193,7 +1159,7 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara\branches\2.13_2nup\bsr.lmf +OFILE=C:\78k_data\yav-mcu-basara\branches\2.15_yamaha_taisaku\bsr.lmf [Options.LK78K0R 3] Version=100 O0=bsr_bsr.lmf @@ -1368,6 +1334,41 @@ DefaultMode2=1 DefaultMode3=1 DefaultMode4=1 DefaultMode5=1 +[SrcFile] +Source1=loader.c +Source2=pm.c +Source3=i2c_ctr.c +Source4=main.c +Source5=magic.c +Source6=WDT.c +Source7=i2c_mcu.c +Source8=i2c_twl.c +Source9=led.c +Source10=rtc.c +Source11=vreg_ctr.c +Source12=vreg_twl.c +Source13=adc.c +Source14=renge\renge.c +Source15=accero.c +Source16=self_flash.c +Source17=sw.c +Source18=task_debug.c +Source19=task_misc.c +Source20=task_sys.c +Source21=pedo_alg_thre_det2.c +Source22=ini_VECT.c +Source23=task_status.c +Source24=led_cam.c +Source25=led_pow.c +Source26=hal.c +Source27=batt_params.c +Source28=voltable.c +Source29=pedo_lpf_coeff.c +Source30=kanaria.asm +Source31=kanaria_c.c +Source32=get_ei.asm +Source33=util_funcs.c +Source34=i2c_mcu-sub.c [IncFile] Include1=incs_loader.h Include2=config.h @@ -1404,3 +1405,4 @@ 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 +Include36=i2c_mcu_sub.h