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 4593) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (working copy) @@ -2549,11 +2549,18 @@ p_parse_lmp_in_rand: + fetch 1,mem_op + set1 op_inrand_req,pdata + store 1,mem_op call lmp_copy_rand jam pincode_state_wait_pincode,mem_pincode_state call p_hci_send_pincode_req_event - branch parse_lmp_in_rand_hci - +// branch parse_lmp_in_rand_hci + call tid_check + nbranch lmp_accept_inrand,true + nbranch parse_lmp_inrand_res,master // ignore this because of not ssp temporary + rtn + p_sp_check_ssp_available: //disable true 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 4593) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (working copy) @@ -581,7 +581,7 @@ store 6,mem_hci_plap jam hci_cmd_nokey,mem_hci_cmd call z_hci_pin_code_reply - //call p_sp_check_ssp_available + call p_sp_check_ssp_available fetch 1,mem_simple_pairing_mode branch p_hci_send_pincode_req_event,blank //force 0x01,pdata 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 4593) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (working copy) @@ -75,58 +75,58 @@ c01d0168 c01f0216 c02081e6 -c02206a9 -c02a06a5 -c02c060f -c02e062b -c02e8631 -c03506ab -c03586ad +c02206b3 +c02a06af +c02c0619 +c02e0635 +c02e863b +c03506b5 +c03586b7 c03601dd c04080eb c0428109 c04300ce c04f00d2 c050014b -c052068e -c0540680 -c05c86af -c05d05a1 +c0520698 +c054068a +c05c86b9 +c05d05a5 c0700142 20202baf -c00386b1 -c006023e -c00906b3 -c0098548 -c00a0527 -c011853b -c0128633 -c0130637 -c0138639 -c014063b -c014863c -c0150641 -c01d83b1 -c01f03ba -c01f8363 -c02084b0 -c0210677 -c0240464 -c02584b4 -c0278440 -c02905c0 -c02c06b5 -c02d85d9 -c02e86b7 -c03005e3 -c03205df -c0370657 -c03806b9 -c03886bb +c00386bb +c0060242 +c00906bd +c009854c +c00a052b +c011853f +c012863d +c0130641 +c0138643 +c0140645 +c0148646 +c015064b +c01d83b5 +c01f03be +c01f8367 +c02084b4 +c0210681 +c0240468 +c02584b8 +c0278444 +c02905c4 +c02c06bf +c02d85dd +c02e86c1 +c03005e7 +c03205e3 +c0370661 +c03806c3 +c03886c5 c03a014d -c0490642 -c05285f2 -c05305f2 +c049064c +c05285f6 +c05305f6 c1590000 c16a0000 20202baf @@ -145,7 +145,7 @@ 20407148 7d3a001c 243a209e -202006bd +202006c7 6fe24133 c4008000 6fe20030 @@ -183,13 +183,13 @@ 6fec04dd 67ec0633 6fe24c8b -c0008386 -204002cc +c000838a +204002d0 204046d3 243680c0 6fe204dc c00300c0 -204002cc +204002d0 6fe44e32 243a00ae 20600000 @@ -335,9 +335,9 @@ 204052b0 6fe20048 207a0000 -202006bf -204006c1 -2020022d +202006c9 +204006cb +20200231 6fe2004b 79207e03 67e2004b @@ -380,21 +380,21 @@ 207a0000 6fe2007c 247a0000 -202006c3 +202006cd 704c9b02 704c8a00 20200184 704c9b00 704ca100 704c9f00 -202006c5 +202006cf 6fe24c9a -203a06c7 +203a06d1 6fe24c99 -203a06bd +203a06c7 1fe0ffff 67e24c99 -202006c7 +202006d1 6fe20018 1ff18400 184f840a @@ -415,7 +415,7 @@ c28221c5 6fe20030 c30221c4 -202002b4 +202002b8 6fe24c9c c00001a8 c00081ab @@ -449,7 +449,7 @@ 20204db7 704c88ff 704c8707 -204002fa +204002fe 58000000 e7e20005 6fec42a9 @@ -459,7 +459,7 @@ 2040712d df2000b8 204070e4 -20400304 +20400308 6fe24fa6 704fa600 70005300 @@ -479,11 +479,11 @@ 1fe67c64 242127fd 202027ea -20400249 +2040024d 68420046 98467c00 20628000 -20200290 +20200294 20402337 202c01ee 204024ca @@ -494,7 +494,7 @@ 20600000 2040248f 704c8a00 -202006c9 +202006d3 204021ec 24740000 78547c00 @@ -510,7 +510,7 @@ 67e84169 78387c00 7834fc00 -202006cb +202006d5 20402b6f d8200010 20402321 @@ -531,7 +531,7 @@ 20402940 78347c00 704c8a01 -202006c9 +202006d3 70011600 70015000 204024d2 @@ -539,10 +539,10 @@ 2040724d 6fe24c9b 207a0000 -202002b4 +202002b8 20404d8e c6108000 -2020022d +20200231 6fe20030 c283a1e1 6fe20b9c @@ -554,51 +554,55 @@ 67e2004b 204021e1 c6108000 -202006c1 +202006cb +6fe24ff0 +1fe0fe01 +67e24ff0 +20600000 704c8803 704c8706 -204002fa +204002fe 18007e00 e7e20005 6fe20046 e7e40005 -20200304 +20200308 704c8806 704c8717 -204002fa +204002fe 6fec0040 e7ec0005 -20200304 +20200308 704c8806 704c8716 -20200237 +2020023b 6fe243de 207a0000 20403e9d 20628000 1fe20c00 20403e92 -c0058282 +c0058286 20203ef4 -2040025d +20400261 2040712d -2020025a -2040025d +2020025e +20400261 efe40006 -2020025a -2040025d +2020025e +20400261 efe60006 -2020025a -2040025d +2020025e +20400261 efec0006 -2020025a -2040025d +2020025e +20400261 efee0006 -2020025a -2040025d +2020025e +20400261 eff00006 -2020025a -2040025d +2020025e +20400261 efe20006 18c20400 60464bf2 @@ -610,16 +614,16 @@ 20600000 7044d901 704c8b01 -202002a2 +202002a6 6fec4c8d 67ec4639 67ec4140 20600000 20600000 704ddb00 -2020026e +20200272 704ddb03 -2020026e +20200272 62464ddc 58004b4a 67e443e3 @@ -635,11 +639,11 @@ 18007e06 67e243e2 20203f1a -204006cd +204006d7 6a464dd8 -2020026a +2020026e 6a464dd8 -20200568 +2020056c 20403e92 20403e92 67e24dd7 @@ -647,56 +651,56 @@ d8a04dd8 20403e88 6fe24dd7 -c0000280 -c001827d +c0000284 +c0018281 20202baf 704c9612 -20200293 +20200297 704c9601 -20200293 +20200297 704c960c -20200293 +20200297 704c9600 df200001 -20400297 -20200304 -704c9600 2040029b +20200308 +704c9600 +2040029f 6fe24c96 e7e20005 20600000 704c870e 1f20fe03 67e24c88 -204002fa +204002fe 6fe64c93 e7e60005 20600000 700f1200 -202002a7 +202002ab 700f120c -202002a7 +202002ab 700f1202 704c870f 704c8804 -204002fa +204002fe 6fe20f12 e7e20005 6fe64c93 e7e60005 -20200304 +20200308 6ff04c6c c4020000 6fe20639 67e24e18 -202006cf +202006d9 6fe20046 67e24e18 793f8021 70004600 704ca100 704c9b00 -202006cf +202006d9 6fe20624 d8400000 c1018000 @@ -722,15 +726,15 @@ 67e24c88 1fe0fe03 67e44db1 -2040057c +20400580 207a0000 704c873e -204002fa +204002fe 58000002 e7e20005 58000001 e7e20005 -204002c0 +204002c4 e0420005 204047d5 1a227e00 @@ -744,35 +748,35 @@ 2040712d 2040018d e7e20005 -20200304 +20200308 6fe20046 67e242a8 -202002f0 +202002f4 6fe20639 67e242a8 704c8805 704c8713 -204002fa +204002fe 58000001 e7e20005 6fe242a8 e7e40005 58000001 e7e40005 -20200304 +20200308 6fe24c88 1fe0fe03 67e44db1 -20400301 +20400305 6fe64c86 e7e60005 20600000 -20400545 +20400549 1a420a00 20600000 da204d84 20403fa5 -2020026c +20200270 18000400 18000201 60421001 @@ -788,9 +792,9 @@ 20600000 6fe2063a c3828000 -20400336 -2040034a -203a0307 +2040033a +2040034e +203a030b efe20006 ea220006 9a267e00 @@ -806,8 +810,8 @@ 18427200 2040712d 2040480e -20400309 -2040034a +2040030d +2040034e efe20006 1fe22200 18c23000 @@ -822,15 +826,15 @@ 202049f1 6fe24683 203a480c -20400340 +20400344 c6130000 da204d5c -20400538 +2040053c c000480c c000c80c 79200026 20600000 -2040034a +2040034e 203a480c efe20006 e8420006 @@ -842,7 +846,7 @@ 20600000 da204d5c 20203fa1 -2040034e +20400352 20202739 204045bd 204045cd @@ -868,11 +872,11 @@ 20407a4f 204045aa 20404766 -20400314 -2040034c -2040050e +20400318 +20400350 +20400512 20404594 -2034051d +20340521 2020458a 6fe20623 79207e05 @@ -898,8 +902,8 @@ e7f20005 6fe40643 e7e40005 -20400418 -202006d1 +2040041c +202006db 6fec0633 684c4627 98467c00 @@ -911,16 +915,16 @@ 7042a700 70065b00 204047d2 -202006d3 -20400595 +202006dd +20400599 67e64e15 58000000 67e64d2e 6fe20046 67e242a8 704ddb05 -202003a1 -2040059b +202003a5 +2040059f 67e64e15 58000000 67e64d31 @@ -955,29 +959,29 @@ 204045b4 2040315c 6fe20624 -c0018402 +c0018406 20204579 -20400249 +2040024d 67e242a8 -20400249 +2040024d 1febfe00 67e444d7 -20400249 -20400249 +2040024d +2040024d 67e44632 -20400249 +2040024d 67e44634 -2040041a -202002a2 -2040034e -20200521 +2040041e +202002a6 +20400352 +20200525 6fe24fea -c00003ea -c00083ed -c00183ef -c00203f1 -c00303eb -c00503d5 +c00003ee +c00083f1 +c00183f3 +c00203f5 +c00303ef +c00503d9 20600000 6fe20623 79207e06 @@ -1026,37 +1030,37 @@ 20600000 7834fc00 204048fd -2021067d -204003cd -20400314 +20210687 +204003d1 +20400318 204045fc 7856fc00 -204003cb -24368434 +204003cf +24368438 20407a4f -2040042f +20400433 20404766 -2040050e +20400512 20404594 -2034041c -20400414 +20340420 +20400418 7854fc00 20202739 6fe24fe7 207a0000 -c009836c +c0098370 20202baf 704fe700 20600000 704fe713 20600000 -20400314 -20400422 +20400318 +20400426 78377c00 -20400521 -2036840b -20200411 -20400424 +20400525 +2036840f +20200415 +20400428 20202739 204045bd 204045cd @@ -1065,8 +1069,8 @@ 782efc00 78307c00 7850fc00 -2040042d -20200356 +20400431 +2020035a 37c18200 20600000 6fe20623 @@ -1075,13 +1079,13 @@ 67e20623 20600000 6fe20623 -c2818411 +c2818415 6fe24e17 1fe67c06 -2421067d +24210687 1fe0fe01 67e24e17 -20200411 +20200415 684c4639 20600000 684c4c7a @@ -1099,8 +1103,8 @@ 67e24537 18427200 6fe2461c -205a043c -245a043e +205a0440 +245a0442 604c4538 d8c044e0 2040712d @@ -1113,7 +1117,7 @@ 67e40124 24610000 2040473e -202006d1 +202006db 6a280f1e 6a480f22 6a660f26 @@ -1122,7 +1126,7 @@ 62480f22 62660f26 20600000 -20400460 +20400464 67244fe8 1a208c01 efe20006 @@ -1131,10 +1135,10 @@ efe40005 1fe0fe01 e7e40005 -20400483 -20400473 +20400487 +20400477 20404618 -2040045c +20400460 6f244fe8 20600000 1a208c00 @@ -1164,7 +1168,7 @@ 6fe40643 98467e00 1fe67c01 -20228499 +2022849d 20600000 1a208c1a efe40006 @@ -1173,7 +1177,7 @@ 98467e00 d840ffff 98467c00 -20228499 +2022849d 20600000 efe20011 793ffe05 @@ -1200,7 +1204,7 @@ 20600000 20404972 2040475a -20400453 +20400457 20202940 78287c00 6fe40631 @@ -1215,15 +1219,15 @@ 78507c00 19623600 37c18400 -203704c4 +203704c8 1b420400 604c00a4 242c2739 -203704cb +203704cf dd2001e0 1c225000 6fe20623 -c30184cb +c30184cf 2055ac9c 20402abc 7823fc00 @@ -1241,36 +1245,36 @@ 67e204dc 1fe27200 67e2068c -203a04f5 +203a04f9 6fe204db 1fe17e03 -c00184ea -c50784ec +c00184ee +c50784f0 da204cca -20400538 -c00084ec -20400591 -203a04ec -2040059b +2040053c +c00084f0 +20400595 +203a04f0 +2040059f 18c20a00 6fe404db e7e40005 -202004f1 +202004f5 d8a004dd -202004f1 +202004f5 09800008 19897e00 -c20004ec +c20004f0 78367c00 -202004f5 +202004f9 09800008 19897e00 e7e20005 -c20004f1 +c20004f5 09800018 78287c00 db600664 -203604fc +20360500 1fef7e00 1ff17e00 e7e60005 @@ -1278,7 +1282,7 @@ 20232739 7836fc00 6fe242b5 -243a0504 +243a0508 6fe20017 1fe0a200 20402a7b @@ -1300,15 +1304,15 @@ 6fe204db 1fe17e03 c001c866 -2040059b -20400506 +2040059f +2040050a 6fe2068c 207a0000 6fe2068d c001c866 -2020039a +2020039e 78377c00 -20400521 +20400525 2036c582 2020458a 68420017 @@ -1316,7 +1320,7 @@ 20402a23 78287c00 d9601388 -202004b9 +202004bd 1a208409 efe20002 203a2baf @@ -1341,13 +1345,13 @@ 6fe204d5 c1018000 20204146 -2040055a +2040055e da204d34 20203f94 da204d34 20403fa5 -20200568 -2040055a +2020056c +2040055e da204d84 20203f94 1a20fe04 @@ -1368,57 +1372,57 @@ 1a420c00 1a427e00 20600000 -2040057c +20400580 203a2baf 6fe44dd1 1fe0fff6 68444db1 98467c00 -20210563 +20210567 da204cca 20203fa5 da204ca2 -20400538 -203a0561 +2040053c +203a0565 da204ca2 20203fa5 -20400574 +20400578 da204ca2 -203a056d +203a0571 da204cca 20203f94 -20400571 +20400575 203a2baf da204ca2 20203f94 6f224caa d8c04cf2 -20200576 +2020057a 6f224cd2 d8c04d10 efe60006 9a467c00 -2022857a -c2000576 +2022857e +c200057a 1f227e00 20600000 6fe44dd1 1fe0fff6 68444db1 98467c00 -20210583 +20210587 da204cca -20200538 +2020053c da204ca2 -20400538 +2040053c 247a0000 -20200581 +20200585 6fe44dd5 -2020058a +2020058e 58000010 67e44db1 62280f1e -2040057c +20400580 6a280f1e 20600000 da204cca @@ -1426,16 +1430,16 @@ 6fe44d2e 247a0000 da204cca -20200538 +2020053c 6fe64d2e 243a7111 -2040058f +20400593 1a427e00 67e64d2e 20207111 6fe64d31 243a7111 -2040058f +20400593 1a427e00 67e64d31 20207111 @@ -1445,12 +1449,12 @@ 1fe22600 20203190 1a627e00 -c00a85a9 +c00a85ad 20203168 704c8c00 704c1700 -204006d5 -204002af +204006df +204002b3 202031c3 6842063a 284c0005 @@ -1467,11 +1471,11 @@ 6fe245b5 c0014794 6fe21002 -c001067d +c0010687 c002c790 20600000 20404906 -204005ae +204005b2 6fe204db 2feffe04 79208027 @@ -1480,9 +1484,9 @@ 2feffe02 7920800f 6fe204dc -203a05d2 +203a05d6 6fe20623 -c30205d2 +c30205d6 c6078000 20406246 204061b6 @@ -1500,13 +1504,13 @@ d8e00001 20407148 247a0000 -202006d7 -204005ef +202006e1 +204005f3 18227e00 c1018000 -202002ee +202002f2 62244db1 -204005ec +204005f0 1a420a00 6fe44db1 e7e20005 @@ -1514,34 +1518,40 @@ e7e20005 e0220005 20600000 -2040055a +2040055e da204d5c 20203f94 da204d5c 20403fa5 -20200568 +2020056c 6fe20b97 -243a06d9 +243a06e3 6fe20b98 -243a06d9 +243a06e3 20600000 +6fe2004b +79207e02 +67e2004b 20404f51 7006ae01 -2040023b -20204d60 +2040023f +204052de +2420cf59 +2434cd67 +20600000 6fe24c97 207a0000 6fe20b95 247a0000 -20400602 +2040060c 704c9f01 20600000 704c8806 704c8731 -204002fa +204002fe 6fec0040 e7ec0005 -20200304 +20200308 6fe20151 1fe17e03 c080a68a @@ -1551,11 +1561,11 @@ 2020268a 1f227e00 67e4012c -203a0608 +203a0612 9ea67c00 20212729 18017e01 -243a061a +243a0624 6fe20151 1fe17e03 c001a649 @@ -1566,11 +1576,11 @@ 98467c00 20212729 da204cca -20400538 +2040053c c000a739 -20400591 -203a2739 20400595 +203a2739 +20400599 18c20a00 6fe20151 e7e20005 @@ -1583,24 +1593,24 @@ c58026ba 793f8000 20600000 -20400392 +20400396 202026dd 62244db1 -2040053f +20400543 6a244db1 20600000 da204d34 20203fa1 -20400542 -202002eb -20200542 -20400587 +20400546 +202002ef +20200546 +2040058b 203a729b 2020729d da204d34 -20200538 +2020053c 20202baf -2040063f +20400649 207a0000 6fe2004b c3830000 @@ -1613,7 +1623,7 @@ 18c27e00 67e4013c 6fe4442c -203a0651 +203a065b 20205b2e 6fe40099 203a2baf @@ -1624,7 +1634,7 @@ 70429300 20204b77 67e40fb7 -2020065b +20200665 68440fb7 18518400 6fe44881 @@ -1643,7 +1653,7 @@ 67e40241 58004e34 67e4023f -2040069e +204006a8 204057e8 6fe280a0 67e20124 @@ -1659,34 +1669,34 @@ 2040682b 700f0d15 20206b2e -20400678 +20400682 7854fc00 20600000 6fe24040 c3800000 c3818000 6fe247cd -203a0687 +203a0691 6fe24724 207a0000 20202d53 6fe206ab 67e24bef -202006db +202006e5 7043dd01 20403f41 -202006db +202006e5 6fe20fd6 -c055069d +c05506a7 6fe24131 207a0000 -2040063f +20400649 247a0000 da204d5c -20400538 +2040053c 247a0000 da204cca -20400538 +2040053c 68424caa 98467c00 24628000 @@ -1698,108 +1708,108 @@ 207a0000 6fe24f64 c1a98000 -202006a0 +202006aa 18227e00 c003a739 c0032739 202025df 580002e0 -20200659 +20200663 580002a0 -20200659 +20200663 580002b0 -20200659 +20200663 58000240 -20200659 +20200663 58000250 -20200659 +20200663 580000f0 -20200659 +20200663 58000320 -20200659 +20200663 580002f0 -20200659 +20200663 58000200 -20200659 +20200663 580001c0 -20200659 +20200663 58000230 -20200659 +20200663 58000300 -20200659 +20200663 58000190 -20200659 +20200663 58000290 -20200659 +20200663 58000120 -20200659 +20200663 58000170 -20200659 +20200663 580002c0 -20200659 +20200663 580002d0 -20200659 +20200663 580001e0 -20200659 +20200663 58000140 -20200659 +20200663 580001b0 -20200659 +20200663 580001a0 -20200659 +20200663 580001f0 -20200659 +20200663 58000260 -20200659 +20200663 58000270 -20200659 +20200663 58000280 -20200659 +20200663 58000080 -20200659 +20200663 58000070 -20200659 +20200663 580000d0 -20200659 +20200663 58000060 -20200659 +20200663 580000c0 -20200659 +20200663 58000090 -20200659 +20200663 580000a0 -20200659 +20200663 580000b0 -20200659 +20200663 580000e0 -20200659 +20200663 58000160 -20200659 +20200663 58000100 -20200659 +20200663 58000010 -20200659 +20200663 58000020 -20200659 +20200663 58000030 -20200659 +20200663 58000040 -20200659 +20200663 58000050 -20200659 +20200663 58000110 -20200659 +20200663 58000210 -20200659 +20200663 58000220 -20200659 +20200663 580001d0 -20200659 +20200663 58000150 -20200659 +20200663 58000180 -20200659 +20200663 58000310 -20200659 +20200663 58000330 -20200659 +20200663 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 4593) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (working copy) @@ -23,14 +23,14 @@ 60444957 704c880b 704c873e -204002fa +204002fe 58000007 e7e20005 6fe20639 e7e40005 6ff04953 e7f00005 -20200304 +20200308 2040000d da200009 d8200003 @@ -69,7 +69,7 @@ c006002b c0008008 c0004880 -2020070b +20200715 efea0006 67ea4528 efe40006 @@ -92,22 +92,22 @@ 20600000 eff00006 67f04c0a -204003fa +204003fe 6ff04c6c c4018000 704c880c 704c873e -204002fa +204002fe 58000004 e7e40005 6fe20639 e7e40005 6ff04c0a e7f00005 -20200304 +20200308 efea0006 67ea4c12 -204003fe +20400402 20348034 6fe24c17 247a0000 @@ -118,14 +118,14 @@ c4028000 704c8808 704c870c -204002fa +204002fe 58000000 e7e20005 6fe20639 e7e40005 6fea4c12 e7ea0005 -20200304 +20200308 20200040 da204140 2040604d @@ -195,9 +195,9 @@ 68420048 20407a08 6fe20048 -c2838707 +c2838711 c0188021 -c0060709 +c0060713 c0038030 c005800b 20204f6c @@ -264,7 +264,7 @@ 98467c00 24628000 2040493a -202006d3 +202006dd 00000000 00000000 00000000 @@ -388,14 +388,14 @@ 704c8a01 704c8808 704c8712 -204002fa +204002fe 18007e35 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -20200304 +20200308 00000000 00000000 00000000 @@ -449,14 +449,14 @@ 20200040 704c8808 704c8712 -204002fa +204002fe 18007e00 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -20200304 +20200308 00000000 00000000 00000000 @@ -519,7 +519,7 @@ 67e4003e 7855fc00 704c8a00 -20200705 +2020070f 00000000 00000000 00000000 @@ -610,7 +610,7 @@ 24348023 18808fff 704c8a02 -20200705 +2020070f 00000000 00000000 00000000 @@ -669,7 +669,7 @@ 67e2004b 6fe20030 c283b413 -20400235 +20400239 202033ca 00000000 00000000 @@ -784,12 +784,12 @@ 204063ce 704c8807 704c8736 -204002fa +204002fe 58000000 e7e20005 6fec0040 e7ec0005 -20200304 +20200308 202052d6 700b960f 204052da @@ -853,8 +853,8 @@ 67e24537 18427200 6fe2461c -205a043c -245a043e +205a0440 +245a0442 604c4538 d8c04500 2040713a @@ -970,15 +970,15 @@ 24558038 20407988 2040001c -580005a6 +580005aa 67e4431d 58000142 67e4431f 58000141 67e4431b -58000688 +58000692 67e44315 -5800068b +58000695 67e44313 2055802e 24358020 @@ -1000,7 +1000,7 @@ 20403f28 58001171 67e44f5d -20200703 +2020070d 20400143 700f0d6a 20203f28 @@ -1026,10 +1026,10 @@ 793f801c 704c8801 704c8701 -204002fa +204002fe 58000000 e7e20005 -20200304 +20200308 00000000 00000000 00000000 @@ -1092,7 +1092,7 @@ 20400015 704c880a 704c8704 -204002fa +204002fe 6fec0040 e7ec0005 6fe60146 @@ -1101,7 +1101,7 @@ e7e20005 6fec0040 67ec4f37 -20200304 +20200308 6fec4f37 684c0040 98467c00 @@ -1155,7 +1155,7 @@ c0060009 c00b8010 c0058013 -c0198701 +c019870b c017001d c0208025 20204ba4 @@ -1178,7 +1178,7 @@ 6fe20030 c3830000 20404d80 -20200235 +20200239 6fe24170 1fe0fe01 68420739 @@ -1195,12 +1195,12 @@ 20600000 704c8803 704c871b -204002fa +204002fe 6fe20046 e7e40005 6fe24170 e7e20005 -20200304 +20200308 00000000 00000000 00000000 @@ -1225,9 +1225,9 @@ c0138033 c014003b c0038037 -c00405f7 +c00405fb c00101b1 -202006ff +20200709 6fe20739 67e206a3 c0088012 @@ -1238,14 +1238,14 @@ 20200016 704c8804 704c8708 -204002fa +204002fe 58000000 e7e20005 68420046 e0440005 58000001 e7e20005 -20200304 +20200308 6fe20739 67e206a3 c0058024 @@ -1261,9 +1261,9 @@ c1830000 60420055 700b9b01 -204005fb +20400605 6fe24c97 -203a023b +203a023f 20600000 20404dc7 6ff00739 @@ -1286,14 +1286,14 @@ dfe04d5c 67e40f12 6a240f12 -20400538 +2040053c 207a0000 6a240f12 20403fa5 -20400568 +2040056c 20200007 1fe22400 -20200568 +2020056c 00000000 00000000 00000000 @@ -1344,12 +1344,12 @@ 00000000 20200040 68464dd8 -2040025b -20400258 +2040025f +2040025c c0008007 c0010012 20202baf -20400249 +2040024d 67e44c94 d84003ff 98410400 @@ -1357,13 +1357,13 @@ 1feb7e00 1fecfe00 67e24c1a -20400258 +2040025c 67e24c1b -202006fd -20400249 +20200707 +2040024d 67e242a8 20400034 -20400249 +2040024d 67e40f12 20402284 24628000 @@ -1372,7 +1372,7 @@ c280002c 6fe40f12 67e44db1 -2040057c +20400580 205a723a 6fe40f12 1fe22200 @@ -1384,7 +1384,7 @@ e0220005 6fe40f12 1fe27200 -2040025d +20400261 2020712d 6fe40f12 2040003a @@ -1400,7 +1400,7 @@ c1008000 18000202 20600000 -2040058a +2040058e 203a729b 2020729d 00000000 @@ -1488,7 +1488,7 @@ 2020000a 20404c78 20400019 -20200602 +2020060c 20400019 20404c78 20404c7c @@ -1497,12 +1497,12 @@ 20600000 704c8809 704c8732 -204002fa +204002fe 6fec0040 e7ec0005 6fe647d3 e7e60005 -20200304 +20200308 00000000 00000000 00000000 @@ -1539,14 +1539,14 @@ c4010000 704c880a 704c873e -204002fa +204002fe 58000003 e7e40005 6fe20639 e7e40005 6fec4530 e7ec0005 -20200304 +20200308 00000000 00000000 00000000 @@ -1603,12 +1603,12 @@ c4000000 704c8813 704c873e -204002fa +204002fe 58000001 e7e40005 6fe20639 e7e40005 -204002bb +204002bf e0420005 6fe24626 e7e20005 @@ -1622,7 +1622,7 @@ 6fe2065b e7e20005 6fe20639 -20200304 +20200308 00000000 00000000 00000000 @@ -1665,7 +1665,7 @@ 20200040 704c8817 704c8718 -204002fa +204002fe 6fec0040 e7ec0005 d8c04297 @@ -1673,7 +1673,7 @@ 2040712d 18007e00 e7e20005 -20200304 +20200308 00000000 00000000 00000000 @@ -1800,7 +1800,7 @@ 20402289 20628000 204001a2 -204002fa +204002fe 58000001 e7e20005 6fec0149 @@ -1821,7 +1821,7 @@ 6fe80132 9c467e00 e7e40005 -20200304 +20200308 6fe60146 e7e60005 6fe80132 @@ -1832,7 +1832,7 @@ e7e20005 6fe24c9c c001002b -20200304 +20200308 6fe64d2e 1fe20c00 efe20006 @@ -1843,7 +1843,7 @@ 2040712d 184672f0 20407100 -20200304 +20200308 00000000 00000000 00000000 @@ -1858,18 +1858,18 @@ 6fe24c18 c0090005 c011001a -2020028e +20200292 6fe24ded -203a0290 -20400252 +203a0294 +20400256 67ee4e0a 2040000e 6fe24ded 1fe0ffff 67e24ded -20200292 -20400269 -243a0290 +20200296 +2040026d +243a0294 1a420a00 1a40a407 1a420c00 @@ -1880,16 +1880,16 @@ 18a08bf9 e7ee0005 20600000 -20400249 +2040024d 67e4495f -20400249 +2040024d 67e44961 20400024 df200003 -20400296 +2040029a 6fe20639 e7e40005 -20200304 +20200308 da400014 da200009 d8200003 @@ -1921,7 +1921,7 @@ 20200040 704c8806 704c8714 -204002fa +204002fe 6fe24c89 e7e20005 6fe20046 @@ -1934,7 +1934,7 @@ 2020000f 58000000 e7e40005 -20200304 +20200308 00000000 00000000 00000000 @@ -1985,7 +1985,7 @@ 20200040 704c8804 704c8705 -204002fa +204002fe 58000000 e7e20005 6fe24e18 @@ -1995,7 +1995,7 @@ 6fe2004c 793ffe05 67e2004c -20200304 +20200308 00000000 00000000 00000000 @@ -2049,12 +2049,12 @@ 20200040 704c8807 704c8720 -204002fa +204002fe 6fec0040 e7ec0005 6fe24ca0 e7e20005 -20200304 +20200308 00000000 00000000 00000000 @@ -2113,7 +2113,7 @@ 20200040 704c880b 704c8703 -204002fa +204002fe 6fe24c8a e7e20005 6fe20046 @@ -2128,7 +2128,7 @@ 7920fe00 e7e20005 6fe20046 -20200304 +20200308 00000000 00000000 00000000 @@ -2184,33 +2184,33 @@ c0030011 c004000e c01f8012 -2020028e -202006f3 -202006f5 -202006f7 -202006f9 -202006fb -2020028e -2020028e +20200292 +202006fd +202006ff +20200701 +20200703 +20200705 +20200292 +20200292 6fe24c18 c0008019 c00b801d c010001f c0518024 c0300034 -2020028e -2040024f -67ec4c8d -20400265 20200292 +20400253 +67ec4c8d +20400269 +20200296 704e193f -20200292 +20200296 df200002 -2040029b +2040029f 58000000 e7e40005 -20200304 -20400249 +20200308 +2040024d 68420046 98467c00 2022802b @@ -2219,18 +2219,18 @@ 24628000 604242a8 df200003 -2040029b +2040029f 6fe242a8 e7e40005 6fe20018 2040018d e7e20005 -20200304 +20200308 df200002 -2040029b +2040029f 6fe44f35 e7e40005 -20200304 +20200308 00000000 00000000 00000000 @@ -2247,14 +2247,14 @@ 67e40f12 20200008 6a240f12 -20400538 +2040053c 207a0000 6a240f12 20403fa5 -20400568 +2040056c 20200008 1fe22400 -20200568 +2020056c 00000000 00000000 00000000 @@ -2304,7 +2304,7 @@ 00000000 20200040 6fe24f34 -243a06f1 +243a06fb 704f3401 20400023 6f224cd2 @@ -2370,7 +2370,7 @@ 6fe24c18 c005001a c007001d -c00983bf +c00983c3 c00b000f c00b8019 c00c0019 @@ -2380,9 +2380,9 @@ c0078020 c0080025 c0088029 -202006ef -20400249 -204002a2 +202006f9 +2040024d +204002a6 da200009 d8200003 204049ab @@ -2391,29 +2391,29 @@ 6ff04ddf e7f00005 20600000 -2020028e -20400258 -67e244de 20200292 +2040025c +67e244de +20200296 7044d900 704c8b00 -20200292 +20200296 df200002 -20400296 +2040029a 58000004 e7e20005 -20200304 +20200308 704ded00 704e0a00 704dee00 -20200292 +20200296 68424ded 18467c04 -20228290 -20400252 +20228294 +20400256 67ee4e0a 20400030 -20200292 +20200296 6fe24ded d8a04dee 1feffe07 @@ -2437,63 +2437,63 @@ c0058012 c0060025 c0068029 -202006ed -20400258 +202006f7 +2040025c 67e244df 1fe27200 -20400246 -20200292 -20400258 +2040024a +20200296 +2040025c 67e244ff 1fe27200 -20400246 -20200292 +2040024a +20200296 6fe244d9 -243a0290 -20400258 +243a0294 +2040025c 67e24636 -20400249 +2040024d 67e444da -20400249 +2040024d 67e444dc -20400258 +2040025c 67e24637 -20400258 +2040025c 67e24e11 6fe444da 684444dc 98467c00 -24228292 +24228296 1fe3fe00 67e444da -20200292 -20400258 +20200296 +2040025c 67e244d9 -20400258 -20200292 -20400249 +2040025c +20200296 +2040024d 67e444da -20400249 +2040024d 67e444dc -20400258 +2040025c 67e24e11 98267c00 -20428260 -20400258 +20428264 +2040025c 67e24626 -2040024f +20400253 67ec4627 -20400258 +2040025c 67e2462d -20400249 +2040024d 1febfe00 67e444d7 -20400249 -20400249 +2040024d +2040024d 67e44632 -20400249 +2040024d 67e44634 -20200262 +20200266 20200040 6fe24c18 c001800a @@ -2503,8 +2503,8 @@ c02b0029 c036002d c0368032 -2020028e -20400292 +20200292 +20400296 5800003f 67f04c6c 5fffffff @@ -2514,39 +2514,39 @@ 67e244de 67e244d9 67e24133 -20200265 +20200269 204001e1 -20400249 +2040024d 67e40051 df200003 -20400296 +2040029a 6fe20046 e7e40005 7042a71d -20200304 -20400258 +20200308 +2040025c 67e24c98 df200064 d8a00183 -20400246 -20200292 +2040024a +20200296 df200002 -20400296 +2040029a 6fe24c97 e7e20005 -20200304 -20400258 +20200308 +2040025c 67e24c97 -203a028c -20200292 +203a0290 +20200296 df200003 -20400296 +2040029a 6fe44de7 e7e40005 -20200304 -20400249 +20200308 +2040024d 67e44de7 -20200292 +20200296 00000000 00000000 00000000 @@ -2562,16 +2562,16 @@ 6fe24c18 c0158005 c0160015 -2020028e -2040024f +20200292 +20400253 67ec42a9 -2040024c +20400250 67e647ce df200007 -20400296 +2040029a 6fec0040 e7ec0005 -20400304 +20400308 6fe24c9f c0008012 7042a716 @@ -2579,14 +2579,14 @@ 204033e5 700b9b01 20600000 -2040024f +20400253 67ec42a9 2040001d df200007 -20400296 +2040029a 6fec0040 e7ec0005 -20200304 +20200308 700b950a 700b9701 20600000 @@ -2628,13 +2628,13 @@ c00e0018 c00e8020 c00d802b -202006eb +202006f5 704fa601 -2040024f +20400253 67ec42a9 -20400249 +2040024d 67e200b6 -20400249 +2040024d 9c40fe00 1fe17ffc 67e800b7 @@ -2645,101 +2645,101 @@ 20228016 704fa602 7042a703 -202002a2 +202002a6 6fe24c9b -c08102a6 -20400249 -203a02a6 -20400258 +c08102aa +2040024d +203a02aa +2040025c 67e206a7 7042a715 -202002a2 -20400249 +202002a6 +2040024d 67e242a8 20402284 -242282a6 +242282aa 1a208c01 efe20006 c2800029 -204002a2 +204002a6 20203420 -204002a2 +204002a6 202048f0 6fe24c9b -c08102a6 -20400249 +c08102aa +2040024d 67e242a8 -203a02a6 -204002a2 +203a02aa +204002a6 6ff04e1a 243a0035 7042a704 20600000 704c880b 704c870b -204002fa +204002fe 58000000 e7e20005 6fe20046 e7e40005 6ff04e1a e7f00005 -20200304 +20200308 00000000 20200040 6fe24c18 c0058009 c0060011 -c0068018 -c0070024 -c008802c -c0098030 -202006e9 -2040024f +c0068019 +c0070022 +c008802a +c009802e +202006f3 +20400253 67ec42a9 d8a04297 18007210 -20400246 +2040024a 70429301 7042a70b -20200027 -2040024f +20200025 +20400253 67ec42a9 7042a70c -20400027 +20400025 +20400605 6fe24c97 -203a023b +203a023f 20600000 -6fe24ff0 -1fe0fe01 -67e24ff0 -2040024f +20400253 67ec42a9 -20400258 +2040025c 67e247f1 98007200 d8a047f2 -20400246 +2040024a 7042a709 -20200027 -2040024f +20200025 +20400253 67ec42a9 7042a70a df200007 -20400296 +2040029a 6fec0040 e7ec0005 -20200304 -20400249 +20200308 +2040024d 67e242a8 7042a70d -202002a2 -20400249 +202002a6 +2040024d 67e242a8 -20400258 +2040025c 1fe0fe0e 67e242a7 -202002a2 +202002a6 +00000000 +00000000 00000000 00000000 00000000 @@ -2755,13 +2755,13 @@ c0030006 c004001c c005002f -202006e7 -20400249 +202006f1 +2040024d 67e242a8 -20400258 +2040025c 67e206a4 20402284 -242282a6 +242282aa 1a208c01 efe20006 c2800018 @@ -2769,16 +2769,16 @@ 6fe242a8 6842439b 98467c00 -242282a2 +242282a6 7042a711 6fe2439a 67e242a8 -202002a2 +202002a6 6fe206a4 67e20f12 20404894 -202002a2 -2040024f +202002a6 +20400253 67ec42a9 7042a71a 6fe24c9b @@ -2793,22 +2793,22 @@ 20200184 704c9602 df200007 -20400297 +2040029b 6fec42a9 e7ec0005 -20200304 +20200308 6fe24ca1 -c00002a6 -c00102a4 +c00002aa +c00102a8 6fe24c9b -c00102a4 +c00102a8 704ca102 -2040024f +20400253 67ec42a9 -20400258 +2040025c 67e24c8a 7042a708 -204002a2 +204002a6 20200184 00000000 00000000 @@ -2828,69 +2828,69 @@ c0230033 c0238034 c0288036 -202006e5 -20400249 +202006ef +2040024d 67e44153 -20400249 +2040024d 67e44151 -20200292 +20200296 df200005 -20400296 +2040029a 6fe4414f e7e40005 6fe4414d e7e40005 -20200304 -20400249 +20200308 +2040024d 67e4414f -20400249 +2040024d 67e4414d -20200292 +20200296 df200004 -20400296 +2040029a 6fe6414a e7e60005 -20200304 -2040024c +20200308 +20400250 67e6414a +20200296 +20200292 +2040025c 20200292 -2020028e -20400258 -2020028e df200002 -20400296 +2040029a 6fe24c9c e7e20005 -20200304 -20400258 +20200308 +2040025c 67e24c9c +20200296 +20200292 +2040025c 20200292 -2020028e -20400258 -2020028e df2000f2 -20400296 +2040029a 6fe24c98 e7e20005 d8c00183 df200064 2040713a -20200304 +20200308 00000000 00000000 20200040 6fe24c18 c0070005 c007800a -2020028e +20200292 df200003 -20400296 +2040029a 6fe44de9 e7e40005 -20200304 -20400249 +20200308 +2040024d 67e44de9 -20200292 +20200296 00000000 00000000 00000000 @@ -2949,60 +2949,60 @@ c0058022 c006002d c0068035 -202006e3 +202006ed 6fe44deb -c30102a4 +c30102a8 6fe44de9 -c30102a4 +c30102a8 6fe24c9b -c08102a6 -20400249 +c08102aa +2040024d 67e40253 -20400249 +2040024d 67e40255 -20400249 +2040024d 67e40257 58000040 67e4430b -20400249 +2040024d 67e4430d -20400249 +2040024d 67e4430f 7042a712 -202002a2 -20400249 +202002a6 +2040024d 67e40253 6fe20031 -c30302a4 +c30302a8 7042a713 -202002a2 +202002a6 6fe24c9b -c08102a6 +c08102aa 6fe44deb -c30002a4 +c30002a8 6fe44de9 -c30002a4 -2040024f +c30002a8 +20400253 67ec42a9 -20400258 +2040025c 7042a718 -202002a2 +202002a6 204001e1 df200005 -20400296 +2040029a 6fe20046 e7e40005 6fe44deb e7e40005 -20200304 +20200308 204001e1 -20400249 +2040024d 67e44deb df200003 -20400296 +2040029a 6fe20046 e7e40005 -20200304 +20200308 00000000 00000000 00000000 @@ -3013,44 +3013,44 @@ c0018010 c0028015 c003001a -202006e1 -20400255 +202006eb +20400259 67f04c6c -20200292 +20200296 df200004 -20400296 +2040029a 580400fb e7e60005 -20200304 +20200308 df200009 -20400296 +2040029a 6ff04ddf e7f00005 -20200304 +20200308 6fe244de -243a0290 -2040024f +243a0294 +20400253 67ec4c7a -20200292 +20200296 6fe244de -243a0290 -20400249 +243a0294 +2040024d 67e44617 -20400249 +2040024d 67e44619 -20400258 +2040025c 2040002d 6042461b -20400258 +2040025c 205a0035 245a0039 -20400258 -2040024f -20400258 +2040025c +20400253 +2040025c 67e24624 -20400258 +2040025c 67e24e11 -20200292 +20200296 d8400000 c1000000 d8400002 @@ -3078,30 +3078,30 @@ c002001e c002801e c0048019 -2020028e +20200292 df200009 -20400296 +2040029a 6ff04c24 e7f00005 -20200304 +20200308 df200041 -20400296 +2040029a d8c04c2c df200040 2040713a -20200304 +20200308 df200009 -20400296 +2040029a 6ff04138 e7f00005 -20200304 +20200308 df200007 -20400296 +2040029a 6fec4140 e7ec0005 -20200304 +20200308 df200008 -20400296 +2040029a 580002a8 e7e40005 5800003c @@ -3109,7 +3109,7 @@ 58000008 e7e40005 e7e40005 -20200304 +20200308 00000000 00000000 00000000 @@ -3144,11 +3144,11 @@ c00c8028 c00d002d c00d8030 -202006df -20400255 +202006e9 +20400259 67f04c1c -20200292 -2040025d +20200296 +20400261 d8a0468a df200042 2040713a @@ -3157,38 +3157,38 @@ d8400000 20400161 60424689 -20200292 +20200296 df2000f9 -20400296 +2040029a d8c0468a df200040 2040713c df200017 204070e4 -20200304 +20200308 df200003 -20400296 +2040029a 6fe44159 e7e40005 -20200304 -20400249 +20200308 +2040024d 67e44159 -20200292 +20200296 df200002 -20400296 +2040029a 6fe24133 e7e20005 -20200304 -20400258 +20200308 +2040025c 67e24133 -20200292 +20200296 df200005 -20400296 +2040029a 6fe44153 e7e40005 6fe44151 e7e40005 -20200304 +20200308 00000000 00000000 00000000 @@ -3204,11 +3204,11 @@ c0010017 c0028019 c0048025 -202006dd +202006e7 7920001c -2040024c +20400250 67e64147 -20400258 +2040025c d8400800 984ffe00 d840ffff @@ -3217,36 +3217,36 @@ 18427e00 18000e02 20407141 -20400258 +2040025c 67e24c99 67e24c9a -202002a2 +202002a6 7042a702 -20200292 -2040024f +20200296 +20400253 67ec42a9 -20400249 +2040024d 67e40251 -20400249 +2040024d 67e200b6 -20400249 -20400258 +2040024d +2040025c 67e24ad0 704c9b01 7042a705 -202002a2 +202002a6 6fe24ca1 -c00002a6 -c00102a4 +c00002aa +c00102a8 6fe24c9b -c00102a4 -2040024f +c00102a8 +20400253 67ec42a9 7042a707 -20400258 -c00082a2 +2040025c +c00082a6 7042a719 -204002a2 +204002a6 20204d51 00000000 00000000