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) @@ -70,6 +70,7 @@ beq patch28_1,p_le_slave_unsync beq patch28_2,p_le_slave_disconn beq patch29_0,p_le_context_nextevent + beq patch29_1,p_le_calc_channel_map beq patch29_3,p_le_receive_slave beq patch29_7,p_le_send_adv_ind beq patch2a_2,p_le_acknowledge @@ -1720,10 +1721,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 +1772,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: @@ -1865,7 +1866,22 @@ call pop_stack_rega_b_c 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,7 +1899,8 @@ store 1,mem_le_state fetch 5,mem_le_new_map - store 5,mem_le_channel_map + add rega,coffset_le_channel_map,contw + istore 5,contw branch le_calc_channel_map p_le_update_param_master: add rega,coffsset_state,contr Index: ModuleDemo/25_OTA/bt_demo/BT/sched/patch.dat =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/patch.dat (revision 4593) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/patch.dat (working copy) @@ -41,7 +41,7 @@ 00 #mem_patch26 c8 #mem_patch27 06 #mem_patch28 -89 #mem_patch29 +8b #mem_patch29 04 #mem_patch2A 29 #mem_patch2B 11 #mem_patch2C 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) @@ -63,89 +63,90 @@ 2000003e 2000003f c2840060 -c0010084 -c0070186 -c0080194 -c00e0177 -c00f0199 -c0100221 -c01201f1 -c0190159 -c01c8166 -c01d0168 -c01f0216 -c02081e6 -c02206a9 -c02a06a5 -c02c060f -c02e062b -c02e8631 -c03506ab -c03586ad -c03601dd -c04080eb -c0428109 -c04300ce -c04f00d2 -c050014b -c052068e -c0540680 -c05c86af -c05d05a1 -c0700142 +c0010085 +c0070187 +c0080195 +c00e0178 +c00f019a +c0100222 +c01201f2 +c019015a +c01c8167 +c01d0169 +c01f0217 +c02081e7 +c02206ba +c02a06b6 +c02c0620 +c02e063c +c02e8642 +c03506bc +c03586be +c03601de +c04080ec +c042810a +c04300cf +c04f00d3 +c050014c +c052069f +c0540691 +c05c86c0 +c05d05b2 +c0700143 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 -c03a014d -c0490642 -c05285f2 -c05305f2 +c00386c2 +c006023f +c00906c4 +c0098559 +c00a0538 +c011854c +c0128644 +c0130648 +c013864a +c014064c +c014864d +c0150652 +c01d83b2 +c01f03bb +c01f8364 +c02084c1 +c0210688 +c0240468 +c0248477 +c02584c5 +c0278444 +c02905d1 +c02c06c6 +c02d85ea +c02e86c8 +c03005f4 +c03205f0 +c0370668 +c03806ca +c03886cc +c03a014e +c0490653 +c0528603 +c0530603 c1590000 c16a0000 20202baf 20406490 20406863 20406326 -2040009f +204000a0 2040203c 20403153 -2040008e +2040008f 2040233d -20400094 +20400095 20202021 c68e0000 18000e02 20407148 7d3a001c 243a209e -202006bd +202006ce 6fe24133 c4008000 6fe20030 @@ -158,7 +159,7 @@ 18423600 202023b7 204045b4 -204000a2 +204000a3 2020455e 6fe244d9 c1808000 @@ -175,23 +176,23 @@ 7854fc00 78487c00 69644e32 -204000c3 -243680c0 +204000c4 +243680c1 204047d5 1a227e00 67e24626 6fec04dd 67ec0633 6fe24c8b -c0008386 -204002cc +c0008387 +204002cd 204046d3 -243680c0 +243680c1 6fe204dc -c00300c0 -204002cc +c00300c1 +204002cd 6fe44e32 -243a00ae +243a00af 20600000 204045c7 204045bd @@ -207,12 +208,12 @@ 6fe24013 793ffe06 67e24013 -202000d4 -204000d4 +202000d5 +204000d5 20202bd8 20405900 70894bba -204000dd +204000de 708907ff 20402a70 70895074 @@ -220,9 +221,9 @@ 70896d07 20600000 6fe242b4 -c00080e1 -c00200e7 -c00100e1 +c00080e2 +c00200e8 +c00100e2 5888e0d0 67e68955 584a103c @@ -232,9 +233,9 @@ 5888c0d0 67e68955 584a106c -202000e4 +202000e5 20407a63 -203080f8 +203080f9 708955d4 20000004 708955d2 @@ -242,8 +243,8 @@ 708955d1 20000004 6fe242b4 -c00080f6 -c0020106 +c00080f7 +c0020107 708955d0 708956e0 18002a08 @@ -262,7 +263,7 @@ 20600000 708955d0 708956c0 -202000f8 +202000f9 60420017 1840a200 6fe242b5 @@ -270,7 +271,7 @@ 20402a7b 58000250 20402bb1 -204000dd +204000de 6fe28906 79207e00 67e28906 @@ -284,25 +285,25 @@ 2000000a 7089027d 6fe242b4 -c0000130 -c002012b +c0000131 +c002012c 70894cfb 70894def 70894eec 70894f5e -c0008132 -c0028127 +c0008133 +c0028128 20202a51 708956ff 20402a5d 708955ff 20600000 -20400136 +20400137 708956cc 20402a5d 708955d8 20600000 -20400136 +20400137 20202a49 708956f7 20402a5d @@ -324,7 +325,7 @@ 6fe8833e 793ffe1d 67e8804c -20200147 +20200148 37d98200 70800520 37d98200 @@ -335,9 +336,9 @@ 204052b0 6fe20048 207a0000 -202006bf -204006c1 -2020022d +202006d0 +204006d2 +2020022e 6fe2004b 79207e03 67e2004b @@ -348,13 +349,13 @@ d8c00183 df2000f0 d8400000 -20400161 +20400162 60440099 2020238d efe20006 207a0000 18408401 -c2000161 +c2000162 20600000 704fa500 20202414 @@ -371,30 +372,30 @@ 20402841 20402827 20404b89 -2040017a +2040017b 20202425 20404b89 -2040017a +2040017b 20202198 6fe242a7 207a0000 6fe2007c 247a0000 -202006c3 +202006d4 704c9b02 704c8a00 -20200184 +20200185 704c9b00 704ca100 704c9f00 -202006c5 +202006d6 6fe24c9a -203a06c7 +203a06d8 6fe24c99 -203a06bd +203a06ce 1fe0ffff 67e24c99 -202006c7 +202006d8 6fe20018 1ff18400 184f840a @@ -404,22 +405,22 @@ 20600000 20402108 6fe24fa6 -243a01c1 +243a01c2 704c8a04 -20200182 +20200183 204024d2 7854fc00 6fe24c9b -c0008194 +c0008195 6fe2004c c28221c5 6fe20030 c30221c4 -202002b4 +202002b5 6fe24c9c -c00001a8 -c00081ab -c00101ae +c00001a9 +c00081ac +c00101af 704c8702 20600000 704c880f @@ -440,16 +441,16 @@ 98408a00 d8c0073b 2040713a -204001d5 +204001d6 68420053 6fe2073a 98467e00 1fe67c0e -202101c1 +202101c2 20204db7 704c88ff 704c8707 -204002fa +204002fb 58000000 e7e20005 6fec42a9 @@ -459,11 +460,11 @@ 2040712d df2000b8 204070e4 -20400304 +20400305 6fe24fa6 704fa600 70005300 -c00101d3 +c00101d4 20204dbb 20404f5f 20204dbb @@ -479,22 +480,22 @@ 1fe67c64 242127fd 202027ea -20400249 +2040024a 68420046 98467c00 20628000 -20200290 +20200291 20402337 -202c01ee +202c01ef 204024ca -243a01e6 +243a01e7 78587c00 1d027e00 67e84169 20600000 2040248f 704c8a00 -202006c9 +202006da 204021ec 24740000 78547c00 @@ -502,15 +503,15 @@ 793f800b 20402b71 2040232b -c5058201 +c5058202 204024ca -243a01f6 +243a01f7 78547c00 1c427e00 67e84169 78387c00 7834fc00 -202006cb +202006dc 20402b6f d8200010 20402321 @@ -519,10 +520,10 @@ 20402917 204024ab 204024f3 -2036820d +2036820e 204024ca -243a0208 -202001fb +243a0209 +202001fc 18000401 6fe20031 793ffe01 @@ -531,7 +532,7 @@ 20402940 78347c00 704c8a01 -202006c9 +202006da 70011600 70015000 204024d2 @@ -539,10 +540,10 @@ 2040724d 6fe24c9b 207a0000 -202002b4 +202002b5 20404d8e c6108000 -2020022d +2020022e 6fe20030 c283a1e1 6fe20b9c @@ -554,51 +555,51 @@ 67e2004b 204021e1 c6108000 -202006c1 +202006d2 704c8803 704c8706 -204002fa +204002fb 18007e00 e7e20005 6fe20046 e7e40005 -20200304 +20200305 704c8806 704c8717 -204002fa +204002fb 6fec0040 e7ec0005 -20200304 +20200305 704c8806 704c8716 -20200237 +20200238 6fe243de 207a0000 20403e9d 20628000 1fe20c00 20403e92 -c0058282 +c0058283 20203ef4 -2040025d +2040025e 2040712d -2020025a -2040025d +2020025b +2040025e efe40006 -2020025a -2040025d +2020025b +2040025e efe60006 -2020025a -2040025d +2020025b +2040025e efec0006 -2020025a -2040025d +2020025b +2040025e efee0006 -2020025a -2040025d +2020025b +2040025e eff00006 -2020025a -2040025d +2020025b +2040025e efe20006 18c20400 60464bf2 @@ -610,16 +611,16 @@ 20600000 7044d901 704c8b01 -202002a2 +202002a3 6fec4c8d 67ec4639 67ec4140 20600000 20600000 704ddb00 -2020026e +2020026f 704ddb03 -2020026e +2020026f 62464ddc 58004b4a 67e443e3 @@ -635,11 +636,11 @@ 18007e06 67e243e2 20203f1a -204006cd +204006de 6a464dd8 -2020026a +2020026b 6a464dd8 -20200568 +20200579 20403e92 20403e92 67e24dd7 @@ -647,56 +648,56 @@ d8a04dd8 20403e88 6fe24dd7 -c0000280 -c001827d +c0000281 +c001827e 20202baf 704c9612 -20200293 +20200294 704c9601 -20200293 +20200294 704c960c -20200293 +20200294 704c9600 df200001 -20400297 -20200304 +20400298 +20200305 704c9600 -2040029b +2040029c 6fe24c96 e7e20005 20600000 704c870e 1f20fe03 67e24c88 -204002fa +204002fb 6fe64c93 e7e60005 20600000 700f1200 -202002a7 +202002a8 700f120c -202002a7 +202002a8 700f1202 704c870f 704c8804 -204002fa +204002fb 6fe20f12 e7e20005 6fe64c93 e7e60005 -20200304 +20200305 6ff04c6c c4020000 6fe20639 67e24e18 -202006cf +202006e0 6fe20046 67e24e18 793f8021 70004600 704ca100 704c9b00 -202006cf +202006e0 6fe20624 d8400000 c1018000 @@ -722,15 +723,15 @@ 67e24c88 1fe0fe03 67e44db1 -2040057c +2040058d 207a0000 704c873e -204002fa +204002fb 58000002 e7e20005 58000001 e7e20005 -204002c0 +204002c1 e0420005 204047d5 1a227e00 @@ -742,37 +743,37 @@ e0420005 18427200 2040712d -2040018d +2040018e e7e20005 -20200304 +20200305 6fe20046 67e242a8 -202002f0 +202002f1 6fe20639 67e242a8 704c8805 704c8713 -204002fa +204002fb 58000001 e7e20005 6fe242a8 e7e40005 58000001 e7e40005 -20200304 +20200305 6fe24c88 1fe0fe03 67e44db1 -20400301 +20400302 6fe64c86 e7e60005 20600000 -20400545 +20400556 1a420a00 20600000 da204d84 20403fa5 -2020026c +2020026d 18000400 18000201 60421001 @@ -788,9 +789,9 @@ 20600000 6fe2063a c3828000 -20400336 -2040034a -203a0307 +20400337 +2040034b +203a0308 efe20006 ea220006 9a267e00 @@ -806,8 +807,8 @@ 18427200 2040712d 2040480e -20400309 -2040034a +2040030a +2040034b efe20006 1fe22200 18c23000 @@ -822,15 +823,15 @@ 202049f1 6fe24683 203a480c -20400340 +20400341 c6130000 da204d5c -20400538 +20400549 c000480c c000c80c 79200026 20600000 -2040034a +2040034b 203a480c efe20006 e8420006 @@ -842,7 +843,7 @@ 20600000 da204d5c 20203fa1 -2040034e +2040034f 20202739 204045bd 204045cd @@ -868,11 +869,11 @@ 20407a4f 204045aa 20404766 -20400314 -2040034c -2040050e +20400315 +2040034d +2040051f 20404594 -2034051d +2034052e 2020458a 6fe20623 79207e05 @@ -898,8 +899,8 @@ e7f20005 6fe40643 e7e40005 -20400418 -202006d1 +2040041b +202006e2 6fec0633 684c4627 98467c00 @@ -911,16 +912,16 @@ 7042a700 70065b00 204047d2 -202006d3 -20400595 +202006e4 +204005a6 67e64e15 58000000 67e64d2e 6fe20046 67e242a8 704ddb05 -202003a1 -2040059b +202003a2 +204005ac 67e64e15 58000000 67e64d31 @@ -955,29 +956,29 @@ 204045b4 2040315c 6fe20624 -c0018402 +c0018403 20204579 -20400249 +2040024a 67e242a8 -20400249 +2040024a 1febfe00 67e444d7 -20400249 -20400249 +2040024a +2040024a 67e44632 -20400249 +2040024a 67e44634 -2040041a -202002a2 -2040034e -20200521 +2040041d +202002a3 +2040034f +20200532 6fe24fea -c00003ea -c00083ed -c00183ef -c00203f1 -c00303eb -c00503d5 +c00003eb +c00083ee +c00183f0 +c00203f2 +c00303ec +c00503d6 20600000 6fe20623 79207e06 @@ -1026,37 +1027,39 @@ 20600000 7834fc00 204048fd -2021067d -204003cd -20400314 +2021068e +204003ce +20400315 204045fc 7856fc00 -204003cb -24368434 +204003cc +24368438 20407a4f -2040042f +20400432 20404766 -2040050e +2040051f 20404594 -2034041c -20400414 +2034041f +20400415 7854fc00 20202739 +6fe20623 +c3830000 6fe24fe7 207a0000 -c009836c +c009836d 20202baf 704fe700 20600000 704fe713 20600000 -20400314 -20400422 +20400315 +20400425 78377c00 -20400521 -2036840b -20200411 -20400424 +20400532 +2036840c +20200412 +20400427 20202739 204045bd 204045cd @@ -1065,23 +1068,24 @@ 782efc00 78307c00 7850fc00 -2040042d -20200356 +20400430 +20200357 37c18200 20600000 6fe20623 c3818000 79207e03 67e20623 +704fea01 20600000 6fe20623 -c2818411 +c2818412 6fe24e17 1fe67c06 -2421067d +2421068e 1fe0fe01 67e24e17 -20200411 +20200412 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 +202006e2 6a280f1e 6a480f22 6a660f26 @@ -1122,7 +1126,7 @@ 62480f22 62660f26 20600000 -20400460 +20400464 67244fe8 1a208c01 efe20006 @@ -1131,12 +1135,24 @@ efe40005 1fe0fe01 e7e40005 +20400494 20400483 -20400473 20404618 -2040045c +20400460 6f244fe8 20600000 +1a208c31 +efea0006 +18000400 +18007225 +c3004628 +18408401 +1fe37e00 +c200047b +1840ffff +1a208a22 +e7e20005 +20600000 1a208c00 efe20006 c4030000 @@ -1151,7 +1167,8 @@ e7e20005 67e20623 6fea4528 -67ea0654 +1a208a31 +e7ea0005 20204622 1a208c00 efe20006 @@ -1164,7 +1181,7 @@ 6fe40643 98467e00 1fe67c01 -20228499 +202284aa 20600000 1a208c1a efe40006 @@ -1173,7 +1190,7 @@ 98467e00 d840ffff 98467c00 -20228499 +202284aa 20600000 efe20011 793ffe05 @@ -1200,7 +1217,7 @@ 20600000 20404972 2040475a -20400453 +20400457 20202940 78287c00 6fe40631 @@ -1215,15 +1232,15 @@ 78507c00 19623600 37c18400 -203704c4 +203704d5 1b420400 604c00a4 242c2739 -203704cb +203704dc dd2001e0 1c225000 6fe20623 -c30184cb +c30184dc 2055ac9c 20402abc 7823fc00 @@ -1241,36 +1258,36 @@ 67e204dc 1fe27200 67e2068c -203a04f5 +203a0506 6fe204db 1fe17e03 -c00184ea -c50784ec +c00184fb +c50784fd da204cca -20400538 -c00084ec -20400591 -203a04ec -2040059b +20400549 +c00084fd +204005a2 +203a04fd +204005ac 18c20a00 6fe404db e7e40005 -202004f1 +20200502 d8a004dd -202004f1 +20200502 09800008 19897e00 -c20004ec +c20004fd 78367c00 -202004f5 +20200506 09800008 19897e00 e7e20005 -c20004f1 +c2000502 09800018 78287c00 db600664 -203604fc +2036050d 1fef7e00 1ff17e00 e7e60005 @@ -1278,7 +1295,7 @@ 20232739 7836fc00 6fe242b5 -243a0504 +243a0515 6fe20017 1fe0a200 20402a7b @@ -1300,15 +1317,15 @@ 6fe204db 1fe17e03 c001c866 -2040059b -20400506 +204005ac +20400517 6fe2068c 207a0000 6fe2068d c001c866 -2020039a +2020039b 78377c00 -20400521 +20400532 2036c582 2020458a 68420017 @@ -1316,7 +1333,7 @@ 20402a23 78287c00 d9601388 -202004b9 +202004ca 1a208409 efe20002 203a2baf @@ -1341,13 +1358,13 @@ 6fe204d5 c1018000 20204146 -2040055a +2040056b da204d34 20203f94 da204d34 20403fa5 -20200568 -2040055a +20200579 +2040056b da204d84 20203f94 1a20fe04 @@ -1368,57 +1385,57 @@ 1a420c00 1a427e00 20600000 -2040057c +2040058d 203a2baf 6fe44dd1 1fe0fff6 68444db1 98467c00 -20210563 +20210574 da204cca 20203fa5 da204ca2 -20400538 -203a0561 +20400549 +203a0572 da204ca2 20203fa5 -20400574 +20400585 da204ca2 -203a056d +203a057e da204cca 20203f94 -20400571 +20400582 203a2baf da204ca2 20203f94 6f224caa d8c04cf2 -20200576 +20200587 6f224cd2 d8c04d10 efe60006 9a467c00 -2022857a -c2000576 +2022858b +c2000587 1f227e00 20600000 6fe44dd1 1fe0fff6 68444db1 98467c00 -20210583 +20210594 da204cca -20200538 +20200549 da204ca2 -20400538 +20400549 247a0000 -20200581 +20200592 6fe44dd5 -2020058a +2020059b 58000010 67e44db1 62280f1e -2040057c +2040058d 6a280f1e 20600000 da204cca @@ -1426,16 +1443,16 @@ 6fe44d2e 247a0000 da204cca -20200538 +20200549 6fe64d2e 243a7111 -2040058f +204005a0 1a427e00 67e64d2e 20207111 6fe64d31 243a7111 -2040058f +204005a0 1a427e00 67e64d31 20207111 @@ -1445,12 +1462,12 @@ 1fe22600 20203190 1a627e00 -c00a85a9 +c00a85ba 20203168 704c8c00 704c1700 -204006d5 -204002af +204006e6 +204002b0 202031c3 6842063a 284c0005 @@ -1467,11 +1484,11 @@ 6fe245b5 c0014794 6fe21002 -c001067d +c001068e c002c790 20600000 20404906 -204005ae +204005bf 6fe204db 2feffe04 79208027 @@ -1480,9 +1497,9 @@ 2feffe02 7920800f 6fe204dc -203a05d2 +203a05e3 6fe20623 -c30205d2 +c30205e3 c6078000 20406246 204061b6 @@ -1500,13 +1517,13 @@ d8e00001 20407148 247a0000 -202006d7 -204005ef +202006e8 +20400600 18227e00 c1018000 -202002ee +202002ef 62244db1 -204005ec +204005fd 1a420a00 6fe44db1 e7e20005 @@ -1514,34 +1531,34 @@ e7e20005 e0220005 20600000 -2040055a +2040056b da204d5c 20203f94 da204d5c 20403fa5 -20200568 +20200579 6fe20b97 -243a06d9 +243a06ea 6fe20b98 -243a06d9 +243a06ea 20600000 20404f51 7006ae01 -2040023b +2040023c 20204d60 6fe24c97 207a0000 6fe20b95 247a0000 -20400602 +20400613 704c9f01 20600000 704c8806 704c8731 -204002fa +204002fb 6fec0040 e7ec0005 -20200304 +20200305 6fe20151 1fe17e03 c080a68a @@ -1551,11 +1568,11 @@ 2020268a 1f227e00 67e4012c -203a0608 +203a0619 9ea67c00 20212729 18017e01 -243a061a +243a062b 6fe20151 1fe17e03 c001a649 @@ -1566,11 +1583,11 @@ 98467c00 20212729 da204cca -20400538 +20400549 c000a739 -20400591 +204005a2 203a2739 -20400595 +204005a6 18c20a00 6fe20151 e7e20005 @@ -1583,24 +1600,24 @@ c58026ba 793f8000 20600000 -20400392 +20400393 202026dd 62244db1 -2040053f +20400550 6a244db1 20600000 da204d34 20203fa1 -20400542 -202002eb -20200542 -20400587 +20400553 +202002ec +20200553 +20400598 203a729b 2020729d da204d34 -20200538 +20200549 20202baf -2040063f +20400650 207a0000 6fe2004b c3830000 @@ -1613,7 +1630,7 @@ 18c27e00 67e4013c 6fe4442c -203a0651 +203a0662 20205b2e 6fe40099 203a2baf @@ -1624,7 +1641,7 @@ 70429300 20204b77 67e40fb7 -2020065b +2020066c 68440fb7 18518400 6fe44881 @@ -1643,7 +1660,7 @@ 67e40241 58004e34 67e4023f -2040069e +204006af 204057e8 6fe280a0 67e20124 @@ -1659,34 +1676,34 @@ 2040682b 700f0d15 20206b2e -20400678 +20400689 7854fc00 20600000 6fe24040 c3800000 c3818000 6fe247cd -203a0687 +203a0698 6fe24724 207a0000 20202d53 6fe206ab 67e24bef -202006db +202006ec 7043dd01 20403f41 -202006db +202006ec 6fe20fd6 -c055069d +c05506ae 6fe24131 207a0000 -2040063f +20400650 247a0000 da204d5c -20400538 +20400549 247a0000 da204cca -20400538 +20400549 68424caa 98467c00 24628000 @@ -1698,108 +1715,108 @@ 207a0000 6fe24f64 c1a98000 -202006a0 +202006b1 18227e00 c003a739 c0032739 202025df 580002e0 -20200659 +2020066a 580002a0 -20200659 +2020066a 580002b0 -20200659 +2020066a 58000240 -20200659 +2020066a 58000250 -20200659 +2020066a 580000f0 -20200659 +2020066a 58000320 -20200659 +2020066a 580002f0 -20200659 +2020066a 58000200 -20200659 +2020066a 580001c0 -20200659 +2020066a 58000230 -20200659 +2020066a 58000300 -20200659 +2020066a 58000190 -20200659 +2020066a 58000290 -20200659 +2020066a 58000120 -20200659 +2020066a 58000170 -20200659 +2020066a 580002c0 -20200659 +2020066a 580002d0 -20200659 +2020066a 580001e0 -20200659 +2020066a 58000140 -20200659 +2020066a 580001b0 -20200659 +2020066a 580001a0 -20200659 +2020066a 580001f0 -20200659 +2020066a 58000260 -20200659 +2020066a 58000270 -20200659 +2020066a 58000280 -20200659 +2020066a 58000080 -20200659 +2020066a 58000070 -20200659 +2020066a 580000d0 -20200659 +2020066a 58000060 -20200659 +2020066a 580000c0 -20200659 +2020066a 58000090 -20200659 +2020066a 580000a0 -20200659 +2020066a 580000b0 -20200659 +2020066a 580000e0 -20200659 +2020066a 58000160 -20200659 +2020066a 58000100 -20200659 +2020066a 58000010 -20200659 +2020066a 58000020 -20200659 +2020066a 58000030 -20200659 +2020066a 58000040 -20200659 +2020066a 58000050 -20200659 +2020066a 58000110 -20200659 +2020066a 58000210 -20200659 +2020066a 58000220 -20200659 +2020066a 580001d0 -20200659 +2020066a 58000150 -20200659 +2020066a 58000180 -20200659 +2020066a 58000310 -20200659 +2020066a 58000330 -20200659 +2020066a 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) @@ -41,7 +41,7 @@ 00 #mem_patch26 c8 #mem_patch27 06 #mem_patch28 -89 #mem_patch29 +8b #mem_patch29 04 #mem_patch2A 29 #mem_patch2B 11 #mem_patch2C @@ -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) @@ -23,14 +23,14 @@ 60444957 704c880b 704c873e -204002fa +204002fb 58000007 e7e20005 6fe20639 e7e40005 6ff04953 e7f00005 -20200304 +20200305 2040000d da200009 d8200003 @@ -69,7 +69,7 @@ c006002b c0008008 c0004880 -2020070b +2020071c efea0006 67ea4528 efe40006 @@ -92,22 +92,22 @@ 20600000 eff00006 67f04c0a -204003fa +204003fb 6ff04c6c c4018000 704c880c 704c873e -204002fa +204002fb 58000004 e7e40005 6fe20639 e7e40005 6ff04c0a e7f00005 -20200304 +20200305 efea0006 67ea4c12 -204003fe +204003ff 20348034 6fe24c17 247a0000 @@ -118,14 +118,14 @@ c4028000 704c8808 704c870c -204002fa +204002fb 58000000 e7e20005 6fe20639 e7e40005 6fea4c12 e7ea0005 -20200304 +20200305 20200040 da204140 2040604d @@ -151,7 +151,7 @@ 20600000 c6908000 793f8021 -20200152 +20200153 00000000 00000000 00000000 @@ -195,9 +195,9 @@ 68420048 20407a08 6fe20048 -c2838707 +c2838718 c0188021 -c0060709 +c006071a c0038030 c005800b 20204f6c @@ -235,7 +235,7 @@ 18007e01 2040528d 204052a6 -2020017f +20200180 70004800 20600000 18007e02 @@ -243,7 +243,7 @@ 6fe206a4 e7e20005 204052a6 -20200154 +20200155 00000000 00000000 00000000 @@ -264,7 +264,7 @@ 98467c00 24628000 2040493a -202006d3 +202006e4 00000000 00000000 00000000 @@ -388,14 +388,14 @@ 704c8a01 704c8808 704c8712 -204002fa +204002fb 18007e35 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -20200304 +20200305 00000000 00000000 00000000 @@ -449,14 +449,14 @@ 20200040 704c8808 704c8712 -204002fa +204002fb 18007e00 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -20200304 +20200305 00000000 00000000 00000000 @@ -519,7 +519,7 @@ 67e4003e 7855fc00 704c8a00 -20200705 +20200716 00000000 00000000 00000000 @@ -610,7 +610,7 @@ 24348023 18808fff 704c8a02 -20200705 +20200716 00000000 00000000 00000000 @@ -669,7 +669,7 @@ 67e2004b 6fe20030 c283b413 -20400235 +20400236 202033ca 00000000 00000000 @@ -784,12 +784,12 @@ 204063ce 704c8807 704c8736 -204002fa +204002fb 58000000 e7e20005 6fec0040 e7ec0005 -20200304 +20200305 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 +580005b7 67e4431d -58000142 +58000143 67e4431f -58000141 +58000142 67e4431b -58000688 +58000699 67e44315 -5800068b +5800069c 67e44313 2055802e 24358020 @@ -1000,8 +1000,8 @@ 20403f28 58001171 67e44f5d -20200703 -20400143 +20200714 +20400144 700f0d6a 20203f28 204054b0 @@ -1011,9 +1011,9 @@ 6848833e 6048804c 70804de6 -2040013b +2040013c 70800520 -2020013b +2020013c 58000034 da204be7 d8400008 @@ -1026,10 +1026,10 @@ 793f801c 704c8801 704c8701 -204002fa +204002fb 58000000 e7e20005 -20200304 +20200305 00000000 00000000 00000000 @@ -1092,7 +1092,7 @@ 20400015 704c880a 704c8704 -204002fa +204002fb 6fec0040 e7ec0005 6fe60146 @@ -1101,7 +1101,7 @@ e7e20005 6fec0040 67ec4f37 -20200304 +20200305 6fec4f37 684c0040 98467c00 @@ -1155,7 +1155,7 @@ c0060009 c00b8010 c0058013 -c0198701 +c0198712 c017001d c0208025 20204ba4 @@ -1164,7 +1164,7 @@ 6fe80739 68480779 98467c00 -2022821e +2022821f 20204d8b 6fe44de9 c3014e10 @@ -1178,7 +1178,7 @@ 6fe20030 c3830000 20404d80 -20200235 +20200236 6fe24170 1fe0fe01 68420739 @@ -1195,12 +1195,12 @@ 20600000 704c8803 704c871b -204002fa +204002fb 6fe20046 e7e40005 6fe24170 e7e20005 -20200304 +20200305 00000000 00000000 00000000 @@ -1225,9 +1225,9 @@ c0138033 c014003b c0038037 -c00405f7 -c00101b1 -202006ff +c0040608 +c00101b2 +20200710 6fe20739 67e206a3 c0088012 @@ -1238,14 +1238,14 @@ 20200016 704c8804 704c8708 -204002fa +204002fb 58000000 e7e20005 68420046 e0440005 58000001 e7e20005 -20200304 +20200305 6fe20739 67e206a3 c0058024 @@ -1261,9 +1261,9 @@ c1830000 60420055 700b9b01 -204005fb +2040060c 6fe24c97 -203a023b +203a023c 20600000 20404dc7 6ff00739 @@ -1271,7 +1271,7 @@ 20600000 6fe20739 67e206a4 -20400154 +20400155 20204d51 20404edd 20200034 @@ -1286,14 +1286,14 @@ dfe04d5c 67e40f12 6a240f12 -20400538 +20400549 207a0000 6a240f12 20403fa5 -20400568 +20400579 20200007 1fe22400 -20200568 +20200579 00000000 00000000 00000000 @@ -1344,12 +1344,12 @@ 00000000 20200040 68464dd8 -2040025b -20400258 +2040025c +20400259 c0008007 c0010012 20202baf -20400249 +2040024a 67e44c94 d84003ff 98410400 @@ -1357,13 +1357,13 @@ 1feb7e00 1fecfe00 67e24c1a -20400258 +20400259 67e24c1b -202006fd -20400249 +2020070e +2040024a 67e242a8 20400034 -20400249 +2040024a 67e40f12 20402284 24628000 @@ -1372,7 +1372,7 @@ c280002c 6fe40f12 67e44db1 -2040057c +2040058d 205a723a 6fe40f12 1fe22200 @@ -1384,7 +1384,7 @@ e0220005 6fe40f12 1fe27200 -2040025d +2040025e 2020712d 6fe40f12 2040003a @@ -1400,7 +1400,7 @@ c1008000 18000202 20600000 -2040058a +2040059b 203a729b 2020729d 00000000 @@ -1488,7 +1488,7 @@ 2020000a 20404c78 20400019 -20200602 +20200613 20400019 20404c78 20404c7c @@ -1497,12 +1497,12 @@ 20600000 704c8809 704c8732 -204002fa +204002fb 6fec0040 e7ec0005 6fe647d3 e7e60005 -20200304 +20200305 00000000 00000000 00000000 @@ -1539,14 +1539,14 @@ c4010000 704c880a 704c873e -204002fa +204002fb 58000003 e7e40005 6fe20639 e7e40005 6fec4530 e7ec0005 -20200304 +20200305 00000000 00000000 00000000 @@ -1603,12 +1603,12 @@ c4000000 704c8813 704c873e -204002fa +204002fb 58000001 e7e40005 6fe20639 e7e40005 -204002bb +204002bc e0420005 6fe24626 e7e20005 @@ -1622,7 +1622,7 @@ 6fe2065b e7e20005 6fe20639 -20200304 +20200305 00000000 00000000 00000000 @@ -1665,7 +1665,7 @@ 20200040 704c8817 704c8718 -204002fa +204002fb 6fec0040 e7ec0005 d8c04297 @@ -1673,7 +1673,7 @@ 2040712d 18007e00 e7e20005 -20200304 +20200305 00000000 00000000 00000000 @@ -1799,8 +1799,8 @@ 684c0149 20402289 20628000 -204001a2 -204002fa +204001a3 +204002fb 58000001 e7e20005 6fec0149 @@ -1821,18 +1821,18 @@ 6fe80132 9c467e00 e7e40005 -20200304 +20200305 6fe60146 e7e60005 6fe80132 9c467e00 e7e40005 6fe20018 -2040018d +2040018e e7e20005 6fe24c9c c001002b -20200304 +20200305 6fe64d2e 1fe20c00 efe20006 @@ -1843,7 +1843,7 @@ 2040712d 184672f0 20407100 -20200304 +20200305 00000000 00000000 00000000 @@ -1858,18 +1858,18 @@ 6fe24c18 c0090005 c011001a -2020028e +2020028f 6fe24ded -203a0290 -20400252 +203a0291 +20400253 67ee4e0a 2040000e 6fe24ded 1fe0ffff 67e24ded -20200292 -20400269 -243a0290 +20200293 +2040026a +243a0291 1a420a00 1a40a407 1a420c00 @@ -1880,16 +1880,16 @@ 18a08bf9 e7ee0005 20600000 -20400249 +2040024a 67e4495f -20400249 +2040024a 67e44961 20400024 df200003 -20400296 +20400297 6fe20639 e7e40005 -20200304 +20200305 da400014 da200009 d8200003 @@ -1921,7 +1921,7 @@ 20200040 704c8806 704c8714 -204002fa +204002fb 6fe24c89 e7e20005 6fe20046 @@ -1934,7 +1934,7 @@ 2020000f 58000000 e7e40005 -20200304 +20200305 00000000 00000000 00000000 @@ -1985,7 +1985,7 @@ 20200040 704c8804 704c8705 -204002fa +204002fb 58000000 e7e20005 6fe24e18 @@ -1995,7 +1995,7 @@ 6fe2004c 793ffe05 67e2004c -20200304 +20200305 00000000 00000000 00000000 @@ -2049,12 +2049,12 @@ 20200040 704c8807 704c8720 -204002fa +204002fb 6fec0040 e7ec0005 6fe24ca0 e7e20005 -20200304 +20200305 00000000 00000000 00000000 @@ -2113,7 +2113,7 @@ 20200040 704c880b 704c8703 -204002fa +204002fb 6fe24c8a e7e20005 6fe20046 @@ -2128,7 +2128,7 @@ 7920fe00 e7e20005 6fe20046 -20200304 +20200305 00000000 00000000 00000000 @@ -2184,33 +2184,33 @@ c0030011 c004000e c01f8012 -2020028e -202006f3 -202006f5 -202006f7 -202006f9 -202006fb -2020028e -2020028e +2020028f +20200704 +20200706 +20200708 +2020070a +2020070c +2020028f +2020028f 6fe24c18 c0008019 c00b801d c010001f c0518024 c0300034 -2020028e -2040024f +2020028f +20400250 67ec4c8d -20400265 -20200292 +20400266 +20200293 704e193f -20200292 +20200293 df200002 -2040029b +2040029c 58000000 e7e40005 -20200304 -20400249 +20200305 +2040024a 68420046 98467c00 2022802b @@ -2219,18 +2219,18 @@ 24628000 604242a8 df200003 -2040029b +2040029c 6fe242a8 e7e40005 6fe20018 -2040018d +2040018e e7e20005 -20200304 +20200305 df200002 -2040029b +2040029c 6fe44f35 e7e40005 -20200304 +20200305 00000000 00000000 00000000 @@ -2247,14 +2247,14 @@ 67e40f12 20200008 6a240f12 -20400538 +20400549 207a0000 6a240f12 20403fa5 -20400568 +20400579 20200008 1fe22400 -20200568 +20200579 00000000 00000000 00000000 @@ -2304,7 +2304,7 @@ 00000000 20200040 6fe24f34 -243a06f1 +243a0702 704f3401 20400023 6f224cd2 @@ -2370,7 +2370,7 @@ 6fe24c18 c005001a c007001d -c00983bf +c00983c0 c00b000f c00b8019 c00c0019 @@ -2380,9 +2380,9 @@ c0078020 c0080025 c0088029 -202006ef -20400249 -204002a2 +20200700 +2040024a +204002a3 da200009 d8200003 204049ab @@ -2391,29 +2391,29 @@ 6ff04ddf e7f00005 20600000 -2020028e -20400258 +2020028f +20400259 67e244de -20200292 +20200293 7044d900 704c8b00 -20200292 +20200293 df200002 -20400296 +20400297 58000004 e7e20005 -20200304 +20200305 704ded00 704e0a00 704dee00 -20200292 +20200293 68424ded 18467c04 -20228290 -20400252 +20228291 +20400253 67ee4e0a 20400030 -20200292 +20200293 6fe24ded d8a04dee 1feffe07 @@ -2437,63 +2437,63 @@ c0058012 c0060025 c0068029 -202006ed -20400258 +202006fe +20400259 67e244df 1fe27200 -20400246 -20200292 -20400258 +20400247 +20200293 +20400259 67e244ff 1fe27200 -20400246 -20200292 +20400247 +20200293 6fe244d9 -243a0290 -20400258 +243a0291 +20400259 67e24636 -20400249 +2040024a 67e444da -20400249 +2040024a 67e444dc -20400258 +20400259 67e24637 -20400258 +20400259 67e24e11 6fe444da 684444dc 98467c00 -24228292 +24228293 1fe3fe00 67e444da -20200292 -20400258 +20200293 +20400259 67e244d9 -20400258 -20200292 -20400249 +20400259 +20200293 +2040024a 67e444da -20400249 +2040024a 67e444dc -20400258 +20400259 67e24e11 98267c00 -20428260 -20400258 +20428261 +20400259 67e24626 -2040024f +20400250 67ec4627 -20400258 +20400259 67e2462d -20400249 +2040024a 1febfe00 67e444d7 -20400249 -20400249 +2040024a +2040024a 67e44632 -20400249 +2040024a 67e44634 -20200262 +20200263 20200040 6fe24c18 c001800a @@ -2503,8 +2503,8 @@ c02b0029 c036002d c0368032 -2020028e -20400292 +2020028f +20400293 5800003f 67f04c6c 5fffffff @@ -2514,39 +2514,39 @@ 67e244de 67e244d9 67e24133 -20200265 -204001e1 -20400249 +20200266 +204001e2 +2040024a 67e40051 df200003 -20400296 +20400297 6fe20046 e7e40005 7042a71d -20200304 -20400258 +20200305 +20400259 67e24c98 df200064 d8a00183 -20400246 -20200292 +20400247 +20200293 df200002 -20400296 +20400297 6fe24c97 e7e20005 -20200304 -20400258 +20200305 +20400259 67e24c97 -203a028c -20200292 +203a028d +20200293 df200003 -20400296 +20400297 6fe44de7 e7e40005 -20200304 -20400249 +20200305 +2040024a 67e44de7 -20200292 +20200293 00000000 00000000 00000000 @@ -2562,16 +2562,16 @@ 6fe24c18 c0158005 c0160015 -2020028e -2040024f +2020028f +20400250 67ec42a9 -2040024c +2040024d 67e647ce df200007 -20400296 +20400297 6fec0040 e7ec0005 -20400304 +20400305 6fe24c9f c0008012 7042a716 @@ -2579,14 +2579,14 @@ 204033e5 700b9b01 20600000 -2040024f +20400250 67ec42a9 2040001d df200007 -20400296 +20400297 6fec0040 e7ec0005 -20200304 +20200305 700b950a 700b9701 20600000 @@ -2628,13 +2628,13 @@ c00e0018 c00e8020 c00d802b -202006eb +202006fc 704fa601 -2040024f +20400250 67ec42a9 -20400249 +2040024a 67e200b6 -20400249 +2040024a 9c40fe00 1fe17ffc 67e800b7 @@ -2645,101 +2645,101 @@ 20228016 704fa602 7042a703 -202002a2 +202002a3 6fe24c9b -c08102a6 -20400249 -203a02a6 -20400258 +c08102a7 +2040024a +203a02a7 +20400259 67e206a7 7042a715 -202002a2 -20400249 +202002a3 +2040024a 67e242a8 20402284 -242282a6 +242282a7 1a208c01 efe20006 c2800029 -204002a2 +204002a3 20203420 -204002a2 +204002a3 202048f0 6fe24c9b -c08102a6 -20400249 +c08102a7 +2040024a 67e242a8 -203a02a6 -204002a2 +203a02a7 +204002a3 6ff04e1a 243a0035 7042a704 20600000 704c880b 704c870b -204002fa +204002fb 58000000 e7e20005 6fe20046 e7e40005 6ff04e1a e7f00005 -20200304 +20200305 00000000 20200040 6fe24c18 c0058009 c0060011 c0068018 -c0070024 -c008802c -c0098030 -202006e9 -2040024f +c0070021 +c0088029 +c009802d +202006fa +20400250 67ec42a9 d8a04297 18007210 -20400246 +20400247 70429301 7042a70b -20200027 -2040024f +20200024 +20400250 67ec42a9 7042a70c -20400027 +20400024 6fe24c97 -203a023b +203a023c 20600000 -6fe24ff0 -1fe0fe01 -67e24ff0 -2040024f +20400250 67ec42a9 -20400258 +20400259 67e247f1 98007200 d8a047f2 -20400246 +20400247 7042a709 -20200027 -2040024f +20200024 +20400250 67ec42a9 7042a70a df200007 -20400296 +20400297 6fec0040 e7ec0005 -20200304 -20400249 +20200305 +2040024a 67e242a8 7042a70d -202002a2 -20400249 +202002a3 +2040024a 67e242a8 -20400258 +20400259 1fe0fe0e 67e242a7 -202002a2 +202002a3 +00000000 +00000000 +00000000 00000000 00000000 00000000 @@ -2755,13 +2755,13 @@ c0030006 c004001c c005002f -202006e7 -20400249 +202006f8 +2040024a 67e242a8 -20400258 +20400259 67e206a4 20402284 -242282a6 +242282a7 1a208c01 efe20006 c2800018 @@ -2769,16 +2769,16 @@ 6fe242a8 6842439b 98467c00 -242282a2 +242282a3 7042a711 6fe2439a 67e242a8 -202002a2 +202002a3 6fe206a4 67e20f12 20404894 -202002a2 -2040024f +202002a3 +20400250 67ec42a9 7042a71a 6fe24c9b @@ -2790,26 +2790,26 @@ 704c9600 2040002a 704c8a02 -20200184 +20200185 704c9602 df200007 -20400297 +20400298 6fec42a9 e7ec0005 -20200304 +20200305 6fe24ca1 -c00002a6 -c00102a4 +c00002a7 +c00102a5 6fe24c9b -c00102a4 +c00102a5 704ca102 -2040024f +20400250 67ec42a9 -20400258 +20400259 67e24c8a 7042a708 -204002a2 -20200184 +204002a3 +20200185 00000000 00000000 00000000 @@ -2828,69 +2828,69 @@ c0230033 c0238034 c0288036 -202006e5 -20400249 +202006f6 +2040024a 67e44153 -20400249 +2040024a 67e44151 -20200292 +20200293 df200005 -20400296 +20400297 6fe4414f e7e40005 6fe4414d e7e40005 -20200304 -20400249 +20200305 +2040024a 67e4414f -20400249 +2040024a 67e4414d -20200292 +20200293 df200004 -20400296 +20400297 6fe6414a e7e60005 -20200304 -2040024c +20200305 +2040024d 67e6414a -20200292 -2020028e -20400258 -2020028e +20200293 +2020028f +20400259 +2020028f df200002 -20400296 +20400297 6fe24c9c e7e20005 -20200304 -20400258 +20200305 +20400259 67e24c9c -20200292 -2020028e -20400258 -2020028e +20200293 +2020028f +20400259 +2020028f df2000f2 -20400296 +20400297 6fe24c98 e7e20005 d8c00183 df200064 2040713a -20200304 +20200305 00000000 00000000 20200040 6fe24c18 c0070005 c007800a -2020028e +2020028f df200003 -20400296 +20400297 6fe44de9 e7e40005 -20200304 -20400249 +20200305 +2040024a 67e44de9 -20200292 +20200293 00000000 00000000 00000000 @@ -2949,60 +2949,60 @@ c0058022 c006002d c0068035 -202006e3 +202006f4 6fe44deb -c30102a4 +c30102a5 6fe44de9 -c30102a4 +c30102a5 6fe24c9b -c08102a6 -20400249 +c08102a7 +2040024a 67e40253 -20400249 +2040024a 67e40255 -20400249 +2040024a 67e40257 58000040 67e4430b -20400249 +2040024a 67e4430d -20400249 +2040024a 67e4430f 7042a712 -202002a2 -20400249 +202002a3 +2040024a 67e40253 6fe20031 -c30302a4 +c30302a5 7042a713 -202002a2 +202002a3 6fe24c9b -c08102a6 +c08102a7 6fe44deb -c30002a4 +c30002a5 6fe44de9 -c30002a4 -2040024f +c30002a5 +20400250 67ec42a9 -20400258 +20400259 7042a718 -202002a2 -204001e1 +202002a3 +204001e2 df200005 -20400296 +20400297 6fe20046 e7e40005 6fe44deb e7e40005 -20200304 -204001e1 -20400249 +20200305 +204001e2 +2040024a 67e44deb df200003 -20400296 +20400297 6fe20046 e7e40005 -20200304 +20200305 00000000 00000000 00000000 @@ -3013,44 +3013,44 @@ c0018010 c0028015 c003001a -202006e1 -20400255 +202006f2 +20400256 67f04c6c -20200292 +20200293 df200004 -20400296 +20400297 580400fb e7e60005 -20200304 +20200305 df200009 -20400296 +20400297 6ff04ddf e7f00005 -20200304 +20200305 6fe244de -243a0290 -2040024f +243a0291 +20400250 67ec4c7a -20200292 +20200293 6fe244de -243a0290 -20400249 +243a0291 +2040024a 67e44617 -20400249 +2040024a 67e44619 -20400258 +20400259 2040002d 6042461b -20400258 +20400259 205a0035 245a0039 -20400258 -2040024f -20400258 +20400259 +20400250 +20400259 67e24624 -20400258 +20400259 67e24e11 -20200292 +20200293 d8400000 c1000000 d8400002 @@ -3078,30 +3078,30 @@ c002001e c002801e c0048019 -2020028e +2020028f df200009 -20400296 +20400297 6ff04c24 e7f00005 -20200304 +20200305 df200041 -20400296 +20400297 d8c04c2c df200040 2040713a -20200304 +20200305 df200009 -20400296 +20400297 6ff04138 e7f00005 -20200304 +20200305 df200007 -20400296 +20400297 6fec4140 e7ec0005 -20200304 +20200305 df200008 -20400296 +20400297 580002a8 e7e40005 5800003c @@ -3109,7 +3109,7 @@ 58000008 e7e40005 e7e40005 -20200304 +20200305 00000000 00000000 00000000 @@ -3144,51 +3144,51 @@ c00c8028 c00d002d c00d8030 -202006df -20400255 +202006f0 +20400256 67f04c1c -20200292 -2040025d +20200293 +2040025e d8a0468a df200042 2040713a df200042 d8c0468a d8400000 -20400161 +20400162 60424689 -20200292 +20200293 df2000f9 -20400296 +20400297 d8c0468a df200040 2040713c df200017 204070e4 -20200304 +20200305 df200003 -20400296 +20400297 6fe44159 e7e40005 -20200304 -20400249 +20200305 +2040024a 67e44159 -20200292 +20200293 df200002 -20400296 +20400297 6fe24133 e7e20005 -20200304 -20400258 +20200305 +20400259 67e24133 -20200292 +20200293 df200005 -20400296 +20400297 6fe44153 e7e40005 6fe44151 e7e40005 -20200304 +20200305 00000000 00000000 00000000 @@ -3204,11 +3204,11 @@ c0010017 c0028019 c0048025 -202006dd +202006ee 7920001c -2040024c +2040024d 67e64147 -20400258 +20400259 d8400800 984ffe00 d840ffff @@ -3217,36 +3217,36 @@ 18427e00 18000e02 20407141 -20400258 +20400259 67e24c99 67e24c9a -202002a2 +202002a3 7042a702 -20200292 -2040024f +20200293 +20400250 67ec42a9 -20400249 +2040024a 67e40251 -20400249 +2040024a 67e200b6 -20400249 -20400258 +2040024a +20400259 67e24ad0 704c9b01 7042a705 -202002a2 +202002a3 6fe24ca1 -c00002a6 -c00102a4 +c00002a7 +c00102a5 6fe24c9b -c00102a4 -2040024f +c00102a5 +20400250 67ec42a9 7042a707 -20400258 -c00082a2 +20400259 +c00082a3 7042a719 -204002a2 +204002a3 20204d51 00000000 00000000