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) @@ -1720,10 +1720,10 @@ disable master branch end_of_packet process_le_cmd: + fetch 1,mem_le_state + rtnbit1 lestate_update_map fetch 1,mem_le_wait_process_cmd rtn blank -// fetch 1,mem_le_state -// rtnbit1 lestate_update_map beq BT_CMD_LE_MASTER_UPDATE_CONN,p_le_send_connection_update_ind branch assert @@ -1771,7 +1771,7 @@ rtnbit1 lestate_got_first_packet set1 lestate_got_first_packet store 1,mem_le_state - //jam LE_MASTER_SM_SEND_VERSION,mem_le_master_sm + jam LE_MASTER_SM_SEND_VERSION,mem_le_master_sm rtn p_le_master_not_match: @@ -1866,6 +1866,22 @@ fetchr loopcnt ,2,mem_loopcnt rtn +//input: rega +p_le_calc_channel_map: + add rega,coffset_le_channel_map,contr + ifetch 5,contr + force 0,temp + force 37,loopcnt +p_le_count_channels_loop: + bbit0 0,le_count_channels_notused + increase 1,temp +p_le_count_channels_notused: + rshift pdata,pdata + loop p_le_count_channels_loop + add temp,-1,pdata + add rega,coffset_le_channels,contw + istore 1,contw + rtn p_le_update_channel_map: add rega,coffsset_state,contr ifetch 1,contr @@ -1883,8 +1899,9 @@ store 1,mem_le_state fetch 5,mem_le_new_map - store 5,mem_le_channel_map - branch le_calc_channel_map + add rega,coffset_le_channel_map,contw + istore 5,contw + branch p_le_calc_channel_map p_le_update_param_master: add rega,coffsset_state,contr ifetch 1,contr 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 4593) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat (working copy) @@ -163,7 +163,7 @@ # mem_tws_rf_packet_rx_window_size - (mem_tws_rf_rcv_window_size + 72us + hardware_delay(18us) + mem_tws_rf_slave_send_full_packet_sleep_time/2) mem_tws_rf_master_check_raw_id_time:db 04 -mem_rf_debug_enable: 00 +mem_rf_debug_enable: 01 mem_rf_debug_rf_rx_debug_gpio: 0c mem_rf_debug_rf_tx_debug_gpio: 0e mem_rf_debug_rf_sync_detect_debug_gpio: 13 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 +c02206b9 +c02a06b5 +c02c061f +c02e063b +c02e8641 +c03506bb +c03586bd c03601dd c04080eb c0428109 c04300ce c04f00d2 c050014b -c052068e -c0540680 -c05c86af -c05d05a1 +c052069e +c0540690 +c05c86bf +c05d05b1 c0700142 20202baf -c00386b1 +c00386c1 c006023e -c00906b3 -c0098548 -c00a0527 -c011853b -c0128633 -c0130637 -c0138639 -c014063b -c014863c -c0150641 +c00906c3 +c0098558 +c00a0537 +c011854b +c0128643 +c0130647 +c0138649 +c014064b +c014864c +c0150651 c01d83b1 c01f03ba c01f8363 -c02084b0 -c0210677 -c0240464 -c02584b4 -c0278440 -c02905c0 -c02c06b5 -c02d85d9 -c02e86b7 -c03005e3 -c03205df -c0370657 -c03806b9 -c03886bb +c02084c0 +c0210687 +c0240467 +c02584c4 +c0278443 +c02905d0 +c02c06c5 +c02d85e9 +c02e86c7 +c03005f3 +c03205ef +c0370667 +c03806c9 +c03886cb c03a014d -c0490642 -c05285f2 -c05305f2 +c0490652 +c0528602 +c0530602 c1590000 c16a0000 20202baf @@ -145,7 +145,7 @@ 20407148 7d3a001c 243a209e -202006bd +202006cd 6fe24133 c4008000 6fe20030 @@ -335,8 +335,8 @@ 204052b0 6fe20048 207a0000 -202006bf -204006c1 +202006cf +204006d1 2020022d 6fe2004b 79207e03 @@ -380,21 +380,21 @@ 207a0000 6fe2007c 247a0000 -202006c3 +202006d3 704c9b02 704c8a00 20200184 704c9b00 704ca100 704c9f00 -202006c5 +202006d5 6fe24c9a -203a06c7 +203a06d7 6fe24c99 -203a06bd +203a06cd 1fe0ffff 67e24c99 -202006c7 +202006d7 6fe20018 1ff18400 184f840a @@ -494,7 +494,7 @@ 20600000 2040248f 704c8a00 -202006c9 +202006d9 204021ec 24740000 78547c00 @@ -510,7 +510,7 @@ 67e84169 78387c00 7834fc00 -202006cb +202006db 20402b6f d8200010 20402321 @@ -531,7 +531,7 @@ 20402940 78347c00 704c8a01 -202006c9 +202006d9 70011600 70015000 204024d2 @@ -554,7 +554,7 @@ 67e2004b 204021e1 c6108000 -202006c1 +202006d1 704c8803 704c8706 204002fa @@ -635,11 +635,11 @@ 18007e06 67e243e2 20203f1a -204006cd +204006dd 6a464dd8 2020026a 6a464dd8 -20200568 +20200578 20403e92 20403e92 67e24dd7 @@ -689,14 +689,14 @@ c4020000 6fe20639 67e24e18 -202006cf +202006df 6fe20046 67e24e18 793f8021 70004600 704ca100 704c9b00 -202006cf +202006df 6fe20624 d8400000 c1018000 @@ -722,7 +722,7 @@ 67e24c88 1fe0fe03 67e44db1 -2040057c +2040058c 207a0000 704c873e 204002fa @@ -767,7 +767,7 @@ 6fe64c86 e7e60005 20600000 -20400545 +20400555 1a420a00 20600000 da204d84 @@ -825,7 +825,7 @@ 20400340 c6130000 da204d5c -20400538 +20400548 c000480c c000c80c 79200026 @@ -870,9 +870,9 @@ 20404766 20400314 2040034c -2040050e +2040051e 20404594 -2034051d +2034052d 2020458a 6fe20623 79207e05 @@ -898,8 +898,8 @@ e7f20005 6fe40643 e7e40005 -20400418 -202006d1 +2040041a +202006e1 6fec0633 684c4627 98467c00 @@ -911,8 +911,8 @@ 7042a700 70065b00 204047d2 -202006d3 -20400595 +202006e3 +204005a5 67e64e15 58000000 67e64d2e @@ -920,7 +920,7 @@ 67e242a8 704ddb05 202003a1 -2040059b +204005ab 67e64e15 58000000 67e64d31 @@ -967,10 +967,10 @@ 67e44632 20400249 67e44634 -2040041a +2040041c 202002a2 2040034e -20200521 +20200531 6fe24fea c00003ea c00083ed @@ -1026,22 +1026,24 @@ 20600000 7834fc00 204048fd -2021067d +2021068d 204003cd 20400314 204045fc 7856fc00 204003cb -24368434 +24368437 20407a4f -2040042f +20400431 20404766 -2040050e +2040051e 20404594 -2034041c +2034041e 20400414 7854fc00 20202739 +6fe20623 +c3830000 6fe24fe7 207a0000 c009836c @@ -1051,12 +1053,12 @@ 704fe713 20600000 20400314 -20400422 +20400424 78377c00 -20400521 +20400531 2036840b 20200411 -20400424 +20400426 20202739 204045bd 204045cd @@ -1065,7 +1067,7 @@ 782efc00 78307c00 7850fc00 -2040042d +2040042f 20200356 37c18200 20600000 @@ -1073,12 +1075,13 @@ c3818000 79207e03 67e20623 +704fea01 20600000 6fe20623 c2818411 6fe24e17 1fe67c06 -2421067d +2421068d 1fe0fe01 67e24e17 20200411 @@ -1099,8 +1102,8 @@ 67e24537 18427200 6fe2461c -205a043c -245a043e +205a043f +245a0441 604c4538 d8c044e0 2040712d @@ -1113,7 +1116,7 @@ 67e40124 24610000 2040473e -202006d1 +202006e1 6a280f1e 6a480f22 6a660f26 @@ -1122,7 +1125,7 @@ 62480f22 62660f26 20600000 -20400460 +20400463 67244fe8 1a208c01 efe20006 @@ -1131,12 +1134,24 @@ efe40005 1fe0fe01 e7e40005 -20400483 -20400473 +20400493 +20400482 20404618 -2040045c +2040045f 6f244fe8 20600000 +1a208c31 +efea0006 +18000400 +18007225 +c3004628 +18408401 +1fe37e00 +c200047a +1840ffff +1a208a22 +e7e20005 +20600000 1a208c00 efe20006 c4030000 @@ -1151,8 +1166,9 @@ e7e20005 67e20623 6fea4528 -67ea0654 -20204622 +1a208a31 +e7ea0005 +20200476 1a208c00 efe20006 c4028000 @@ -1164,7 +1180,7 @@ 6fe40643 98467e00 1fe67c01 -20228499 +202284a9 20600000 1a208c1a efe40006 @@ -1173,7 +1189,7 @@ 98467e00 d840ffff 98467c00 -20228499 +202284a9 20600000 efe20011 793ffe05 @@ -1200,7 +1216,7 @@ 20600000 20404972 2040475a -20400453 +20400456 20202940 78287c00 6fe40631 @@ -1215,15 +1231,15 @@ 78507c00 19623600 37c18400 -203704c4 +203704d4 1b420400 604c00a4 242c2739 -203704cb +203704db dd2001e0 1c225000 6fe20623 -c30184cb +c30184db 2055ac9c 20402abc 7823fc00 @@ -1241,36 +1257,36 @@ 67e204dc 1fe27200 67e2068c -203a04f5 +203a0505 6fe204db 1fe17e03 -c00184ea -c50784ec +c00184fa +c50784fc da204cca -20400538 -c00084ec -20400591 -203a04ec -2040059b +20400548 +c00084fc +204005a1 +203a04fc +204005ab 18c20a00 6fe404db e7e40005 -202004f1 +20200501 d8a004dd -202004f1 +20200501 09800008 19897e00 -c20004ec +c20004fc 78367c00 -202004f5 +20200505 09800008 19897e00 e7e20005 -c20004f1 +c2000501 09800018 78287c00 db600664 -203604fc +2036050c 1fef7e00 1ff17e00 e7e60005 @@ -1278,7 +1294,7 @@ 20232739 7836fc00 6fe242b5 -243a0504 +243a0514 6fe20017 1fe0a200 20402a7b @@ -1300,15 +1316,15 @@ 6fe204db 1fe17e03 c001c866 -2040059b -20400506 +204005ab +20400516 6fe2068c 207a0000 6fe2068d c001c866 2020039a 78377c00 -20400521 +20400531 2036c582 2020458a 68420017 @@ -1316,7 +1332,7 @@ 20402a23 78287c00 d9601388 -202004b9 +202004c9 1a208409 efe20002 203a2baf @@ -1341,13 +1357,13 @@ 6fe204d5 c1018000 20204146 -2040055a +2040056a da204d34 20203f94 da204d34 20403fa5 -20200568 -2040055a +20200578 +2040056a da204d84 20203f94 1a20fe04 @@ -1368,57 +1384,57 @@ 1a420c00 1a427e00 20600000 -2040057c +2040058c 203a2baf 6fe44dd1 1fe0fff6 68444db1 98467c00 -20210563 +20210573 da204cca 20203fa5 da204ca2 -20400538 -203a0561 +20400548 +203a0571 da204ca2 20203fa5 -20400574 +20400584 da204ca2 -203a056d +203a057d da204cca 20203f94 -20400571 +20400581 203a2baf da204ca2 20203f94 6f224caa d8c04cf2 -20200576 +20200586 6f224cd2 d8c04d10 efe60006 9a467c00 -2022857a -c2000576 +2022858a +c2000586 1f227e00 20600000 6fe44dd1 1fe0fff6 68444db1 98467c00 -20210583 +20210593 da204cca -20200538 +20200548 da204ca2 -20400538 +20400548 247a0000 -20200581 +20200591 6fe44dd5 -2020058a +2020059a 58000010 67e44db1 62280f1e -2040057c +2040058c 6a280f1e 20600000 da204cca @@ -1426,16 +1442,16 @@ 6fe44d2e 247a0000 da204cca -20200538 +20200548 6fe64d2e 243a7111 -2040058f +2040059f 1a427e00 67e64d2e 20207111 6fe64d31 243a7111 -2040058f +2040059f 1a427e00 67e64d31 20207111 @@ -1445,11 +1461,11 @@ 1fe22600 20203190 1a627e00 -c00a85a9 +c00a85b9 20203168 704c8c00 704c1700 -204006d5 +204006e5 204002af 202031c3 6842063a @@ -1467,11 +1483,11 @@ 6fe245b5 c0014794 6fe21002 -c001067d +c001068d c002c790 20600000 20404906 -204005ae +204005be 6fe204db 2feffe04 79208027 @@ -1480,9 +1496,9 @@ 2feffe02 7920800f 6fe204dc -203a05d2 +203a05e2 6fe20623 -c30205d2 +c30205e2 c6078000 20406246 204061b6 @@ -1500,13 +1516,13 @@ d8e00001 20407148 247a0000 -202006d7 -204005ef +202006e7 +204005ff 18227e00 c1018000 202002ee 62244db1 -204005ec +204005fc 1a420a00 6fe44db1 e7e20005 @@ -1514,16 +1530,16 @@ e7e20005 e0220005 20600000 -2040055a +2040056a da204d5c 20203f94 da204d5c 20403fa5 -20200568 +20200578 6fe20b97 -243a06d9 +243a06e9 6fe20b98 -243a06d9 +243a06e9 20600000 20404f51 7006ae01 @@ -1533,7 +1549,7 @@ 207a0000 6fe20b95 247a0000 -20400602 +20400612 704c9f01 20600000 704c8806 @@ -1551,11 +1567,11 @@ 2020268a 1f227e00 67e4012c -203a0608 +203a0618 9ea67c00 20212729 18017e01 -243a061a +243a062a 6fe20151 1fe17e03 c001a649 @@ -1566,11 +1582,11 @@ 98467c00 20212729 da204cca -20400538 +20400548 c000a739 -20400591 +204005a1 203a2739 -20400595 +204005a5 18c20a00 6fe20151 e7e20005 @@ -1586,21 +1602,21 @@ 20400392 202026dd 62244db1 -2040053f +2040054f 6a244db1 20600000 da204d34 20203fa1 -20400542 +20400552 202002eb -20200542 -20400587 +20200552 +20400597 203a729b 2020729d da204d34 -20200538 +20200548 20202baf -2040063f +2040064f 207a0000 6fe2004b c3830000 @@ -1613,7 +1629,7 @@ 18c27e00 67e4013c 6fe4442c -203a0651 +203a0661 20205b2e 6fe40099 203a2baf @@ -1624,7 +1640,7 @@ 70429300 20204b77 67e40fb7 -2020065b +2020066b 68440fb7 18518400 6fe44881 @@ -1643,7 +1659,7 @@ 67e40241 58004e34 67e4023f -2040069e +204006ae 204057e8 6fe280a0 67e20124 @@ -1659,34 +1675,34 @@ 2040682b 700f0d15 20206b2e -20400678 +20400688 7854fc00 20600000 6fe24040 c3800000 c3818000 6fe247cd -203a0687 +203a0697 6fe24724 207a0000 20202d53 6fe206ab 67e24bef -202006db +202006eb 7043dd01 20403f41 -202006db +202006eb 6fe20fd6 -c055069d +c05506ad 6fe24131 207a0000 -2040063f +2040064f 247a0000 da204d5c -20400538 +20400548 247a0000 da204cca -20400538 +20400548 68424caa 98467c00 24628000 @@ -1698,108 +1714,108 @@ 207a0000 6fe24f64 c1a98000 -202006a0 +202006b0 18227e00 c003a739 c0032739 202025df 580002e0 -20200659 +20200669 580002a0 -20200659 +20200669 580002b0 -20200659 +20200669 58000240 -20200659 +20200669 58000250 -20200659 +20200669 580000f0 -20200659 +20200669 58000320 -20200659 +20200669 580002f0 -20200659 +20200669 58000200 -20200659 +20200669 580001c0 -20200659 +20200669 58000230 -20200659 +20200669 58000300 -20200659 +20200669 58000190 -20200659 +20200669 58000290 -20200659 +20200669 58000120 -20200659 +20200669 58000170 -20200659 +20200669 580002c0 -20200659 +20200669 580002d0 -20200659 +20200669 580001e0 -20200659 +20200669 58000140 -20200659 +20200669 580001b0 -20200659 +20200669 580001a0 -20200659 +20200669 580001f0 -20200659 +20200669 58000260 -20200659 +20200669 58000270 -20200659 +20200669 58000280 -20200659 +20200669 58000080 -20200659 +20200669 58000070 -20200659 +20200669 580000d0 -20200659 +20200669 58000060 -20200659 +20200669 580000c0 -20200659 +20200669 58000090 -20200659 +20200669 580000a0 -20200659 +20200669 580000b0 -20200659 +20200669 580000e0 -20200659 +20200669 58000160 -20200659 +20200669 58000100 -20200659 +20200669 58000010 -20200659 +20200669 58000020 -20200659 +20200669 58000030 -20200659 +20200669 58000040 -20200659 +20200669 58000050 -20200659 +20200669 58000110 -20200659 +20200669 58000210 -20200659 +20200669 58000220 -20200659 +20200669 580001d0 -20200659 +20200669 58000150 -20200659 +20200669 58000180 -20200659 +20200669 58000310 -20200659 +20200669 58000330 -20200659 +20200669 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 4593) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom (working copy) @@ -230,7 +230,7 @@ # mem_tws_rf_packet_rx_window_size - (mem_tws_rf_rcv_window_size + 72us + hardware_delay(18us) + mem_tws_rf_slave_send_full_packet_sleep_time/2) mem_tws_rf_master_check_raw_id_time:db 04 -mem_rf_debug_enable: 00 +mem_rf_debug_enable: 01 mem_rf_debug_rf_rx_debug_gpio: 0c mem_rf_debug_rf_tx_debug_gpio: 0e mem_rf_debug_rf_sync_detect_debug_gpio: 13 @@ -255,7 +255,7 @@ # debug log define #mem_param_debug_log_mem_block_start_addr -mem_param_debug_log_func_enable:01 +mem_param_debug_log_func_enable:00 mem_param_debug_log_initial_flag_addr:10 db 01 mem_param_debug_log_lock_flag_cm0_addr:11 db 01 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) @@ -69,7 +69,7 @@ c006002b c0008008 c0004880 -2020070b +2020071b efea0006 67ea4528 efe40006 @@ -195,9 +195,9 @@ 68420048 20407a08 6fe20048 -c2838707 +c2838717 c0188021 -c0060709 +c0060719 c0038030 c005800b 20204f6c @@ -264,7 +264,7 @@ 98467c00 24628000 2040493a -202006d3 +202006e3 00000000 00000000 00000000 @@ -519,7 +519,7 @@ 67e4003e 7855fc00 704c8a00 -20200705 +20200715 00000000 00000000 00000000 @@ -610,7 +610,7 @@ 24348023 18808fff 704c8a02 -20200705 +20200715 00000000 00000000 00000000 @@ -853,8 +853,8 @@ 67e24537 18427200 6fe2461c -205a043c -245a043e +205a043f +245a0441 604c4538 d8c04500 2040713a @@ -970,15 +970,15 @@ 24558038 20407988 2040001c -580005a6 +580005b6 67e4431d 58000142 67e4431f 58000141 67e4431b -58000688 +58000698 67e44315 -5800068b +5800069b 67e44313 2055802e 24358020 @@ -1000,7 +1000,7 @@ 20403f28 58001171 67e44f5d -20200703 +20200713 20400143 700f0d6a 20203f28 @@ -1155,7 +1155,7 @@ c0060009 c00b8010 c0058013 -c0198701 +c0198711 c017001d c0208025 20204ba4 @@ -1225,9 +1225,9 @@ c0138033 c014003b c0038037 -c00405f7 +c0040607 c00101b1 -202006ff +2020070f 6fe20739 67e206a3 c0088012 @@ -1261,7 +1261,7 @@ c1830000 60420055 700b9b01 -204005fb +2040060b 6fe24c97 203a023b 20600000 @@ -1286,14 +1286,14 @@ dfe04d5c 67e40f12 6a240f12 -20400538 +20400548 207a0000 6a240f12 20403fa5 -20400568 +20400578 20200007 1fe22400 -20200568 +20200578 00000000 00000000 00000000 @@ -1359,7 +1359,7 @@ 67e24c1a 20400258 67e24c1b -202006fd +2020070d 20400249 67e242a8 20400034 @@ -1372,7 +1372,7 @@ c280002c 6fe40f12 67e44db1 -2040057c +2040058c 205a723a 6fe40f12 1fe22200 @@ -1400,7 +1400,7 @@ c1008000 18000202 20600000 -2040058a +2040059a 203a729b 2020729d 00000000 @@ -1488,7 +1488,7 @@ 2020000a 20404c78 20400019 -20200602 +20200612 20400019 20404c78 20404c7c @@ -2185,11 +2185,11 @@ c004000e c01f8012 2020028e -202006f3 -202006f5 -202006f7 -202006f9 -202006fb +20200703 +20200705 +20200707 +20200709 +2020070b 2020028e 2020028e 6fe24c18 @@ -2247,14 +2247,14 @@ 67e40f12 20200008 6a240f12 -20400538 +20400548 207a0000 6a240f12 20403fa5 -20400568 +20400578 20200008 1fe22400 -20200568 +20200578 00000000 00000000 00000000 @@ -2304,7 +2304,7 @@ 00000000 20200040 6fe24f34 -243a06f1 +243a0701 704f3401 20400023 6f224cd2 @@ -2380,7 +2380,7 @@ c0078020 c0080025 c0088029 -202006ef +202006ff 20400249 204002a2 da200009 @@ -2437,7 +2437,7 @@ c0058012 c0060025 c0068029 -202006ed +202006fd 20400258 67e244df 1fe27200 @@ -2628,7 +2628,7 @@ c00e0018 c00e8020 c00d802b -202006eb +202006fb 704fa601 2040024f 67ec42a9 @@ -2691,10 +2691,10 @@ c0058009 c0060011 c0068018 -c0070024 -c008802c -c0098030 -202006e9 +c0070021 +c0088029 +c009802d +202006f9 2040024f 67ec42a9 d8a04297 @@ -2702,17 +2702,14 @@ 20400246 70429301 7042a70b -20200027 +20200024 2040024f 67ec42a9 7042a70c -20400027 +20400024 6fe24c97 203a023b 20600000 -6fe24ff0 -1fe0fe01 -67e24ff0 2040024f 67ec42a9 20400258 @@ -2721,7 +2718,7 @@ d8a047f2 20400246 7042a709 -20200027 +20200024 2040024f 67ec42a9 7042a70a @@ -2750,12 +2747,15 @@ 00000000 00000000 00000000 +00000000 +00000000 +00000000 20200040 6fe24c18 c0030006 c004001c c005002f -202006e7 +202006f7 20400249 67e242a8 20400258 @@ -2828,7 +2828,7 @@ c0230033 c0238034 c0288036 -202006e5 +202006f5 20400249 67e44153 20400249 @@ -2949,7 +2949,7 @@ c0058022 c006002d c0068035 -202006e3 +202006f3 6fe44deb c30102a4 6fe44de9 @@ -3013,7 +3013,7 @@ c0018010 c0028015 c003001a -202006e1 +202006f1 20400255 67f04c6c 20200292 @@ -3144,7 +3144,7 @@ c00c8028 c00d002d c00d8030 -202006df +202006ef 20400255 67f04c1c 20200292 @@ -3204,7 +3204,7 @@ c0010017 c0028019 c0048025 -202006dd +202006ed 7920001c 2040024c 67e64147