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 4539) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (working copy) @@ -151,7 +151,45 @@ fetchr timeup,2,mem_le_scan_window_temp call p_le_receive_packet nbranch p_le_scan_timeout_check,match - branch le_scan_match + //branch le_scan_match +p_le_scan_match: + call le_scan_check_sender_addr_type + copy rega,pdata + store 1,mem_le_conn_peer_addr_type +ifdef WHITE_LIST + arg mem_le_white_list_type_and_bd_addr,contw + istore 1,contw + fetch 6,mem_le_rxbuf+2 + istore 6,contw + fetch 1,mem_le_white_list_cnt + beq 0,p_le_scan_match_send_event + fetch 1,mem_le_white_list_filter_policy + beq NONE_FILTER,p_le_scan_match_send_event + beq WHITE_LIST_SCAN_FILTER,p_white_filter_scan_check + beq WHITE_LIST_CONNECT_FILTER,p_le_scan_match_send_event + beq WHITE_LIST_CONN_SCAN_FILTER,p_white_filter_scan_check +p_white_filter_scan_check: + call p_check_addr_in_white_list + nbranch p_le_scan_timeout_check,blank +endif +p_le_scan_match_send_event: + fetch 6,mem_le_rxbuf+2 + store 6,mem_le_plap + + fetch 1,mem_mesh_creat_connection_flag + beq CREAT_CONNECTION,p_le_create_conn + call p_hci_send_event_le_advertising_report + + call le_send_scan_request + nbranch p_le_scan_timeout_check,match + fetch 1,mem_le_rxbuf+1 + beq 6,p_le_scan_timeout_check + call p_hci_send_event_le_advertising_report + +p_le_scan_timeout_check: + fetch 2,mem_le_scan_window_temp + nbranch p_le_scan_loop,blank + rtn p_le_receive_packet: call lerx_setfreq @@ -1328,44 +1366,6 @@ branch p_le_slave_more_data,user branch le_slave_cont -p_le_scan_match: - call le_scan_check_sender_addr_type - copy rega,pdata - store 1,mem_le_conn_peer_addr_type -ifdef WHITE_LIST - arg mem_le_white_list_type_and_bd_addr,contw - istore 1,contw - fetch 6,mem_le_rxbuf+2 - istore 6,contw - fetch 1,mem_le_white_list_cnt - beq 0,p_le_scan_match_send_event - fetch 1,mem_le_white_list_filter_policy - beq NONE_FILTER,p_le_scan_match_send_event - beq WHITE_LIST_SCAN_FILTER,p_white_filter_scan_check - beq WHITE_LIST_CONNECT_FILTER,p_le_scan_match_send_event - beq WHITE_LIST_CONN_SCAN_FILTER,p_white_filter_scan_check -p_white_filter_scan_check: - call p_check_addr_in_white_list - nbranch p_le_scan_timeout_check,blank -endif -p_le_scan_match_send_event: - fetch 6,mem_le_rxbuf+2 - store 6,mem_le_plap - - fetch 1,mem_mesh_creat_connection_flag - beq CREAT_CONNECTION,p_le_create_conn - call p_hci_send_event_le_advertising_report - - call le_send_scan_request - nbranch p_le_scan_timeout_check,match - fetch 1,mem_le_rxbuf+1 - beq 6,p_le_scan_timeout_check - call p_hci_send_event_le_advertising_report - -p_le_scan_timeout_check: - fetch 2,mem_le_scan_window_temp - nbranch p_le_scan_loop,blank - rtn p_le_create_conn: fetch 6,mem_le_plap 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 4539) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (working copy) @@ -1,4 +1,5 @@ -20200040 +70809f3e +20200041 20000001 20000002 20000003 @@ -62,89 +63,90 @@ 2000003d 2000003e 2000003f -c2840060 -c0010083 -c0070175 -c0080183 -c00e0166 -c00f0186 -c01001e2 -c01201b2 -c0190148 -c01c8155 -c01d0157 -c01f01d7 -c02081a7 -c02205b4 -c02a05b0 -c02c051d -c02e0539 -c02e853f -c03505b6 -c03585b8 -c036019e -c04080db -c04280f8 -c04300be -c04f00c2 -c050013a -c052059c -c054058e -c05c85ba -c05d04ae -c0700131 +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 20202baf -c00385bc -c00601ff -c00905be -c0098457 -c00a0436 -c011844a -c0128541 -c0130545 -c0138547 -c0140549 -c014854a -c015054f -c01d8362 -c01f036b -c01f831f -c02083c0 -c0210585 -c02583c4 -c02783a4 -c02904cd -c02c05c0 -c02d84e6 -c02e85c2 -c03004f0 -c03204ec -c0370565 -c03805c4 -c03885c6 -c03a013c -c0490550 -c05284ff -c05304ff +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 c1590000 c16a0000 20202baf 20406490 20406863 20406326 -2040009e +204000a0 2040203c 20403153 -2040008d +2040008f 2040233d -20400093 +20400095 20202021 c68e0000 18000e02 20407148 7d3a001c 243a209e -202005c8 +202005cf 6fe24133 c4008000 6fe20030 @@ -157,7 +159,7 @@ 18423600 202023b7 204045b4 -204000a1 +204000a3 2020455e 6fe244d9 c1808000 @@ -174,9 +176,24 @@ 7854fc00 78487c00 69644e32 -204000b3 -24368334 -202047b3 +204000c4 +243680c1 +204047d5 +1a227e00 +67e24626 +6fec04dd +67ec0633 +6fe24c8b +c000833a +2040029a +204046d3 +243680c1 +6fe204dc +c00300c1 +2040029a +6fe44e32 +243a00af +20600000 204045c7 204045bd 7856fc00 @@ -191,12 +208,12 @@ 6fe24013 793ffe06 67e24013 -202000c4 -204000c4 +202000d5 +204000d5 20202bd8 20405900 70894bba -204000cd +204000de 708907ff 20402a70 70895074 @@ -204,9 +221,9 @@ 70896d07 20600000 6fe242b4 -c00080d1 -c00200d7 -c00100d1 +c00080e2 +c00200e8 +c00100e2 5888e0d0 67e68955 584a103c @@ -216,8 +233,9 @@ 5888c0d0 67e68955 584a106c -202000d4 -203080e7 +202000e5 +20407a63 +203080f9 708955d4 20000004 708955d2 @@ -225,8 +243,8 @@ 708955d1 20000004 6fe242b4 -c00080e5 -c00200f5 +c00080f7 +c0020107 708955d0 708956e0 18002a08 @@ -245,7 +263,7 @@ 20600000 708955d0 708956c0 -202000e7 +202000f9 60420017 1840a200 6fe242b5 @@ -253,7 +271,7 @@ 20402a7b 58000250 20402bb1 -204000cd +204000de 6fe28906 79207e00 67e28906 @@ -267,25 +285,25 @@ 2000000a 7089027d 6fe242b4 -c000011f -c002011a +c0000131 +c002012c 70894cfb 70894def 70894eec 70894f5e -c0008121 -c0028116 +c0008133 +c0028128 20202a51 708956ff 20402a5d 708955ff 20600000 -20400125 +20400137 708956cc 20402a5d 708955d8 20600000 -20400125 +20400137 20202a49 708956f7 20402a5d @@ -307,7 +325,7 @@ 6fe8833e 793ffe1d 67e8804c -20200136 +20200148 37d98200 70800520 37d98200 @@ -318,9 +336,9 @@ 204052b0 6fe20048 207a0000 -202005ca -204005cc -202001ee +202005d1 +204005d3 +20200200 6fe2004b 79207e03 67e2004b @@ -331,13 +349,13 @@ d8c00183 df2000f0 d8400000 -20400150 +20400162 60440099 2020238d efe20006 207a0000 18408401 -c2000150 +c2000162 20600000 704fa500 20202414 @@ -354,30 +372,30 @@ 20402841 20402827 20404b89 -20400169 +2040017b 20202425 20404b89 -20400169 +2040017b 20202198 6fe242a7 207a0000 6fe2007c 247a0000 -202005ce +202005d5 704c9b02 704c8a00 -20200173 +20200185 704c9b00 704ca100 704c9f00 -202005d0 +202005d7 6fe24c9a -203a05d2 +203a05d9 6fe24c99 -203a05c8 +203a05cf 1fe0ffff 67e24c99 -202005d2 +202005d9 6fe20018 1ff18400 184f840a @@ -387,20 +405,20 @@ 20600000 20402108 704c8a04 -20200171 +20200183 204024d2 7854fc00 6fe24c9b -c0008183 +c0008195 6fe2004c c28221c5 6fe20030 c30221c4 -20200270 +20200282 6fe24c9c -c0000195 -c0008198 -c001019b +c00001a7 +c00081aa +c00101ad 704c8702 20600000 704c880f @@ -416,22 +434,22 @@ 1fe67c64 242127fd 202027ea -2040020a +2040021c 68420046 98467c00 20628000 -2020024c +2020025e 20402337 -202c01af +202c01c1 204024ca -243a01a7 +243a01b9 78587c00 1d027e00 67e84169 20600000 2040248f 704c8a00 -202005d4 +202005db 204021ec 24740000 78547c00 @@ -439,15 +457,15 @@ 793f800b 20402b71 2040232b -c50581c2 +c50581d4 204024ca -243a01b7 +243a01c9 78547c00 1c427e00 67e84169 78387c00 7834fc00 -202005d6 +202005dd 20402b6f d8200010 20402321 @@ -456,10 +474,10 @@ 20402917 204024ab 204024f3 -203681ce +203681e0 204024ca -243a01c9 -202001bc +243a01db +202001ce 18000401 6fe20031 793ffe01 @@ -468,7 +486,7 @@ 20402940 78347c00 704c8a01 -202005d4 +202005db 70011600 70015000 204024d2 @@ -476,10 +494,10 @@ 2040724d 6fe24c9b 207a0000 -20200270 +20200282 20404d8e c6108000 -202001ee +20200200 6fe20030 c283a1e1 6fe20b9c @@ -491,51 +509,51 @@ 67e2004b 204021e1 c6108000 -202005cc +202005d3 704c8803 704c8706 -204002b6 +204002c8 18007e00 e7e20005 6fe20046 e7e40005 -202002c0 +202002d2 704c8806 704c8717 -204002b6 +204002c8 6fec0040 e7ec0005 -202002c0 +202002d2 704c8806 704c8716 -202001f8 +2020020a 6fe243de 207a0000 20403e9d 20628000 1fe20c00 20403e92 -c005823e +c0058250 20203ef4 -2040021e +20400230 2040712d -2020021b -2040021e +2020022d +20400230 efe40006 -2020021b -2040021e +2020022d +20400230 efe60006 -2020021b -2040021e +2020022d +20400230 efec0006 -2020021b -2040021e +2020022d +20400230 efee0006 -2020021b -2040021e +2020022d +20400230 eff00006 -2020021b -2040021e +2020022d +20400230 efe20006 18c20400 60464bf2 @@ -549,9 +567,9 @@ 20600000 20600000 704ddb00 -2020022a +2020023c 704ddb03 -2020022a +2020023c 62464ddc 58004b4a 67e443e3 @@ -567,11 +585,11 @@ 18007e06 67e243e2 20203f1a -204005d8 +204005df 6a464dd8 -20200226 +20200238 6a464dd8 -20200476 +2020047c 20403e92 20403e92 67e24dd7 @@ -579,56 +597,56 @@ d8a04dd8 20403e88 6fe24dd7 -c000023c -c0018239 +c000024e +c001824b 20202baf 704c9612 -2020024f +20200261 704c9601 -2020024f +20200261 704c960c -2020024f +20200261 704c9600 df200001 -20400253 -202002c0 +20400265 +202002d2 704c9600 -20400257 +20400269 6fe24c96 e7e20005 20600000 704c870e 1f20fe03 67e24c88 -204002b6 +204002c8 6fe64c93 e7e60005 20600000 700f1200 -20200263 +20200275 700f120c -20200263 +20200275 700f1202 704c870f 704c8804 -204002b6 +204002c8 6fe20f12 e7e20005 6fe64c93 e7e60005 -202002c0 +202002d2 6ff04c6c c4020000 6fe20639 67e24e18 -202005da +202005e1 6fe20046 67e24e18 793f8021 70004600 704ca100 704c9b00 -202005da +202005e1 6fe20624 d8400000 c1018000 @@ -654,15 +672,15 @@ 67e24c88 1fe0fe03 67e44db1 -2040048a +20400490 207a0000 704c873e -204002b6 +204002c8 58000002 e7e20005 58000001 e7e20005 -2040027c +2040028e e0420005 204047d5 1a227e00 @@ -674,37 +692,37 @@ e0420005 18427200 2040712d -2040017c +2040018e e7e20005 -202002c0 +202002d2 6fe20046 67e242a8 -202002ac +202002be 6fe20639 67e242a8 704c8805 704c8713 -204002b6 +204002c8 58000001 e7e20005 6fe242a8 e7e40005 58000001 e7e40005 -202002c0 +202002d2 6fe24c88 1fe0fe03 67e44db1 -204002bd +204002cf 6fe64c86 e7e60005 20600000 -20400454 +2040045a 1a420a00 20600000 da204d84 20403fa5 -20200228 +2020023a 18000400 18000201 60421001 @@ -720,9 +738,9 @@ 20600000 6fe2063a c3828000 -204002f2 -20400306 -203a02c3 +20400304 +20400318 +203a02d5 efe20006 ea220006 9a267e00 @@ -738,8 +756,8 @@ 18427200 2040712d 2040480e -204002c5 -20400306 +204002d7 +20400318 efe20006 1fe22200 18c23000 @@ -754,15 +772,15 @@ 202049f1 6fe24683 203a480c -204002fc +2040030e c6130000 da204d5c -20400447 +2040044d c000480c c000c80c 79200026 20600000 -20400306 +20400318 203a480c efe20006 e8420006 @@ -774,7 +792,7 @@ 20600000 da204d5c 20203fa1 -2040030a +2040031c 20202739 204045bd 204045cd @@ -797,30 +815,15 @@ 08008608 2022c6a6 202046a3 +20407a4f 204045aa 20404766 -204002d0 -20400308 -2040041d +204002e2 +2040031a +20400423 20404594 -2034042c +20340432 2020458a -204047d5 -1a227e00 -67e24626 -6fec04dd -67ec0633 -6fe24c8b -c0008337 -20400288 -204046d3 -24368334 -6fe204dc -c0030334 -20400288 -6fe44e32 -243a00ad -20600000 6fec0633 684c4627 98467c00 @@ -832,16 +835,16 @@ 7042a700 70065b00 204047d2 -202005dc -204004a2 +202005e3 +204004a8 67e64e15 58000000 67e64d2e 6fe20046 67e242a8 704ddb05 -20200352 -204004a8 +20200355 +204004ae 67e64e15 58000000 67e64d31 @@ -876,41 +879,43 @@ 204045b4 2040315c 6fe20624 -c0018372 +c0018375 20204579 -2040030a -20200430 +2040031c +20200436 7834fc00 204048fd -2021058b +20210592 204045fc -204002d0 +204002e2 7856fc00 -20400370 -24368398 -20400393 +20400373 +2436839d +20407a4f +20400398 20404766 -2040041d +20400423 20404594 -20340381 +20340385 7854fc00 20202739 -204002d0 -20400387 +204002e2 +2040038b 78377c00 -20400430 -2036837a -2020037f -20400389 +20400436 +2036837d +20200383 +2040038d 20202739 204045bd 204045cd +20407a47 79202a00 782efc00 78307c00 7850fc00 -20400391 -20200312 +20400396 +20200324 37c18200 20600000 6fe20623 @@ -919,13 +924,13 @@ 67e20623 20600000 6fe20623 -c281837f +c2818383 6fe24e17 1fe67c06 -2421058b +24210592 1fe0fe01 67e24e17 -2020037f +20200383 684c4639 20600000 684c4c7a @@ -943,8 +948,8 @@ 67e24537 18427200 6fe2461c -205a03a0 -245a03a2 +205a03a5 +245a03a7 604c4538 d8c044e0 2040712d @@ -957,10 +962,10 @@ 67e40124 24610000 2040473e -202005de +202005e5 20404972 2040475a -204003b7 +204003bc 20202940 78287c00 6fe40631 @@ -975,15 +980,15 @@ 78507c00 19623600 37c18400 -203703d4 +203703d9 1b420400 604c00a4 242c2739 -203703db +203703e0 dd2001e0 1c225000 6fe20623 -c30183db +c30183e0 2055ac9c 20402abc 7823fc00 @@ -1001,43 +1006,44 @@ 67e204dc 1fe27200 67e2068c -203a0405 +203a040a 6fe204db 1fe17e03 -c00183fa -c50783fc +c00183ff +c5078401 da204cca -20400447 -c00083fc -2040049e -203a03fc -204004a8 +2040044d +c0008401 +204004a4 +203a0401 +204004ae 18c20a00 6fe404db e7e40005 -20200401 +20200406 d8a004dd -20200401 +20200406 09800008 19897e00 -c20003fc +c2000401 78367c00 -20200405 +2020040a 09800008 19897e00 e7e20005 -c2000401 +c2000406 09800018 78287c00 db600664 -2036040c +20360411 1fef7e00 1ff17e00 e7e60005 +20437a57 20232739 7836fc00 6fe242b5 -243a0413 +243a0419 6fe20017 1fe0a200 20402a7b @@ -1059,15 +1065,15 @@ 6fe204db 1fe17e03 c001c866 -204004a8 -20400415 +204004ae +2040041b 6fe2068c 207a0000 6fe2068d c001c866 -2020034b +2020034e 78377c00 -20400430 +20400436 2036c582 2020458a 68420017 @@ -1075,7 +1081,7 @@ 20402a23 78287c00 d9601388 -202003c9 +202003ce 1a208409 efe20002 203a2baf @@ -1100,13 +1106,13 @@ 6fe204d5 c1018000 20204146 -20400469 +2040046f da204d34 20203f94 da204d34 20403fa5 -20200476 -20400469 +2020047c +2040046f da204d84 20203f94 1a20fe04 @@ -1127,55 +1133,55 @@ 1a420c00 1a427e00 20600000 -2040048a +20400490 203a2baf 6fe44dd1 68444db1 98467c00 -20210471 +20210477 da204cca 20203fa5 da204ca2 -20400447 -203a046f +2040044d +203a0475 da204ca2 20203fa5 -20400482 +20400488 da204ca2 -203a047b +203a0481 da204cca 20203f94 -2040047f +20400485 203a2baf da204ca2 20203f94 6f224caa d8c04cf2 -20200484 +2020048a 6f224cd2 d8c04d10 efe60006 9a467c00 -20228488 -c2000484 +2022848e +c200048a 1f227e00 20600000 6fe44dd1 68444db1 98467c00 -20210490 +20210496 da204cca -20200447 +2020044d da204ca2 -20400447 +2040044d 247a0000 -2020048e +20200494 6fe44dd5 -20200497 +2020049d 58000010 67e44db1 62280f1e -2040048a +20400490 6a280f1e 20600000 da204cca @@ -1183,16 +1189,16 @@ 6fe44d2e 247a0000 da204cca -20200447 +2020044d 6fe64d2e 243a7111 -2040049c +204004a2 1a427e00 67e64d2e 20207111 6fe64d31 243a7111 -2040049c +204004a2 1a427e00 67e64d31 20207111 @@ -1202,12 +1208,12 @@ 1fe22600 20203190 1a627e00 -c00a84b6 +c00a84bc 20203168 704c8c00 704c1700 -204005e0 -2040026b +204005e7 +2040027d 202031c3 6842063a 284c0005 @@ -1224,11 +1230,11 @@ 6fe245b5 c0014794 6fe21002 -c001058b +c0010592 c002c790 20600000 20404906 -204004bb +204004c1 6fe204db 2feffe04 79208027 @@ -1237,9 +1243,9 @@ 2feffe02 7920800f 6fe204dc -203a04df +203a04e5 6fe20623 -c30204df +c30204e5 c6078000 20406246 204061b6 @@ -1257,13 +1263,13 @@ d8e00001 20407148 247a0000 -202005e2 -204004fc +202005e9 +20400502 18227e00 c1018000 -202002aa +202002bc 62244db1 -204004f9 +204004ff 1a420a00 6fe44db1 e7e20005 @@ -1271,16 +1277,16 @@ e7e20005 e0220005 20600000 -20400469 +2040046f da204d5c 20203f94 da204d5c 20403fa5 -20200476 +2020047c 6fe20b97 -243a05e4 +243a05eb 6fe20b98 -243a05e4 +243a05eb 20600000 7840fc00 6fe24c97 @@ -1290,16 +1296,16 @@ 98417e00 6fe20b95 247a0000 -20400510 +20400516 704c9f01 7820fc00 20600000 704c8806 704c8731 -204002b6 +204002c8 6fec0040 e7ec0005 -202002c0 +202002d2 6fe20151 1fe17e03 c080a68a @@ -1309,11 +1315,11 @@ 2020268a 1f227e00 67e4012c -203a0516 +203a051c 9ea67c00 20212729 18017e01 -243a0528 +243a052e 6fe20151 1fe17e03 c001a649 @@ -1324,11 +1330,11 @@ 98467c00 20212729 da204cca -20400447 +2040044d c000a739 -2040049e +204004a4 203a2739 -204004a2 +204004a8 18c20a00 6fe20151 e7e20005 @@ -1341,24 +1347,24 @@ c58026ba 793f8000 20600000 -20400343 +20400346 202026dd 62244db1 -2040044e +20400454 6a244db1 20600000 da204d34 20203fa1 -20400451 -202002a7 -20200451 -20400494 +20400457 +202002b9 +20200457 +2040049a 203a729b 2020729d da204d34 -20200447 +2020044d 20202baf -2040054d +20400553 207a0000 6fe2004b c3830000 @@ -1371,7 +1377,7 @@ 18c27e00 67e4013c 6fe4442c -203a055f +203a0565 20205b2e 6fe40099 203a2baf @@ -1382,7 +1388,8 @@ 70429300 20204b77 67e40fb7 -20200569 +70809f3f +20200570 68440fb7 18518400 6fe44881 @@ -1401,7 +1408,7 @@ 67e40241 58004e34 67e4023f -204005a9 +204005b0 204057e8 6fe280a0 67e20124 @@ -1417,32 +1424,32 @@ 2040682b 700f0d15 20206b2e -20400586 +2040058d 7854fc00 20600000 6fe24040 c3800000 c3818000 6fe247cd -203a0595 +203a059c 6fe24724 207a0000 20202d53 6fe206ab 67e24bef -202005e6 +202005ed 7043dd01 20403f41 -202005e6 +202005ed 6fe24131 207a0000 -2040054d +20400553 247a0000 da204d5c -20400447 +2040044d 247a0000 da204cca -20400447 +2040044d 68424caa 98467c00 24628000 @@ -1453,108 +1460,108 @@ 207a0000 6fe24f64 c1a98000 -202005ab +202005b2 18227e00 c003a739 c0032739 202025df 580002e0 -20200567 +2020056d 580002a0 -20200567 +2020056d 580002b0 -20200567 +2020056d 58000240 -20200567 +2020056d 58000250 -20200567 +2020056d 580000f0 -20200567 +2020056d 58000320 -20200567 +2020056d 580002f0 -20200567 +2020056d 58000200 -20200567 +2020056d 580001c0 -20200567 +2020056d 58000230 -20200567 +2020056d 58000300 -20200567 +2020056d 58000190 -20200567 +2020056d 58000290 -20200567 +2020056d 58000120 -20200567 +2020056d 58000170 -20200567 +2020056d 580002c0 -20200567 +2020056d 580002d0 -20200567 +2020056d 580001e0 -20200567 +2020056d 58000140 -20200567 +2020056d 580001a0 -20200567 +2020056d 580001b0 -20200567 +2020056d 580001f0 -20200567 +2020056d 58000260 -20200567 +2020056d 58000270 -20200567 +2020056d 58000280 -20200567 +2020056d 58000080 -20200567 +2020056d 58000070 -20200567 +2020056d 580000d0 -20200567 +2020056d 58000060 -20200567 +2020056d 580000c0 -20200567 +2020056d 58000090 -20200567 +2020056d 580000a0 -20200567 +2020056d 580000b0 -20200567 +2020056d 580000e0 -20200567 +2020056d 58000160 -20200567 +2020056d 58000100 -20200567 +2020056d 58000010 -20200567 +2020056d 58000020 -20200567 +2020056d 58000030 -20200567 +2020056d 58000040 -20200567 +2020056d 58000050 -20200567 +2020056d 58000110 -20200567 +2020056d 58000210 -20200567 +2020056d 58000220 -20200567 +2020056d 580001d0 -20200567 +2020056d 58000150 -20200567 +2020056d 58000180 -20200567 +2020056d 58000310 -20200567 +2020056d 58000330 -20200567 +2020056d 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 4539) +++ /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 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 4539) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (working copy) @@ -23,14 +23,14 @@ 60444957 704c880b 704c873e -204002b6 +204002c8 58000007 e7e20005 6fe20639 e7e40005 6ff04953 e7f00005 -202002c0 +202002d2 2040000d da200009 d8200003 @@ -69,7 +69,7 @@ c006002a c0008008 c0004880 -20200616 +2020061d efea0006 67ea4528 efe40006 @@ -96,14 +96,14 @@ c4018000 704c880c 704c873e -204002b6 +204002c8 58000004 e7e40005 6fe20639 e7e40005 6ff04c0a e7f00005 -202002c0 +202002d2 efea0006 67ea4c12 20348032 @@ -116,14 +116,14 @@ c4028000 704c8808 704c870c -204002b6 +204002c8 58000000 e7e20005 6fe20639 e7e40005 6fea4c12 e7ea0005 -202002c0 +202002d2 00000000 00000000 20200040 @@ -151,7 +151,7 @@ 20600000 c6908000 793f8021 -20200141 +20200153 00000000 00000000 00000000 @@ -192,9 +192,9 @@ 00000000 20200040 6fe20048 -c2838612 +c2838619 c018801e -c0060614 +c006061b c003802d c0058008 20204f6c @@ -232,7 +232,7 @@ 18007e01 2040528d 204052a6 -2020016e +20200180 70004800 20600000 18007e02 @@ -240,7 +240,7 @@ 6fe206a4 e7e20005 204052a6 -20200143 +20200155 00000000 00000000 00000000 @@ -264,7 +264,7 @@ 98467c00 24628000 2040493a -202005dc +202005e3 00000000 00000000 00000000 @@ -388,14 +388,14 @@ 704c8a01 704c8808 704c8712 -204002b6 +204002c8 18007e35 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -449,14 +449,14 @@ 20200040 704c8808 704c8712 -204002b6 +204002c8 18007e00 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -519,7 +519,7 @@ 67e4003e 7855fc00 704c8a00 -20200610 +20200617 00000000 00000000 00000000 @@ -610,7 +610,7 @@ 24348023 18808fff 704c8a02 -20200610 +20200617 00000000 00000000 00000000 @@ -669,7 +669,7 @@ 67e2004b 6fe20030 c283b413 -204001f6 +20400208 202033ca 00000000 00000000 @@ -784,12 +784,12 @@ 204063ce 704c8807 704c8736 -204002b6 +204002c8 58000000 e7e20005 6fec0040 e7ec0005 -202002c0 +202002d2 202052d6 700b960f 204052da @@ -853,8 +853,8 @@ 67e24537 18427200 6fe2461c -205a03a0 -245a03a2 +205a03a5 +245a03a7 604c4538 d8c04500 2040713a @@ -968,15 +968,15 @@ 67e206ab 24558031 20407988 -580004b3 +580004b9 67e4431d -58000131 +58000143 67e4431f -58000130 +58000142 67e4431b -58000596 +5800059d 67e44315 -58000599 +580005a0 67e44313 20558027 2435801a @@ -993,8 +993,8 @@ 20403f28 58001171 67e44f5d -2020060e -20400132 +20200615 +20400144 700f0d6a 20203f28 204054b0 @@ -1004,9 +1004,9 @@ 6848833e 6048804c 70804de6 -2040012a +2040013c 70800520 -2020012a +2020013c 58000034 da204be7 d8400008 @@ -1026,10 +1026,10 @@ 793f801c 704c8801 704c8701 -204002b6 +204002c8 58000000 e7e20005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -1092,7 +1092,7 @@ 20400015 704c880a 704c8704 -204002b6 +204002c8 6fec0040 e7ec0005 6fe60146 @@ -1101,7 +1101,7 @@ e7e20005 6fec0040 67ec4f37 -202002c0 +202002d2 6fec4f37 684c0040 98467c00 @@ -1155,7 +1155,7 @@ c0060008 c00b800f c0058012 -c019860c +c0198613 c017001c 20204ba4 da200040 @@ -1163,7 +1163,7 @@ 6fe80739 68480779 98467c00 -202281df +202281f1 20204d8b 6fe44de9 c3014e10 @@ -1177,7 +1177,7 @@ 6fe20030 c3830000 20404d80 -202001f6 +20200208 6fe24170 1fe0fe01 68420739 @@ -1190,12 +1190,12 @@ 20600000 704c8803 704c871b -204002b6 +204002c8 6fe20046 e7e40005 6fe24170 e7e20005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -1226,7 +1226,7 @@ c0140039 c0038035 c004003b -2020060a +20200611 6fe20739 67e206a3 c0088011 @@ -1237,14 +1237,14 @@ 20200015 704c8804 704c8708 -204002b6 +204002c8 58000000 e7e20005 68420046 e0440005 58000001 e7e20005 -202002c0 +202002d2 6fe20739 67e206a3 c0058023 @@ -1260,8 +1260,8 @@ c1830000 60420055 700b9b01 -20400504 -242081fc +2040050a +2420820e 20600000 20404dc7 6ff00739 @@ -1269,13 +1269,13 @@ 20600000 6fe20739 67e206a4 -20400143 +20400155 20204d51 20404edd 20200032 20404f51 7006ae01 -204001fc +2040020e 20204d60 00000000 20200040 @@ -1286,14 +1286,14 @@ dfe04d5c 67e40f12 6a240f12 -20400447 +2040044d 207a0000 6a240f12 20403fa5 -20400476 +2040047c 20200007 1fe22400 -20200476 +2020047c 00000000 00000000 00000000 @@ -1344,12 +1344,12 @@ 00000000 20200040 68464dd8 -2040021c -20400219 +2040022e +2040022b c0008007 c0010012 20202baf -2040020a +2040021c 67e44c94 d84003ff 98410400 @@ -1357,13 +1357,13 @@ 1feb7e00 1fecfe00 67e24c1a -20400219 +2040022b 67e24c1b -20200608 -2040020a +2020060f +2040021c 67e242a8 20400034 -2040020a +2040021c 67e40f12 20402284 24628000 @@ -1372,7 +1372,7 @@ c280002c 6fe40f12 67e44db1 -2040048a +20400490 205a723a 6fe40f12 1fe22200 @@ -1384,7 +1384,7 @@ e0220005 6fe40f12 1fe27200 -2040021e +20400230 2020712d 6fe40f12 2040003a @@ -1400,7 +1400,7 @@ c1008000 18000202 20600000 -20400497 +2040049d 203a729b 2020729d 00000000 @@ -1488,7 +1488,7 @@ 2020000a 20404c78 20400019 -20200510 +20200516 20400019 20404c78 20404c7c @@ -1497,12 +1497,12 @@ 20600000 704c8809 704c8732 -204002b6 +204002c8 6fec0040 e7ec0005 6fe647d3 e7e60005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -1539,14 +1539,14 @@ c4010000 704c880a 704c873e -204002b6 +204002c8 58000003 e7e40005 6fe20639 e7e40005 6fec4530 e7ec0005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -1603,12 +1603,12 @@ c4000000 704c8813 704c873e -204002b6 +204002c8 58000001 e7e40005 6fe20639 e7e40005 -20400277 +20400289 e0420005 6fe24626 e7e20005 @@ -1622,7 +1622,7 @@ 6fe2065b e7e20005 6fe20639 -202002c0 +202002d2 00000000 00000000 00000000 @@ -1665,7 +1665,7 @@ 20200040 704c8817 704c8718 -204002b6 +204002c8 6fec0040 e7ec0005 d8c04297 @@ -1673,7 +1673,7 @@ 2040712d 18007e00 e7e20005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -1799,8 +1799,8 @@ 684c0149 20402289 20628000 -2040018f -204002b6 +204001a1 +204002c8 58000001 e7e20005 6fec0149 @@ -1821,18 +1821,18 @@ 6fe80132 9c467e00 e7e40005 -202002c0 +202002d2 6fe60146 e7e60005 6fe80132 9c467e00 e7e40005 6fe20018 -2040017c +2040018e e7e20005 6fe24c9c c001002b -202002c0 +202002d2 6fe64d2e 1fe20c00 efe20006 @@ -1843,7 +1843,7 @@ 2040712d 184672f0 20407100 -202002c0 +202002d2 00000000 00000000 00000000 @@ -1858,18 +1858,18 @@ 6fe24c18 c0090005 c011001a -2020024a +2020025c 6fe24ded -203a024c -20400213 +203a025e +20400225 67ee4e0a 2040000e 6fe24ded 1fe0ffff 67e24ded -2020024e -20400225 -243a024c +20200260 +20400237 +243a025e 1a420a00 1a40a407 1a420c00 @@ -1880,16 +1880,16 @@ 18a08bf9 e7ee0005 20600000 -2040020a +2040021c 67e4495f -2040020a +2040021c 67e44961 20400024 df200003 -20400252 +20400264 6fe20639 e7e40005 -202002c0 +202002d2 da400014 da200009 d8200003 @@ -1921,7 +1921,7 @@ 20200040 704c8806 704c8714 -204002b6 +204002c8 6fe24c89 e7e20005 6fe20046 @@ -1934,7 +1934,7 @@ 2020000f 58000000 e7e40005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -1985,7 +1985,7 @@ 20200040 704c8804 704c8705 -204002b6 +204002c8 58000000 e7e20005 6fe24e18 @@ -1995,7 +1995,7 @@ 6fe2004c 793ffe05 67e2004c -202002c0 +202002d2 00000000 00000000 00000000 @@ -2049,12 +2049,12 @@ 20200040 704c8807 704c8720 -204002b6 +204002c8 6fec0040 e7ec0005 6fe24ca0 e7e20005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -2113,7 +2113,7 @@ 20200040 704c880b 704c8703 -204002b6 +204002c8 6fe24c8a e7e20005 6fe20046 @@ -2128,7 +2128,7 @@ 7920fe00 e7e20005 6fe20046 -202002c0 +202002d2 00000000 00000000 00000000 @@ -2184,33 +2184,33 @@ c0030011 c004000e c01f8012 -2020024a -202005fe -20200600 -20200602 -20200604 -20200606 -2020024a -2020024a +2020025c +20200605 +20200607 +20200609 +2020060b +2020060d +2020025c +2020025c 6fe24c18 c0008019 c00b801d c010001f c0518024 c0300034 -2020024a -20400210 +2020025c +20400222 67ec4c8d -20400221 -2020024e +20400233 +20200260 704e193f -2020024e +20200260 df200002 -20400257 +20400269 58000000 e7e40005 -202002c0 -2040020a +202002d2 +2040021c 68420046 98467c00 2022802b @@ -2219,18 +2219,18 @@ 24628000 604242a8 df200003 -20400257 +20400269 6fe242a8 e7e40005 6fe20018 -2040017c +2040018e e7e20005 -202002c0 +202002d2 df200002 -20400257 +20400269 6fe44f35 e7e40005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -2247,14 +2247,14 @@ 67e40f12 20200008 6a240f12 -20400447 +2040044d 207a0000 6a240f12 20403fa5 -20400476 +2040047c 20200008 1fe22400 -20200476 +2020047c 00000000 00000000 00000000 @@ -2304,7 +2304,7 @@ 00000000 20200040 6fe24f34 -243a05fc +243a0603 704f3401 20400023 6f224cd2 @@ -2380,9 +2380,9 @@ c0078020 c0080025 c0088029 -202005fa -2040020a -2040025e +20200601 +2040021c +20400270 da200009 d8200003 204049ab @@ -2391,29 +2391,29 @@ 6ff04ddf e7f00005 20600000 -2020024a -20400219 +2020025c +2040022b 67e244de -2020024e +20200260 7044d900 704c8b00 -2020024e +20200260 df200002 -20400252 +20400264 58000004 e7e20005 -202002c0 +202002d2 704ded00 704e0a00 704dee00 -2020024e +20200260 68424ded 18467c04 -2022824c -20400213 +2022825e +20400225 67ee4e0a 20400030 -2020024e +20200260 6fe24ded d8a04dee 1feffe07 @@ -2437,61 +2437,61 @@ c0058012 c0060025 c0068029 -202005f8 -20400219 +202005ff +2040022b 67e244df 1fe27200 -20400207 -2020024e 20400219 +20200260 +2040022b 67e244ff 1fe27200 -20400207 -2020024e -6fe244d9 -243a024c 20400219 +20200260 +6fe244d9 +243a025e +2040022b 67e24636 -2040020a +2040021c 67e444da -2040020a +2040021c 67e444dc -20400219 +2040022b 67e24637 -20400219 +2040022b 67e24e11 6fe444da 684444dc 98467c00 -2422824e +24228260 1fe3fe00 67e444da -2020024e -20400219 +20200260 +2040022b 67e244d9 -20400219 -2020024e -2040020a +2040022b +20200260 +2040021c 67e444da -2040020a +2040021c 67e444dc -20400219 -20400219 -20400210 +2040022b +2040022b +20400222 67ec4627 -20400219 +2040022b 67e24626 -2040020a +2040021c 1febfe00 67e444d7 -2040020a -2040020a +2040021c +2040021c 67e44632 -2040020a +2040021c 67e44634 7044d901 704c8b01 -2020025e +20200270 00000000 00000000 20200040 @@ -2503,8 +2503,8 @@ c02b0029 c036002d c0368032 -2020024a -2040024e +2020025c +20400260 5800003f 67f04c6c 5fffffff @@ -2514,39 +2514,39 @@ 67e244de 67e244d9 67e24133 -20200221 -204001a2 -2040020a +20200233 +204001b4 +2040021c 67e40051 df200003 -20400252 +20400264 6fe20046 e7e40005 7042a71d -202002c0 -20400219 +202002d2 +2040022b 67e24c98 df200064 d8a00183 -20400207 -2020024e +20400219 +20200260 df200002 -20400252 +20400264 6fe24c97 e7e20005 -202002c0 -20400219 +202002d2 +2040022b 67e24c97 -203a0248 -2020024e +203a025a +20200260 df200003 -20400252 +20400264 6fe44de7 e7e40005 -202002c0 -2040020a +202002d2 +2040021c 67e44de7 -2020024e +20200260 00000000 00000000 00000000 @@ -2562,16 +2562,16 @@ 6fe24c18 c0158005 c0160015 -2020024a -20400210 +2020025c +20400222 67ec42a9 -2040020d +2040021f 67e647ce df200007 -20400252 +20400264 6fec0040 e7ec0005 -204002c0 +204002d2 6fe24c9f c0008012 7042a716 @@ -2579,14 +2579,14 @@ 204033e5 700b9b01 20600000 -20400210 +20400222 67ec42a9 2040001d df200007 -20400252 +20400264 6fec0040 e7ec0005 -202002c0 +202002d2 700b950a 700b9701 20600000 @@ -2628,56 +2628,56 @@ c00e0011 c00e8019 c00d8024 -202005f6 -20400210 +202005fd +20400222 67ec42a9 -2040020a +2040021c 67e200b6 -2040020a +2040021c 9c40fe00 1fe17ffc 67e800b7 7042a703 -2020025e +20200270 6fe24c9b -c0810262 -2040020a -203a0262 -20400219 +c0810274 +2040021c +203a0274 +2040022b 67e206a7 7042a715 -2020025e -2040020a +20200270 +2040021c 67e242a8 20402284 -24228262 +24228274 1a208c01 efe20006 c2800022 -2040025e +20400270 20203420 -2040025e +20400270 202048f0 6fe24c9b -c0810262 -2040020a +c0810274 +2040021c 67e242a8 -203a0262 -2040025e +203a0274 +20400270 6ff04e1a 243a002e 7042a704 20600000 704c880b 704c870b -204002b6 +204002c8 58000000 e7e20005 6fe20046 e7e40005 6ff04e1a e7f00005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -2694,48 +2694,48 @@ c0070020 c0088028 c009802c -202005f4 -20400210 +202005fb +20400222 67ec42a9 d8a04297 18007210 -20400207 +20400219 70429301 7042a70b 20200023 -20400210 +20400222 67ec42a9 7042a70c 20400023 -20400504 -242081fc -20400210 +2040050a +2420820e +20400222 67ec42a9 -20400219 +2040022b 67e247f1 98007200 d8a047f2 -20400207 +20400219 7042a709 20200023 -20400210 +20400222 67ec42a9 7042a70a df200007 -20400252 +20400264 6fec0040 e7ec0005 -202002c0 -2040020a +202002d2 +2040021c 67e242a8 7042a70d -2020025e -2040020a +20200270 +2040021c 67e242a8 -20400219 +2040022b 1fe0fe0e 67e242a7 -2020025e +20200270 00000000 00000000 00000000 @@ -2755,13 +2755,13 @@ c0030006 c004001c c005002f -202005f2 -2040020a +202005f9 +2040021c 67e242a8 -20400219 +2040022b 67e206a4 20402284 -24228262 +24228274 1a208c01 efe20006 c2800018 @@ -2769,16 +2769,16 @@ 6fe242a8 6842439b 98467c00 -2422825e +24228270 7042a711 6fe2439a 67e242a8 -2020025e +20200270 6fe206a4 67e20f12 20404894 -2020025e -20400210 +20200270 +20400222 67ec42a9 7042a71a 6fe24c9b @@ -2790,26 +2790,26 @@ 704c9600 2040002a 704c8a02 -20200173 +20200185 704c9602 df200007 -20400253 +20400265 6fec42a9 e7ec0005 -202002c0 +202002d2 6fe24ca1 -c0000262 -c0010260 +c0000274 +c0010272 6fe24c9b -c0010260 +c0010272 704ca102 -20400210 +20400222 67ec42a9 -20400219 +2040022b 67e24c8a 7042a708 -2040025e -20200173 +20400270 +20200185 00000000 00000000 00000000 @@ -2828,69 +2828,69 @@ c0230033 c0238034 c0288036 -202005f0 -2040020a +202005f7 +2040021c 67e44153 -2040020a +2040021c 67e44151 -2020024e +20200260 df200005 -20400252 +20400264 6fe4414f e7e40005 6fe4414d e7e40005 -202002c0 -2040020a +202002d2 +2040021c 67e4414f -2040020a +2040021c 67e4414d -2020024e +20200260 df200004 -20400252 +20400264 6fe6414a e7e60005 -202002c0 -2040020d +202002d2 +2040021f 67e6414a -2020024e -2020024a -20400219 -2020024a +20200260 +2020025c +2040022b +2020025c df200002 -20400252 +20400264 6fe24c9c e7e20005 -202002c0 -20400219 +202002d2 +2040022b 67e24c9c -2020024e -2020024a -20400219 -2020024a +20200260 +2020025c +2040022b +2020025c df2000f2 -20400252 +20400264 6fe24c98 e7e20005 d8c00183 df200064 2040713a -202002c0 +202002d2 00000000 00000000 20200040 6fe24c18 c0070005 c007800a -2020024a +2020025c df200003 -20400252 +20400264 6fe44de9 e7e40005 -202002c0 -2040020a +202002d2 +2040021c 67e44de9 -2020024e +20200260 00000000 00000000 00000000 @@ -2949,60 +2949,60 @@ c0058022 c006002d c0068035 -202005ee +202005f5 6fe44deb -c3010260 +c3010272 6fe44de9 -c3010260 +c3010272 6fe24c9b -c0810262 -2040020a +c0810274 +2040021c 67e40253 -2040020a +2040021c 67e40255 -2040020a +2040021c 67e40257 58000040 67e4430b -2040020a +2040021c 67e4430d -2040020a +2040021c 67e4430f 7042a712 -2020025e -2040020a +20200270 +2040021c 67e40253 6fe20031 -c3030260 +c3030272 7042a713 -2020025e +20200270 6fe24c9b -c0810262 +c0810274 6fe44deb -c3000260 +c3000272 6fe44de9 -c3000260 -20400210 +c3000272 +20400222 67ec42a9 -20400219 +2040022b 7042a718 -2020025e -204001a2 +20200270 +204001b4 df200005 -20400252 +20400264 6fe20046 e7e40005 6fe44deb e7e40005 -202002c0 -204001a2 -2040020a +202002d2 +204001b4 +2040021c 67e44deb df200003 -20400252 +20400264 6fe20046 e7e40005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -3013,44 +3013,44 @@ c0018010 c0028015 c003001a -202005ec -20400216 +202005f3 +20400228 67f04c6c -2020024e +20200260 df200004 -20400252 +20400264 580400fb e7e60005 -202002c0 +202002d2 df200009 -20400252 +20400264 6ff04ddf e7f00005 -202002c0 +202002d2 6fe244de -243a024c -20400210 +243a025e +20400222 67ec4c7a -2020024e +20200260 6fe244de -243a024c -2040020a +243a025e +2040021c 67e44617 -2040020a +2040021c 67e44619 -20400219 +2040022b 2040002d 6042461b -20400219 +2040022b 205a0035 245a0039 -20400219 -20400210 -20400219 +2040022b +20400222 +2040022b 67e24624 -20400219 +2040022b 67e24e11 -2020024e +20200260 d8400000 c1000000 d8400002 @@ -3078,30 +3078,30 @@ c002001e c002801e c0048019 -2020024a +2020025c df200009 -20400252 +20400264 6ff04c24 e7f00005 -202002c0 +202002d2 df200041 -20400252 +20400264 d8c04c2c df200040 2040713a -202002c0 +202002d2 df200009 -20400252 +20400264 6ff04138 e7f00005 -202002c0 +202002d2 df200007 -20400252 +20400264 6fec4140 e7ec0005 -202002c0 +202002d2 df200008 -20400252 +20400264 580002a8 e7e40005 5800003c @@ -3109,7 +3109,7 @@ 58000008 e7e40005 e7e40005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -3144,51 +3144,51 @@ c00c8028 c00d002d c00d8030 -202005ea -20400216 +202005f1 +20400228 67f04c1c -2020024e -2040021e +20200260 +20400230 d8a0468a df200042 2040713a df200042 d8c0468a d8400000 -20400150 +20400162 60424689 -2020024e +20200260 df2000f9 -20400252 +20400264 d8c0468a df200040 2040713c df200017 204070e4 -202002c0 +202002d2 df200003 -20400252 +20400264 6fe44159 e7e40005 -202002c0 -2040020a +202002d2 +2040021c 67e44159 -2020024e +20200260 df200002 -20400252 +20400264 6fe24133 e7e20005 -202002c0 -20400219 +202002d2 +2040022b 67e24133 -2020024e +20200260 df200005 -20400252 +20400264 6fe44153 e7e40005 6fe44151 e7e40005 -202002c0 +202002d2 00000000 00000000 00000000 @@ -3204,11 +3204,11 @@ c0010017 c0028019 c0048025 -202005e8 +202005ef 7920001c -2040020d +2040021f 67e64147 -20400219 +2040022b d8400800 984ffe00 d840ffff @@ -3217,36 +3217,36 @@ 18427e00 18000e02 20407141 -20400219 +2040022b 67e24c99 67e24c9a -2020025e +20200270 7042a702 -2020024e -20400210 +20200260 +20400222 67ec42a9 -2040020a +2040021c 67e40251 -2040020a +2040021c 67e200b6 -2040020a -20400219 +2040021c +2040022b 67e24ad0 704c9b01 7042a705 -2020025e +20200270 6fe24ca1 -c0000262 -c0010260 +c0000274 +c0010272 6fe24c9b -c0010260 -20400210 +c0010272 +20400222 67ec42a9 7042a707 -20400219 -c000825e +2040022b +c0008270 7042a719 -2040025e +20400270 20204d51 00000000 00000000