Index: ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (revision 4387) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (working copy) @@ -1604,8 +1604,13 @@ //status(1), connection_handle(2), Reason(1) fetch 1,mem_conn_handle store 1,mem_hci_record_disc_conn_handle +p_hci_send_disconnect_complete_init_connection_classic: + set0 mark_slave_in_rand_accepted,mark + jam 0,mem_conn_handle + jam 0,mem_conn_req_status + jam 0,mem_conn_status branch z_hci_send_disconnect_complete - + p_le_get_role: fetch 1,mem_le_mode Index: ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (revision 4387) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (working copy) @@ -1221,18 +1221,11 @@ istore 2,contw fetch 1,mem_disconn_reason_send istore 1,contw - call z_hci_send_disconnect_complete_init_connection fetch 1,mem_state_map set0 smap_edr,pdata store 1,mem_state_map branch ipc_hci_tx_start -z_hci_send_disconnect_complete_init_connection: - set0 mark_slave_in_rand_accepted,mark - jam 0,mem_conn_handle - jam 0,mem_conn_req_status - jam 0,mem_conn_status - rtn org z z_hci_send_mode_change: Index: ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat (revision 4387) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat (working copy) @@ -291,7 +291,7 @@ mem_snd_ble_total_size:0a mem_snd_hci_total_size:0a -mem_hci_version_svnid:3987 +mem_hci_version_svnid:4392 mem_keyscan_switch:00 Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (revision 4387) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (working copy) @@ -75,9 +75,9 @@ c01f028b c020825b c0220293 -c02c06fb -c02e0717 -c02e871d +c02c0702 +c02e071e +c02e8724 c0350228 c035824c c04080bf @@ -85,47 +85,47 @@ c04300a2 c04f00a6 c0500161 -c0520795 -c0540774 +c052079c +c054077b c05c812d -c05d0626 +c05d062d c0700158 20202baf c003811e c006031d -c00905ac -c00985cf -c00a05ae -c01185c2 -c012871f -c0130723 -c0138725 -c0140727 -c0148728 -c015072d -c01d84d8 -c01f04e1 -c01f844e -c0208536 -c021076b -c025853a -c027851a -c0290645 -c02c0462 -c02d865e -c02e84ce -c0300663 -c032065f -c0370743 +c00905b3 +c00985d6 +c00a05b5 +c01185c9 +c0128726 +c013072a +c013872c +c014072e +c014872f +c0150734 +c01d84df +c01f04e8 +c01f8455 +c020853d +c0210772 +c0258541 +c0278521 +c029064c +c02c0469 +c02d8665 +c02e84d5 +c030066a +c0320666 +c037074a c03802b1 -c03887a2 +c03887a9 c03902c1 c03a0163 c0440110 c0448116 -c049072e -c0528672 -c0530678 +c0490735 +c0528679 +c053067f c1590000 c16a0000 20202baf @@ -157,7 +157,7 @@ 18423600 202023b7 204045b4 -204007a4 +204007ab 20404909 202045b8 6fe24013 @@ -306,17 +306,17 @@ 67e24bce 6fe24bef 67e206ab -245587a6 +245587ad 20407988 -5800062b +58000632 67e4431d 58000158 67e4431f 5800012c 67e4431b -5800077c +58000783 67e44315 -5800077f +58000786 67e44313 20558153 24358146 @@ -326,7 +326,7 @@ 20203f28 58001171 67e44f5d -204007a8 +204007af 204057bf 6fec4140 67ec4340 @@ -361,10 +361,10 @@ 68420048 20407a08 6fe20048 -c28387aa +c28387b1 c0188188 c0060197 -c0038761 +c0038768 c0058171 20204f6c 6fe20b9c @@ -429,7 +429,7 @@ 20600000 c6908000 793f8021 -204007ac +204007b3 202002f4 6fe20183 203a2378 @@ -501,14 +501,14 @@ 704c9b00 704ca100 704c9f00 -202007ae +202007b5 6fe24c9a -203a07b0 +203a07b7 6fe24c99 203a0221 1fe0ffff 67e24c99 -202007b0 +202007b7 6fe20018 1ff18400 184f840a @@ -527,7 +527,7 @@ c28221c5 6fe20030 c30221c4 -202003a3 +202003a6 6fe24c9c c0000218 c000821b @@ -546,10 +546,10 @@ 793f801c 704c8801 704c8701 -204003e5 +204003ec 58000000 e7e20005 -202003ef +202003f6 c595822d 1c40a200 20348230 @@ -600,7 +600,7 @@ 98467c00 20628000 2020037f -202007b2 +202007b9 20402337 202c0263 204024ca @@ -656,7 +656,7 @@ 2040724d 6fe24c9b 207a0000 -202003a3 +202003a6 20404b82 204024ce 1fe67c0f @@ -666,37 +666,37 @@ 202024b9 704c8808 704c8712 -204003e5 +204003ec 18007e00 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -202003ef +202003f6 704c8a00 243482a7 704c8a01 704c8808 704c8712 -204003e5 +204003ec 18007e35 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -202003ef +202003f6 da201000 68440738 20407a08 6fe2007d -c00206d2 -c01386e4 +c00206d9 +c01386eb c0198305 c00382e0 -c01706e8 -c01406f2 +c01706ef +c01406f9 c00582d6 c00402e4 c00882c7 @@ -708,9 +708,9 @@ c00882c5 20204cad 20404d0a -202006c8 +202006cf 20404e14 -202006c8 +202006cf da200040 2040604d 6fe80739 @@ -736,7 +736,7 @@ 202002fc 6fe20739 67e206a4 -20400766 +2040076d 20204d51 20404f51 7006ae01 @@ -753,21 +753,21 @@ 67e2004b 204021e1 c6108000 -202007ac +202007b3 704c8803 704c8706 -204003e5 +204003ec 18007e00 e7e20005 6fe20046 e7e40005 -202003ef +202003f6 704c8806 704c8717 -204003e5 +204003ec 6fec0040 e7ec0005 -202003ef +202003f6 704c8806 704c8716 202002fe @@ -777,7 +777,7 @@ 2040031a 704c880a 704c8704 -204003e5 +204003ec 6fec0040 e7ec0005 6fe60146 @@ -786,7 +786,7 @@ e7e20005 6fec0040 67ec4f37 -202003ef +202003f6 6fec4f37 684c0040 98467c00 @@ -852,7 +852,7 @@ 20600000 2040032c 20400391 -202004a7 +202004ae 2020037d 20600000 704ddb00 @@ -874,11 +874,11 @@ 18007e06 67e243e2 20203f1a -204007b4 +204007bb 6a464dd8 20200359 6a464dd8 -202005ee +202005f5 20403e92 20403e92 67e24dd7 @@ -898,7 +898,7 @@ 704c9600 df200001 20400386 -202003ef +202003f6 704c9600 2040038a 6fe24c96 @@ -907,7 +907,7 @@ 704c870e 1f20fe03 67e24c88 -204003e5 +204003ec 6fe64c93 e7e60005 20600000 @@ -918,20 +918,27 @@ 700f1202 704c870f 704c8804 -204003e5 +204003ec 6fe20f12 e7e20005 6fe64c93 e7e60005 -202003ef +202003f6 +6fe24ff0 +1fe0fe01 +67e24ff0 6ff04c6c c4020000 6fe20639 67e24e18 -202007b6 +202007bd 6fe20046 67e24e18 -202007b6 +793f8021 +70004600 +704ca100 +704c9b00 +202007bd 6fe20624 d8400000 c1018000 @@ -957,15 +964,15 @@ 67e24c88 1fe0fe03 67e44db1 -20400602 +20400609 207a0000 704c873e -204003e5 +204003ec 58000002 e7e20005 58000001 e7e20005 -204003ab +204003b2 e0420005 204047d5 1a227e00 @@ -979,30 +986,30 @@ 2040712d 204001ff e7e20005 -202003ef +202003f6 6fe20046 67e242a8 -202003db +202003e2 6fe20639 67e242a8 704c8805 704c8713 -204003e5 +204003ec 58000001 e7e20005 6fe242a8 e7e40005 58000001 e7e40005 -202003ef +202003f6 6fe24c88 1fe0fe03 67e44db1 -204003ec +204003f3 6fe64c86 e7e60005 20600000 -204005cc +204005d3 1a420a00 20600000 da204d84 @@ -1023,9 +1030,9 @@ 20600000 6fe2063a c3828000 -20400421 -20400435 -203a03f2 +20400428 +2040043c +203a03f9 efe20006 ea220006 9a267e00 @@ -1041,8 +1048,8 @@ 18427200 2040712d 2040480e -204003f4 -20400435 +204003fb +2040043c efe20006 1fe22200 18c23000 @@ -1057,15 +1064,15 @@ 202049f1 6fe24683 203a480c -2040042b +20400432 c6130000 da204d5c -204005bf +204005c6 c000480c c000c80c 79200026 20600000 -20400435 +2040043c 203a480c efe20006 e8420006 @@ -1077,7 +1084,7 @@ 20600000 da204d5c 20203fa1 -20400439 +20400440 20202739 204045bd 204045cd @@ -1102,11 +1109,11 @@ 202046a3 204045aa 20404766 -204003ff -20400437 -20400593 +20400406 +2040043e +2040059a 20404594 -203405a2 +203405a9 2020458a 6fec0633 684c4627 @@ -1119,15 +1126,15 @@ 7042a700 70065b00 204047d2 -202007b8 +202007bf 6fe204dd -c001049c -c0040490 -c0048499 -c006049f -c000846b -c00a0485 -c00a847a +c00104a3 +c0040497 +c00484a0 +c00604a6 +c0008472 +c00a048c +c00a8481 20204868 efea0006 67ea4528 @@ -1148,14 +1155,14 @@ 67f04953 6fe44953 6844495f -20400476 +2040047d 60444953 6fe44957 6844495b -20400476 +2040047d 60444957 -202007ba -2040047a +202007c1 +20400481 da200009 d8200003 204049ab @@ -1165,8 +1172,8 @@ e7f00005 20600000 da400014 -20200486 -20400499 +2020048d +204004a0 da200009 d8200003 204049ab @@ -1177,7 +1184,7 @@ 20600000 eff00006 67f04c0a -202007bc +202007c3 efe20006 67e206a4 20204890 @@ -1197,15 +1204,15 @@ 6ff04ddf e7f00005 20600000 -2040061a +20400621 67e64e15 58000000 67e64d2e 6fe20046 67e242a8 704ddb05 -202004be -20400620 +202004c5 +20400627 67e64e15 58000000 67e64d31 @@ -1230,14 +1237,14 @@ 20203f1a 6fe204db 684c4639 -c28384d2 -202004d3 +c28384d9 +202004da 684c4c7a 6fec04e3 98467c00 24628000 2040493a -202007b8 +202007bf 20404536 70100001 70100100 @@ -1250,32 +1257,32 @@ 204045b4 2040315c 6fe20624 -c00184e8 +c00184ef 20204579 -20400439 -202005a6 +20400440 +202005ad 7834fc00 204048fd -20210771 +20210778 204045fc -204003ff +20400406 7856fc00 -204004e6 -2436850e -20400509 +204004ed +24368515 +20400510 20404766 -20400593 +2040059a 20404594 -203404f7 +203404fe 7854fc00 20202739 -204003ff -204004fd +20400406 +20400504 78377c00 -204005a6 -203684f0 -202004f5 -204004ff +204005ad +203684f7 +202004fc +20400506 20202739 204045bd 204045cd @@ -1283,8 +1290,8 @@ 782efc00 78307c00 7850fc00 -20400507 -20200441 +2040050e +20200448 37c18200 20600000 6fe20623 @@ -1293,13 +1300,13 @@ 67e20623 20600000 6fe20623 -c28184f5 +c28184fc 6fe24e17 1fe67c06 -24210771 +24210778 1fe0fe01 67e24e17 -202004f5 +202004fc 684c4639 20600000 684c4c7a @@ -1317,8 +1324,8 @@ 67e24537 18427200 6fe2461c -205a0516 -245a0518 +205a051d +245a051f 604c4538 d8c044e0 2040712d @@ -1331,10 +1338,10 @@ 67e40124 24610000 2040473e -202007be +202007c5 20404972 2040475a -2040052d +20400534 20202940 78287c00 6fe40631 @@ -1349,15 +1356,15 @@ 78507c00 19623600 37c18400 -2037054a +20370551 1b420400 604c00a4 242c2739 -20370551 +20370558 dd2001e0 1c225000 6fe20623 -c3018551 +c3018558 2055ac9c 20402abc 7823fc00 @@ -1375,43 +1382,43 @@ 67e204dc 1fe27200 67e2068c -203a057b +203a0582 6fe204db 1fe17e03 -c0018570 -c5078572 +c0018577 +c5078579 da204cca -204005bf -c0008572 -20400616 -203a0572 -20400620 +204005c6 +c0008579 +2040061d +203a0579 +20400627 18c20a00 6fe404db e7e40005 -20200577 +2020057e d8a004dd -20200577 +2020057e 09800008 19897e00 -c2000572 +c2000579 78367c00 -2020057b +20200582 09800008 19897e00 e7e20005 -c2000577 +c200057e 09800018 78287c00 db600664 -20360582 +20360589 1fef7e00 1ff17e00 e7e60005 20232739 7836fc00 6fe242b5 -243a0589 +243a0590 6fe20017 1fe0a200 20402a7b @@ -1433,15 +1440,15 @@ 6fe204db 1fe17e03 c001c866 -20400620 -2040058b +20400627 +20400592 6fe2068c 207a0000 6fe2068d c001c866 -202004b7 +202004be 78377c00 -204005a6 +204005ad 2036c582 2020458a 68420017 @@ -1449,9 +1456,9 @@ 20402a23 78287c00 d9601388 -2020053f +20200546 2040010e -202007c0 +202007c7 1a208409 efe20002 203a2baf @@ -1476,13 +1483,13 @@ 6fe204d5 c1018000 20204146 -204005e1 +204005e8 da204d34 20203f94 da204d34 20403fa5 -202005ee -204005e1 +202005f5 +204005e8 da204d84 20203f94 1a20fe04 @@ -1503,55 +1510,55 @@ 1a420c00 1a427e00 20600000 -20400602 +20400609 203a2baf 6fe44dd1 68444db1 98467c00 -202105e9 +202105f0 da204cca 20203fa5 da204ca2 -204005bf -203a05e7 +204005c6 +203a05ee da204ca2 20203fa5 -204005fa +20400601 da204ca2 -203a05f3 +203a05fa da204cca 20203f94 -204005f7 +204005fe 203a2baf da204ca2 20203f94 6f224caa d8c04cf2 -202005fc +20200603 6f224cd2 d8c04d10 efe60006 9a467c00 -20228600 -c20005fc +20228607 +c2000603 1f227e00 20600000 6fe44dd1 68444db1 98467c00 -20210608 +2021060f da204cca -202005bf +202005c6 da204ca2 -204005bf +204005c6 247a0000 -20200606 +2020060d 6fe44dd5 -2020060f +20200616 58000010 67e44db1 62280f1e -20400602 +20400609 6a280f1e 20600000 da204cca @@ -1559,16 +1566,16 @@ 6fe44d2e 247a0000 da204cca -202005bf +202005c6 6fe64d2e 243a7111 -20400614 +2040061b 1a427e00 67e64d2e 20207111 6fe64d31 243a7111 -20400614 +2040061b 1a427e00 67e64d31 20207111 @@ -1578,11 +1585,11 @@ 1fe22600 20203190 1a627e00 -c00a862e +c00a8635 20203168 704c8c00 704c1700 -204007c2 +204007c9 2040039e 202031c3 6842063a @@ -1600,11 +1607,11 @@ 6fe245b5 c0014794 6fe21002 -c0010771 +c0010778 c002c790 20600000 20404906 -20400633 +2040063a 6fe204db 2feffe04 79208027 @@ -1613,9 +1620,9 @@ 2feffe02 7920800f 6fe204dc -203a0657 +203a065e 6fe20623 -c3020657 +c302065e c6078000 20406246 204061b6 @@ -1628,13 +1635,13 @@ 79400402 6042063a 20600000 -202007c4 -2040066f +202007cb +20400676 18227e00 c1018000 -202003d9 +202003e0 62244db1 -2040066c +20400673 1a420a00 6fe44db1 e7e20005 @@ -1642,27 +1649,27 @@ e7e20005 e0220005 20600000 -204005e1 +204005e8 da204d5c 20203f94 da204d5c 20403fa5 -202005ee +202005f5 6fe20b97 207a0000 700b9700 6fe20b95 -c004867f +c0048686 20206472 6fe20b98 207a0000 700b9800 6fe20b96 -c0090688 -c004867f +c009068f +c0048686 20206481 204063ce -202006c0 +202006c7 202052d6 700b960f 204052da @@ -1681,9 +1688,9 @@ 20400385 6fec0040 e7ec0005 -204003ef +204003f6 6fe24c9f -c0008698 +c000869f 7042a716 20600000 204033e5 @@ -1691,12 +1698,12 @@ 20600000 20400332 67ec42a9 -204006af +204006b6 df200007 20400385 6fec0040 e7ec0005 -202003ef +202003f6 7840fc00 6fe24c97 207a0000 @@ -1705,7 +1712,7 @@ 98417e00 6fe20b95 247a0000 -204006ba +204006c1 704c9f01 7820fc00 20600000 @@ -1714,39 +1721,39 @@ 20600000 704c8809 704c8732 -204003e5 +204003ec 6fec0040 e7ec0005 6fe647d3 e7e60005 -202003ef +202003f6 704c8806 704c8731 -204003e5 +204003ec 6fec0040 e7ec0005 -202003ef +202003f6 704c8807 704c8736 -204003e5 +204003ec 58000000 e7e20005 6fec0040 e7ec0005 -202003ef +202003f6 704c8804 704c8708 -204003e5 +204003ec 58000000 e7e20005 68420046 e0440005 58000001 e7e20005 -202003ef +202003f6 6fe20739 67e206a3 -c00586d6 +c00586dd 20204cc0 6fe24132 c087cd22 @@ -1759,7 +1766,7 @@ c1830000 60420055 700b9b01 -204006a3 +204006aa 24208302 20600000 20404dc7 @@ -1770,14 +1777,14 @@ 1fe0fe01 68420739 98467c00 -242106f0 +242106f7 60424170 20404d51 -202007c6 +202007cd 70007c04 20600000 20404edd -202006e5 +202006ec 6fe20151 1fe17e03 c080a68a @@ -1787,11 +1794,11 @@ 2020268a 1f227e00 67e4012c -203a06f4 +203a06fb 9ea67c00 20212729 18017e01 -243a0706 +243a070d 6fe20151 1fe17e03 c001a649 @@ -1802,11 +1809,11 @@ 98467c00 20212729 da204cca -204005bf +204005c6 c000a739 -20400616 +2040061d 203a2739 -2040061a +20400621 18c20a00 6fe20151 e7e20005 @@ -1819,24 +1826,24 @@ c58026ba 793f8000 20600000 -204004af +204004b6 202026dd 62244db1 -204005c6 +204005cd 6a244db1 20600000 da204d34 20203fa1 -204005c9 -202003d6 -202005c9 -2040060c +204005d0 +202003dd +202005d0 +20400613 203a729b 2020729d da204d34 -202005bf +202005c6 20202baf -2040072b +20400732 207a0000 6fe2004b c3830000 @@ -1849,7 +1856,7 @@ 18c27e00 67e4013c 6fe4442c -203a073d +203a0744 20205b2e 6fe40099 203a2baf @@ -1860,7 +1867,7 @@ 70429300 20204b77 67e40fb7 -20200747 +2020074e 68440fb7 18518400 6fe44881 @@ -1903,124 +1910,124 @@ 2040682b 700f0d15 20206b2e -2040076c +20400773 7854fc00 20600000 6fe24040 c3800000 c3818000 6fe247cd -203a077b +203a0782 6fe24724 207a0000 20202d53 6fe206ab 67e24bef -20200781 +20200788 7043dd01 20403f41 2040554f -20400792 +20400799 df200020 d8c08080 18c20a00 efe20006 -c001878e -c002078e -c002878e -c003878e -c016078e -c016878e -c0800790 +c0018795 +c0020795 +c0028795 +c0038795 +c0160795 +c0168795 +c0800797 58000080 e7e20005 -c2000785 +c200078c 20600000 df200008 d8c0812a -20200785 +2020078c 6fe24131 207a0000 -2040072b +20400732 247a0000 da204d5c -204005bf +204005c6 247a0000 da204cca -204005bf +204005c6 68424caa 98467c00 24628000 20202d15 580001e0 -20200745 +2020074c 58000240 -20200745 +2020074c 58000250 -20200745 +2020074c 580001f0 -20200745 +2020074c 58000180 -20200745 +2020074c 58000190 -20200745 +2020074c 58000110 -20200745 +2020074c 58000170 -20200745 +2020074c 58000150 -20200745 +2020074c 58000200 -20200745 +2020074c 58000140 -20200745 +2020074c 580001a0 -20200745 +2020074c 580001d0 -20200745 +2020074c 580001c0 -20200745 +2020074c 580001b0 -20200745 +2020074c 580000e0 -20200745 +2020074c 58000220 -20200745 +2020074c 58000230 -20200745 +2020074c 58000130 -20200745 +2020074c 58000080 -20200745 +2020074c 58000070 -20200745 +2020074c 580000c0 -20200745 +2020074c 58000060 -20200745 +2020074c 580000b0 -20200745 +2020074c 58000090 -20200745 +2020074c 580000a0 -20200745 +2020074c 580000d0 -20200745 +2020074c 58000160 -20200745 +2020074c 580000f0 -20200745 +2020074c 58000010 -20200745 +2020074c 58000020 -20200745 +2020074c 58000030 -20200745 +2020074c 58000040 -20200745 +2020074c 58000050 -20200745 +2020074c 58000210 -20200745 +2020074c 58000100 -20200745 +2020074c Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom (revision 4387) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom (working copy) @@ -255,7 +255,7 @@ # debug log define #mem_param_debug_log_mem_block_start_addr -mem_param_debug_log_func_enable:00 +mem_param_debug_log_func_enable:01 mem_param_debug_log_initial_flag_addr:10 db 01 mem_param_debug_log_lock_flag_cm0_addr:11 db 01 @@ -358,7 +358,7 @@ mem_snd_ble_total_size:0a mem_snd_hci_total_size:0a -mem_hci_version_svnid:3987 +mem_hci_version_svnid:4392 mem_keyscan_switch:00 Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (revision 4387) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (working copy) @@ -87,13 +87,13 @@ 6fec04dd 67ec0633 6fe24c8b -c0008456 -204003b7 +c000845d +204003be 204046d3 24368020 6fe204dc c0030020 -204003b7 +204003be 6fe44e32 243a000e 20600000 @@ -154,8 +154,8 @@ 67e24537 18427200 6fe2461c -205a0516 -245a0518 +205a051d +245a051f 604c4538 d8c04500 2040713a @@ -198,14 +198,14 @@ dfe04d5c 67e40f12 6a240f12 -204005bf +204005c6 207a0000 6a240f12 20403fa5 -204005ee +204005f5 20200007 1fe22400 -202005ee +202005f5 00000000 00000000 00000000 @@ -267,7 +267,7 @@ c280001b 6fe40f12 67e44db1 -20400602 +20400609 205a723a 6fe40f12 1fe22200 @@ -295,7 +295,7 @@ c1008000 18000202 20600000 -2040060f +20400616 203a729b 2020729d 00000000 @@ -323,7 +323,7 @@ 2040033e 2040033b c0008007 -c00107e6 +c00107ed 20202baf 2040032c 67e44c94 @@ -335,7 +335,7 @@ 67e24c1a 2040033b 67e24c1b -202007e8 +202007ef 00000000 00000000 00000000 @@ -463,9 +463,9 @@ 20404ca0 2020000a 20404c78 -204006b2 -202006ba -204006b2 +204006b9 +202006c1 +204006b9 20404c78 20404c7c 700b9801 @@ -513,26 +513,26 @@ 20200040 704c880b 704c873e -204003e5 +204003ec 58000007 e7e20005 6fe20639 e7e40005 6ff04953 e7f00005 -202003ef +202003f6 6ff04c6c c4028000 704c8808 704c870c -204003e5 +204003ec 58000000 e7e20005 6fe20639 e7e40005 6fea4c12 e7ea0005 -202003ef +202003f6 00000000 00000000 00000000 @@ -579,14 +579,14 @@ c4018000 704c880c 704c873e -204003e5 +204003ec 58000004 e7e40005 6fe20639 e7e40005 6ff04c0a e7f00005 -202003ef +202003f6 00000000 00000000 00000000 @@ -643,14 +643,14 @@ c4010000 704c880a 704c873e -204003e5 +204003ec 58000003 e7e40005 6fe20639 e7e40005 6fec4530 e7ec0005 -202003ef +202003f6 00000000 00000000 00000000 @@ -707,12 +707,12 @@ c4000000 704c8813 704c873e -204003e5 +204003ec 58000001 e7e40005 6fe20639 e7e40005 -204003a6 +204003ad e0420005 6fe24626 e7e20005 @@ -726,7 +726,7 @@ 6fe2065b e7e20005 6fe20639 -202003ef +202003f6 00000000 00000000 00000000 @@ -769,7 +769,7 @@ 20200040 704c8817 704c8718 -204003e5 +204003ec 6fec0040 e7ec0005 d8c04297 @@ -777,7 +777,7 @@ 2040712d 18007e00 e7e20005 -202003ef +202003f6 00000000 00000000 00000000 @@ -904,7 +904,7 @@ 20402289 20628000 20400212 -204003e5 +204003ec 58000001 e7e20005 6fec0149 @@ -925,7 +925,7 @@ 6fe80132 9c467e00 e7e40005 -202003ef +202003f6 6fe60146 e7e60005 6fe80132 @@ -936,7 +936,7 @@ e7e20005 6fe24c9c c001002b -202003ef +202003f6 6fe64d2e 1fe20c00 efe20006 @@ -947,7 +947,7 @@ 2040712d 184672f0 20407100 -202003ef +202003f6 00000000 00000000 00000000 @@ -988,12 +988,12 @@ 67e4495f 2040032c 67e44961 -2040048e +20400495 df200003 20400385 6fe20639 e7e40005 -202003ef +202003f6 00000000 00000000 00000000 @@ -1025,7 +1025,7 @@ 20200040 704c8806 704c8714 -204003e5 +204003ec 6fe24c89 e7e20005 6fe20046 @@ -1038,7 +1038,7 @@ 2020000f 58000000 e7e40005 -202003ef +202003f6 00000000 00000000 00000000 @@ -1089,23 +1089,23 @@ 20200040 704c8804 704c8705 -204003e5 +204003ec 58000000 e7e20005 6fe24e18 e7e40005 6fe206a4 e7e20005 -2040000f 6fe2004c 793ffe05 67e2004c -202003ef -793f8021 -70004600 -704ca100 -704c9b00 -20600000 +202003f6 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 00000000 00000000 00000000 @@ -1153,12 +1153,12 @@ 20200040 704c8803 704c871b -204003e5 +204003ec 6fe20046 e7e40005 6fe24170 e7e20005 -202003ef +202003f6 00000000 00000000 00000000 @@ -1217,12 +1217,12 @@ 20200040 704c8807 704c8720 -204003e5 +204003ec 6fec0040 e7ec0005 6fe24ca0 e7e20005 -202003ef +202003f6 00000000 00000000 00000000 @@ -1281,7 +1281,7 @@ 20200040 704c880b 704c8703 -204003e5 +204003ec 6fe24c8a e7e20005 6fe20046 @@ -1296,7 +1296,7 @@ 7920fe00 e7e20005 6fe20046 -202003ef +202003f6 00000000 00000000 00000000 @@ -1353,11 +1353,11 @@ c004000e c01f8012 2020037d -202007dc -202007de -202007e0 -202007e2 -202007e4 +202007e3 +202007e5 +202007e7 +202007e9 +202007eb 2020037d 2020037d 6fe24c18 @@ -1377,7 +1377,7 @@ 2040038a 58000000 e7e40005 -202003ef +202003f6 2040032c 68420046 98467c00 @@ -1393,12 +1393,12 @@ 6fe20018 204001ff e7e20005 -202003ef +202003f6 df200002 2040038a 6fe44f35 e7e40005 -202003ef +202003f6 00000000 00000000 00000000 @@ -1415,14 +1415,14 @@ 67e40f12 20200008 6a240f12 -204005bf +204005c6 207a0000 6a240f12 20403fa5 -204005ee +204005f5 20200008 1fe22400 -202005ee +202005f5 00000000 00000000 00000000 @@ -1472,7 +1472,7 @@ 00000000 20200040 6fe24f34 -243a07da +243a07e1 704f3401 20400023 6f224cd2 @@ -1548,7 +1548,7 @@ c0078015 c008001a c008801e -202007d8 +202007df 2040033b 67e244de 20200381 @@ -1559,7 +1559,7 @@ 20400385 58000004 e7e20005 -202003ef +202003f6 704ded00 704e0a00 704dee00 @@ -1605,7 +1605,7 @@ c0058012 c0060025 c0068029 -202007d6 +202007dd 2040033b 67e244df 1fe27200 @@ -1679,7 +1679,7 @@ 6fe20046 e7e40005 7042a71d -202003ef +202003f6 2040033b 67e24c98 df200064 @@ -1690,7 +1690,7 @@ 20400385 6fe24c97 e7e20005 -202003ef +202003f6 2040033b 67e24c97 203a037b @@ -1699,7 +1699,7 @@ 20400385 6fe44de7 e7e40005 -202003ef +202003f6 2040032c 67e44de7 20200381 @@ -1731,8 +1731,8 @@ c00c8009 c00e0013 c00e801b -c015868b -c016069b +c0158692 +c01606a2 c00d8026 2020037d 20400332 @@ -1776,14 +1776,14 @@ 20600000 704c880b 704c870b -204003e5 +204003ec 58000000 e7e20005 6fe20046 e7e40005 6ff04e1a e7f00005 -202003ef +202003f6 00000000 00000000 00000000 @@ -1798,7 +1798,7 @@ c0070020 c0088028 c009802c -202007d4 +202007db 20400332 67ec42a9 d8a04297 @@ -1811,7 +1811,7 @@ 67ec42a9 7042a70c 20400023 -204006a3 +204006aa 24208302 20400332 67ec42a9 @@ -1829,7 +1829,7 @@ 20400385 6fec0040 e7ec0005 -202003ef +202003f6 2040032c 67e242a8 7042a70d @@ -1859,7 +1859,7 @@ c0030006 c0040018 c005002b -202007d2 +202007d9 2040032c 67e242a8 2040033b @@ -1896,7 +1896,7 @@ 20400386 6fec42a9 e7ec0005 -202003ef +202003f6 6fe24ca1 c0000395 c0010393 @@ -1932,7 +1932,7 @@ c0230033 c0238034 c0288036 -202007d0 +202007d7 2040032c 67e44153 2040032c @@ -1944,7 +1944,7 @@ e7e40005 6fe4414d e7e40005 -202003ef +202003f6 2040032c 67e4414f 2040032c @@ -1954,7 +1954,7 @@ 20400385 6fe6414a e7e60005 -202003ef +202003f6 2040032f 67e6414a 20200381 @@ -1965,7 +1965,7 @@ 20400385 6fe24c9c e7e20005 -202003ef +202003f6 2040033b 67e24c9c 20200381 @@ -1979,7 +1979,7 @@ d8c00183 df200064 2040713a -202003ef +202003f6 00000000 00000000 20200040 @@ -1991,7 +1991,7 @@ 20400385 6fe44de9 e7e40005 -202003ef +202003f6 2040032c 67e44de9 20200381 @@ -2053,7 +2053,7 @@ c0058022 c006002d c0068035 -202007ce +202007d5 6fe44deb c3010393 6fe44de9 @@ -2098,7 +2098,7 @@ e7e40005 6fe44deb e7e40005 -202003ef +202003f6 20400255 2040032c 67e44deb @@ -2106,7 +2106,7 @@ 20400385 6fe20046 e7e40005 -202003ef +202003f6 00000000 00000000 00000000 @@ -2117,7 +2117,7 @@ c0018010 c0028015 c003001a -202007cc +202007d3 20400338 67f04c6c 20200381 @@ -2125,12 +2125,12 @@ 20400385 580400fb e7e60005 -202003ef +202003f6 df200009 20400385 6ff04ddf e7f00005 -202003ef +202003f6 6fe244de 243a037f 20400332 @@ -2187,23 +2187,23 @@ 20400385 6ff04c24 e7f00005 -202003ef +202003f6 df200041 20400385 d8c04c2c df200040 2040713a -202003ef +202003f6 df200009 20400385 6ff04138 e7f00005 -202003ef +202003f6 df200007 20400385 6fec4140 e7ec0005 -202003ef +202003f6 df200008 20400385 580002a8 @@ -2213,7 +2213,7 @@ 58000008 e7e40005 e7e40005 -202003ef +202003f6 00000000 00000000 00000000 @@ -2249,7 +2249,7 @@ c00c802b c00d0030 c00d8033 -202007ca +202007d1 20400338 67f04c1c 20200381 @@ -2272,12 +2272,12 @@ 2040713c df200017 204070e4 -202003ef +202003f6 df200003 20400385 6fe44159 e7e40005 -202003ef +202003f6 2040032c 67e44159 20200381 @@ -2285,7 +2285,7 @@ 20400385 6fe24133 e7e20005 -202003ef +202003f6 2040033b 67e24133 20200381 @@ -2295,7 +2295,7 @@ e7e40005 6fe44151 e7e40005 -202003ef +202003f6 00000000 00000000 00000000 @@ -2308,7 +2308,7 @@ c0010017 c0028019 c0048025 -202007c8 +202007cf 7920001c 2040032f 67e64147