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 4739) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (working copy) @@ -1325,8 +1325,9 @@ rtneq lemode_master arg HCI_ROLE_SLAVE,temp rtn - - +p_le_get_master_role: + arg HCI_ROLE_MASTER,temp + rtn le_scan_check_event_type: fetch 1,mem_le_rxbuf 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 4672) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (working copy) @@ -1036,8 +1036,8 @@ // jam BLOCK_MAX_NUM_NEW,mem_l2cap_rx_malloc_num // setarg L2CAP_BIG_BUFF_LENTH // store 2,mem_l2cap_rx_max_lenth + call z_init_all_queue - // init the big buffer queue fetchr loopcnt,1,mem_alloc_big_total_size fetchr regb,2,mem_param_alloc_big_buffer_start_address @@ -1062,7 +1062,6 @@ setarg mem_alloc_normal_block store 2,mem_temp1 call z_queue_init_loop - // store the big block ptr to list fetch 1,mem_alloc_normal_total_size mul32 pdata,3,loopcnt @@ -1073,6 +1072,7 @@ z_queue_init_loop: fetchr rega,2,mem_temp1 call queue_insert + fetch 2,mem_temp iadd regb,regb loop z_queue_init_loop @@ -1523,10 +1523,9 @@ istore 1,contw fetch 1,mem_le_conn_handle istore 2,contw //connection handle - arg HCI_ROLE_MASTER,temp + call p_le_get_role fetch 1,mem_le_conn_status - sub pdata,2,null - call p_le_get_role,zero + ncall p_le_get_master_role,blank istoret 1,contw //role fetch 1,mem_le_hci_conn_peer_addr_type istore 1,contw //peer address type @@ -2496,6 +2495,8 @@ nrtn zero call parse_connect_req+5 //arg SLAVE_CONNECTION_HANDLE,temp + fetch 6,mem_le_plap + store 6,mem_le_conn_peer_addr //fetch 2,mem_le_init_superto //store 2,mem_le_superto branch z_hci_send_event_le_connection_complete 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 4739) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (working copy) @@ -75,59 +75,59 @@ c01d01a2 c01f0253 c0208223 -c0220773 -c02a0715 -c02c0677 -c02e0693 -c02e8699 -c0350775 -c0358777 +c0220775 +c02a0717 +c02c0679 +c02e0695 +c02e869b +c0350777 +c0358779 c036021a c04080f5 c0428113 c04300cf c04f00d3 c0500183 -c05206fe -c05406ee -c05c8779 -c05d05fe +c0520700 +c05406f0 +c05c877b +c05d0600 c0700177 20202baf -c003877b +c003877d c006027b -c009077d -c00985a5 -c00a0584 -c0118598 -c012869b -c013069f -c01386a1 -c01406a3 -c01486a4 -c01506a9 -c01d83ff -c01f0408 -c01f83ab -c020850d -c02106df -c02404b4 -c0258511 -c0278490 -c029061d -c02c077f -c02d8636 -c02e8781 -c0300640 -c032063c -c03706bf -c0380783 -c0388785 +c009077f +c00985a7 +c00a0586 +c011859a +c012869d +c01306a1 +c01386a3 +c01406a5 +c01486a6 +c01506ab +c01d8401 +c01f040a +c01f83ad +c020850f +c02106e1 +c02404b6 +c0258513 +c0278492 +c029061f +c02c0781 +c02d8638 +c02e8783 +c0300642 +c032063e +c03706c1 +c0380785 +c0388787 c03a0187 -c04906aa -c052864f -c053064f -c075075b +c04906ac +c0528651 +c0530651 +c075075d c1590000 c16a0000 20202baf @@ -146,7 +146,7 @@ 20407148 7d3a001c 243a209e -20200787 +20200789 6fe24133 c4008000 6fe20030 @@ -184,13 +184,13 @@ 6fec04dd 67ec0633 6fe24c8b -c00083ce -20400312 +c00083d0 +20400314 204046d3 243680c1 6fe204dc c00300c1 -20400312 +20400314 6fe44e32 243a00af 20600000 @@ -356,12 +356,12 @@ 9841fe00 67e24bd7 20600000 -20400722 +20400724 700f0d9f 20203f28 6fe24bce c302016c -20400727 +20400729 20400178 700f0d6a 20203f28 @@ -385,7 +385,7 @@ 20400145 70800520 20200145 -20400719 +2040071b 2040017c d85fffff 20202cbe @@ -393,8 +393,8 @@ 204052b0 6fe20048 207a0000 -20200789 -2040078b +2020078b +2040078d 2020026a 6fe2004b 79207e03 @@ -438,24 +438,24 @@ 207a0000 6fe2007c 247a0000 -2020078d +2020078f 204002d7 704c8a02 -2020078f +20200791 704c9b02 704c8a00 202001c1 704c9b00 704ca100 704c9f00 -20200791 +20200793 6fe24c9a -203a0793 +203a0795 6fe24c99 -203a0787 +203a0789 1fe0ffff 67e24c99 -20200793 +20200795 6fe20018 1ff18400 184f840a @@ -510,7 +510,7 @@ 20204db7 704c88ff 704c8707 -20400342 +20400344 58000000 e7e20005 6fec42a9 @@ -520,7 +520,7 @@ 2040712d df2000b8 204070e4 -2040034c +2040034e 6fe24fa6 704fa600 70005300 @@ -555,7 +555,7 @@ 20600000 2040248f 704c8a00 -20200795 +20200797 204021ec 24740000 78547c00 @@ -571,7 +571,7 @@ 67e84169 78387c00 7834fc00 -20200797 +20200799 20402b6f d8200010 20402321 @@ -592,7 +592,7 @@ 20402940 78347c00 704c8a01 -20200795 +20200797 70011600 70015000 204024d2 @@ -615,21 +615,21 @@ 67e2004b 204021e1 c6108000 -2020078b +2020078d 704c8803 704c8706 -20400342 +20400344 18007e00 e7e20005 6fe20046 e7e40005 -2020034c +2020034e 704c8806 704c8717 -20400342 +20400344 6fec0040 e7ec0005 -2020034c +2020034e 704c8806 704c8716 20200274 @@ -697,12 +697,12 @@ 18007e06 67e243e2 20203f1a -20400799 +2040079b 6a464dd8 202002a8 204002c1 6a464dd8 -202005c5 +202005c7 2040029a df200003 d8a04dd8 @@ -713,7 +713,7 @@ 20400297 6fe24dd7 c00002be -204005e6 +204005e8 207a0000 204002c1 6fe24dd7 @@ -728,7 +728,7 @@ 704c9600 df200001 204002dc -2020034c +2020034e 704c9600 204002e0 6fe24c96 @@ -737,7 +737,7 @@ 704c870e 1f20fe03 67e24c88 -20400342 +20400344 6fe64c93 e7e60005 20600000 @@ -748,30 +748,32 @@ 700f1202 704c870f 704c8804 -20400342 +20400344 6fe20f12 e7e20005 6fe64c93 e7e60005 -2020034c +2020034e 6ff04c6c c4020000 6fe20639 67e24e18 704fed00 -2020079b +2020079d 6fe20046 67e24e18 793f8021 70004600 704ca100 704c9b00 -2020079b +2020079d 6fe20624 d8400000 c1018000 d8400001 20600000 +d8400000 +20600000 6fe204db 1fe17e0f d8400000 @@ -793,16 +795,16 @@ 1fe0fe03 67e44db1 da204cca -20400595 +20400597 1fe67c02 20610000 704c873e -20400342 +20400344 58000002 e7e20005 58000001 e7e20005 -20400306 +20400308 e0420005 204047d5 1a227e00 @@ -816,30 +818,30 @@ 2040712d 204001ca e7e20005 -2020034c +2020034e 6fe20046 67e242a8 -20200338 +2020033a 6fe20639 67e242a8 704c8805 704c8713 -20400342 +20400344 58000001 e7e20005 6fe242a8 e7e40005 58000001 e7e40005 -2020034c +2020034e 6fe24c88 1fe0fe03 67e44db1 -20400349 +2040034b 6fe64c86 e7e60005 20600000 -204005a2 +204005a4 1a420a00 20600000 da204d84 @@ -860,9 +862,9 @@ 20600000 6fe2063a c3828000 -2040037e -20400392 -203a034f +20400380 +20400394 +203a0351 efe20006 ea220006 9a267e00 @@ -878,8 +880,8 @@ 18427200 2040712d 2040480e -20400351 -20400392 +20400353 +20400394 efe20006 1fe22200 18c23000 @@ -894,15 +896,15 @@ 202049f1 6fe24683 203a480c -20400388 +2040038a c6130000 da204d5c -20400595 +20400597 c000480c c000c80c 79200026 20600000 -20400392 +20400394 203a480c efe20006 e8420006 @@ -914,7 +916,7 @@ 20600000 da204d5c 20203fa1 -20400396 +20400398 20202739 204045bd 204045cd @@ -940,11 +942,11 @@ 20407a4f 204045aa 20404766 -2040035c -20400394 -2040056b +2040035e +20400396 +2040056d 20404594 -2034057a +2034057c 2020458a 6fe20623 79207e05 @@ -970,8 +972,8 @@ e7f20005 6fe40643 e7e40005 -20400467 -2020079d +20400469 +2020079f 6fe24626 68424fee 98467c00 @@ -989,16 +991,16 @@ 204047d2 704fed02 704c8a00 -2020078f -204005f2 +20200791 +204005f4 67e64e15 58000000 67e64d2e 6fe20046 67e242a8 704ddb05 -202003ef -204005f8 +202003f1 +204005fa 67e64e15 58000000 67e64d31 @@ -1033,7 +1035,7 @@ 204045b4 2040315c 6fe20624 -c001844f +c0018451 20204579 20400286 67e242a8 @@ -1045,17 +1047,17 @@ 67e44632 20400286 67e44634 -20400469 +2040046b 202002e7 -20400396 -2020057e +20400398 +20200580 6fe24fea -c0000437 -c000843a -c001843c -c002043e -c0030438 -c0050423 +c0000439 +c000843c +c001843e +c0020440 +c003043a +c0050425 20600000 6fe20623 79207e06 @@ -1103,39 +1105,39 @@ 20600000 7834fc00 204048fd -202106eb -2040041b -2040035c +202106ed +2040041d +2040035e 204045fc 7856fc00 -20400419 -24368484 +2040041b +24368486 20407a4f -2040047e +20400480 20404766 -2040056b +2040056d 20404594 -2034046b -20400461 +2034046d +20400463 7854fc00 20202739 6fe20623 c3830000 6fe24fe7 207a0000 -c00983b4 +c00983b6 20202baf 704fe700 20600000 704fe713 20600000 -2040035c -20400471 -78377c00 -2040057e -20368458 -2020045e +2040035e 20400473 +78377c00 +20400580 +2036845a +20200460 +20400475 20202739 204045bd 204045cd @@ -1144,8 +1146,8 @@ 782efc00 78307c00 7850fc00 -2040047c -2020039e +2040047e +202003a0 37c18200 20600000 6fe20623 @@ -1155,13 +1157,13 @@ 704fea01 20600000 6fe20623 -c281845e +c2818460 6fe24e17 1fe67c06 -242106eb +242106ed 1fe0fe01 67e24e17 -2020045e +20200460 684c4639 20600000 684c4c7a @@ -1179,8 +1181,8 @@ 67e24537 18427200 6fe2461c -205a048c -245a048e +205a048e +245a0490 604c4538 d8c044e0 2040712d @@ -1193,7 +1195,7 @@ 67e40124 24610000 2040473e -2020079d +2020079f 6a280f1e 6a480f22 6a660f26 @@ -1202,7 +1204,7 @@ 62480f22 62660f26 20600000 -204004b0 +204004b2 67244fe8 1a208c01 efe20006 @@ -1211,10 +1213,10 @@ efe40005 1fe0fe01 e7e40005 -204004e0 -204004cf +204004e2 +204004d1 20404618 -204004ac +204004ae 6f244fe8 20600000 1a208c31 @@ -1224,7 +1226,7 @@ c3004628 18408401 1fe37e00 -c20004c7 +c20004c9 1840ffff 1a208a22 e7e20005 @@ -1245,7 +1247,7 @@ 6fea4528 1a208a31 e7ea0005 -202004c3 +202004c5 1a208c00 efe20006 c4028000 @@ -1257,7 +1259,7 @@ 6fe40643 98467e00 1fe67c01 -202284f6 +202284f8 20600000 1a208c1a efe40006 @@ -1266,7 +1268,7 @@ 98467e00 d840ffff 98467c00 -202284f6 +202284f8 20600000 efe20011 793ffe05 @@ -1293,7 +1295,7 @@ 20600000 20404972 2040475a -204004a3 +204004a5 20202940 78287c00 6fe40631 @@ -1308,15 +1310,15 @@ 78507c00 19623600 37c18400 -20370521 +20370523 1b420400 604c00a4 242c2739 -20370528 +2037052a dd2001e0 1c225000 6fe20623 -c3018528 +c301852a 2055ac9c 20402abc 7823fc00 @@ -1334,36 +1336,36 @@ 67e204dc 1fe27200 67e2068c -203a0552 +203a0554 6fe204db 1fe17e03 -c0018547 -c5078549 +c0018549 +c507854b da204cca -20400595 -c0008549 -204005ee -203a0549 -204005f8 +20400597 +c000854b +204005f0 +203a054b +204005fa 18c20a00 6fe404db e7e40005 -2020054e +20200550 d8a004dd -2020054e +20200550 09800008 19897e00 -c2000549 +c200054b 78367c00 -20200552 +20200554 09800008 19897e00 e7e20005 -c200054e +c2000550 09800018 78287c00 db600664 -20360559 +2036055b 1fef7e00 1ff17e00 e7e60005 @@ -1371,7 +1373,7 @@ 20232739 7836fc00 6fe242b5 -243a0561 +243a0563 6fe20017 1fe0a200 20402a7b @@ -1393,15 +1395,15 @@ 6fe204db 1fe17e03 c001c866 -204005f8 -20400563 +204005fa +20400565 6fe2068c 207a0000 6fe2068d c001c866 -202003e8 +202003ea 78377c00 -2040057e +20400580 2036c582 2020458a 68420017 @@ -1409,7 +1411,7 @@ 20402a23 78287c00 d9601388 -20200516 +20200518 1a208409 efe20002 203a2baf @@ -1434,13 +1436,13 @@ 6fe204d5 c1018000 20204146 -204005b7 +204005b9 da204d34 20203f94 da204d34 20403fa5 -202005c5 -204005b7 +202005c7 +204005b9 da204d84 20203f94 1a20fe04 @@ -1461,57 +1463,57 @@ 1a420c00 1a427e00 20600000 -204005d9 +204005db 203a2baf 6fe44dd1 1fe0fff6 68444db1 98467c00 -202105c0 +202105c2 da204cca 20203fa5 da204ca2 -20400595 -203a05be +20400597 +203a05c0 da204ca2 20203fa5 -204005d1 +204005d3 da204ca2 -203a05ca +203a05cc da204cca 20203f94 -204005ce +204005d0 203a2baf da204ca2 20203f94 6f224caa d8c04cf2 -202005d3 +202005d5 6f224cd2 d8c04d10 efe60006 9a467c00 -202285d7 -c20005d3 +202285d9 +c20005d5 1f227e00 20600000 6fe44dd1 1fe0fff6 68444db1 98467c00 -202105e0 +202105e2 da204cca -20200595 +20200597 da204ca2 -20400595 +20400597 247a0000 -202005de +202005e0 6fe44dd5 -202005e7 +202005e9 58000010 67e44db1 62280f1e -204005d9 +204005db 6a280f1e 20600000 da204cca @@ -1519,16 +1521,16 @@ 6fe44d2e 247a0000 da204cca -20200595 +20200597 6fe64d2e 243a7111 -204005ec +204005ee 1a427e00 67e64d2e 20207111 6fe64d31 243a7111 -204005ec +204005ee 1a427e00 67e64d31 20207111 @@ -1538,11 +1540,11 @@ 1fe22600 20203190 1a627e00 -c00a8606 +c00a8608 20203168 704c8c00 704c1700 -2040079f +204007a1 204002f4 202031c3 6842063a @@ -1560,11 +1562,11 @@ 6fe245b5 c0014794 6fe21002 -c00106eb +c00106ed c002c790 20600000 20404906 -2040060b +2040060d 6fe204db 2feffe04 79208027 @@ -1573,9 +1575,9 @@ 2feffe02 7920800f 6fe204dc -203a062f +203a0631 6fe20623 -c302062f +c3020631 c6078000 20406246 204061b6 @@ -1593,13 +1595,13 @@ d8e00001 20407148 247a0000 -202007a1 -2040064c +202007a3 +2040064e 18227e00 c1018000 -20200336 +20200338 62244db1 -20400649 +2040064b 1a420a00 6fe44db1 e7e20005 @@ -1607,16 +1609,16 @@ e7e20005 e0220005 20600000 -204005b7 +204005b9 da204d5c 20203f94 da204d5c 20403fa5 -202005c5 +202005c7 6fe20b97 -243a07a3 +243a07a5 6fe20b98 -243a07a3 +243a07a5 20600000 6fe2004b 79207e02 @@ -1637,15 +1639,15 @@ 1a208c01 efe20006 c4008000 -2040066a +2040066c 704c9f01 20600000 704c8806 704c8731 -20400342 +20400344 6fec0040 e7ec0005 -2020034c +2020034e 6fe20151 1fe17e03 c080a68a @@ -1655,11 +1657,11 @@ 2020268a 1f227e00 67e4012c -203a0670 +203a0672 9ea67c00 20212729 18017e01 -243a0682 +243a0684 6fe20151 1fe17e03 c001a649 @@ -1670,11 +1672,11 @@ 98467c00 20212729 da204cca -20400595 +20400597 c000a739 -204005ee +204005f0 203a2739 -204005f2 +204005f4 18c20a00 6fe20151 e7e20005 @@ -1687,24 +1689,24 @@ c58026ba 793f8000 20600000 -204003e0 +204003e2 202026dd 62244db1 -2040059c +2040059e 6a244db1 20600000 da204d34 20203fa1 -2040059f -20200333 -2020059f -204005e4 +204005a1 +20200335 +202005a1 +204005e6 203a729b 2020729d da204d34 -20200595 +20200597 20202baf -204006a7 +204006a9 207a0000 6fe2004b c3830000 @@ -1717,7 +1719,7 @@ 18c27e00 67e4013c 6fe4442c -203a06b9 +203a06bb 20205b2e 6fe40099 203a2baf @@ -1728,7 +1730,7 @@ 70429300 20204b77 67e40fb7 -202006c3 +202006c5 68440fb7 18518400 6fe44881 @@ -1747,7 +1749,7 @@ 67e40241 58004e34 67e4023f -2040070e +20400710 204057e8 6fe280a0 67e20124 @@ -1769,36 +1771,36 @@ 704c8b00 700f0d15 20206b2e -204006e0 +204006e2 7854fc00 20600000 6fe24040 c3800000 c3818000 6fe247cd -203a06f5 +203a06f7 6fe24724 207a0000 20202d53 6fe206ab 67e24bef 704bf000 -20400719 -202007a5 +2040071b +202007a7 7043dd01 20403f41 -202007a5 +202007a7 6fe20fd6 -c055070d +c055070f 6fe24131 207a0000 -204006a7 +204006a9 247a0000 da204d5c -20400595 +20400597 247a0000 da204cca -20400595 +20400597 68424caa 98467c00 24628000 @@ -1810,7 +1812,7 @@ 207a0000 6fe24f64 c1a98000 -20200710 +20200712 18227e00 c003a739 c0032739 @@ -1828,7 +1830,7 @@ 68444bd7 20407a08 6fe84bd7 -20200756 +20200758 da201701 68444bd7 20407a08 @@ -1839,41 +1841,41 @@ 79207e15 67e84bd7 df200032 -2040073e +20400740 6fe84bd7 793ffe15 -20400756 +20400758 6fe84bd7 793ffe14 -20400756 +20400758 200004b0 6fe84bd7 793ffe16 -20400756 +20400758 200004b0 20600000 6fe84bd7 793ffe15 -20400756 +20400758 6fe84bd7 79207e15 -20400756 -c200073e +20400758 +c2000740 20600000 da201702 68444bd7 20407a08 6fe84bd7 79207e16 -20400756 +20400758 200004b0 6fe84bd7 79207e14 -20400756 +20400758 200004b0 6fe84bd7 79207e15 -20400756 +20400758 200004b0 20600000 67e84bd7 @@ -1888,14 +1890,14 @@ 20406b2b 18427e00 207a0000 -c04c0765 +c04c0767 67e20fba -202007a7 +202007a9 20405875 20001770 68448352 18427e00 -205a076e +205a0770 60444feb 20405882 700f0d9e @@ -1904,104 +1906,104 @@ 68448352 20600000 2055802d -20200779 +2020077b 580002f0 -202006c1 +202006c3 580002b0 -202006c1 +202006c3 580002c0 -202006c1 +202006c3 58000250 -202006c1 +202006c3 58000260 -202006c1 +202006c3 580000f0 -202006c1 +202006c3 58000330 -202006c1 +202006c3 58000300 -202006c1 +202006c3 58000200 -202006c1 +202006c3 580001c0 -202006c1 +202006c3 58000240 -202006c1 +202006c3 58000310 -202006c1 +202006c3 58000190 -202006c1 +202006c3 580002a0 -202006c1 +202006c3 580001a0 -202006c1 +202006c3 58000120 -202006c1 +202006c3 58000170 -202006c1 +202006c3 580002d0 -202006c1 +202006c3 580002e0 -202006c1 +202006c3 580001e0 -202006c1 +202006c3 58000140 -202006c1 +202006c3 580001b0 -202006c1 +202006c3 580001f0 -202006c1 +202006c3 58000270 -202006c1 +202006c3 58000280 -202006c1 +202006c3 58000290 -202006c1 +202006c3 58000230 -202006c1 +202006c3 58000080 -202006c1 +202006c3 58000070 -202006c1 +202006c3 580000d0 -202006c1 +202006c3 58000060 -202006c1 +202006c3 580000c0 -202006c1 +202006c3 58000090 -202006c1 +202006c3 580000a0 -202006c1 +202006c3 580000b0 -202006c1 +202006c3 580000e0 -202006c1 +202006c3 58000160 -202006c1 +202006c3 58000100 -202006c1 +202006c3 58000010 -202006c1 +202006c3 58000020 -202006c1 +202006c3 58000030 -202006c1 +202006c3 58000040 -202006c1 +202006c3 58000050 -202006c1 +202006c3 58000110 -202006c1 +202006c3 58000210 -202006c1 +202006c3 58000220 -202006c1 +202006c3 58000150 -202006c1 +202006c3 58000180 -202006c1 +202006c3 58000320 -202006c1 +202006c3 58000340 -202006c1 +202006c3 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 4739) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (working copy) @@ -23,14 +23,14 @@ 60444957 704c880b 704c873e -20400342 +20400344 58000007 e7e20005 6fe20639 e7e40005 6ff04953 e7f00005 -2020034c +2020034e 2040000d da200009 d8200003 @@ -69,7 +69,7 @@ c006002b c0008008 c0004880 -202007d5 +202007d7 efea0006 67ea4528 efe40006 @@ -92,22 +92,22 @@ 20600000 eff00006 67f04c0a -20400447 +20400449 6ff04c6c c4018000 704c880c 704c873e -20400342 +20400344 58000004 e7e40005 6fe20639 e7e40005 6ff04c0a e7f00005 -2020034c +2020034e efea0006 67ea4c12 -2040044b +2040044d 20348034 6fe24c17 247a0000 @@ -118,14 +118,14 @@ c4028000 704c8808 704c870c -20400342 +20400344 58000000 e7e20005 6fe20639 e7e40005 6fea4c12 e7ea0005 -2020034c +2020034e 20200040 da204140 2040604d @@ -195,9 +195,9 @@ 68420048 20407a08 6fe20048 -c28387d1 +c28387d3 c0188021 -c00607d3 +c00607d5 c0038030 c005800b 20204f6c @@ -264,9 +264,9 @@ 98467c00 24628000 2040493a -2020078f -00000000 -00000000 +6fec0633 +67ec4627 +20200791 00000000 00000000 00000000 @@ -388,14 +388,14 @@ 704c8a01 704c8808 704c8712 -20400342 +20400344 18007e35 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -2020034c +2020034e 00000000 00000000 00000000 @@ -449,14 +449,14 @@ 20200040 704c8808 704c8712 -20400342 +20400344 18007e00 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -2020034c +2020034e 00000000 00000000 00000000 @@ -519,7 +519,7 @@ 67e4003e 7855fc00 704c8a00 -202007cf +202007d1 00000000 00000000 00000000 @@ -610,7 +610,7 @@ 24348023 18808fff 704c8a02 -202007cf +202007d1 00000000 00000000 00000000 @@ -784,12 +784,12 @@ 204063ce 704c8807 704c8736 -20400342 +20400344 58000000 e7e20005 6fec0040 e7ec0005 -2020034c +2020034e 202052d6 700b960f 204052da @@ -853,8 +853,8 @@ 67e24537 18427200 6fe2461c -205a048c -245a048e +205a048e +245a0490 604c4538 d8c04500 2040713a @@ -970,15 +970,15 @@ 24558150 20407988 2040001b -58000603 +58000605 67e4431d 58000177 67e4431f 5800014b 67e4431b -580006f6 +580006f8 67e44315 -580006fb +580006fd 67e44313 2435801f 20403e79 @@ -991,13 +991,13 @@ 202056bd 6fec4140 67ec4340 -20400765 +20400767 70801002 204057bf 6fe24bce c3010166 c2828169 -20400722 +20400724 700f0d65 20203f28 20400178 @@ -1026,10 +1026,10 @@ 793f801c 704c8801 704c8701 -20400342 +20400344 58000000 e7e20005 -2020034c +2020034e 00000000 00000000 00000000 @@ -1098,20 +1098,20 @@ 79207e1d 67e8804c 20200180 -20200727 +20200729 da201703 68444bd7 20407a08 6fe84bd7 79207e02 -20200756 +20200758 da201704 68444bd7 20407a08 6fe84bd7 793ffe02 -20200756 -20400746 +20200758 +20400748 6fe8833e 79207e1c 67e8804c @@ -1156,7 +1156,7 @@ 20400015 704c880a 704c8704 -20400342 +20400344 6fec0040 e7ec0005 6fe60146 @@ -1165,7 +1165,7 @@ e7e20005 6fec0040 67ec4f37 -2020034c +2020034e 6fec4f37 684c0040 98467c00 @@ -1219,7 +1219,7 @@ c0060009 c00b8010 c0058013 -c01987cd +c01987cf c017001d c0208025 20204ba4 @@ -1259,12 +1259,12 @@ 20600000 704c8803 704c871b -20400342 +20400344 6fe20046 e7e40005 6fe24170 e7e20005 -2020034c +2020034e 00000000 00000000 00000000 @@ -1289,9 +1289,9 @@ c0138033 c014003b c0038037 -c0040654 +c0040656 c00101ee -202007cb +202007cd 6fe20739 67e206a3 c0088012 @@ -1302,14 +1302,14 @@ 20200016 704c8804 704c8708 -20400342 +20400344 58000000 e7e20005 68420046 e0440005 58000001 e7e20005 -2020034c +2020034e 6fe20739 67e206a3 c0058024 @@ -1325,7 +1325,7 @@ c1830000 60420055 700b9b01 -2040065e +20400660 6fe24c97 203a0278 20600000 @@ -1350,14 +1350,14 @@ dfe04d5c 67e40f12 6a240f12 -20400595 +20400597 207a0000 6a240f12 20403fa5 -204005c5 +204005c7 20200007 1fe22400 -202005c5 +202005c7 00000000 00000000 00000000 @@ -1423,7 +1423,7 @@ 67e24c1a 20400295 67e24c1b -202007c9 +202007cb 20400286 67e242a8 20400034 @@ -1436,7 +1436,7 @@ c280002c 6fe40f12 67e44db1 -204005d9 +204005db 205a723a 6fe40f12 1fe22200 @@ -1464,7 +1464,7 @@ c1008000 18000202 20600000 -204005e7 +204005e9 203a729b 2020729d 00000000 @@ -1552,7 +1552,7 @@ 2020000a 20404c78 20400019 -2020066a +2020066c 20400019 20404c78 20404c7c @@ -1561,12 +1561,12 @@ 20600000 704c8809 704c8732 -20400342 +20400344 6fec0040 e7ec0005 6fe647d3 e7e60005 -2020034c +2020034e 00000000 00000000 00000000 @@ -1603,14 +1603,14 @@ c4010000 704c880a 704c873e -20400342 +20400344 58000003 e7e40005 6fe20639 e7e40005 6fec4530 e7ec0005 -2020034c +2020034e 00000000 00000000 00000000 @@ -1667,17 +1667,16 @@ c4000000 704c8813 704c873e -20400342 +20400344 58000001 e7e20005 6fe24c8a e7e20005 6fe20639 e7e40005 -d8400000 +20400301 6fe24fed -1fe67c02 -20428301 +245a0306 e0420005 6fe24fee e7e20005 @@ -1691,7 +1690,8 @@ 6fe2065b e7e20005 6fe20639 -2020034c +2020034e +00000000 00000000 00000000 00000000 @@ -1729,7 +1729,7 @@ 20200040 704c8817 704c8718 -20400342 +20400344 6fec0040 e7ec0005 d8c04297 @@ -1737,7 +1737,7 @@ 2040712d 18007e00 e7e20005 -2020034c +2020034e 00000000 00000000 00000000 @@ -1864,7 +1864,7 @@ 20402289 20628000 204001df -20400342 +20400344 58000001 e7e20005 6fec0149 @@ -1885,7 +1885,7 @@ 6fe80132 9c467e00 e7e40005 -2020034c +2020034e 6fe60146 e7e60005 6fe80132 @@ -1896,7 +1896,7 @@ e7e20005 6fe24c9c c001002b -2020034c +2020034e 6fe64d2e 1fe20c00 efe20006 @@ -1907,7 +1907,7 @@ 2040712d 184672f0 20407100 -2020034c +2020034e 00000000 00000000 00000000 @@ -1953,7 +1953,7 @@ 204002db 6fe20639 e7e40005 -2020034c +2020034e da400014 da200009 d8200003 @@ -1985,7 +1985,7 @@ 20200040 704c8806 704c8714 -20400342 +20400344 6fe24c89 e7e20005 6fe20046 @@ -1998,7 +1998,7 @@ 2020000f 58000000 e7e40005 -2020034c +2020034e 00000000 00000000 00000000 @@ -2049,7 +2049,7 @@ 20200040 704c8804 704c8705 -20400342 +20400344 58000000 e7e20005 6fe24e18 @@ -2059,7 +2059,7 @@ 6fe2004c 793ffe05 67e2004c -2020034c +2020034e 00000000 00000000 00000000 @@ -2113,12 +2113,12 @@ 20200040 704c8807 704c8720 -20400342 +20400344 6fec0040 e7ec0005 6fe24ca0 e7e20005 -2020034c +2020034e 00000000 00000000 00000000 @@ -2177,7 +2177,7 @@ 20200040 704c880b 704c8703 -20400342 +20400344 6fe24c8a e7e20005 6fe20046 @@ -2192,7 +2192,7 @@ 7920fe00 e7e20005 6fe20046 -2020034c +2020034e 00000000 00000000 00000000 @@ -2249,11 +2249,11 @@ c004000e c01f8012 202002d3 -202007bf 202007c1 202007c3 202007c5 202007c7 +202007c9 202002d3 202002d3 6fe24c18 @@ -2273,7 +2273,7 @@ 204002e0 58000000 e7e40005 -2020034c +2020034e 20400286 68420046 98467c00 @@ -2289,12 +2289,12 @@ 6fe20018 204001ca e7e20005 -2020034c +2020034e df200002 204002e0 6fe44f35 e7e40005 -2020034c +2020034e 00000000 00000000 00000000 @@ -2311,14 +2311,14 @@ 67e40f12 20200008 6a240f12 -20400595 +20400597 207a0000 6a240f12 20403fa5 -204005c5 +204005c7 20200008 1fe22400 -202005c5 +202005c7 00000000 00000000 00000000 @@ -2368,7 +2368,7 @@ 00000000 20200040 6fe24f34 -243a07bd +243a07bf 704f3401 20400023 6f224cd2 @@ -2434,7 +2434,7 @@ 6fe24c18 c005001a c007001d -c009840d +c009840f c00b000f c00b8019 c00c0019 @@ -2444,7 +2444,7 @@ c0078022 c0080027 c008802b -202007bb +202007bd 20400286 204002e7 da200009 @@ -2468,7 +2468,7 @@ 204002db 58000004 e7e20005 -2020034c +2020034e 704ded00 704e0a00 704dee00 @@ -2501,7 +2501,7 @@ c0058012 c0060025 c0068029 -202007b9 +202007bb 20400295 67e244df 1fe27200 @@ -2587,7 +2587,7 @@ 6fe20046 e7e40005 7042a71d -2020034c +2020034e 20400295 67e24c98 df200064 @@ -2598,7 +2598,7 @@ 204002db 6fe24c97 e7e20005 -2020034c +2020034e 20400295 67e24c97 203a02d1 @@ -2607,7 +2607,7 @@ 204002db 6fe44de7 e7e40005 -2020034c +2020034e 20400286 67e44de7 202002d7 @@ -2635,7 +2635,7 @@ 204002db 6fec0040 e7ec0005 -2040034c +2040034e 6fe24c9f c0008012 7042a716 @@ -2650,7 +2650,7 @@ 204002db 6fec0040 e7ec0005 -2020034c +2020034e 700b950a 700b9701 20600000 @@ -2692,7 +2692,7 @@ c00e0018 c00e8020 c00d802b -202007b7 +202007b9 704fa601 2040028c 67ec42a9 @@ -2741,14 +2741,14 @@ 20600000 704c880b 704c870b -20400342 +20400344 58000000 e7e20005 6fe20046 e7e40005 6ff04e1a e7f00005 -2020034c +2020034e 00000000 20200040 6fe24c18 @@ -2758,7 +2758,7 @@ c0070022 c008802a c009802e -202007b5 +202007b7 2040028c 67ec42a9 d8a04297 @@ -2771,7 +2771,7 @@ 67ec42a9 7042a70c 20400025 -2040065e +20400660 6fe24c97 203a0278 20600000 @@ -2791,7 +2791,7 @@ 204002db 6fec0040 e7ec0005 -2020034c +2020034e 20400286 67e242a8 7042a70d @@ -2819,7 +2819,7 @@ c0030006 c004001c c005002f -202007b3 +202007b5 20400286 67e242a8 20400295 @@ -2860,7 +2860,7 @@ 204002dc 6fec42a9 e7ec0005 -2020034c +2020034e 6fe24ca1 c00002eb c00102e9 @@ -2892,7 +2892,7 @@ c0230033 c0238034 c0288036 -202007b1 +202007b3 20400286 67e44153 20400286 @@ -2904,7 +2904,7 @@ e7e40005 6fe4414d e7e40005 -2020034c +2020034e 20400286 67e4414f 20400286 @@ -2914,7 +2914,7 @@ 204002db 6fe6414a e7e60005 -2020034c +2020034e 20400289 67e6414a 202002d7 @@ -2925,7 +2925,7 @@ 204002db 6fe24c9c e7e20005 -2020034c +2020034e 20400295 67e24c9c 202002d7 @@ -2939,7 +2939,7 @@ d8c00183 df200064 2040713a -2020034c +2020034e 00000000 00000000 20200040 @@ -2951,7 +2951,7 @@ 204002db 6fe44de9 e7e40005 -2020034c +2020034e 20400286 67e44de9 202002d7 @@ -3013,7 +3013,7 @@ c0058022 c006002d c0068035 -202007af +202007b1 6fe44deb c30102e9 6fe44de9 @@ -3058,7 +3058,7 @@ e7e40005 6fe44deb e7e40005 -2020034c +2020034e 2040021e 20400286 67e44deb @@ -3066,7 +3066,7 @@ 204002db 6fe20046 e7e40005 -2020034c +2020034e 00000000 00000000 00000000 @@ -3077,7 +3077,7 @@ c0018010 c0028015 c003001a -202007ad +202007af 20400292 67f04c6c 202002d7 @@ -3085,12 +3085,12 @@ 204002db 580400fb e7e60005 -2020034c +2020034e df200009 204002db 6ff04ddf e7f00005 -2020034c +2020034e 6fe244de 243a02d5 2040028c @@ -3147,23 +3147,23 @@ 204002db 6ff04c24 e7f00005 -2020034c +2020034e df200041 204002db d8c04c2c df200040 2040713a -2020034c +2020034e df200009 204002db 6ff04138 e7f00005 -2020034c +2020034e df200007 204002db 6fec4140 e7ec0005 -2020034c +2020034e df200008 204002db 580002a8 @@ -3173,7 +3173,7 @@ 58000008 e7e40005 e7e40005 -2020034c +2020034e 00000000 00000000 00000000 @@ -3208,7 +3208,7 @@ c00c8028 c00d002d c00d8030 -202007ab +202007ad 20400292 67f04c1c 202002d7 @@ -3229,12 +3229,12 @@ 2040713c df200017 204070e4 -2020034c +2020034e df200003 204002db 6fe44159 e7e40005 -2020034c +2020034e 20400286 67e44159 202002d7 @@ -3242,7 +3242,7 @@ 204002db 6fe24133 e7e20005 -2020034c +2020034e 20400295 67e24133 202002d7 @@ -3252,7 +3252,7 @@ e7e40005 6fe44151 e7e40005 -2020034c +2020034e 00000000 00000000 00000000 @@ -3268,7 +3268,7 @@ c0010017 c0028019 c0048025 -202007a9 +202007ab 7920001c 20400289 67e64147