Index: Librarier/bt_rom/format/headset.format =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/bt_rom/format/headset.format (revision 5410) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/bt_rom/format/headset.format (working copy) @@ -306,6 +306,16 @@ 1 mem_initiate_enc_master 1 mem_le_send_empty_flag 2 mem_hci_conn_accept_timeout + 2 mem_hci_packet_type + + //read remote version information + 1 mem_hci_read_remote_version_information_flag + 5 mem_mesh_classic_version + + //le encryption + 16 mem_le_plaintext_data +// 8 mem_le_random_number +// 2 mem_le_encrypted_diversifier 0 mem_headset_end ) ( 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 5410) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (working copy) @@ -50,10 +50,17 @@ //z_create_connection_unsave_clk_offset: call p_ipc_rx_hci_data_one_byte store 1,mem_allow_switch + ncall z_hci_update_link_policy_settings,blank jam 1,mem_conn_status jam hci_cmd_create_conn,mem_hci_cmd branch p_hci_send_event_command_status +z_hci_update_link_policy_settings: + fetch 2,mem_link_policy_settings + set1 Role_Switch,pdata + store 2,mem_link_policy_settings + rtn + z_hci_parse_packet_cmd_ogf_link_control_accept_connection: //9 fetch 1,mem_conn_req_status beq 0,p_hci_send_event_command_status_err_unknown_connection @@ -643,9 +650,8 @@ fetch 1,mem_mesh_hci_opcode_ocf beq HCI_REMOTE_NAME_REQUEST,z_hci_parse_packet_cmd_ogf_link_control_remote_name_request //19 beq HCI_READ_REMOTE_EXT_FEATURES,z_hci_parse_packet_cmd_ogf_link_control_read_remote_ext_features //1C - beq HCI_READ_REMOTE_VERSION_INFORMATION,z_hci_parse_packet_cmd_ogf_link_control_read_remote_version_information //1D beq HCI_READ_REMOTE_SUPPORTED_FEATURES,z_hci_parse_packet_cmd_ogf_link_control_read_remote_supported_features //1B - + branch z_hci_parse_packet_cmd_ogf_link_control4 z_hci_parse_packet_cmd_ogf_link_control_remote_name_request: //19 @@ -680,27 +686,6 @@ jam hci_cmd_remote_ext_features_req,mem_hci_cmd branch p_hci_send_event_command_status -z_hci_parse_packet_cmd_ogf_link_control_read_remote_version_information: - call p_ipc_rx_hci_data_two_byte //connect handle - store 1,mem_hci_conn_handle - - call context_search_conn_handle - nbranch p_hci_send_event_command_status_err_unknown_connection,zero - - // check is classic or ble - add rega,coffset_mode,contr - ifetch 1,contr - bbit1 mode_le,z_hci_control_read_remote_version_le - -z_hci_control_read_remote_version_classic: - call p_hci_send_event_command_status - branch cmd_version_req - -z_hci_control_read_remote_version_le: - call p_hci_send_event_command_status - branch le_send_version_ind - - z_hci_parse_packet_cmd_ogf_link_control_read_remote_supported_features: //1B // TODO: Think judge link exist or not. fetch 1,mem_conn_status @@ -730,18 +715,37 @@ istore 8,contw branch ipc_hci_tx_start - - - org z z_hci_parse_packet_cmd_ogf_link_control4: fetch 1,mem_mesh_hci_opcode_ocf + beq HCI_CHANGE_CONNECTION_PACKET_TYPE,z_hci_parse_packet_cmd_ogf_link_control_change_connection_packet_type //0f beq HCI_READ_CLOCK_OFFSET,z_hci_parse_packet_cmd_ogf_link_control_read_clock_offset beq HCI_IO_CAP_REQUEST_REPLY,z_hci_parse_packet_cmd_ogf_link_control_io_cap_request_reply //2B beq HCI_USER_CONFIRMATION_REQUEST_REPLY,z_hci_parse_packet_cmd_ogf_link_control_user_confirmation_request_reply //2C // beq HCI_USER_CONFIRMATION_REQUEST_NEGATIVE_REPLY,z_hci_parse_packet_cmd_ogf_link_control_user_confirmation_request_negative_reply //2d - branch p_hci_send_event_command_complete_error_command_nuknown + branch z_hci_parse_packet_cmd_ogf_link_control5 + +z_hci_parse_packet_cmd_ogf_link_control_change_connection_packet_type: + call p_hci_parse_connection_handle_check + nbranch p_hci_send_event_command_complete_error_command_disallowed,zero + call p_ipc_rx_hci_data_two_byte + store 2,mem_hci_packet_type + call p_hci_send_event_command_status +z_hci_send_connection_packet_type_changed_event: + //status(1),connection_handle(2),packet_type(2) + jam 5,mem_mesh_event_para_total_length + jam HCI_EVENT_CONNECTION_PACKET_TYPE_CHANGED,mem_mesh_event_head_event_code + call p_hci_prepare_send_event + setarg 0 + istore 1,contw + // Connection_Handle + fetch 1,mem_conn_handle + istore 2,contw + // link type, 0:SCO, 1:ACL + fetch 2,mem_hci_packet_type + istore 2,contw + branch ipc_hci_tx_start z_hci_parse_packet_cmd_ogf_link_control_read_clock_offset: call p_hci_parse_connection_handle_check @@ -815,6 +819,48 @@ // rtn org z +z_hci_parse_packet_cmd_ogf_link_control5: + fetch 1,mem_mesh_hci_opcode_ocf + beq HCI_READ_REMOTE_VERSION_INFORMATION,z_hci_parse_packet_cmd_ogf_link_control_read_remote_version_information //1D + + branch p_hci_send_event_command_complete_error_command_nuknown + +z_hci_parse_packet_cmd_ogf_link_control_read_remote_version_information: + call p_ipc_rx_hci_data_two_byte //connect handle + store 1,mem_hci_conn_handle + + call context_search_conn_handle + nbranch p_hci_send_event_command_status_err_unknown_connection,zero + + // check is classic or ble + add rega,coffset_mode,contr + ifetch 1,contr + bbit1 mode_le,z_hci_control_read_remote_version_le + +z_hci_control_read_remote_version_classic: + call p_hci_send_event_command_status + fetch 1,mem_hci_read_remote_version_information_flag + branch cmd_version_req,blank //here may need add protection when flag is zero + branch z_hci_send_classic_read_remote_version_information_complete +z_hci_send_classic_read_remote_version_information_complete: + fetch 8,mem_mesh_event_mask + rtnbit0 READ_REMOTE_VERSION_INFORMATION_COMPLETE_EVENT + jam 8,mem_mesh_event_para_total_length + jam HCI_EVENT_READ_REMOTE_VERSION_INFORMATION_COMPLETE,mem_mesh_event_head_event_code + call p_hci_prepare_send_event + setarg COMMAND_SUCCEEDED + istore 1,contw //subevent code & status + fetch 1,mem_conn_handle + istore 2,contw + fetch 5,mem_mesh_classic_version + istore 5,contw + branch ipc_hci_tx_start + +z_hci_control_read_remote_version_le: + call p_hci_send_event_command_status + branch le_send_version_ind + +org z z_hci_parse_packet_cmd_ogf_controller_and_baseband2: fetch 1,mem_mesh_hci_opcode_ocf beq HCI_RESET,z_hci_parse_packet_cmd_ogf_controller_and_baseband_reset //03 @@ -840,6 +886,7 @@ store 3,mem_glap store 6,mem_mesh_le_random_address setarg 0 + store 1,mem_hci_read_remote_version_information_flag store 1,mem_le_adv_enable store 1,mem_le_scan_enable store 1,mem_scan_mode @@ -1019,7 +1066,6 @@ beq HCI_LE_READ_REMOTE_FEATURES,z_hci_parse_packet_cmd_ogf_le_controller_read_remote_features beq HCI_LE_ENCRYPT,z_hci_parse_packet_cmd_ogf_le_controller_encrypt beq HCI_LE_RAND,z_hci_parse_packet_cmd_ogf_le_controller_rand - beq HCI_LE_START_ENCRYPTION,z_hci_parse_packet_cmd_ogf_le_controller_start_encryption beq HCI_LE_LONG_TERM_KEY_REQUEST_REPLY,z_hci_parse_packet_cmd_ogf_le_controller_ltk_request_reply beq HCI_LE_LONG_TERM_KEY_REQUEST_NEGATIVE_REPLY,z_hci_parse_packet_cmd_ogf_le_controller_ltk_request_negative_reply @@ -1048,7 +1094,6 @@ z_hci_parse_packet_cmd_ogf_le_controller_encrypt: z_hci_parse_packet_cmd_ogf_le_controller_rand: -z_hci_parse_packet_cmd_ogf_le_controller_start_encryption: z_hci_parse_packet_cmd_ogf_le_controller_ltk_request_reply: z_hci_parse_packet_cmd_ogf_le_controller_ltk_request_negative_reply: branch p_hci_send_event_command_complete_error_command_nuknown @@ -1428,6 +1473,8 @@ fetch 1,mem_mesh_hci_opcode_ocf beq HCI_LE_REMOVE_DEVICE_FROM_WHITE_LIST,z_hci_parse_packet_cmd_ogf_le_controller_remove_device_from_white_list beq HCI_LE_SET_DATA_LENGTH,z_hci_parse_packet_cmd_ogf_le_controller_set_data_length + beq HCI_LE_ENCRYPT,z_hci_parse_packet_cmd_ogf_le_controller_encryption +// beq HCI_LE_START_ENCRYPTION,z_hci_parse_packet_cmd_ogf_le_controller_start_encryption //0x19 branch p_hci_send_event_command_complete_error_command_nuknown z_hci_parse_packet_cmd_ogf_le_controller_remove_device_from_white_list: @@ -1487,6 +1534,25 @@ istore 8,contw rtn +z_hci_parse_packet_cmd_ogf_le_controller_encryption: + arg mem_le_my_ltk,contw //key + force 16,loopcnt + call p_ipc_rx_hci_data_n_byte + arg mem_le_plaintext_data,contw //plaintext_data + force 16,loopcnt + call p_ipc_rx_hci_data_n_byte + rtn +//z_hci_parse_packet_cmd_ogf_le_controller_start_encryption: +// call p_ipc_rx_hci_data_two_byte //handle +// store 1,mem_le_conn_handle +// store 1,mem_hci_conn_handle +// call p_ipc_rx_hci_data_eight_byte +// store 8,mem_le_random_number +// call p_ipc_rx_hci_data_two_byte +// store 2,mem_le_encrypted_diversifier +// arg mem_le_my_ltk,contw //long_term_key +// force 16,loopcnt +// call p_ipc_rx_hci_data_n_byte org z z_hci_inquiry_reply_check_eir: @@ -1868,6 +1934,7 @@ beq LMP_DETACH,z_parse_lmp_detach beq LMP_IN_RAND,p_parse_lmp_in_rand //in_rand beq LMP_NAME_RES,p_parse_lmp_name_res + beq LMP_VERSION_RES,z_parse_lmp_version_res branch z_parse_lmp_process_sub @@ -1913,8 +1980,12 @@ call parse_lmp_features_res branch z_store_remote_features - - +z_parse_lmp_version_res: + fetch 5,mem_rxbuf+1 + store 5,mem_mesh_classic_version + jam 1,mem_hci_read_remote_version_information_flag + branch parse_lmp_version_res + org z z_parse_lmp_process_sub: fetch 1,mem_lmi_opcode2 @@ -2012,7 +2083,8 @@ call parse_lmp_start_encryption_req+2 fetch 1,mem_role_switch_enc_flag beq role_switch_enc_resume,z_hci_send_encryption_key_refresh_complete_event - branch z_hci_send_encryption_change_complete_event + rtn +// branch z_hci_send_encryption_change_complete_event z_hci_send_encryption_key_refresh_complete_event: jam 0,mem_role_switch_enc_flag @@ -2927,14 +2999,14 @@ ifetch 5,contr store 5,mem_mesh_le_version call p_le_parse_version_ind_cmd_master - branch z_hci_send_read_remote_version_information_complete,master + branch z_hci_send_le_read_remote_version_information_complete,master fetch 1,mem_mesh_le_version_exchange_times nrtn blank pincrease 1 store 1,mem_mesh_le_version_exchange_times branch le_send_version_ind -z_hci_send_read_remote_version_information_complete: +z_hci_send_le_read_remote_version_information_complete: fetch 8,mem_mesh_le_event_mask rtnbit0 READ_REMOTE_VERSION_INFORMATION_COMPLETE_EVENT jam 8,mem_mesh_event_para_total_length Index: ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvoptx =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvoptx (revision 5410) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvoptx (working copy) @@ -256,7 +256,6 @@ 1 - 0 0 1 10000000 Index: ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx (revision 5410) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx (working copy) @@ -16,7 +16,7 @@ ARMCM0 ARM - ARM.CMSIS.5.5.1 + ARM.CMSIS.5.3.0 http://www.keil.com/pack/ IROM(0x00000000,0x00040000) IRAM(0x20000000,0x00020000) CPUTYPE("Cortex-M0") CLOCK(12000000) ESEL ELITTLE @@ -33,7 +33,7 @@ - + $$Device:ARMCM0$Device\ARM\SVD\ARMCM0.svd 0 0 @@ -184,7 +184,6 @@ 0 0 0 - 0 0 0 8 Index: ModuleDemo/25_OTA/bt_demo/CM0/User/btreg.h =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/btreg.h (revision 5410) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/btreg.h (working copy) @@ -1705,7 +1705,11 @@ #define mem_initiate_enc_master 0x4ef0 #define mem_le_send_empty_flag 0x4ef1 #define mem_hci_conn_accept_timeout 0x4ef2 -#define mem_headset_end 0x4ef4 +#define mem_hci_packet_type 0x4ef4 +#define mem_hci_read_remote_version_information_flag 0x4ef6 +#define mem_mesh_classic_version 0x4ef7 +#define mem_le_plaintext_data 0x4efc +#define mem_headset_end 0x4f0c #define mem_usb_mouse_data 0x4ace #define mem_usb_kb_data 0x4ade #define mem_usb_kb_multikey 0x4aee 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 5410) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/main.c (working copy) @@ -63,9 +63,9 @@ #endif h4_init(); - sleep_500ms; - LPM_ENABLE; - POWER_OFF; +// sleep_500ms; +// LPM_ENABLE; +// POWER_OFF; while (1) { #ifdef FUNCTION_WATCH_DOG @@ -86,7 +86,7 @@ DEBUG_POLLING_PRINT(); SYS_timerPolling(); - Bat_StateSwitchPooling(); + // Bat_StateSwitchPooling(); h4_polling_rx(); } Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/memmap.format =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/memmap.format (revision 5410) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/memmap.format (working copy) @@ -1703,7 +1703,11 @@ 0x4ef0 mem_initiate_enc_master 0x4ef1 mem_le_send_empty_flag 0x4ef2 mem_hci_conn_accept_timeout -0x4ef4 mem_headset_end +0x4ef4 mem_hci_packet_type +0x4ef6 mem_hci_read_remote_version_information_flag +0x4ef7 mem_mesh_classic_version +0x4efc mem_le_plaintext_data +0x4f0c mem_headset_end 0x4ace mem_usb_mouse_data 0x4ade mem_usb_kb_data 0x4aee mem_usb_kb_multikey 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 5410) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (working copy) @@ -1922,77 +1922,77 @@ 6fe24ca1 c1808000 202007c0 -58000320 -202006d8 -580002e0 +58000330 202006d8 580002f0 202006d8 -58000270 -202006d8 -58000290 +58000300 202006d8 -58000100 +58000280 202006d8 -58000370 +580002a0 202006d8 -58000330 +58000110 202006d8 -58000210 +58000380 202006d8 -580001d0 +58000340 202006d8 -58000390 +58000220 202006d8 -58000260 +580001e0 202006d8 -58000340 +580003a0 202006d8 -580001a0 +58000270 202006d8 -580002d0 +58000350 202006d8 580001b0 202006d8 -58000130 +580002e0 202006d8 -58000180 +580001c0 202006d8 -58000300 +58000140 +202006d8 +58000190 202006d8 58000310 202006d8 -580001f0 +58000320 202006d8 -58000150 +58000200 202006d8 -580001c0 +58000160 202006d8 -58000360 +580001d0 202006d8 -58000200 +58000370 202006d8 -580002a0 +58000210 202006d8 580002b0 202006d8 580002c0 202006d8 -580003b0 +580002d0 202006d8 -58000250 +580003c0 202006d8 -580003a0 +58000260 +202006d8 +580003b0 202006d8 58000080 202006d8 58000070 202006d8 -580000e0 +580000f0 202006d8 58000060 202006d8 -580000c0 +580000d0 202006d8 58000090 202006d8 @@ -2000,13 +2000,15 @@ 202006d8 580000b0 202006d8 -580000d0 +580000c0 202006d8 -580000f0 +580000e0 202006d8 -58000170 +58000100 202006d8 -58000110 +58000180 +202006d8 +58000120 202006d8 58000010 202006d8 @@ -2018,21 +2020,21 @@ 202006d8 58000050 202006d8 -58000120 +58000130 202006d8 -58000220 +58000230 202006d8 -58000240 +58000250 202006d8 -58000230 +58000240 202006d8 -58000280 +58000290 202006d8 -58000160 +58000170 202006d8 -58000190 +580001a0 202006d8 -58000350 +58000360 202006d8 -58000380 +58000390 202006d8 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 5410) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (working copy) @@ -261,7 +261,7 @@ c006002b c0008008 c0004880 -202007f4 +202007f6 efea0006 67ea4528 efe40006 @@ -451,9 +451,9 @@ 68420048 20407a08 6fe20048 -c28387f0 +c28387f2 c0188021 -c00607f2 +c00607f4 c0038030 c005800b 20204f6c @@ -775,7 +775,7 @@ 67e4003e 7855fc00 704c8a00 -202007ee +202007f0 00000000 00000000 00000000 @@ -866,7 +866,7 @@ 24348023 18808fff 704c8a02 -202007ee +202007f0 00000000 00000000 00000000 @@ -1320,7 +1320,7 @@ 204057bf 6fe24bce c301002c -c28287ec +c28287ee 2040073a 2040073a 700f0d9f @@ -1542,7 +1542,7 @@ 20404e14 6fe24eef c0010009 -2020001a +20600000 704eef00 704c8803 704c8730 @@ -1603,11 +1603,11 @@ c006000a c00b8011 c0058014 -c01987e8 +c01987ea c017001e c0208026 c0098034 -202007ea +202007ec da200040 2040604d 6fe80739 @@ -1667,16 +1667,17 @@ 68440738 20407a08 6fe2007d -c002000c -c013801f -c0140027 -c0038023 +c002000d +c0138020 +c0140028 +c0038024 c0040662 c00101e4 -202007e6 +c013002a +202007e8 6fe20739 67e206a3 -c0058010 +c0058011 20204cc0 6fe24132 c087cd22 @@ -1702,12 +1703,11 @@ 20400184 20204d51 20404edd -20200020 -00000000 -00000000 -00000000 -00000000 -00000000 +20200021 +6fea0739 +67ea4ef7 +704ef601 +20204d57 00000000 00000000 00000000 @@ -1807,7 +1807,7 @@ 67e24c1a 20400297 67e24c1b -202007e4 +202007e6 20400288 67e242a8 20400034 @@ -2304,14 +2304,15 @@ 00000000 20200040 6fe24c18 -c0090005 -c011001a +c0090006 +c011001b +c00b802e 202002d5 6fe24ded 203a02d7 20400291 67ee4e0a -2040000e +2040000f 6fe24ded 1fe0ffff 67e24ded @@ -2323,7 +2324,7 @@ 1a420c00 efee0006 e7ee0005 -c2000010 +c2000011 58000000 18a08bf9 e7ee0005 @@ -2332,7 +2333,7 @@ 67e4495f 20400288 67e44961 -20400024 +20400025 df200003 204002dd 6fe20639 @@ -2347,13 +2348,12 @@ 6ff0495b e7f00005 20600000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 +d8a00603 +18007210 +20400285 +d8a04efc +18007210 +20400285 00000000 00000000 00000000 @@ -2633,11 +2633,11 @@ c004000e c01f8012 202002d5 -202007da 202007dc 202007de 202007e0 202007e2 +202007e4 202002d5 202002d5 6fe24c18 @@ -2752,7 +2752,7 @@ 00000000 20200040 6fe24e34 -243a07d8 +243a07da 704e3401 20400023 6f224cd2 @@ -2816,19 +2816,18 @@ 00000000 20200040 6fe24c18 -c005001a -c007001d +c0050019 +c007001c c0098417 -c00b000f -c00b8019 -c00c0019 -c00c8019 -c00d0019 -c00d8019 -c0078022 -c0080027 -c008802b -202007d6 +c00b000e +c00b8018 +c00c0018 +c00d0018 +c00d8018 +c0078021 +c0080026 +c008802a +202007d8 20400288 204002e9 da200009 @@ -2862,7 +2861,7 @@ 202282d7 20400291 67ee4e0a -20400032 +20400031 202002d9 6fe24ded d8a04dee @@ -2878,6 +2877,7 @@ 00000000 00000000 00000000 +00000000 20200040 6fe24c18 c0040008 @@ -2885,7 +2885,7 @@ c0058012 c0060025 c0068029 -202007d4 +202007d6 20400297 67e244df 1fe27200 @@ -3009,13 +3009,13 @@ 20200040 6fe24c18 c001800a -c01b8017 -c0290021 -c02a8027 -c02b002c -c0360030 -c0368035 -202007d2 +c01b8018 +c0290022 +c02a8028 +c02b002d +c0360031 +c0368036 +202007d4 204002d9 5800003f 67f04c6c @@ -3025,6 +3025,7 @@ 67e64147 67ec4c7a 58000000 +67e24ef6 67e244de 67e244d9 67e24133 @@ -3069,13 +3070,92 @@ 00000000 00000000 00000000 -00000000 20200040 6fe24c18 -c00f8006 -c0158013 -c0160023 +c00e8004 202002d5 +20400288 +67e242a8 +20402284 +242282ed +1a208c01 +efe20006 +c280001b +204002e9 +6fe24ef6 +203a3420 +2020000f +6ff04c1c +c4028000 +704c8808 +704c870c +20400347 +58000000 +e7e20005 +6fe20046 +e7e40005 +6fea4ef7 +e7ea0005 +20200351 +204002e9 +202048f0 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +20200040 +6fe24c18 +c0078007 +c00f8016 +c0158023 +c0160033 +202007d2 +20400219 +242282d7 +20400288 +67e44ef4 +204002e9 +704c8805 +704c871d +20400347 +58000000 +e7e20005 +6fe20046 +e7e40005 +6fe44ef4 +e7e40005 +20200351 20400219 242282d7 204002e9 @@ -3099,7 +3179,7 @@ e7ec0005 20400351 6fe24c9f -c0008020 +c0008030 7042a716 20600000 204033e5 @@ -3118,28 +3198,11 @@ 00000000 00000000 00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 20200040 6fe24c18 -c00c8007 -c00e0018 -c00e8020 -c00d802b +c00c8006 +c00e0017 +c00d801f 202007d0 704ea601 2040028e @@ -3154,7 +3217,7 @@ d8a04ea7 204070e4 20402287 -20228016 +20228015 704ea602 7042a703 202002e9 @@ -3166,17 +3229,6 @@ 67e206a7 7042a715 202002e9 -20400288 -67e242a8 -20402284 -242282ed -1a208c01 -efe20006 -c2800029 -204002e9 -20203420 -204002e9 -202048f0 6fe24c9b c08102ed 20400288 @@ -3184,7 +3236,7 @@ 203a02ed 204002e9 6ff04e1a -243a0035 +243a0029 7042a704 20600000 704c880b @@ -3198,6 +3250,18 @@ e7f00005 20200351 00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 20200040 6fe24c18 c0058009