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 4542) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (working copy) @@ -3,7 +3,7 @@ //define TEST_QUEUE_DEBUG //define RF_DEBUG //define WHITE_LIST -//define MINZHAN_SDK +define MINZHAN_SDK define FSC_RTK_HOST //define PATCH_DEBUG_LOG /******************************************/ @@ -2652,6 +2652,10 @@ branch z_enter_hibernate_prepare_work p_lpm_dispatch: +ifdef MINZHAN_SDK + fetch 1,mem_ota_enable_xip_flag + beq OTA_NEED_ENABLE_XIP_FLAG,p_loadcode_normal +endif fetch 1,mem_lpm_mode rtn blank call p_l2cap_malloc_is_fifo_empty @@ -2666,6 +2670,11 @@ nrtn zero branch lpm_dispatch+12 +ifdef MINZHAN_SDK +p_loadcode_normal: + branch soft_reset +endif + //get qspi lock qspi_get_lock: jam 1,mem_qspi_lock_flag_respin // I'm interested 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 4542) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (working copy) @@ -1982,7 +1982,9 @@ org z z_app_init: - //jam 0,mem_ota_enable_xip_flag +ifdef MINZHAN_SDK + jam 0,mem_ota_enable_xip_flag +endif // RAM reset. //jam 0,mem_ota_wdt_en_flag //jam 0,mem_ota_wdt_m0_en @@ -2046,7 +2048,9 @@ // store local addr fetch 6,mem_lap store 6,mem_local_bdaddr - +ifdef MINZHAN_SDK + jam 2 ,core_reset +endif call enable_xip fetch 1,mem_hibernate_flag Index: ModuleDemo/25_OTA/bt_demo/CM0/User/main.c =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/main.c (revision 4542) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/main.c (working copy) @@ -41,11 +41,11 @@ }; +#define GPIO_0_5_ADC_DATA HREADW(mem_0_5_adc_io_data) +#define GPIO_1V_ADC_DATA HREADW(mem_1v_adc_io_data) +#define HVIN_3V_ADC_DATA HREADW(mem_3v_adc_hvin_data) +#define HVIN_5V_ADC_DATA HREADW(mem_5v_adc_hvin_data) -#define GPIO_0_5_ADC_DATA HWRITEW(mem_0_5_adc_io_data) -#define GPIO_1V_ADC_DATA HWRITEW(mem_1v_adc_io_data) -#define HVIN_3V_ADC_DATA HWRITEW(mem_3v_adc_hvin_data) -#define HVIN_5V_ADC_DATA HWRITEW(mem_5v_adc_hvin_data) int main(void) { @@ -63,7 +63,7 @@ h4_init(); sleep_500ms; - LPM_ENABLE; +// LPM_ENABLE; // POWER_OFF; while (1) { 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 4542) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (working copy) @@ -1,5 +1,4 @@ -70809f3e -20200041 +20200040 20000001 20000002 20000003 @@ -63,90 +62,89 @@ 2000003d 2000003e 2000003f -c2840061 -c0010085 -c0070187 -c0080195 -c00e0178 -c00f0198 -c01001f4 -c01201c4 -c019015a -c01c8167 -c01d0169 -c01f01e9 -c02081b9 -c02205bb -c02a05b7 -c02c0523 -c02e053f -c02e8545 -c03505bd -c03585bf -c03601b0 -c04080ec -c042810a -c04300cf -c04f00d3 -c050014c -c05205a3 -c0540595 -c05c85c1 -c05d04b4 -c0700143 +c2840060 +c0010083 +c0070184 +c0080192 +c00e0175 +c00f0195 +c01001f1 +c01201c1 +c0190157 +c01c8164 +c01d0166 +c01f01e6 +c02081b6 +c02205b6 +c02a05b2 +c02c051c +c02e0538 +c02e853e +c03505b8 +c03585ba +c03601ad +c04080ea +c0428107 +c04300cd +c04f00d1 +c0500149 +c052059b +c054058d +c05c85bc +c05d04ad +c0700140 20202baf -70809f3e -c00385c3 -c0060211 -c00905c5 -c009845d -c00a043c -c0118450 -c0128547 -c013054b -c013854d -c014054f -c0148550 -c0150555 -c01d8365 -c01f036e -c01f8331 -c02083c5 -c021058c -c02583c9 -c02783a9 -c02904d3 -c02c05c7 -c02d84ec -c02e85c9 -c03004f6 -c03204f2 -c037056b -c03805cb -c03885cd -c03a014e -c0490556 -c0528505 -c0530505 +c00385be +c006020e +c00905c0 +c0098456 +c00a0435 +c0118449 +c0128540 +c0130544 +c0138546 +c0140548 +c0148549 +c015054e +c01d8361 +c01f036a +c01f832e +c02083bf +c0210584 +c02583c3 +c02783a3 +c02904cc +c02c05c2 +c02d84e5 +c02e85c4 +c03004ef +c03204eb +c0370564 +c03805c6 +c03885c8 +c03a014b +c049054f +c05284fe +c05304fe c1590000 c16a0000 20202baf 20406490 20406863 20406326 -204000a0 +2040009e 2040203c 20403153 -2040008f +2040008d 2040233d -20400095 +20400093 20202021 c68e0000 18000e02 20407148 7d3a001c 243a209e -202005cf +202005ca 6fe24133 c4008000 6fe20030 @@ -159,7 +157,7 @@ 18423600 202023b7 204045b4 -204000a3 +204000a1 2020455e 6fe244d9 c1808000 @@ -176,23 +174,23 @@ 7854fc00 78487c00 69644e32 -204000c4 -243680c1 +204000c2 +243680bf 204047d5 1a227e00 67e24626 6fec04dd 67ec0633 6fe24c8b -c000833a -2040029a +c0008336 +20400297 204046d3 -243680c1 +243680bf 6fe204dc -c00300c1 -2040029a +c00300bf +20400297 6fe44e32 -243a00af +243a00ad 20600000 204045c7 204045bd @@ -208,12 +206,12 @@ 6fe24013 793ffe06 67e24013 -202000d5 -204000d5 +202000d3 +204000d3 20202bd8 20405900 70894bba -204000de +204000dc 708907ff 20402a70 70895074 @@ -221,9 +219,9 @@ 70896d07 20600000 6fe242b4 -c00080e2 -c00200e8 -c00100e2 +c00080e0 +c00200e6 +c00100e0 5888e0d0 67e68955 584a103c @@ -233,9 +231,8 @@ 5888c0d0 67e68955 584a106c -202000e5 -20407a63 -203080f9 +202000e3 +203080f6 708955d4 20000004 708955d2 @@ -243,8 +240,8 @@ 708955d1 20000004 6fe242b4 -c00080f7 -c0020107 +c00080f4 +c0020104 708955d0 708956e0 18002a08 @@ -263,7 +260,7 @@ 20600000 708955d0 708956c0 -202000f9 +202000f6 60420017 1840a200 6fe242b5 @@ -271,7 +268,7 @@ 20402a7b 58000250 20402bb1 -204000de +204000dc 6fe28906 79207e00 67e28906 @@ -285,25 +282,25 @@ 2000000a 7089027d 6fe242b4 -c0000131 -c002012c +c000012e +c0020129 70894cfb 70894def 70894eec 70894f5e -c0008133 -c0028128 +c0008130 +c0028125 20202a51 708956ff 20402a5d 708955ff 20600000 -20400137 +20400134 708956cc 20402a5d 708955d8 20600000 -20400137 +20400134 20202a49 708956f7 20402a5d @@ -325,7 +322,7 @@ 6fe8833e 793ffe1d 67e8804c -20200148 +20200145 37d98200 70800520 37d98200 @@ -336,9 +333,9 @@ 204052b0 6fe20048 207a0000 -202005d1 -204005d3 -20200200 +202005cc +204005ce +202001fd 6fe2004b 79207e03 67e2004b @@ -349,13 +346,13 @@ d8c00183 df2000f0 d8400000 -20400162 +2040015f 60440099 2020238d efe20006 207a0000 18408401 -c2000162 +c200015f 20600000 704fa500 20202414 @@ -372,30 +369,30 @@ 20402841 20402827 20404b89 -2040017b +20400178 20202425 20404b89 -2040017b +20400178 20202198 6fe242a7 207a0000 6fe2007c 247a0000 -202005d5 +202005d0 704c9b02 704c8a00 -20200185 +20200182 704c9b00 704ca100 704c9f00 -202005d7 +202005d2 6fe24c9a -203a05d9 +203a05d4 6fe24c99 -203a05cf +203a05ca 1fe0ffff 67e24c99 -202005d9 +202005d4 6fe20018 1ff18400 184f840a @@ -405,20 +402,20 @@ 20600000 20402108 704c8a04 -20200183 +20200180 204024d2 7854fc00 6fe24c9b -c0008195 +c0008192 6fe2004c c28221c5 6fe20030 c30221c4 -20200282 +2020027f 6fe24c9c -c00001a7 -c00081aa -c00101ad +c00001a4 +c00081a7 +c00101aa 704c8702 20600000 704c880f @@ -434,22 +431,22 @@ 1fe67c64 242127fd 202027ea -2040021c +20400219 68420046 98467c00 20628000 -2020025e +2020025b 20402337 -202c01c1 +202c01be 204024ca -243a01b9 +243a01b6 78587c00 1d027e00 67e84169 20600000 2040248f 704c8a00 -202005db +202005d6 204021ec 24740000 78547c00 @@ -457,15 +454,15 @@ 793f800b 20402b71 2040232b -c50581d4 +c50581d1 204024ca -243a01c9 +243a01c6 78547c00 1c427e00 67e84169 78387c00 7834fc00 -202005dd +202005d8 20402b6f d8200010 20402321 @@ -474,10 +471,10 @@ 20402917 204024ab 204024f3 -203681e0 +203681dd 204024ca -243a01db -202001ce +243a01d8 +202001cb 18000401 6fe20031 793ffe01 @@ -486,7 +483,7 @@ 20402940 78347c00 704c8a01 -202005db +202005d6 70011600 70015000 204024d2 @@ -494,10 +491,10 @@ 2040724d 6fe24c9b 207a0000 -20200282 +2020027f 20404d8e c6108000 -20200200 +202001fd 6fe20030 c283a1e1 6fe20b9c @@ -509,51 +506,51 @@ 67e2004b 204021e1 c6108000 -202005d3 +202005ce 704c8803 704c8706 -204002c8 +204002c5 18007e00 e7e20005 6fe20046 e7e40005 -202002d2 +202002cf 704c8806 704c8717 -204002c8 +204002c5 6fec0040 e7ec0005 -202002d2 +202002cf 704c8806 704c8716 -2020020a +20200207 6fe243de 207a0000 20403e9d 20628000 1fe20c00 20403e92 -c0058250 +c005824d 20203ef4 -20400230 +2040022d 2040712d -2020022d -20400230 +2020022a +2040022d efe40006 -2020022d -20400230 +2020022a +2040022d efe60006 -2020022d -20400230 +2020022a +2040022d efec0006 -2020022d -20400230 +2020022a +2040022d efee0006 -2020022d -20400230 +2020022a +2040022d eff00006 -2020022d -20400230 +2020022a +2040022d efe20006 18c20400 60464bf2 @@ -567,9 +564,9 @@ 20600000 20600000 704ddb00 -2020023c +20200239 704ddb03 -2020023c +20200239 62464ddc 58004b4a 67e443e3 @@ -585,11 +582,11 @@ 18007e06 67e243e2 20203f1a -204005df +204005da 6a464dd8 -20200238 +20200235 6a464dd8 -2020047c +20200475 20403e92 20403e92 67e24dd7 @@ -597,56 +594,56 @@ d8a04dd8 20403e88 6fe24dd7 -c000024e -c001824b +c000024b +c0018248 20202baf 704c9612 -20200261 +2020025e 704c9601 -20200261 +2020025e 704c960c -20200261 +2020025e 704c9600 df200001 -20400265 -202002d2 +20400262 +202002cf 704c9600 -20400269 +20400266 6fe24c96 e7e20005 20600000 704c870e 1f20fe03 67e24c88 -204002c8 +204002c5 6fe64c93 e7e60005 20600000 700f1200 -20200275 +20200272 700f120c -20200275 +20200272 700f1202 704c870f 704c8804 -204002c8 +204002c5 6fe20f12 e7e20005 6fe64c93 e7e60005 -202002d2 +202002cf 6ff04c6c c4020000 6fe20639 67e24e18 -202005e1 +202005dc 6fe20046 67e24e18 793f8021 70004600 704ca100 704c9b00 -202005e1 +202005dc 6fe20624 d8400000 c1018000 @@ -672,15 +669,15 @@ 67e24c88 1fe0fe03 67e44db1 -20400490 +20400489 207a0000 704c873e -204002c8 +204002c5 58000002 e7e20005 58000001 e7e20005 -2040028e +2040028b e0420005 204047d5 1a227e00 @@ -692,37 +689,37 @@ e0420005 18427200 2040712d -2040018e +2040018b e7e20005 -202002d2 +202002cf 6fe20046 67e242a8 -202002be +202002bb 6fe20639 67e242a8 704c8805 704c8713 -204002c8 +204002c5 58000001 e7e20005 6fe242a8 e7e40005 58000001 e7e40005 -202002d2 +202002cf 6fe24c88 1fe0fe03 67e44db1 -204002cf +204002cc 6fe64c86 e7e60005 20600000 -2040045a +20400453 1a420a00 20600000 da204d84 20403fa5 -2020023a +20200237 18000400 18000201 60421001 @@ -738,9 +735,9 @@ 20600000 6fe2063a c3828000 -20400304 -20400318 -203a02d5 +20400301 +20400315 +203a02d2 efe20006 ea220006 9a267e00 @@ -756,8 +753,8 @@ 18427200 2040712d 2040480e -204002d7 -20400318 +204002d4 +20400315 efe20006 1fe22200 18c23000 @@ -772,15 +769,15 @@ 202049f1 6fe24683 203a480c -2040030e +2040030b c6130000 da204d5c -2040044d +20400446 c000480c c000c80c 79200026 20600000 -20400318 +20400315 203a480c efe20006 e8420006 @@ -792,7 +789,7 @@ 20600000 da204d5c 20203fa1 -2040031c +20400319 20202739 204045bd 204045cd @@ -815,14 +812,13 @@ 08008608 2022c6a6 202046a3 -20407a4f 204045aa 20404766 -204002e2 -2040031a -20400423 +204002df +20400317 +2040041c 20404594 -20340432 +2034042b 2020458a 6fec0633 684c4627 @@ -835,16 +831,16 @@ 7042a700 70065b00 204047d2 -202005e3 -204004a8 +202005de +204004a1 67e64e15 58000000 67e64d2e 6fe20046 67e242a8 704ddb05 -20200355 -204004ae +20200351 +204004a7 67e64e15 58000000 67e64d31 @@ -879,43 +875,41 @@ 204045b4 2040315c 6fe20624 -c0018375 +c0018371 20204579 -2040031c -20200436 +20400319 +2020042f 7834fc00 204048fd -20210592 +2021058a 204045fc -204002e2 +204002df 7856fc00 -20400373 -2436839d -20407a4f -20400398 +2040036f +24368397 +20400392 20404766 -20400423 +2040041c 20404594 -20340385 +20340380 7854fc00 20202739 -204002e2 -2040038b +204002df +20400386 78377c00 -20400436 -2036837d -20200383 -2040038d +2040042f +20368379 +2020037e +20400388 20202739 204045bd 204045cd -20407a47 79202a00 782efc00 78307c00 7850fc00 -20400396 -20200324 +20400390 +20200321 37c18200 20600000 6fe20623 @@ -924,13 +918,13 @@ 67e20623 20600000 6fe20623 -c2818383 +c281837e 6fe24e17 1fe67c06 -24210592 +2421058a 1fe0fe01 67e24e17 -20200383 +2020037e 684c4639 20600000 684c4c7a @@ -948,8 +942,8 @@ 67e24537 18427200 6fe2461c -205a03a5 -245a03a7 +205a039f +245a03a1 604c4538 d8c044e0 2040712d @@ -962,10 +956,10 @@ 67e40124 24610000 2040473e -202005e5 +202005e0 20404972 2040475a -204003bc +204003b6 20202940 78287c00 6fe40631 @@ -980,15 +974,15 @@ 78507c00 19623600 37c18400 -203703d9 +203703d3 1b420400 604c00a4 242c2739 -203703e0 +203703da dd2001e0 1c225000 6fe20623 -c30183e0 +c30183da 2055ac9c 20402abc 7823fc00 @@ -1006,44 +1000,43 @@ 67e204dc 1fe27200 67e2068c -203a040a +203a0404 6fe204db 1fe17e03 -c00183ff -c5078401 +c00183f9 +c50783fb da204cca -2040044d -c0008401 -204004a4 -203a0401 -204004ae +20400446 +c00083fb +2040049d +203a03fb +204004a7 18c20a00 6fe404db e7e40005 -20200406 +20200400 d8a004dd -20200406 +20200400 09800008 19897e00 -c2000401 +c20003fb 78367c00 -2020040a +20200404 09800008 19897e00 e7e20005 -c2000406 +c2000400 09800018 78287c00 db600664 -20360411 +2036040b 1fef7e00 1ff17e00 e7e60005 -20437a57 20232739 7836fc00 6fe242b5 -243a0419 +243a0412 6fe20017 1fe0a200 20402a7b @@ -1065,15 +1058,15 @@ 6fe204db 1fe17e03 c001c866 -204004ae -2040041b +204004a7 +20400414 6fe2068c 207a0000 6fe2068d c001c866 -2020034e +2020034a 78377c00 -20400436 +2040042f 2036c582 2020458a 68420017 @@ -1081,7 +1074,7 @@ 20402a23 78287c00 d9601388 -202003ce +202003c8 1a208409 efe20002 203a2baf @@ -1106,13 +1099,13 @@ 6fe204d5 c1018000 20204146 -2040046f +20400468 da204d34 20203f94 da204d34 20403fa5 -2020047c -2040046f +20200475 +20400468 da204d84 20203f94 1a20fe04 @@ -1133,55 +1126,55 @@ 1a420c00 1a427e00 20600000 -20400490 +20400489 203a2baf 6fe44dd1 68444db1 98467c00 -20210477 +20210470 da204cca 20203fa5 da204ca2 -2040044d -203a0475 +20400446 +203a046e da204ca2 20203fa5 -20400488 +20400481 da204ca2 -203a0481 +203a047a da204cca 20203f94 -20400485 +2040047e 203a2baf da204ca2 20203f94 6f224caa d8c04cf2 -2020048a +20200483 6f224cd2 d8c04d10 efe60006 9a467c00 -2022848e -c200048a +20228487 +c2000483 1f227e00 20600000 6fe44dd1 68444db1 98467c00 -20210496 +2021048f da204cca -2020044d +20200446 da204ca2 -2040044d +20400446 247a0000 -20200494 +2020048d 6fe44dd5 -2020049d +20200496 58000010 67e44db1 62280f1e -20400490 +20400489 6a280f1e 20600000 da204cca @@ -1189,16 +1182,16 @@ 6fe44d2e 247a0000 da204cca -2020044d +20200446 6fe64d2e 243a7111 -204004a2 +2040049b 1a427e00 67e64d2e 20207111 6fe64d31 243a7111 -204004a2 +2040049b 1a427e00 67e64d31 20207111 @@ -1208,12 +1201,12 @@ 1fe22600 20203190 1a627e00 -c00a84bc +c00a84b5 20203168 704c8c00 704c1700 -204005e7 -2040027d +204005e2 +2040027a 202031c3 6842063a 284c0005 @@ -1230,11 +1223,11 @@ 6fe245b5 c0014794 6fe21002 -c0010592 +c001058a c002c790 20600000 20404906 -204004c1 +204004ba 6fe204db 2feffe04 79208027 @@ -1243,9 +1236,9 @@ 2feffe02 7920800f 6fe204dc -203a04e5 +203a04de 6fe20623 -c30204e5 +c30204de c6078000 20406246 204061b6 @@ -1263,13 +1256,13 @@ d8e00001 20407148 247a0000 -202005e9 -20400502 +202005e4 +204004fb 18227e00 c1018000 -202002bc +202002b9 62244db1 -204004ff +204004f8 1a420a00 6fe44db1 e7e20005 @@ -1277,16 +1270,16 @@ e7e20005 e0220005 20600000 -2040046f +20400468 da204d5c 20203f94 da204d5c 20403fa5 -2020047c +20200475 6fe20b97 -243a05eb +243a05e6 6fe20b98 -243a05eb +243a05e6 20600000 7840fc00 6fe24c97 @@ -1296,16 +1289,16 @@ 98417e00 6fe20b95 247a0000 -20400516 +2040050f 704c9f01 7820fc00 20600000 704c8806 704c8731 -204002c8 +204002c5 6fec0040 e7ec0005 -202002d2 +202002cf 6fe20151 1fe17e03 c080a68a @@ -1315,11 +1308,11 @@ 2020268a 1f227e00 67e4012c -203a051c +203a0515 9ea67c00 20212729 18017e01 -243a052e +243a0527 6fe20151 1fe17e03 c001a649 @@ -1330,11 +1323,11 @@ 98467c00 20212729 da204cca -2040044d +20400446 c000a739 -204004a4 +2040049d 203a2739 -204004a8 +204004a1 18c20a00 6fe20151 e7e20005 @@ -1347,24 +1340,24 @@ c58026ba 793f8000 20600000 -20400346 +20400342 202026dd 62244db1 -20400454 +2040044d 6a244db1 20600000 da204d34 20203fa1 -20400457 -202002b9 -20200457 -2040049a +20400450 +202002b6 +20200450 +20400493 203a729b 2020729d da204d34 -2020044d +20200446 20202baf -20400553 +2040054c 207a0000 6fe2004b c3830000 @@ -1377,7 +1370,7 @@ 18c27e00 67e4013c 6fe4442c -203a0565 +203a055e 20205b2e 6fe40099 203a2baf @@ -1388,8 +1381,7 @@ 70429300 20204b77 67e40fb7 -70809f3f -20200570 +20200568 68440fb7 18518400 6fe44881 @@ -1408,7 +1400,7 @@ 67e40241 58004e34 67e4023f -204005b0 +204005ab 204057e8 6fe280a0 67e20124 @@ -1424,144 +1416,147 @@ 2040682b 700f0d15 20206b2e -2040058d +20400585 7854fc00 20600000 6fe24040 c3800000 c3818000 6fe247cd -203a059c +203a0594 6fe24724 207a0000 20202d53 6fe206ab 67e24bef -202005ed +202005e8 7043dd01 20403f41 -202005ed +202005e8 +6fe20fd6 +c05505aa 6fe24131 207a0000 -20400553 +2040054c 247a0000 da204d5c -2040044d +20400446 247a0000 da204cca -2040044d +20400446 68424caa 98467c00 24628000 20202d15 +20202001 704f6301 704f6453 6fe24f62 207a0000 6fe24f64 c1a98000 -202005b2 +202005ad 18227e00 c003a739 c0032739 202025df 580002e0 -2020056d +20200566 580002a0 -2020056d +20200566 580002b0 -2020056d +20200566 58000240 -2020056d +20200566 58000250 -2020056d +20200566 580000f0 -2020056d +20200566 58000320 -2020056d +20200566 580002f0 -2020056d +20200566 58000200 -2020056d +20200566 580001c0 -2020056d +20200566 58000230 -2020056d +20200566 58000300 -2020056d +20200566 58000190 -2020056d +20200566 58000290 -2020056d +20200566 58000120 -2020056d +20200566 58000170 -2020056d +20200566 580002c0 -2020056d +20200566 580002d0 -2020056d +20200566 580001e0 -2020056d +20200566 58000140 -2020056d +20200566 580001a0 -2020056d +20200566 580001b0 -2020056d +20200566 580001f0 -2020056d +20200566 58000260 -2020056d +20200566 58000270 -2020056d +20200566 58000280 -2020056d +20200566 58000080 -2020056d +20200566 58000070 -2020056d +20200566 580000d0 -2020056d +20200566 58000060 -2020056d +20200566 580000c0 -2020056d +20200566 58000090 -2020056d +20200566 580000a0 -2020056d +20200566 580000b0 -2020056d +20200566 580000e0 -2020056d +20200566 58000160 -2020056d +20200566 58000100 -2020056d +20200566 58000010 -2020056d +20200566 58000020 -2020056d +20200566 58000030 -2020056d +20200566 58000040 -2020056d +20200566 58000050 -2020056d +20200566 58000110 -2020056d +20200566 58000210 -2020056d +20200566 58000220 -2020056d +20200566 580001d0 -2020056d +20200566 58000150 -2020056d +20200566 58000180 -2020056d +20200566 58000310 -2020056d +20200566 58000330 -2020056d +20200566 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 4542) +++ /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: 01 +mem_rf_debug_enable: 00 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/zcode.rom =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (revision 4542) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (working copy) @@ -23,14 +23,14 @@ 60444957 704c880b 704c873e -204002c8 +204002c5 58000007 e7e20005 6fe20639 e7e40005 6ff04953 e7f00005 -202002d2 +202002cf 2040000d da200009 d8200003 @@ -69,7 +69,7 @@ c006002a c0008008 c0004880 -2020061d +20200618 efea0006 67ea4528 efe40006 @@ -96,14 +96,14 @@ c4018000 704c880c 704c873e -204002c8 +204002c5 58000004 e7e40005 6fe20639 e7e40005 6ff04c0a e7f00005 -202002d2 +202002cf efea0006 67ea4c12 20348032 @@ -116,14 +116,14 @@ c4028000 704c8808 704c870c -204002c8 +204002c5 58000000 e7e20005 6fe20639 e7e40005 6fea4c12 e7ea0005 -202002d2 +202002cf 00000000 00000000 20200040 @@ -151,7 +151,7 @@ 20600000 c6908000 793f8021 -20200153 +20200150 00000000 00000000 00000000 @@ -192,9 +192,9 @@ 00000000 20200040 6fe20048 -c2838619 +c2838614 c018801e -c006061b +c0060616 c003802d c0058008 20204f6c @@ -232,7 +232,7 @@ 18007e01 2040528d 204052a6 -20200180 +2020017d 70004800 20600000 18007e02 @@ -240,7 +240,7 @@ 6fe206a4 e7e20005 204052a6 -20200155 +20200152 00000000 00000000 00000000 @@ -264,7 +264,7 @@ 98467c00 24628000 2040493a -202005e3 +202005de 00000000 00000000 00000000 @@ -388,14 +388,14 @@ 704c8a01 704c8808 704c8712 -204002c8 +204002c5 18007e35 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -449,14 +449,14 @@ 20200040 704c8808 704c8712 -204002c8 +204002c5 18007e00 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -519,7 +519,7 @@ 67e4003e 7855fc00 704c8a00 -20200617 +20200612 00000000 00000000 00000000 @@ -610,7 +610,7 @@ 24348023 18808fff 704c8a02 -20200617 +20200612 00000000 00000000 00000000 @@ -669,7 +669,7 @@ 67e2004b 6fe20030 c283b413 -20400208 +20400205 202033ca 00000000 00000000 @@ -784,12 +784,12 @@ 204063ce 704c8807 704c8736 -204002c8 +204002c5 58000000 e7e20005 6fec0040 e7ec0005 -202002d2 +202002cf 202052d6 700b960f 204052da @@ -853,8 +853,8 @@ 67e24537 18427200 6fe2461c -205a03a5 -245a03a7 +205a039f +245a03a1 604c4538 d8c04500 2040713a @@ -959,42 +959,49 @@ 00000000 00000000 20200040 +700fd600 71f0001c 70804205 -2040002b +20400032 6fe28341 67e24bce 6fe24bef 67e206ab -24558031 +24558038 20407988 -580004b9 +2040001c +580004b2 67e4431d -58000143 +58000140 67e4431f -58000142 +5800013f 67e4431b -5800059d +58000595 67e44315 -580005a0 +58000598 67e44313 -20558027 -2435801a +2055802e +24358020 20403e79 204057bf 700f0d66 20203f28 +58000000 +da204f65 +d8400040 +202056bd 6fec4140 67ec4340 +70801002 204057bf 6fe24bce -c2828024 +c282802b 700f0d65 20403f28 58001171 67e44f5d -20200615 -20400144 +20200610 +20400141 700f0d6a 20203f28 204054b0 @@ -1004,9 +1011,9 @@ 6848833e 6048804c 70804de6 -2040013c +20400139 70800520 -2020013c +20200139 58000034 da204be7 d8400008 @@ -1015,21 +1022,14 @@ 00000000 00000000 00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 20200040 793f801c 704c8801 704c8701 -204002c8 +204002c5 58000000 e7e20005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -1092,7 +1092,7 @@ 20400015 704c880a 704c8704 -204002c8 +204002c5 6fec0040 e7ec0005 6fe60146 @@ -1101,7 +1101,7 @@ e7e20005 6fec0040 67ec4f37 -202002d2 +202002cf 6fec4f37 684c0040 98467c00 @@ -1155,7 +1155,7 @@ c0060008 c00b800f c0058012 -c0198613 +c019860e c017001c 20204ba4 da200040 @@ -1163,7 +1163,7 @@ 6fe80739 68480779 98467c00 -202281f1 +202281ee 20204d8b 6fe44de9 c3014e10 @@ -1177,7 +1177,7 @@ 6fe20030 c3830000 20404d80 -20200208 +20200205 6fe24170 1fe0fe01 68420739 @@ -1190,12 +1190,12 @@ 20600000 704c8803 704c871b -204002c8 +204002c5 6fe20046 e7e40005 6fe24170 e7e20005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -1226,7 +1226,7 @@ c0140039 c0038035 c004003b -20200611 +2020060c 6fe20739 67e206a3 c0088011 @@ -1237,14 +1237,14 @@ 20200015 704c8804 704c8708 -204002c8 +204002c5 58000000 e7e20005 68420046 e0440005 58000001 e7e20005 -202002d2 +202002cf 6fe20739 67e206a3 c0058023 @@ -1260,8 +1260,8 @@ c1830000 60420055 700b9b01 -2040050a -2420820e +20400503 +2420820b 20600000 20404dc7 6ff00739 @@ -1269,13 +1269,13 @@ 20600000 6fe20739 67e206a4 -20400155 +20400152 20204d51 20404edd 20200032 20404f51 7006ae01 -2040020e +2040020b 20204d60 00000000 20200040 @@ -1286,14 +1286,14 @@ dfe04d5c 67e40f12 6a240f12 -2040044d +20400446 207a0000 6a240f12 20403fa5 -2040047c +20400475 20200007 1fe22400 -2020047c +20200475 00000000 00000000 00000000 @@ -1344,12 +1344,12 @@ 00000000 20200040 68464dd8 -2040022e 2040022b +20400228 c0008007 c0010012 20202baf -2040021c +20400219 67e44c94 d84003ff 98410400 @@ -1357,13 +1357,13 @@ 1feb7e00 1fecfe00 67e24c1a -2040022b +20400228 67e24c1b -2020060f -2040021c +2020060a +20400219 67e242a8 20400034 -2040021c +20400219 67e40f12 20402284 24628000 @@ -1372,7 +1372,7 @@ c280002c 6fe40f12 67e44db1 -20400490 +20400489 205a723a 6fe40f12 1fe22200 @@ -1384,7 +1384,7 @@ e0220005 6fe40f12 1fe27200 -20400230 +2040022d 2020712d 6fe40f12 2040003a @@ -1400,7 +1400,7 @@ c1008000 18000202 20600000 -2040049d +20400496 203a729b 2020729d 00000000 @@ -1488,7 +1488,7 @@ 2020000a 20404c78 20400019 -20200516 +2020050f 20400019 20404c78 20404c7c @@ -1497,12 +1497,12 @@ 20600000 704c8809 704c8732 -204002c8 +204002c5 6fec0040 e7ec0005 6fe647d3 e7e60005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -1539,14 +1539,14 @@ c4010000 704c880a 704c873e -204002c8 +204002c5 58000003 e7e40005 6fe20639 e7e40005 6fec4530 e7ec0005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -1603,12 +1603,12 @@ c4000000 704c8813 704c873e -204002c8 +204002c5 58000001 e7e40005 6fe20639 e7e40005 -20400289 +20400286 e0420005 6fe24626 e7e20005 @@ -1622,7 +1622,7 @@ 6fe2065b e7e20005 6fe20639 -202002d2 +202002cf 00000000 00000000 00000000 @@ -1665,7 +1665,7 @@ 20200040 704c8817 704c8718 -204002c8 +204002c5 6fec0040 e7ec0005 d8c04297 @@ -1673,7 +1673,7 @@ 2040712d 18007e00 e7e20005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -1799,8 +1799,8 @@ 684c0149 20402289 20628000 -204001a1 -204002c8 +2040019e +204002c5 58000001 e7e20005 6fec0149 @@ -1821,18 +1821,18 @@ 6fe80132 9c467e00 e7e40005 -202002d2 +202002cf 6fe60146 e7e60005 6fe80132 9c467e00 e7e40005 6fe20018 -2040018e +2040018b e7e20005 6fe24c9c c001002b -202002d2 +202002cf 6fe64d2e 1fe20c00 efe20006 @@ -1843,7 +1843,7 @@ 2040712d 184672f0 20407100 -202002d2 +202002cf 00000000 00000000 00000000 @@ -1858,18 +1858,18 @@ 6fe24c18 c0090005 c011001a -2020025c +20200259 6fe24ded -203a025e -20400225 +203a025b +20400222 67ee4e0a 2040000e 6fe24ded 1fe0ffff 67e24ded -20200260 -20400237 -243a025e +2020025d +20400234 +243a025b 1a420a00 1a40a407 1a420c00 @@ -1880,16 +1880,16 @@ 18a08bf9 e7ee0005 20600000 -2040021c +20400219 67e4495f -2040021c +20400219 67e44961 20400024 df200003 -20400264 +20400261 6fe20639 e7e40005 -202002d2 +202002cf da400014 da200009 d8200003 @@ -1921,7 +1921,7 @@ 20200040 704c8806 704c8714 -204002c8 +204002c5 6fe24c89 e7e20005 6fe20046 @@ -1934,7 +1934,7 @@ 2020000f 58000000 e7e40005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -1985,7 +1985,7 @@ 20200040 704c8804 704c8705 -204002c8 +204002c5 58000000 e7e20005 6fe24e18 @@ -1995,7 +1995,7 @@ 6fe2004c 793ffe05 67e2004c -202002d2 +202002cf 00000000 00000000 00000000 @@ -2049,12 +2049,12 @@ 20200040 704c8807 704c8720 -204002c8 +204002c5 6fec0040 e7ec0005 6fe24ca0 e7e20005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -2113,7 +2113,7 @@ 20200040 704c880b 704c8703 -204002c8 +204002c5 6fe24c8a e7e20005 6fe20046 @@ -2128,7 +2128,7 @@ 7920fe00 e7e20005 6fe20046 -202002d2 +202002cf 00000000 00000000 00000000 @@ -2184,33 +2184,33 @@ c0030011 c004000e c01f8012 -2020025c -20200605 -20200607 -20200609 -2020060b -2020060d -2020025c -2020025c +20200259 +20200600 +20200602 +20200604 +20200606 +20200608 +20200259 +20200259 6fe24c18 c0008019 c00b801d c010001f c0518024 c0300034 -2020025c -20400222 +20200259 +2040021f 67ec4c8d -20400233 -20200260 +20400230 +2020025d 704e193f -20200260 +2020025d df200002 -20400269 +20400266 58000000 e7e40005 -202002d2 -2040021c +202002cf +20400219 68420046 98467c00 2022802b @@ -2219,18 +2219,18 @@ 24628000 604242a8 df200003 -20400269 +20400266 6fe242a8 e7e40005 6fe20018 -2040018e +2040018b e7e20005 -202002d2 +202002cf df200002 -20400269 +20400266 6fe44f35 e7e40005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -2247,14 +2247,14 @@ 67e40f12 20200008 6a240f12 -2040044d +20400446 207a0000 6a240f12 20403fa5 -2040047c +20400475 20200008 1fe22400 -2020047c +20200475 00000000 00000000 00000000 @@ -2304,7 +2304,7 @@ 00000000 20200040 6fe24f34 -243a0603 +243a05fe 704f3401 20400023 6f224cd2 @@ -2380,9 +2380,9 @@ c0078020 c0080025 c0088029 -20200601 -2040021c -20400270 +202005fc +20400219 +2040026d da200009 d8200003 204049ab @@ -2391,29 +2391,29 @@ 6ff04ddf e7f00005 20600000 -2020025c -2040022b +20200259 +20400228 67e244de -20200260 +2020025d 7044d900 704c8b00 -20200260 +2020025d df200002 -20400264 +20400261 58000004 e7e20005 -202002d2 +202002cf 704ded00 704e0a00 704dee00 -20200260 +2020025d 68424ded 18467c04 -2022825e -20400225 +2022825b +20400222 67ee4e0a 20400030 -20200260 +2020025d 6fe24ded d8a04dee 1feffe07 @@ -2437,61 +2437,61 @@ c0058012 c0060025 c0068029 -202005ff -2040022b +202005fa +20400228 67e244df 1fe27200 -20400219 -20200260 -2040022b +20400216 +2020025d +20400228 67e244ff 1fe27200 -20400219 -20200260 +20400216 +2020025d 6fe244d9 -243a025e -2040022b +243a025b +20400228 67e24636 -2040021c +20400219 67e444da -2040021c +20400219 67e444dc -2040022b +20400228 67e24637 -2040022b +20400228 67e24e11 6fe444da 684444dc 98467c00 -24228260 +2422825d 1fe3fe00 67e444da -20200260 -2040022b +2020025d +20400228 67e244d9 -2040022b -20200260 -2040021c +20400228 +2020025d +20400219 67e444da -2040021c +20400219 67e444dc -2040022b -2040022b -20400222 +20400228 +20400228 +2040021f 67ec4627 -2040022b +20400228 67e24626 -2040021c +20400219 1febfe00 67e444d7 -2040021c -2040021c +20400219 +20400219 67e44632 -2040021c +20400219 67e44634 7044d901 704c8b01 -20200270 +2020026d 00000000 00000000 20200040 @@ -2503,8 +2503,8 @@ c02b0029 c036002d c0368032 -2020025c -20400260 +20200259 +2040025d 5800003f 67f04c6c 5fffffff @@ -2514,39 +2514,39 @@ 67e244de 67e244d9 67e24133 -20200233 -204001b4 -2040021c +20200230 +204001b1 +20400219 67e40051 df200003 -20400264 +20400261 6fe20046 e7e40005 7042a71d -202002d2 -2040022b +202002cf +20400228 67e24c98 df200064 d8a00183 -20400219 -20200260 +20400216 +2020025d df200002 -20400264 +20400261 6fe24c97 e7e20005 -202002d2 -2040022b +202002cf +20400228 67e24c97 -203a025a -20200260 +203a0257 +2020025d df200003 -20400264 +20400261 6fe44de7 e7e40005 -202002d2 -2040021c +202002cf +20400219 67e44de7 -20200260 +2020025d 00000000 00000000 00000000 @@ -2562,16 +2562,16 @@ 6fe24c18 c0158005 c0160015 -2020025c -20400222 -67ec42a9 +20200259 2040021f +67ec42a9 +2040021c 67e647ce df200007 -20400264 +20400261 6fec0040 e7ec0005 -204002d2 +204002cf 6fe24c9f c0008012 7042a716 @@ -2579,14 +2579,14 @@ 204033e5 700b9b01 20600000 -20400222 +2040021f 67ec42a9 2040001d df200007 -20400264 +20400261 6fec0040 e7ec0005 -202002d2 +202002cf 700b950a 700b9701 20600000 @@ -2628,56 +2628,56 @@ c00e0011 c00e8019 c00d8024 -202005fd -20400222 +202005f8 +2040021f 67ec42a9 -2040021c +20400219 67e200b6 -2040021c +20400219 9c40fe00 1fe17ffc 67e800b7 7042a703 -20200270 +2020026d 6fe24c9b -c0810274 -2040021c -203a0274 -2040022b +c0810271 +20400219 +203a0271 +20400228 67e206a7 7042a715 -20200270 -2040021c +2020026d +20400219 67e242a8 20402284 -24228274 +24228271 1a208c01 efe20006 c2800022 -20400270 +2040026d 20203420 -20400270 +2040026d 202048f0 6fe24c9b -c0810274 -2040021c +c0810271 +20400219 67e242a8 -203a0274 -20400270 +203a0271 +2040026d 6ff04e1a 243a002e 7042a704 20600000 704c880b 704c870b -204002c8 +204002c5 58000000 e7e20005 6fe20046 e7e40005 6ff04e1a e7f00005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -2694,48 +2694,48 @@ c0070020 c0088028 c009802c -202005fb -20400222 +202005f6 +2040021f 67ec42a9 d8a04297 18007210 -20400219 +20400216 70429301 7042a70b 20200023 -20400222 +2040021f 67ec42a9 7042a70c 20400023 -2040050a -2420820e -20400222 +20400503 +2420820b +2040021f 67ec42a9 -2040022b +20400228 67e247f1 98007200 d8a047f2 -20400219 +20400216 7042a709 20200023 -20400222 +2040021f 67ec42a9 7042a70a df200007 -20400264 +20400261 6fec0040 e7ec0005 -202002d2 -2040021c +202002cf +20400219 67e242a8 7042a70d -20200270 -2040021c +2020026d +20400219 67e242a8 -2040022b +20400228 1fe0fe0e 67e242a7 -20200270 +2020026d 00000000 00000000 00000000 @@ -2755,13 +2755,13 @@ c0030006 c004001c c005002f -202005f9 -2040021c +202005f4 +20400219 67e242a8 -2040022b +20400228 67e206a4 20402284 -24228274 +24228271 1a208c01 efe20006 c2800018 @@ -2769,16 +2769,16 @@ 6fe242a8 6842439b 98467c00 -24228270 +2422826d 7042a711 6fe2439a 67e242a8 -20200270 +2020026d 6fe206a4 67e20f12 20404894 -20200270 -20400222 +2020026d +2040021f 67ec42a9 7042a71a 6fe24c9b @@ -2790,26 +2790,26 @@ 704c9600 2040002a 704c8a02 -20200185 +20200182 704c9602 df200007 -20400265 +20400262 6fec42a9 e7ec0005 -202002d2 +202002cf 6fe24ca1 -c0000274 -c0010272 +c0000271 +c001026f 6fe24c9b -c0010272 +c001026f 704ca102 -20400222 +2040021f 67ec42a9 -2040022b +20400228 67e24c8a 7042a708 -20400270 -20200185 +2040026d +20200182 00000000 00000000 00000000 @@ -2828,69 +2828,69 @@ c0230033 c0238034 c0288036 -202005f7 -2040021c +202005f2 +20400219 67e44153 -2040021c +20400219 67e44151 -20200260 +2020025d df200005 -20400264 +20400261 6fe4414f e7e40005 6fe4414d e7e40005 -202002d2 -2040021c +202002cf +20400219 67e4414f -2040021c +20400219 67e4414d -20200260 +2020025d df200004 -20400264 +20400261 6fe6414a e7e60005 -202002d2 -2040021f +202002cf +2040021c 67e6414a -20200260 -2020025c -2040022b -2020025c +2020025d +20200259 +20400228 +20200259 df200002 -20400264 +20400261 6fe24c9c e7e20005 -202002d2 -2040022b +202002cf +20400228 67e24c9c -20200260 -2020025c -2040022b -2020025c +2020025d +20200259 +20400228 +20200259 df2000f2 -20400264 +20400261 6fe24c98 e7e20005 d8c00183 df200064 2040713a -202002d2 +202002cf 00000000 00000000 20200040 6fe24c18 c0070005 c007800a -2020025c +20200259 df200003 -20400264 +20400261 6fe44de9 e7e40005 -202002d2 -2040021c +202002cf +20400219 67e44de9 -20200260 +2020025d 00000000 00000000 00000000 @@ -2949,60 +2949,60 @@ c0058022 c006002d c0068035 -202005f5 +202005f0 6fe44deb -c3010272 +c301026f 6fe44de9 -c3010272 +c301026f 6fe24c9b -c0810274 -2040021c +c0810271 +20400219 67e40253 -2040021c +20400219 67e40255 -2040021c +20400219 67e40257 58000040 67e4430b -2040021c +20400219 67e4430d -2040021c +20400219 67e4430f 7042a712 -20200270 -2040021c +2020026d +20400219 67e40253 6fe20031 -c3030272 +c303026f 7042a713 -20200270 +2020026d 6fe24c9b -c0810274 +c0810271 6fe44deb -c3000272 +c300026f 6fe44de9 -c3000272 -20400222 +c300026f +2040021f 67ec42a9 -2040022b +20400228 7042a718 -20200270 -204001b4 +2020026d +204001b1 df200005 -20400264 +20400261 6fe20046 e7e40005 6fe44deb e7e40005 -202002d2 -204001b4 -2040021c +202002cf +204001b1 +20400219 67e44deb df200003 -20400264 +20400261 6fe20046 e7e40005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -3013,44 +3013,44 @@ c0018010 c0028015 c003001a -202005f3 -20400228 +202005ee +20400225 67f04c6c -20200260 +2020025d df200004 -20400264 +20400261 580400fb e7e60005 -202002d2 +202002cf df200009 -20400264 +20400261 6ff04ddf e7f00005 -202002d2 +202002cf 6fe244de -243a025e -20400222 +243a025b +2040021f 67ec4c7a -20200260 +2020025d 6fe244de -243a025e -2040021c +243a025b +20400219 67e44617 -2040021c +20400219 67e44619 -2040022b +20400228 2040002d 6042461b -2040022b +20400228 205a0035 245a0039 -2040022b -20400222 -2040022b +20400228 +2040021f +20400228 67e24624 -2040022b +20400228 67e24e11 -20200260 +2020025d d8400000 c1000000 d8400002 @@ -3078,30 +3078,30 @@ c002001e c002801e c0048019 -2020025c +20200259 df200009 -20400264 +20400261 6ff04c24 e7f00005 -202002d2 +202002cf df200041 -20400264 +20400261 d8c04c2c df200040 2040713a -202002d2 +202002cf df200009 -20400264 +20400261 6ff04138 e7f00005 -202002d2 +202002cf df200007 -20400264 +20400261 6fec4140 e7ec0005 -202002d2 +202002cf df200008 -20400264 +20400261 580002a8 e7e40005 5800003c @@ -3109,7 +3109,7 @@ 58000008 e7e40005 e7e40005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -3144,51 +3144,51 @@ c00c8028 c00d002d c00d8030 -202005f1 -20400228 +202005ec +20400225 67f04c1c -20200260 -20400230 +2020025d +2040022d d8a0468a df200042 2040713a df200042 d8c0468a d8400000 -20400162 +2040015f 60424689 -20200260 +2020025d df2000f9 -20400264 +20400261 d8c0468a df200040 2040713c df200017 204070e4 -202002d2 +202002cf df200003 -20400264 +20400261 6fe44159 e7e40005 -202002d2 -2040021c +202002cf +20400219 67e44159 -20200260 +2020025d df200002 -20400264 +20400261 6fe24133 e7e20005 -202002d2 -2040022b +202002cf +20400228 67e24133 -20200260 +2020025d df200005 -20400264 +20400261 6fe44153 e7e40005 6fe44151 e7e40005 -202002d2 +202002cf 00000000 00000000 00000000 @@ -3204,11 +3204,11 @@ c0010017 c0028019 c0048025 -202005ef +202005ea 7920001c -2040021f +2040021c 67e64147 -2040022b +20400228 d8400800 984ffe00 d840ffff @@ -3217,36 +3217,36 @@ 18427e00 18000e02 20407141 -2040022b +20400228 67e24c99 67e24c9a -20200270 +2020026d 7042a702 -20200260 -20400222 +2020025d +2040021f 67ec42a9 -2040021c +20400219 67e40251 -2040021c +20400219 67e200b6 -2040021c -2040022b +20400219 +20400228 67e24ad0 704c9b01 7042a705 -20200270 +2020026d 6fe24ca1 -c0000274 -c0010272 +c0000271 +c001026f 6fe24c9b -c0010272 -20400222 +c001026f +2040021f 67ec42a9 7042a707 -2040022b -c0008270 +20400228 +c000826d 7042a719 -20400270 +2040026d 20204d51 00000000 00000000