Index: Librarier/bt_rom/format/headset.format =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/bt_rom/format/headset.format (revision 5413) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/bt_rom/format/headset.format (working copy) @@ -313,7 +313,7 @@ 5 mem_mesh_classic_version //le encryption - 16 mem_le_plaintext_data + 16 mem_le_encrypted_data // 8 mem_le_random_number // 2 mem_le_encrypted_diversifier 0 mem_headset_end 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 5410) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (working copy) @@ -717,7 +717,7 @@ //rtnne 1 // bne 1,assert fetch 1,mem_hci_remote_name_req_flag - nbranch p_hci_send_remote_name_request_complete,blank + nbranch z_hci_send_remote_name_request_complete,blank jam PAGE_TIMEOUT,mem_mesh_event_parameter_status branch p_hci_send_connection_error // will call zcode, so should not push to zcode @@ -753,62 +753,6 @@ jam HCI_EVENT_EXT_INQUIRY_RESULT,mem_mesh_event_head_event_code rtn -p_parse_lmp_name_res: - fetch 1,mem_hci_remote_name_req_flag - branch parse_lmp_name_res,blank - - fetch 2,mem_len - add pdata,-3,loopcnt //for remote name length error - fetcht 1,mem_rxbuf+1 - setarg mem_tmp_buffer - iadd temp,contw - arg mem_rxbuf+3,contr - call memcpy - call p_hci_save_mem_hci_remote_name - fetcht 1,mem_name_offset - fetch 1,mem_rxbuf+2 - isub temp,pdata - sub pdata,14,null - branch p_hci_send_remote_name_request_complete,positive - branch parse_lmp_name_res+12 -// branch p_hci_send_remote_name_request_complete -p_hci_send_remote_name_request_complete: - jam 255,mem_mesh_event_para_total_length - jam HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE,mem_mesh_event_head_event_code - call p_hci_prepare_send_event - setarg 0x00 - istore 1,contw - fetch 6,mem_hci_plap - istore 6,contw - arg 64,loopcnt - arg mem_hci_remote_name,contr - call memcpy_fast - arg 184,loopcnt - call memset0 - call ipc_hci_tx_start -p_hci_remote_name_request_flag_init: - fetch 1,mem_hci_remote_name_req_flag - jam 0,mem_hci_remote_name_req_flag - jam 0,mem_name_offset - beq 2,p_hci_send_remote_name_request_complete_detach - branch parse_lmp_name_res_end -p_hci_send_remote_name_request_complete_detach: - call lmp_disconnect+1 - branch parse_lmp_name_res_end - -p_hci_save_mem_hci_remote_name: - fetcht 1,mem_rxbuf+1 - setarg mem_hci_remote_name - iadd temp,contw - - fetch 1,mem_rxbuf+2 - fetcht 1,mem_rxbuf+1 - isub temp,loopcnt - - arg mem_rxbuf+3,contr - branch memcpy_fast - - p_check_attempt: fetch 1,mem_check_attempt_limit @@ -1488,8 +1432,39 @@ isolate1 mark_ble_tx_md,mark setflag true,md,pdata store 1,mem_le_txheader_temp + fetch 1,mem_le_txlen_temp + rtn blank + fetch 7,mem_le_txheader_temp+1 + fetch 1,mem_le_state + rtnbit0 lestate_encryption + call load_sk +// branch p_le_encrypt +p_le_encrypt: + arg mem_le_txheader_temp,regc + fetcht 5,mem_le_pcnt_tx + call generate_mic + force 0,rega + call first_block_data + call aes_init + force regidx_data,regext_index + copy regb,regext + call do_aes_cfb + arg mem_le_txpayload_temp,regc + fetch 1,mem_le_txlen_temp + add pdata,-1,regb + iadd regc,contw + force regidx_result,regext_index + istorer regext,4,contw + force 0,rega /* rega is block counter */ + call aes_crypt_data + fetch 1,mem_le_txlen_temp + increase 4,pdata + store 1,mem_le_txlen_temp + fetcht 5,mem_le_pcnt_tx + increase 1,temp + storet 5,mem_le_pcnt_tx rtn - + p_le_send_empty_check: fetch 1,mem_le_send_empty_flag rtn blank @@ -1621,37 +1596,6 @@ branch p_le_slave_more_data,user branch le_slave_cont - - -p_le_send_connection_update_ind: - fetch 1,mem_le_state - set1 lestate_update_param,pdata - store 1,mem_le_state - - jam 1,mem_le_new_transmitwindowsize // window size 1 1.25ms - setarg 0x3 - store 2,mem_le_new_transmitwindowoffset //window offset 3 3.75ms - fetch 2,mem_le_conn_interval - store 2,mem_le_new_conninterval // event interval 30 37.5ms - fetch 2,mem_le_conn_latency - store 2,mem_le_new_connslavelatency // latency - fetch 2,mem_le_conn_superto - store 2,mem_le_new_connsupervisiontimeout //supervision timeout 500 5s - fetch 2,mem_le_event_count - increase 0x10,pdata - store 2,mem_le_instant - arg 12,rega - arg LLID_LE_LL,type - call le_fifo_malloc_tx - setarg LL_CONNECTION_UPDATE_REQ - istore 1,contw - //winsize winoffset - fetch 9,mem_le_new_param - istore 9,contw - fetch 2,mem_le_instant - istore 2,contw - call clear_le_cmd - branch z_hci_send_le_connection_update_commplete p_le_create_conn: fetch 1,mem_le_conn_peer_addr_type @@ -1886,7 +1830,7 @@ rtnbit1 lestate_update_map fetch 1,mem_le_wait_process_cmd rtn blank - beq BT_CMD_LE_MASTER_UPDATE_CONN,p_le_send_connection_update_ind + beq BT_CMD_LE_MASTER_UPDATE_CONN,z_le_send_connection_update_ind branch assert clear_le_cmd: @@ -1989,17 +1933,6 @@ branch le_send_adv_transmit // branch le_send_adv_ind+7 -p_le_update_param: - fetch 1,mem_le_state - rtnbit0 lestate_update_param - fetch 2,mem_le_event_count - fetcht 2,mem_le_instant - isub temp,pdata - store 2,mem_pdatatemp - nrtn positive - call le_update_param+7 - branch z_hci_send_le_connection_update_commplete - pop_stack_rega_b_c: fetchr rega,4, mem_rega fetchr regb,4, mem_regb @@ -2125,7 +2058,7 @@ // call le_savelist call p_le_lpm_set_mult call le_update_channel_map - call p_le_update_param + call z_le_update_param branch calc_clke_offset @@ -2681,9 +2614,12 @@ p_le_check_wak_end_ll: fetch 1,mem_le_txpayload_temp beq LL_TERMINATE_IND,p_le_master_disconn - beq LL_START_ENC_REQ,le_set_enc + beq LL_START_ENC_REQ,p_le_set_enc rtn +p_le_set_enc: + call generate_sk + branch le_set_enc p_le_acknowledge: call le_supervision_flush @@ -2701,7 +2637,7 @@ bbit0 lestate_encryption,p_le_ack_unenc rtnmark1 mark_old_packet call load_sk - call le_decrypt + call p_le_decrypt setflag blank,mark_le_mic_ok,mark nrtn blank p_le_ack_unenc: @@ -2721,7 +2657,54 @@ nrtn blank branch z_le_adv +p_le_decrypt: +// fetch 1, mem_debug_count +/// sub pdata,12,null +// call ice_break,zero + fetch 1,mem_le_rxbuf + and pdata,0x03,pdata + beq LLID_LE_LL,le_decrypt + fetcht 5,mem_le_pcnt_rx + force 0,rega + call first_block_data + call aes_init + + fetchr rega,3,mem_rcv_ble_queue_ptr + increase 1,rega + copy rega,contr + ifetch 1,contr //mem_le_rxbuf+1 + copy contr,regc //mem_le_rxbuf+2 + //fetch 1,mem_le_rxbuf+1 + //arg mem_le_rxbuf+2,regc + add pdata,-1,regb + increase -4,pdata /* mic will be discarded */ + istore 1,rega //mem_le_rxbuf+1 + //store 1,mem_le_rxbuf+1 + iadd regc,contr + force regidx_data,regext_index + ifetchr regext,4,contr + call do_aes_cfb + force regidx_result,regext_index + storer regext,4,mem_le_peer_mic + force 0,rega /* rega is block counter */ + call aes_crypt_data + + fetchr regc,3,mem_rcv_ble_queue_ptr + //arg mem_le_rxbuf,regc + call generate_mic + fetch 4,mem_le_peer_mic + isub regb,pdata /* MIC ok? */ + nrtn blank + fetch 4,mem_le_last_mic /* reduntdant packet? */ + isub regb,pdata + rtn blank + storet 4,mem_le_last_mic + fetch 5,mem_le_pcnt_rx + increase 1,pdata + store 5,mem_le_pcnt_rx + force 0,pdata + rtn p_le_fifo_release_first_node: @@ -2761,20 +2744,6 @@ fetch 1,mem_master_sp_flag nbranch z_simple_pairing_process,blank rtn - - -p_parse_lmp_in_rand: - fetch 1,mem_op - set1 op_inrand_req,pdata - store 1,mem_op - call lmp_copy_rand - jam pincode_state_wait_pincode,mem_pincode_state - call p_hci_send_pincode_req_event -// branch parse_lmp_in_rand_hci - call tid_check - nbranch lmp_accept_inrand,true - nbranch parse_lmp_inrand_res,master // ignore this because of not ssp temporary - rtn p_sp_check_ssp_available: @@ -3430,4 +3399,4 @@ p_rcv_conn_req_accept_timeout_dispatch: fetch 1,mem_conn_req_status rtnne 1 // if not rcv a conn request, return - branch z_rcv_conn_req_accept_timeout \ No newline at end of file + branch z_rcv_conn_req_accept_timeout 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 5413) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (working copy) @@ -1064,10 +1064,6 @@ beq HCI_LE_CREATE_CONNECTION_CANCEL,z_hci_parse_packet_cmd_ogf_le_controller_create_connection_cancel beq HCI_LE_CONNECTION_UPDATE,p_hci_parse_packet_cmd_ogf_le_controller_connection_update 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_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 beq HCI_LE_READ_WHITE_LIST_SIZE,z_hci_parse_packet_cmd_ogf_le_controller_read_white_list_size beq HCI_LE_CLEAR_WHITE_LIST,z_hci_parse_packet_cmd_ogf_le_controller_clear_white_list @@ -1091,13 +1087,6 @@ istore 8,contw rtn - -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_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 - z_hci_parse_packet_cmd_ogf_le_controller_set_adv_enable: //OCF:0x000A call p_ipc_rx_hci_data_one_byte store 1,mem_le_adv_enable @@ -1471,12 +1460,19 @@ org z z_hci_parse_packet_cmd_ogf_le_controller3: 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 + beq HCI_LE_RAND,z_hci_parse_packet_cmd_ogf_le_controller_rand //18 + beq HCI_LE_REMOVE_DEVICE_FROM_WHITE_LIST,z_hci_parse_packet_cmd_ogf_le_controller_remove_device_from_white_list //12 + beq HCI_LE_LONG_TERM_KEY_REQUEST_REPLY,z_hci_parse_packet_cmd_ogf_le_controller_ltk_request_reply //1a + branch z_hci_parse_packet_cmd_ogf_le_controller4 + +z_hci_parse_packet_cmd_ogf_le_controller_rand: + arg 9,loopcnt + call p_hci_prepare_send_event_command_complete_with_status_success + force 8,loopcnt + call generate_random_another + branch ipc_hci_tx_start + z_hci_parse_packet_cmd_ogf_le_controller_remove_device_from_white_list: fetch 1,mem_le_white_list_cnt branch p_hci_send_event_command_complete_error_command_disallowed,blank @@ -1503,22 +1499,25 @@ istore 7,contw rtn - -z_hci_parse_packet_cmd_ogf_le_controller_set_data_length: - //length - call p_ipc_rx_hci_data_two_byte - store 2,mem_local_tx_max_octets - //time +z_hci_parse_packet_cmd_ogf_le_controller_ltk_request_reply: call p_ipc_rx_hci_data_two_byte - store 2,mem_local_tx_max_time - call z_le_send_data_length_req - + store 1,mem_hci_conn_handle //connect handle + arg mem_le_ltk,contw + force 16,loopcnt + call p_ipc_rx_hci_data_n_byte arg 3,loopcnt call p_hci_prepare_send_event_command_complete_with_status_success fetch 1,mem_le_conn_handle istore 2,contw - branch ipc_hci_tx_start - //branch p_hci_send_event_command_complete_without_payload + call ipc_hci_tx_start +// jam 1,mem_ltk_exists //no smp,no need +// call generate_sk //here did not set encrypt state,so when context_load will lose mem_le_sk + arg 1,rega + arg LLID_LE_LL,type + call le_fifo_malloc_tx + setarg LL_START_ENC_REQ + istore 1,contw + rtn z_le_send_data_length_req: arg LL_LENGTH_REQ,regb @@ -1534,26 +1533,104 @@ istore 8,contw rtn +org z +z_hci_parse_packet_cmd_ogf_le_controller4: + fetch 1,mem_mesh_hci_opcode_ocf + beq HCI_LE_ENCRYPT,z_hci_parse_packet_cmd_ogf_le_controller_encryption //17 + beq HCI_LE_LONG_TERM_KEY_REQUEST_NEGATIVE_REPLY,z_hci_parse_packet_cmd_ogf_le_controller_ltk_request_negative_reply //1b + + beq HCI_LE_SET_DATA_LENGTH,z_hci_parse_packet_cmd_ogf_le_controller_set_data_length //22 + + branch z_hci_parse_packet_cmd_ogf_le_controller5 + z_hci_parse_packet_cmd_ogf_le_controller_encryption: - arg mem_le_my_ltk,contw //key force 16,loopcnt + arg mem_le_my_ltk,contw call p_ipc_rx_hci_data_n_byte - arg mem_le_plaintext_data,contw //plaintext_data force 16,loopcnt + arg mem_le_mrand,contw call p_ipc_rx_hci_data_n_byte +z_function_aes_s1: + force regidx_data,regext_index + arg 4,loopcnt + arg mem_le_mrand,contr + call z_function_aes_s1_loop + arg 4,loopcnt + arg mem_le_my_ltk,contr + call z_function_aes_s1_loop + call do_aes_ecb_be + arg mem_le_encrypted_data,contw + call store_aes_result + arg 17,loopcnt + call p_hci_prepare_send_event_command_complete_with_status_success + arg 16,loopcnt + arg mem_le_encrypted_data,contr + call memcpy_fast + branch ipc_hci_tx_start + +z_function_aes_s1_loop: + ifetch 4,contr + iforce regext + increase 1,regext_index + loop z_function_aes_s1_loop 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 + +z_hci_parse_packet_cmd_ogf_le_controller_ltk_request_negative_reply: + call p_ipc_rx_hci_data_two_byte + store 1,mem_hci_conn_handle //connect handle + arg 3,loopcnt + call p_hci_prepare_send_event_command_complete_with_status_success + fetch 1,mem_le_conn_handle + istore 2,contw + call ipc_hci_tx_start +// jam 0,mem_ltk_exists //no smp,no need + call le_send_enc_rsp + branch le_ltk_lost + +z_hci_parse_packet_cmd_ogf_le_controller_set_data_length: + //length + call p_ipc_rx_hci_data_two_byte + store 2,mem_local_tx_max_octets + //time + call p_ipc_rx_hci_data_two_byte + store 2,mem_local_tx_max_time + call z_le_send_data_length_req + + arg 3,loopcnt + call p_hci_prepare_send_event_command_complete_with_status_success + fetch 1,mem_le_conn_handle + istore 2,contw + branch ipc_hci_tx_start + //branch p_hci_send_event_command_complete_without_payload + +org z +z_hci_parse_packet_cmd_ogf_le_controller5: + fetch 1,mem_mesh_hci_opcode_ocf + 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_start_encryption: + call p_ipc_rx_hci_data_two_byte + store 1,mem_hci_conn_handle //connect handle + call p_ipc_rx_hci_data_eight_byte + store 8,mem_le_rand + call p_ipc_rx_hci_data_two_byte + store 2,mem_le_ediv + arg mem_le_ltk,contw + force 16,loopcnt + call p_ipc_rx_hci_data_n_byte + arg mem_le_skdm,contw + force 8, loopcnt + call generate_random_another + arg mem_le_ivm,contw + force 4, loopcnt + call generate_random_another + jam FLAG_LE_RCV_ENC_START,mem_le_enc_state + branch p_hci_send_event_command_status + org z z_hci_inquiry_reply_check_eir: fetch 1,mem_inquiry_mode @@ -1670,7 +1747,7 @@ fetch 1,mem_le_conn_status ncall p_le_get_master_role,blank istoret 1,contw //role - fetch 1,mem_le_hci_conn_peer_addr_type + fetch 1,mem_le_conn_peer_addr_type istore 1,contw //peer address type fetch 6,mem_le_conn_peer_addr istore 6,contw //peer address @@ -1685,6 +1762,35 @@ branch ipc_hci_tx_start org z +z_le_send_connection_update_ind: + fetch 1,mem_le_state + set1 lestate_update_param,pdata + store 1,mem_le_state + + jam 1,mem_le_new_transmitwindowsize // window size 1 1.25ms + setarg 0x3 + store 2,mem_le_new_transmitwindowoffset //window offset 3 3.75ms + fetch 2,mem_le_conn_interval + store 2,mem_le_new_conninterval // event interval 30 37.5ms + fetch 2,mem_le_conn_latency + store 2,mem_le_new_connslavelatency // latency + fetch 2,mem_le_conn_superto + store 2,mem_le_new_connsupervisiontimeout //supervision timeout 500 5s + fetch 2,mem_le_event_count + increase 0x10,pdata + store 2,mem_le_instant + arg 12,rega + arg LLID_LE_LL,type + call le_fifo_malloc_tx + setarg LL_CONNECTION_UPDATE_REQ + istore 1,contw + //winsize winoffset + fetch 9,mem_le_new_param + istore 9,contw + fetch 2,mem_le_instant + istore 2,contw + call clear_le_cmd +// branch z_hci_send_le_connection_update_commplete z_hci_send_le_connection_update_commplete: fetch 8,mem_mesh_le_event_mask rtnbit0 LE_CONNECTION_UPDATE_COMPLETE_EVENT @@ -1699,7 +1805,31 @@ istore 6,contw branch ipc_hci_tx_start - +org z +z_le_update_param: + fetch 1,mem_le_state + rtnbit0 lestate_update_param + fetch 2,mem_le_event_count + fetcht 2,mem_le_instant + isub temp,pdata + store 2,mem_pdatatemp + nrtn positive + call le_update_param+7 +// branch z_hci_send_le_connection_update_commplete_sub +z_hci_send_le_connection_update_commplete_sub: + fetch 8,mem_mesh_le_event_mask + rtnbit0 LE_CONNECTION_UPDATE_COMPLETE_EVENT + jam 10,mem_mesh_event_para_total_length + jam HCI_EVENT_LE_META_EVENT,mem_mesh_event_head_event_code + call p_hci_prepare_send_event + setarg HCI_LE_SUBEVENT_CONN_UPDATE_COMPLETE + istore 2,contw //subevent code & status + fetch 1,mem_le_conn_handle + istore 2,contw + fetch 6,mem_le_new_conninterval + istore 6,contw + branch ipc_hci_tx_start + org z z_parse_lmp_escape: @@ -1932,8 +2062,6 @@ beq LMP_FEATURES_REQ,z_parse_lmp_features_req beq LMP_FEATURES_RES,z_parse_lmp_features_res 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 @@ -1979,13 +2107,13 @@ z_parse_lmp_features_res: 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 @@ -2076,8 +2204,8 @@ fetch 1,mem_lmi_opcode2 beq LMP_ACCEPTED,z_parse_lmp_accepted//multi beq LMP_START_ENCRYPTION_REQ, z_parse_lmp_start_encryption_req - - branch parse_lmp_process+5 + + branch z_parse_lmp_process_sub2 z_parse_lmp_start_encryption_req: call parse_lmp_start_encryption_req+2 @@ -2149,6 +2277,83 @@ // jam hci_cmd_accept_conn,mem_hci_cmd rtn +org z +z_parse_lmp_process_sub2: + fetch 1,mem_lmi_opcode2 + beq LMP_IN_RAND,z_parse_lmp_in_rand //in_rand + beq LMP_NAME_RES,z_parse_lmp_name_res + + branch parse_lmp_process+5 + +z_parse_lmp_in_rand: + fetch 1,mem_op + set1 op_inrand_req,pdata + store 1,mem_op + call lmp_copy_rand + jam pincode_state_wait_pincode,mem_pincode_state + call p_hci_send_pincode_req_event +// branch parse_lmp_in_rand_hci + call tid_check + nbranch lmp_accept_inrand,true + nbranch parse_lmp_inrand_res,master // ignore this because of not ssp temporary + rtn + +z_parse_lmp_name_res: + fetch 1,mem_hci_remote_name_req_flag + branch parse_lmp_name_res,blank + + fetch 2,mem_len + add pdata,-3,loopcnt //for remote name length error + fetcht 1,mem_rxbuf+1 + setarg mem_tmp_buffer + iadd temp,contw + arg mem_rxbuf+3,contr + call memcpy + call z_hci_save_mem_hci_remote_name + fetcht 1,mem_name_offset + fetch 1,mem_rxbuf+2 + isub temp,pdata + sub pdata,14,null + branch z_hci_send_remote_name_request_complete,positive + branch parse_lmp_name_res+12 + +z_hci_save_mem_hci_remote_name: + fetcht 1,mem_rxbuf+1 + setarg mem_hci_remote_name + iadd temp,contw + + fetch 1,mem_rxbuf+2 + fetcht 1,mem_rxbuf+1 + isub temp,loopcnt + + arg mem_rxbuf+3,contr + branch memcpy_fast + +org z +z_hci_send_remote_name_request_complete: + jam 255,mem_mesh_event_para_total_length + jam HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE,mem_mesh_event_head_event_code + call p_hci_prepare_send_event + setarg 0x00 + istore 1,contw + fetch 6,mem_hci_plap + istore 6,contw + arg 64,loopcnt + arg mem_hci_remote_name,contr + call memcpy_fast + arg 184,loopcnt + call memset0 + call ipc_hci_tx_start +z_hci_remote_name_request_flag_init: + fetch 1,mem_hci_remote_name_req_flag + jam 0,mem_hci_remote_name_req_flag + jam 0,mem_name_offset + beq 2,z_hci_send_remote_name_request_complete_detach + branch parse_lmp_name_res_end +z_hci_send_remote_name_request_complete_detach: + call lmp_disconnect+1 + branch parse_lmp_name_res_end + org z z_parse_lmp_conn_req: @@ -3024,15 +3229,11 @@ org z z_le_parse_ll_sub: -// fetch 2,mem_le_payload_ptr -// copy pdata,contr -// ifetch 1,contr fetch 1,mem_le_rxbuf+2 beq LL_LENGTH_REQ,z_le_parse_length_request beq LL_LENGTH_RSP,z_le_parse_length_rsp beq LL_TERMINATE_IND,z_le_parse_terminate_ind - branch le_parse_ll+2 - + branch z_le_parse_ll_sub1 z_le_parse_terminate_ind: ifetch 1,contr @@ -3095,6 +3296,82 @@ branch z_le_send_data_length org z +z_le_parse_ll_sub1: + fetch 1,mem_le_rxbuf+2 + beq LL_ENC_REQ,z_le_parse_enc_req + beq LL_START_ENC_RSP,z_le_parse_start_enc_rsp + + branch le_parse_ll+2 + +// just do request,waiting for host ack or nak. +z_le_parse_enc_req: + fetch 8,mem_le_features + rtnbit0 0 //if le encryption feature do not set 1,rtn + fetch 1,mem_le_rxbuf+2 + ifetch 8,contr + store 8,mem_le_rand + ifetch 2,contr + store 2,mem_le_ediv + ifetch 8,contr + store 8,mem_le_skdm + ifetch 4,contr + store 4,mem_le_ivm + call le_send_enc_rsp + branch z_le_parse_enc_req_send_le_ltk_request_event +// fetch 1,mem_le_pairing_state +// beq FLAG_LE_PAIRING_AFTER_AUTH,z_le_parse_enc_req_after_auth +// fetch 1,mem_ltk_exists +// beq 0,z_le_parse_enc_req_send_le_ltk_request_event +//le_parse_enc_req_ltk_exist: +//z_le_parse_enc_req_after_auth: +// jam FLAG_LE_RCV_ENC_START,mem_le_enc_state +// call le_send_enc_rsp +// call le_send_start_enc_req +// branch generate_sk + +z_le_parse_enc_req_send_le_ltk_request_event: + jam 13,mem_mesh_event_para_total_length + jam HCI_EVENT_LE_META_EVENT,mem_mesh_event_head_event_code + call p_hci_prepare_send_event + setarg HCI_LE_SUBEVENT_LTK_REQUEST + istore 1,contw //subevent code + fetch 1,mem_le_conn_handle + istore 2,contw + fetch 8,mem_le_rand + istore 8,contw + fetch 2,mem_le_ediv + istore 2,contw + branch ipc_hci_tx_start + +z_le_parse_start_enc_rsp: + call z_hci_le_send_encryption_change_complete_event + rtn master + arg 1,rega + arg LLID_LE_LL,type + call le_fifo_malloc_tx + setarg LL_START_ENC_RSP + istore 1,contw + rtn + +// as the same as z_hci_send_encryption_change_complete_event +z_hci_le_send_encryption_change_complete_event: + //Status(1), conn_handle(2), enc_mode(1) + jam 4,mem_mesh_event_para_total_length + jam HCI_EVENT_ENCRYPTION_CHANGE_COMPLETE,mem_mesh_event_head_event_code + call p_hci_prepare_send_event + setarg 0 + istore 1,contw + + fetch 1,mem_le_conn_handle + istore 2,contw + + //enc_mode + setarg 1 + istore 1,contw + + branch ipc_hci_tx_start + +org z z_send_lmp_accepted: force 2,pdata call msg_send_lmp @@ -3160,4 +3437,56 @@ loop z_charge_reset_bias rtn + +ifdef AES_S1_TEST +org z +z_sim_s1: + setarg 0x1123 + store 4,mem_le_tk + setarg 0x667788 + store 3,mem_le_srand + setarg 0x334455 + istore 3,contw + setarg 0x1122 + istore 2,contw + setarg 0xeeff00 + store 3,mem_le_mrand + setarg 0xbbccdd + istore 3,contw + setarg 0x99aa + istore 2,contw + call function_s1 + arg mem_le_ltk,contw + call store_aes_result + branch assert +org z +z_sim_s1_test: + call ice_break + force regidx_data,regext_index + call aes_clear + increase -4,regext_index + fetch 4,mem_le_srand + iforce regext + increase 4,regext_index + call aes_clear + increase -4,regext_index + arg mem_le_my_ltk,contr + ifetch 4,contr + iforce regext + increase 1,regext_index + ifetch 4,contr + iforce regext + increase 1,regext_index + ifetch 4,contr + iforce regext + increase 1,regext_index + ifetch 4,contr + iforce regext + increase 1,regext_index + call do_aes_ecb_be + + arg mem_le_my_ltk,contw + call store_aes_result + branch assert +endif 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 @@ -274,7 +273,7 @@ 1 1 1 - 1 + 0 0 0 ..\..\User\main.c @@ -294,6 +293,18 @@ 0 0 + + 1 + 3 + 1 + 0 + 0 + 0 + ..\..\User\yc11xx_softdma.c + yc11xx_softdma.c + 0 + 0 + @@ -304,7 +315,7 @@ 0 2 - 3 + 4 2 0 0 @@ -324,9 +335,9 @@ 0 3 - 4 + 5 1 - 1 + 0 0 0 ..\..\..\..\..\..\Librarier\device\yc11xx.c @@ -336,7 +347,7 @@ 3 - 5 + 6 1 0 0 @@ -348,7 +359,7 @@ 3 - 6 + 7 1 0 0 @@ -360,7 +371,7 @@ 3 - 7 + 8 1 0 0 @@ -372,7 +383,7 @@ 3 - 8 + 9 1 0 0 @@ -384,7 +395,7 @@ 3 - 9 + 10 1 0 0 @@ -396,7 +407,7 @@ 3 - 10 + 11 1 0 0 @@ -408,7 +419,7 @@ 3 - 11 + 12 1 0 0 @@ -420,7 +431,7 @@ 3 - 12 + 13 1 0 0 @@ -432,7 +443,7 @@ 3 - 13 + 14 1 0 0 @@ -444,7 +455,7 @@ 3 - 14 + 15 1 0 0 @@ -456,7 +467,7 @@ 3 - 15 + 16 1 0 0 @@ -468,7 +479,7 @@ 3 - 16 + 17 1 1 0 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 @@ -392,6 +391,11 @@ 1 ..\..\User\Drv_bt.c + + yc11xx_softdma.c + 1 + ..\..\User\yc11xx_softdma.c + 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 5413) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/btreg.h (working copy) @@ -1708,7 +1708,7 @@ #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_le_encrypted_data 0x4efc #define mem_headset_end 0x4f0c #define mem_usb_mouse_data 0x4ace #define mem_usb_kb_data 0x4ade 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 5413) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/memmap.format (working copy) @@ -1706,7 +1706,7 @@ 0x4ef4 mem_hci_packet_type 0x4ef6 mem_hci_read_remote_version_information_flag 0x4ef7 mem_mesh_classic_version -0x4efc mem_le_plaintext_data +0x4efc mem_le_encrypted_data 0x4f0c mem_headset_end 0x4ace mem_usb_mouse_data 0x4ade mem_usb_kb_data 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 5413) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (working copy) @@ -68,69 +68,69 @@ c00801c7 c00e01a7 c00f01cc -c010025a -c0120228 +c010022e +c01201fc c0190189 c01c8196 c01d0198 -c01f024d -c020821d -c0220784 -c02a0736 -c02c068e -c02e06aa -c02e86b0 -c0350786 -c0358788 -c0360210 -c03c0214 +c01f0221 +c02081f1 +c022076f +c02a0721 +c02c0679 +c02e0695 +c02e869b +c0350771 +c0358773 +c03601e4 +c03c01e8 c04080f7 c0428111 c04300d3 c04f00d7 c0500179 -c052071e -c054070e -c05c878a -c05d060b +c0520709 +c05406f9 +c05c8775 +c05d05d9 c0700171 20202baf -c003878c -c0060277 -c009078e -c00985ae -c00a058d -c01185a1 -c01286b2 -c01306b6 -c01386b8 -c01406ba -c01486bb -c01506c0 -c01d8409 -c01f0412 -c01f83b5 -c0208502 -c02106ff -c02404a6 -c0258515 -c0278482 +c0038777 +c006024b +c0090779 +c009857c +c00a055b +c011856f +c012869d +c01306a1 +c01386a3 +c01406a5 +c01486a6 +c01506ab +c01d83e0 +c01f03e9 +c01f83a6 +c02084d0 +c02106ea +c0240474 +c02584e3 +c0278459 c028813c -c029062b -c02c0790 -c02d8644 -c02e8792 -c030064e -c032064a -c03706d6 -c0380794 -c0388796 +c02905fb +c02c077b +c02d8614 +c02e877d +c0300643 +c032063f +c03706c1 +c038077f +c0388781 c03a017d -c03a8798 -c04906c1 -c052865d -c053065d -c075076b +c03a8783 +c04906ac +c0528652 +c0530652 +c0750756 c1590000 c16a0000 20202baf @@ -143,14 +143,14 @@ 20400093 2040233d 20400099 -20400781 +2040076c 20202021 c68e0000 18000e02 20407148 7d3a001c 243a209e -2020079a +20200785 6fe24133 c4008000 6fe20030 @@ -188,13 +188,13 @@ 6fec04dd 67ec0633 6fe24c8b -c00083d8 -20400317 +c00083af +204002eb 204046d3 243680c5 6fe204dc c00300c5 -20400317 +204002eb 6fe44e32 243a00b3 20600000 @@ -375,7 +375,7 @@ 20400138 70800520 20200138 -20400762 +2040074d 20400172 d85fffff 20202cbe @@ -383,9 +383,9 @@ 204052b0 6fe20048 207a0000 -2020079c -2040079e -20200266 +20200787 +20400789 +2020023a 6fe2004b 79207e03 67e2004b @@ -428,24 +428,24 @@ 207a0000 6fe2007c 247a0000 -202007a0 -204002d9 +2020078b +204002ad 704c8a02 -202007a2 +2020078d 704c9b02 704c8a00 202001b7 704c9b00 704ca100 704c9f00 -202007a4 +2020078f 6fe24c9a -203a07a6 +203a0791 6fe24c99 -203a079a +203a0785 1fe0ffff 67e24c99 -202007a6 +20200791 6fe20018 1ff18400 184f840a @@ -455,7 +455,7 @@ 20600000 20402108 6fe24ea6 -243a01f4 +243a0793 704c8a04 202001b5 204024d2 @@ -466,7 +466,7 @@ c28221c5 6fe20030 c30221c4 -202002fc +202002d0 6fe24c9c c00001db c00081de @@ -482,50 +482,6 @@ 704c88ff 704c872f 20600000 -6fe24ea6 -203a4dab -6fe4012c -1fe0f3fd -68420739 -580000c6 -98408a00 -d8c0073b -2040713a -20400208 -68420053 -6fe2073a -98467e00 -1fe67c0e -202101f4 -20204db7 -704c88ff -704c8707 -20400347 -58000000 -e7e20005 -6fec42a9 -e7ec0005 -df200040 -d8c04ea7 -2040712d -df2000b8 -204070e4 -20400351 -6fe24ea6 -704ea600 -70005300 -c0010206 -20204dbb -20404f5f -20204dbb -68420739 -58004ea7 -98408a00 -6fe2073a -68420739 -98467200 -d8c0073b -2020712d 6fe24ea5 1fe67c64 242127fd @@ -535,21 +491,21 @@ 98000c00 1d027e00 20202931 -20400288 +2040025c 68420046 98467c00 20600000 20402337 -202c0225 +202c01f9 204024ca -243a021d +243a01f1 78587c00 1d027e00 67e84169 20600000 2040248f 704c8a00 -202007a8 +20200795 204021ec 24740000 78547c00 @@ -557,15 +513,15 @@ 793f800b 20402b71 2040232b -c5058238 +c505820c 204024ca -243a022d +243a0201 78547c00 1c427e00 67e84169 78387c00 7834fc00 -202007aa +20200797 20402b6f d8200010 20402321 @@ -574,10 +530,10 @@ 20402917 204024ab 204024f3 -20368244 +20368218 204024ca -243a023f -20200232 +243a0213 +20200206 18000401 6fe20031 793ffe01 @@ -586,7 +542,7 @@ 20402940 78347c00 704c8a01 -202007a8 +20200795 70011600 70015000 204024d2 @@ -594,11 +550,11 @@ 2040724d 6fe24c9b 207a0000 -202002fc +202002d0 20404d8e c6108000 6fe24ef0 -c0008266 +c000823a 20600000 6fe20030 c283a1e1 @@ -611,57 +567,57 @@ 67e2004b 204021e1 c6108000 -2020079e +20200789 704c8803 704c8706 -20400347 +2040031b 18007e00 e7e20005 6fe20046 e7e40005 -20200351 +20200325 704c8806 704c8717 -20400347 +2040031b 6fec0040 e7ec0005 -20200351 +20200325 704c8806 704c8716 -20200270 -2040027d -204005ef +20200244 +20400251 +204005bd 207a0000 20403e9d 20628000 -20200277 +2020024b 6fe243de 207a0000 20403e9d 20628000 1fe20c00 20403e92 -c00582c7 +c005829b 20203ef4 -2040029c +20400270 2040712d -20200299 -2040029c +2020026d +20400270 efe40006 -20200299 -2040029c +2020026d +20400270 efe60006 -20200299 -2040029c +2020026d +20400270 efec0006 -20200299 -2040029c +2020026d +20400270 efee0006 -20200299 -2040029c +2020026d +20400270 eff00006 -20200299 -2040029c +2020026d +20400270 efe20006 18c20400 60464bf2 @@ -674,16 +630,16 @@ 704eed01 7044d901 704c8b01 -202002e9 +202002bd 6fec4c8d 67ec4639 67ec4140 20600000 20600000 704ddb00 -202002ae +20200282 704ddb03 -202002ae +20200282 62464ddc 58004b4a 67e443e3 @@ -699,69 +655,69 @@ 18007e06 67e243e2 20203f1a -204007ac +20400799 6a464dd8 -202002aa -204002c3 +2020027e +20400297 6a464dd8 -202005ce -2040029c +2020059c +20400270 df200003 d8a04dd8 20203e88 20403e92 20403e92 67e24dd7 -20400299 +2040026d 6fe24dd7 -c00002c0 -204005ef +c0000294 +204005bd 207a0000 -204002c3 +20400297 6fe24dd7 -c00182bd +c0018291 20202baf 704c9612 -202002da +202002ae 704c9601 -202002da +202002ae 704c960c -202002da +202002ae 704c9600 df200001 -204002de -20200351 +204002b2 +20200325 704c9600 -204002e2 +204002b6 6fe24c96 e7e20005 20600000 704c870e 1f20fe03 67e24c88 -20400347 +2040031b 6fe64c93 e7e60005 20600000 700f1200 -202002ee +202002c2 700f120c -202002ee +202002c2 700f1202 704c870f 704c8804 -20400347 +2040031b 6fe20f12 e7e20005 6fe64c93 e7e60005 -20200351 +20200325 6ff04c6c c4020000 6fe20639 67e24e18 704eed00 -202007ae +2020079b 6fe20046 67e24e18 793f8021 @@ -769,7 +725,7 @@ 70004600 704ca100 704c9b00 -202007ae +2020079b 6fe20624 d8400000 c1018000 @@ -798,16 +754,16 @@ 1fe0fe03 67e44db1 da204cca -2040059e +2040056c 1fe67c02 20610000 704c873e -20400347 +2040031b 58000002 e7e20005 58000001 e7e20005 -2040030b +204002df e0420005 204047d5 1a227e00 @@ -821,35 +777,35 @@ 2040712d 204001c0 e7e20005 -20200351 +20200325 6fe20046 67e242a8 -2020033d +20200311 6fe20639 67e242a8 704c8805 704c8713 -20400347 +2040031b 58000001 e7e20005 6fe242a8 e7e40005 58000001 e7e40005 -20200351 +20200325 6fe24c88 1fe0fe03 67e44db1 -2040034e +20400322 6fe64c86 e7e60005 20600000 -204005ab +20400579 1a420a00 20600000 da204d84 20403fa5 -202002ac +20200280 18000400 18000201 704ef101 @@ -863,16 +819,45 @@ 280ffe26 7920fe04 67e21000 +6fe21001 +207a0000 +6fee1001 +6fe20623 +c4020000 +20406246 +da601000 +684a455d +2040617c +18002200 +20406168 +204061ec +18007000 +1a425e00 +204061e3 +da601002 +6fe21001 +1fe0a5ff +9a608a00 +1800700c +e5e80005 +18002200 +20406193 +6fe21001 +1fe0fe04 +67e21001 +684a455d +18408401 +604a455d 20600000 6fe24ef1 207a0000 -20200354 +20200328 6fe2063a -c2828362 +c2828353 704ef100 -20400388 -2040039c -203a0354 +20400379 +2040038d +203a0328 efe20006 ea220006 9a267e00 @@ -888,8 +873,8 @@ 18427200 2040712d 2040480e -20400357 -2040039c +2040032b +2040038d efe20006 1fe22200 18c23000 @@ -904,15 +889,15 @@ 202049f1 6fe24683 203a480c -20400392 +20400383 c6130000 da204d5c -2040059e +2040056c c000480c c000c80c 79200026 20600000 -2040039c +2040038d 203a480c efe20006 e8420006 @@ -924,7 +909,7 @@ 20600000 da204d5c 20203fa1 -204003a0 +20400391 20202739 204045bd 204045cd @@ -950,38 +935,12 @@ 20407a4f 204045aa 20404766 -20400365 -2040039e -20400570 +20400356 +2040038f +2040053e 20404594 -20340583 +20340551 2020458a -6fe20623 -79207e05 -67e20623 -70452d01 -58000003 -67e4452e -6fe444d7 -67e44530 -6fe44632 -67e44532 -6fe44634 -67e44534 -6fe4063d -1fe0fe10 -67e40643 -da20000c -d8200003 -204049ab -58000000 -e7e20005 -6ff2452d -e7f20005 -6fe40643 -e7e40005 -20400459 -202007b0 6fe24626 68424eee 98467c00 @@ -999,16 +958,16 @@ 204047d2 704eed02 704c8a00 -202007a2 -204005ff +2020078d +204005cd 67e64e15 58000000 67e64d2e 6fe20046 67e242a8 704ddb05 -202003f9 -20400605 +202003d0 +204005d3 67e64e15 58000000 67e64d31 @@ -1043,21 +1002,21 @@ 204045b4 2040315c 6fe20624 -c0018440 +c0018417 20204579 -20400288 +2040025c 67e242a8 -20400288 +2040025c 67e444d7 -20400288 -20400288 +2040025c +2040025c 67e44632 -20400288 +2040025c 67e44634 -2040045b -202002e9 -204003a0 -20200587 +20400432 +202002bd +20400391 +20200555 6fe20623 79207e06 67e20623 @@ -1088,40 +1047,40 @@ 20600000 7834fc00 204048fd -2021070b +202106f6 6fe24eea -245a07b2 -20400365 +245a079d +20400356 204045fc 7856fc00 -20400422 -24368476 +204003f9 +2436844d 20407a4f -20400470 +20400447 20404766 -20400570 +2040053e 20404594 -2034045d -20400453 +20340434 +2040042a 7854fc00 20202739 6fe20623 c3830000 6fe24ee7 207a0000 -c00983be +c009879f 20202baf 704ee700 20600000 704ee713 20600000 -20400365 -20400463 +20400356 +2040043a 78377c00 -20400587 -2036844a -20200450 -20400465 +20400555 +20368421 +20200427 +2040043c 20202739 204045bd 204045cd @@ -1130,8 +1089,8 @@ 782efc00 78307c00 7850fc00 -2040046e -202003a8 +20400445 +20200399 37c18200 20600000 6fe20623 @@ -1141,13 +1100,13 @@ 704eea01 20600000 6fe20623 -c2818450 +c2818427 6fe24e17 1fe67c06 -2421070b +242106f6 1fe0fe01 67e24e17 -20200450 +20200427 684c4639 20600000 684c4c7a @@ -1165,21 +1124,12 @@ 67e24537 18427200 6fe2461c -205a047e -245a0480 +205a0455 +245a0457 604c4538 d8c044e0 2040712d 202046cd -6fe20623 -c4028000 -6fe4063d -68440643 -98467e00 -67e40124 -24610000 -2040473e -202007b0 6a280f1e 6a480f22 6a660f26 @@ -1188,7 +1138,7 @@ 62480f22 62660f26 20600000 -204004a2 +20400470 67244ee8 1a208c01 efe20006 @@ -1197,10 +1147,10 @@ efe40005 1fe0fe01 e7e40005 -204004d5 -204004c1 +204004a3 +2040048f 20404618 -2040049e +2040046c 6f244ee8 20600000 1a208c31 @@ -1210,7 +1160,7 @@ c3004628 18408401 1fe37e00 -c20004b9 +c2000487 1840ffff 1a208a22 e7e20005 @@ -1234,7 +1184,7 @@ 6fea4528 1a208a31 e7ea0005 -202004b5 +20200483 1a208c00 efe20006 c4028000 @@ -1246,7 +1196,7 @@ 6fe40643 98467e00 1fe67c01 -202284eb +202284b9 20600000 1a208c1a efe40006 @@ -1255,7 +1205,7 @@ 98467e00 d840ffff 98467c00 -202284eb +202284b9 20600000 efe20011 793ffe05 @@ -1280,12 +1230,12 @@ 1a208a2d e7e80005 20600000 -20400506 +204004d4 2040475a -20400495 +204007a1 20202940 7855fc00 -20370509 +203704d7 2436c981 20402d74 6fe44161 @@ -1312,15 +1262,15 @@ 78507c00 19623600 37c18400 -20370525 +203704f3 1b420400 604c00a4 242c2739 -2037052c +203704fa dd2001e0 1c225000 6fe20623 -c301852c +c30184fa 2055ac9c 20402abc 7823fc00 @@ -1338,37 +1288,37 @@ 67e204dc 1fe27200 67e2068c -203a0557 +203a0525 6fe204db 1fe17e03 -c001854c -c507854e +c001851a +c507851c da204cca -2040059e -c000854e -203a054e -204005fb -203a054e -20400605 +2040056c +c000851c +203a051c +204005c9 +203a051c +204005d3 18c20a00 6fe404db e7e40005 -20200553 +20200521 d8a004dd -20200553 +20200521 09800008 19897e00 -c200054e +c200051c 78367c00 -20200557 +20200525 09800008 19897e00 e7e20005 -c2000553 +c2000521 09800018 78287c00 db600664 -2036055e +2036052c 1fef7e00 1ff17e00 e7e60005 @@ -1376,7 +1326,7 @@ 20232739 7836fc00 6fe242b5 -243a0566 +243a0534 6fe20017 1fe0a200 20402a7b @@ -1394,23 +1344,23 @@ c68d0000 20760000 6fe204dc -203a057d +203a054b 6fe204db 1fe17e03 c001c866 -20400605 -20400568 +204005d3 +20400536 6fe2068c 207a0000 -202003f2 +202003c9 6fe64d31 207a0000 1fe22400 58000000 67e64d31 -202005ce +2020059c 78377c00 -20400587 +20400555 2036c582 2020458a 68420017 @@ -1418,7 +1368,7 @@ 20402a23 78287c00 d9601388 -2020051a +202004e8 1a208409 efe20002 203a2baf @@ -1443,13 +1393,13 @@ 6fe204d5 c1018000 20204146 -204005c0 +2040058e da204d34 20203f94 da204d34 20403fa5 -202005ce -204005c0 +2020059c +2040058e da204d84 20203f94 1a20fe04 @@ -1470,57 +1420,57 @@ 1a420c00 1a427e00 20600000 -204005e2 +204005b0 203a2baf 6fe44dd1 1fe0fff6 68444db1 98467c00 -202105c9 +20210597 da204cca 20203fa5 da204ca2 -2040059e -203a05c7 +2040056c +203a0595 da204ca2 20203fa5 -204005da +204005a8 da204ca2 -203a05d3 +203a05a1 da204cca 20203f94 -204005d7 +204005a5 203a2baf da204ca2 20203f94 6f224caa d8c04cf2 -202005dc +202005aa 6f224cd2 d8c04d10 efe60006 9a467c00 -202285e0 -c20005dc +202285ae +c20005aa 1f227e00 20600000 6fe44dd1 1fe0fff6 68444db1 98467c00 -202105e9 +202105b7 da204cca -2020059e +2020056c da204ca2 -2040059e +2040056c 247a0000 -202005e7 +202005b5 6fe44dd5 -202005f0 +202005be 58000010 67e44db1 62280f1e -204005e2 +204005b0 6a280f1e 20600000 da204cca @@ -1528,20 +1478,20 @@ 6fe44d2e 247a0000 da204cca -2020059e +2020056c 6fe44d31 247a0000 da204cca -2020059e +2020056c 6fe64d2e 243a7111 -204005f5 +204005c3 1a427e00 67e64d2e 20207111 6fe64d31 243a7111 -204005f5 +204005c3 1a427e00 67e64d31 20207111 @@ -1552,12 +1502,12 @@ 20203190 1a627e00 c00a326c -c00a8614 +c00a85e2 20203168 704c8c00 704c1700 -204007b4 -204002f6 +204007a3 +204002ca 202031c3 6842063a 284c0005 @@ -1574,11 +1524,13 @@ 6fe245b5 c0014794 6fe21002 -c001070b -c002c790 +c00106f6 +c00285f9 20600000 +2040615d +20204790 20404906 -20400619 +204005e7 6fe204db 2feffe04 79208027 @@ -1587,12 +1539,12 @@ 2feffe02 7920800f 6fe204dc -203a063d +203a060d 6fe20623 -c302063d +c302060d c6078000 20406246 -204061b6 +2040061a 793a001a 247a0000 20760000 @@ -1607,13 +1559,50 @@ d8e00001 20407148 247a0000 -202007b6 -2040065a +202007a5 +6fe204db +1fe17e03 +c001e1b6 +684a4562 +18002200 +20406168 +204061ec +6a264d31 +1a20a201 +1a220c00 +efe20006 +18c22600 +1fe0a5ff +1fe0fffc +e7e20011 +9a608c00 +18007000 +ede80006 +204061e3 +1800700c +65e805df +18002200 +20406193 +6a664d31 +2040617c +6fe805df +9a467e00 +247a0000 +6fe84567 +9a467e00 +207a0000 +60484567 +6fea4562 +1fe0fe01 +67ea4562 +18007e00 +20600000 +2040064f 18227e00 c1018000 -2020033b +2020030f 62244db1 -20400657 +2040064c 1a420a00 6fe44db1 e7e20005 @@ -1621,26 +1610,16 @@ e7e20005 e0220005 20600000 -204005c0 +2040058e da204d5c 20203f94 da204d5c 20403fa5 -202005ce +2020059c 6fe20b97 -243a07b8 +243a07a7 6fe20b98 -243a07b8 -20600000 -6fe2004b -79207e02 -67e2004b -20404f51 -7006ae01 -20400274 -204052de -2420cf59 -2434cd67 +243a07a7 20600000 6fe24c97 207a0000 @@ -1651,24 +1630,24 @@ 1a208c01 efe20006 c4008000 -20400678 +20400663 704c9f01 20600000 704c8806 704c8731 -20400347 +2040031b 6fec0040 e7ec0005 -20200351 +20200325 204063ce 704c8807 704c8736 -20400347 +2040031b 58000000 e7e20005 6fec0040 e7ec0005 -20200351 +20200325 6fe20151 1fe17e03 c080a68a @@ -1678,11 +1657,11 @@ 2020268a 1f227e00 67e4012c -203a0687 +203a0672 9ea67c00 20212729 18017e01 -243a0699 +243a0684 6fe20151 1fe17e03 c001a649 @@ -1693,11 +1672,11 @@ 98467c00 20212729 da204cca -2040059e +2040056c c000a739 -204005f7 +204005c5 203a2739 -204005ff +204005cd 18c20a00 6fe20151 e7e20005 @@ -1710,24 +1689,24 @@ c58026ba 793f8000 20600000 -204003ea +204003c1 202026dd 62244db1 -204005a5 +20400573 6a244db1 20600000 da204d34 20203fa1 -204005a8 -20200338 -202005a8 -204005ed +20400576 +2020030c +20200576 +204005bb 203a729b 2020729d da204d34 -2020059e +2020056c 20202baf -204006be +204006a9 207a0000 6fe2004b c3830000 @@ -1740,7 +1719,7 @@ 18c27e00 67e4013c 6fe4442c -203a06d0 +203a06bb 20205b2e 6fe40099 203a2baf @@ -1751,7 +1730,7 @@ 70429300 20204b77 67e40fb7 -202006da +202006c5 68440fb7 18518400 6fe44881 @@ -1770,11 +1749,11 @@ 67e40241 58017f00 67e4023f -2040072f +2040071a 204057e8 6fe280a0 67e20124 -204006f6 +204006e1 6fe20124 67e280a0 704e6300 @@ -1801,39 +1780,39 @@ 704c8b00 700f0d15 20206b2e -20400700 +204006eb 7854fc00 20600000 6fe24040 c3800000 c3818000 6fe247cd -203a0715 +203a0700 6fe24724 207a0000 20202d53 6fe206ab 67e24bef 704bf000 -20400762 -202007ba +2040074d +202007a9 7043dd01 20403f41 -202007ba +202007a9 6fe20fd6 -c055072e +c0550719 6fe24131 207a0000 -204006be +204006a9 247a0000 da204d5c -2040059e +2040056c 247a0000 da204ca2 -2040059e +2040056c c1850000 da204cca -2040059e +2040056c c1850000 20202d15 20202001 @@ -1843,13 +1822,13 @@ 207a0000 6fe24e64 c1a98000 -20200731 +2020071c 18227e00 c003a739 c0032739 202025df 6fe84bd7 -2020075d +20200748 20006a60 6fe84bd7 79207e16 @@ -1857,30 +1836,30 @@ 79207e15 67e84bd7 df200032 -204007bc +204007ab 6fe84bd7 793ffe15 -2040075d +20400748 6fe84bd7 793ffe14 -2040075d +20400748 200004b0 6fe84bd7 793ffe16 -2040075d +20400748 200004b0 20600000 6fe84bd7 79207e16 -2040075d +20400748 200004b0 6fe84bd7 79207e14 -2040075d +20400748 200004b0 6fe84bd7 79207e15 -2040075d +20400748 200004b0 20600000 67e84bd7 @@ -1904,14 +1883,14 @@ 20406b2b 18427e00 207a0000 -c04c0775 +c04c0760 67e20fba -202007be +202007ad 20405875 20001770 68448352 18427e00 -205a077e +205a0769 60444eeb 20405882 700f0d9e @@ -1921,120 +1900,132 @@ 20600000 6fe24ca1 c1808000 -202007c0 -58000330 -202006d8 -580002f0 -202006d8 -58000300 -202006d8 -58000280 -202006d8 -580002a0 -202006d8 -58000110 -202006d8 +202007af 58000380 -202006d8 +202006c3 58000340 -202006d8 -58000220 -202006d8 -580001e0 -202006d8 -580003a0 -202006d8 -58000270 -202006d8 +202006c3 58000350 -202006d8 -580001b0 -202006d8 -580002e0 -202006d8 -580001c0 -202006d8 +202006c3 +580002d0 +202006c3 +580002f0 +202006c3 +58000110 +202006c3 +580003d0 +202006c3 +58000390 +202006c3 +58000250 +202006c3 +58000210 +202006c3 +58000400 +202006c3 +580002c0 +202006c3 +580003a0 +202006c3 +580001d0 +202006c3 +58000330 +202006c3 +580001e0 +202006c3 58000140 -202006d8 -58000190 -202006d8 +202006c3 +580001b0 +202006c3 +58000290 +202006c3 +58000360 +202006c3 +58000370 +202006c3 +58000230 +202006c3 +58000160 +202006c3 +580003c0 +202006c3 +580001f0 +202006c3 +58000200 +202006c3 +58000240 +202006c3 +58000300 +202006c3 58000310 -202006d8 +202006c3 58000320 -202006d8 -58000200 -202006d8 -58000160 -202006d8 -580001d0 -202006d8 -58000370 -202006d8 -58000210 -202006d8 +202006c3 +58000420 +202006c3 580002b0 -202006d8 -580002c0 -202006d8 -580002d0 -202006d8 -580003c0 -202006d8 -58000260 -202006d8 -580003b0 -202006d8 +202006c3 +58000410 +202006c3 58000080 -202006d8 +202006c3 58000070 -202006d8 +202006c3 580000f0 -202006d8 +202006c3 58000060 -202006d8 +202006c3 580000d0 -202006d8 +202006c3 58000090 -202006d8 +202006c3 580000a0 -202006d8 +202006c3 580000b0 -202006d8 +202006c3 580000c0 -202006d8 +202006c3 580000e0 -202006d8 +202006c3 58000100 -202006d8 +202006c3 58000180 -202006d8 +202006c3 58000120 -202006d8 +202006c3 58000010 -202006d8 +202006c3 58000020 -202006d8 +202006c3 58000030 -202006d8 +202006c3 58000040 -202006d8 +202006c3 58000050 -202006d8 +202006c3 +58000190 +202006c3 +580001a0 +202006c3 58000130 -202006d8 -58000230 -202006d8 -58000250 -202006d8 -58000240 -202006d8 -58000290 -202006d8 +202006c3 +58000260 +202006c3 +580002a0 +202006c3 +58000270 +202006c3 +58000280 +202006c3 +580002e0 +202006c3 58000170 -202006d8 -580001a0 -202006d8 -58000360 -202006d8 -58000390 -202006d8 +202006c3 +580001c0 +202006c3 +580003b0 +202006c3 +580003e0 +202006c3 +580003f0 +202006c3 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 5413) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (working copy) @@ -1,10 +1,10 @@ 20200040 6fe84bd7 793ffe15 -2040075d +20400748 6fe84bd7 79207e15 -2040075d +20400748 c2000001 20600000 00000000 @@ -76,7 +76,7 @@ 704ca100 704c880b 704c8703 -20400347 +2040031b 6fe24c8a e7e20005 6fe20046 @@ -90,7 +90,7 @@ 284ffe02 7920fe00 e7e20005 -20200351 +20200325 00000000 00000000 00000000 @@ -192,10 +192,74 @@ 00000000 20200040 6fe204dd +c0018005 +c003001e +20204868 +6ff04ddf +c4000000 +6fe204dd +eff00006 +67f045bd +efe40006 +67e445bb +eff00006 +67f005e3 +efe80006 +67e8456b +204048b8 +20200012 +704c880d +704c873e +2040031b +58000005 +e7e20005 +6fe20639 +e7e40005 +6ff045bd +e7f00005 +6fe445bb +e7e40005 +20200325 +20400026 +20748000 +da200001 +d8200003 +204049ab +58000006 +e7e20005 +20600000 +704c8804 +704c8708 +2040031b +58000000 +e7e20005 +6fe20639 +e7e40005 +58000001 +e7e20005 +20200325 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +20200040 +6fe204dd c00a0021 c00a800d c0010006 -20204868 +202007ed efe20006 67e206a4 20204890 @@ -215,14 +279,14 @@ 60444957 704c880b 704c873e -20400347 +2040031b 58000007 e7e20005 6fe20639 e7e40005 6ff04953 e7f00005 -20200351 +20200325 2040000d da200009 d8200003 @@ -261,7 +325,7 @@ c006002b c0008008 c0004880 -202007f6 +202007eb efea0006 67ea4528 efe40006 @@ -284,22 +348,22 @@ 20600000 eff00006 67f04c0a -20400438 +2040040f 6ff04c6c c4018000 704c880c 704c873e -20400347 +2040031b 58000004 e7e40005 6fe20639 e7e40005 6ff04c0a e7f00005 -20200351 +20200325 efea0006 67ea4c12 -2040043c +20400413 20348034 6fe24c17 247a0000 @@ -310,14 +374,14 @@ c4028000 704c8808 704c870c -20400347 +2040031b 58000000 e7e20005 6fe20639 e7e40005 6fea4c12 e7ea0005 -20200351 +20200325 20200040 6fe24eea c0000009 @@ -325,7 +389,7 @@ c001800e c0020010 c003000a -c0050424 +c00503fb 20600000 20600000 704eea0a @@ -451,9 +515,9 @@ 68420048 20407a08 6fe20048 -c28387f2 +c28387e7 c0188021 -c00607f4 +c00607e9 c0038030 c005800b 20204f6c @@ -522,7 +586,7 @@ 2040493a 6fec0633 67ec4627 -202007a2 +2020078d 00000000 00000000 00000000 @@ -644,14 +708,14 @@ 704c8a01 704c8808 704c8712 -20400347 +2040031b 18007e35 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -20200351 +20200325 00000000 00000000 00000000 @@ -705,14 +769,14 @@ 20200040 704c8808 704c8712 -20400347 +2040031b 18007e00 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -20200351 +20200325 00000000 00000000 00000000 @@ -775,7 +839,7 @@ 67e4003e 7855fc00 704c8a00 -202007f0 +202007e5 00000000 00000000 00000000 @@ -866,7 +930,7 @@ 24348023 18808fff 704c8a02 -202007f0 +202007e5 00000000 00000000 00000000 @@ -933,7 +997,7 @@ 67e2004b 6fe20030 c283b413 -2040026e +20400242 202033ca 00000000 00000000 @@ -1042,7 +1106,7 @@ 20206481 20400015 20778000 -2020067e +20200669 7857fc00 6fe247d4 247a0000 @@ -1060,12 +1124,12 @@ 20200024 704c880a 704c8733 -20400347 +2040031b 6fec0040 e7ec0005 6fe80ba1 e7e80005 -20200351 +20200325 202052d6 700b960f 204052da @@ -1109,8 +1173,8 @@ 67e24537 18427200 6fe2461c -205a047e -245a0480 +205a0455 +245a0457 604c4538 d8c04500 2040713a @@ -1216,7 +1280,7 @@ 00000000 20200040 c3020003 -2040073c +20400727 6fe8833e 793ffe1d 67e8804c @@ -1290,15 +1354,15 @@ 24558157 20407988 2040001f -58000610 +580005de 67e4431d 58000171 67e4431f 58000152 67e4431b -58000716 +58000701 67e44315 -5800071b +58000706 67e44313 24358023 20403e79 @@ -1315,14 +1379,14 @@ 202056bd 6fec4140 67ec4340 -20400775 +20400760 70801002 204057bf 6fe24bce c301002c -c28287ee -2040073a -2040073a +c28287e3 +20400725 +20400725 700f0d9f 20203f28 204054b0 @@ -1346,10 +1410,10 @@ 793f801c 704c8801 704c8701 -20400347 +2040031b 58000000 e7e20005 -20200351 +20200325 00000000 00000000 00000000 @@ -1418,14 +1482,14 @@ 79207e1d 67e8804c 20200176 -2020073c +20200727 6fe84bd7 79207e02 -2020075d +20200748 6fe84bd7 793ffe02 -2020075d -20400750 +20200748 +2040073b 6fe8833e 79207e1c 67e8804c @@ -1479,7 +1543,7 @@ 20400018 704c880a 704c8704 -20400347 +2040031b 6fec0040 e7ec0005 6fe60146 @@ -1488,7 +1552,7 @@ e7e20005 6fec0040 67ec4e37 -20200351 +20200325 6fec4e37 684c0040 98467c00 @@ -1535,10 +1599,138 @@ 00000000 00000000 20200040 +704c88ff +704c8707 +2040031b +58000000 +e7e20005 +6fec42a9 +e7ec0005 +df200040 +d8c04ea7 +2040712d +df2000b8 +204070e4 +20400325 +6fe24ea6 +704ea600 +70005300 +c0010013 +20204dbb +20404f5f +20204dbb +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 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +20200040 +6fe2007d +c0040005 +c001000f +20204ba4 +6fe2004b +79207e02 +67e2004b +20404f51 +7006ae01 +20400248 +204052de +2420cf59 +2434cd67 +20600000 +6fe24ea6 +203a4dab +6fe4012c +1fe0f3fd +68420739 +580000c6 +98408a00 +d8c0073b +2040713a +2040001f +68420053 +6fe2073a +98467e00 +1fe67c0e +20210793 +20204db7 +68420739 +58004ea7 +98408a00 +6fe2073a +68420739 +98467200 +d8c0073b +2020712d +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 6fe2007d c0018012 c0088005 -20204ba4 +202007e1 20404e14 6fe24eef c0010009 @@ -1546,12 +1738,12 @@ 704eef00 704c8803 704c8730 -20400347 +2040031b 58000000 e7e20005 68420046 e0440005 -20200351 +20200325 6fe20739 67e206a3 c0088018 @@ -1562,14 +1754,14 @@ 2020001a 704c8804 704c8708 -20400347 +2040031b 58000000 e7e20005 68420046 e0440005 58000001 e7e20005 -20200351 +20200325 6fe24eef c1808000 704eef02 @@ -1603,17 +1795,17 @@ c006000a c00b8011 c0058014 -c01987ea +c01987dd c017001e c0208026 c0098034 -202007ec +202007df da200040 2040604d 6fe80739 68480779 98467c00 -20228255 +20228229 20204d8b 6fe44de9 c3014e10 @@ -1627,7 +1819,7 @@ 6fe20030 c3830000 20404d80 -2020026e +20200242 6fe24170 1fe0fe01 68420739 @@ -1644,12 +1836,12 @@ 20600000 704c8803 704c871b -20400347 +2040031b 6fe20046 e7e40005 6fe24170 e7e20005 -20200351 +20200325 6fe44deb c3004e21 6fe44de9 @@ -1667,17 +1859,15 @@ 68440738 20407a08 6fe2007d -c002000d -c0138020 -c0140028 -c0038024 -c0040662 -c00101e4 -c013002a -202007e8 +c002000b +c013801e +c0140026 +c0038022 +c0130028 +202007db 6fe20739 67e206a3 -c0058011 +c005800f 20204cc0 6fe24132 c087cd22 @@ -1690,9 +1880,9 @@ c1830000 60420055 700b9b01 -2040066c +20400657 6fe24c97 -203a0274 +203a0248 20600000 20404dc7 6ff00739 @@ -1703,7 +1893,7 @@ 20400184 20204d51 20404edd -20200021 +2020001f 6fea0739 67ea4ef7 704ef601 @@ -1726,6 +1916,8 @@ 00000000 00000000 00000000 +00000000 +00000000 20200040 6fe64d31 245a000e @@ -1734,14 +1926,14 @@ dfe04d5c 67e40f12 6a240f12 -2040059e +2040056c 207a0000 6a240f12 20403fa5 -204005ce +2040059c 20200007 1fe22400 -202005ce +2020059c 00000000 00000000 00000000 @@ -1792,12 +1984,12 @@ 00000000 20200040 68464dd8 -2040029a -20400297 +2040026e +2040026b c0008007 c0010012 20202baf -20400288 +2040025c 67e44c94 d84003ff 98410400 @@ -1805,13 +1997,13 @@ 1feb7e00 1fecfe00 67e24c1a -20400297 +2040026b 67e24c1b -202007e6 -20400288 +202007d9 +2040025c 67e242a8 20400034 -20400288 +2040025c 67e40f12 20402284 24628000 @@ -1820,7 +2012,7 @@ c280002c 6fe40f12 67e44db1 -204005e2 +204005b0 205a723a 6fe40f12 1fe22200 @@ -1832,7 +2024,7 @@ e0220005 6fe40f12 1fe27200 -2040029c +20400270 2020712d 6fe40f12 2040003a @@ -1848,7 +2040,7 @@ c1008000 18000202 20600000 -204005f0 +204005be 203a729b 2020729d 00000000 @@ -1936,7 +2128,7 @@ 2020000a 20404c78 20400019 -20200678 +20200663 20400019 20404c78 20404c7c @@ -1945,12 +2137,12 @@ 20600000 704c8809 704c8732 -20400347 +2040031b 6fec0040 e7ec0005 6fe647d3 e7e60005 -20200351 +20200325 00000000 00000000 00000000 @@ -1983,18 +2175,29 @@ 00000000 00000000 20200040 +6fe20623 +c4028000 +6fe4063d +68440643 +98467e00 +67e40124 +24610000 +2040473e 6ff04c6c c4010000 704c880a 704c873e -20400347 +2040031b 58000003 e7e40005 6fe20639 e7e40005 6fec4530 e7ec0005 -20200351 +20200325 +00000000 +00000000 +00000000 00000000 00000000 00000000 @@ -2035,6 +2238,59 @@ 00000000 00000000 00000000 +20200040 +6fe20623 +79207e05 +67e20623 +70452d01 +58000003 +67e4452e +6fe444d7 +67e44530 +6fe44632 +67e44532 +6fe44634 +67e44534 +6fe4063d +1fe0fe10 +67e40643 +da20000c +d8200003 +204049ab +58000000 +e7e20005 +6ff2452d +e7f20005 +6fe40643 +e7e40005 +20400430 +6ff04c6c +c4010000 +704c880a +704c873e +2040031b +58000003 +e7e40005 +6fe20639 +e7e40005 +6fec4530 +e7ec0005 +20200325 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 00000000 00000000 00000000 @@ -2051,18 +2307,18 @@ c4000000 704c8813 704c873e -20400347 +2040031b 58000001 e7e20005 6fe24c8a e7e20005 6fe20639 e7e40005 -20400304 +204002d8 6fe24eed -245a0309 +245a02dd e0420005 -6fe24eee +6fe24626 e7e20005 6fec4627 e7ec0005 @@ -2074,7 +2330,7 @@ 6fe2065b e7e20005 6fe20639 -20200351 +20200325 00000000 00000000 00000000 @@ -2113,7 +2369,7 @@ 20200040 704c8817 704c8718 -20400347 +2040031b 6fec0040 e7ec0005 d8c04297 @@ -2121,7 +2377,7 @@ 2040712d 18007e00 e7e20005 -20200351 +20200325 00000000 00000000 00000000 @@ -2248,7 +2504,7 @@ 20402289 20628000 204001d5 -20400347 +2040031b 58000001 e7e20005 6fec0149 @@ -2269,7 +2525,7 @@ 6fe80132 9c467e00 e7e40005 -20200351 +20200325 6fe60146 e7e60005 6fe80132 @@ -2280,7 +2536,7 @@ e7e20005 6fe24c9c c001002b -20200351 +20200325 6fe64d2e 1fe20c00 efe20006 @@ -2291,7 +2547,135 @@ 2040712d 184672f0 20407100 -20200351 +20200325 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +20200040 +6fe24c18 +c00c8004 +202002a9 +2040025c +67e242a8 +20400268 +67f045bd +2040025c +67e445bb +d8a04573 +18007210 +20400259 +d8a005e3 +18007208 +204052f8 +d8a0456b +18007204 +204052f8 +7045b501 +202002bd +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 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +20200040 +6fe24c18 +c00b8006 +c00d8021 +c011002a +202007d7 +18007210 +d8a00603 +20400259 +18007210 +d8a00613 +20400259 +18007000 +df200004 +d8c00613 +2040001c +df200004 +d8c00603 +2040001c +204061e6 +d8a04efc +20406250 +df200011 +204002b1 +df200010 +d8c04efc +2040712d +20200325 +efe80006 +98005e00 +1f00f001 +c200001c +20600000 +2040025c +67e242a8 +df200003 +204002b1 +6fe20639 +e7e40005 +20400325 +204048b8 +202048ae +2040025c +67e4495f +2040025c +67e44961 +20400030 +df200003 +204002b1 +6fe20639 +e7e40005 +20200325 +00000000 +00000000 00000000 00000000 00000000 @@ -2304,41 +2688,52 @@ 00000000 20200040 6fe24c18 -c0090006 -c011001b -c00b802e -202002d5 +c00c0006 +c009000b +c00d0020 +202007d5 +df200009 +204002b1 +18007208 +204052f8 +20200325 6fe24ded -203a02d7 -20400291 +203a02ab +20400265 67ee4e0a -2040000f +20400014 6fe24ded 1fe0ffff 67e24ded -202002d9 -204002a9 -243a02d7 +202002ad +2040027d +243a02ab 1a420a00 1a40a407 1a420c00 efee0006 e7ee0005 -c2000011 +c2000016 58000000 18a08bf9 e7ee0005 20600000 -20400288 -67e4495f -20400288 -67e44961 -20400025 +2040025c +67e242a8 +d8a04573 +18007210 +20400259 df200003 -204002dd +204002b1 6fe20639 e7e40005 -20200351 +20400325 +da200001 +d8200003 +204049ab +58000005 +e7e20005 +20600000 da400014 da200009 d8200003 @@ -2348,17 +2743,6 @@ 6ff0495b e7f00005 20600000 -d8a00603 -18007210 -20400285 -d8a04efc -18007210 -20400285 -00000000 -00000000 -00000000 -00000000 -00000000 00000000 00000000 00000000 @@ -2369,7 +2753,7 @@ 20200040 704c8806 704c8714 -20400347 +2040031b 6fe24c89 e7e20005 6fe20046 @@ -2382,7 +2766,7 @@ 2020000f 58000000 e7e40005 -20200351 +20200325 00000000 00000000 00000000 @@ -2433,7 +2817,7 @@ 20200040 704c8804 704c8705 -20400347 +2040031b 58000000 e7e20005 6fe24e18 @@ -2443,7 +2827,7 @@ 6fe2004c 793ffe05 67e2004c -20200351 +20200325 00000000 00000000 00000000 @@ -2497,12 +2881,12 @@ 20200040 704c8807 704c8720 -20400347 +2040031b 6fec0040 e7ec0005 6fe24ca0 e7e20005 -20200351 +20200325 00000000 00000000 00000000 @@ -2561,7 +2945,7 @@ 20200040 704c880b 704c8703 -20400347 +2040031b 6fe24c8a e7e20005 6fe20046 @@ -2576,7 +2960,7 @@ 7920fe00 e7e20005 6fe20046 -20200351 +20200325 00000000 00000000 00000000 @@ -2632,33 +3016,33 @@ c0030011 c004000e c01f8012 -202002d5 -202007dc -202007de -202007e0 -202007e2 -202007e4 -202002d5 -202002d5 +202002a9 +202007cb +202007cd +202007cf +202007d1 +202007d3 +202002a9 +202002a9 6fe24c18 c0008019 c00b801d c010001f c0518024 c0300034 -202002d5 -2040028e +202002a9 +20400262 67ec4c8d -204002a5 -202002d9 +20400279 +202002ad 704e193f -202002d9 +202002ad df200002 -204002e2 +204002b6 58000000 e7e40005 -20200351 -20400288 +20200325 +2040025c 68420046 98467c00 2022802b @@ -2667,18 +3051,18 @@ 24628000 604242a8 df200003 -204002e2 +204002b6 6fe242a8 e7e40005 6fe20018 204001c0 e7e20005 -20200351 +20200325 df200002 -204002e2 +204002b6 6fe44e35 e7e40005 -20200351 +20200325 00000000 00000000 00000000 @@ -2695,14 +3079,14 @@ 67e40f12 20200008 6a240f12 -2040059e +2040056c 207a0000 6a240f12 20403fa5 -204005ce +2040059c 20200008 1fe22400 -202005ce +2020059c 00000000 00000000 00000000 @@ -2752,7 +3136,7 @@ 00000000 20200040 6fe24e34 -243a07da +243a07c9 704e3401 20400023 6f224cd2 @@ -2816,20 +3200,16 @@ 00000000 20200040 6fe24c18 -c0050019 -c007001c -c0098417 -c00b000e -c00b8018 -c00c0018 -c00d0018 -c00d8018 -c0078021 -c0080026 -c008802a -202007d8 -20400288 -204002e9 +c0050014 +c0070017 +c00983ee +c00b000a +c007801c +c0080021 +c0088025 +202007c7 +2040025c +204002bd da200009 d8200003 204049ab @@ -2838,31 +3218,30 @@ 6ff04ddf e7f00005 20600000 -202002d5 -20400297 +2040026b 67e244de -202002d9 +202002ad 7044d900 704c8b00 6fe24eed c00081af -202002d7 +202002ab df200002 -204002dd +204002b1 58000004 e7e20005 -20200351 +20200325 704ded00 704e0a00 704dee00 -202002d9 +202002ad 68424ded 18467c04 -202282d7 -20400291 +202282ab +20400265 67ee4e0a -20400031 -202002d9 +2040002c +202002ad 6fe24ded d8a04dee 1feffe07 @@ -2878,6 +3257,11 @@ 00000000 00000000 00000000 +00000000 +00000000 +00000000 +00000000 +00000000 20200040 6fe24c18 c0040008 @@ -2885,89 +3269,89 @@ c0058012 c0060025 c0068029 -202007d6 -20400297 +202007c5 +2040026b 67e244df 1fe27200 -20400285 -202002d9 -20400297 +20400259 +202002ad +2040026b 67e244ff 1fe27200 -20400285 -202002d9 +20400259 +202002ad 6fe244d9 -243a02d7 -20400297 +243a02ab +2040026b 67e24636 -20400288 +2040025c 67e444da -20400288 +2040025c 67e444dc -20400297 +2040026b 67e24637 -20400297 +2040026b 67e24e11 6fe444da 684444dc 98467c00 -242282d9 +242282ad 1fe3fe00 67e444da -202002d9 -20400297 +202002ad +2040026b 67e244d9 -20400297 -202002d9 -20400288 +2040026b +202002ad +2040025c 67e444da -20400288 +2040025c 67e444dc -20400297 +2040026b 67e24e11 98267c00 -2042829f -20400297 +20428273 +2040026b 67e24eee -2040028e +20400262 67ec4627 -20400297 +2040026b 67e2462d -20400288 +2040025c 1febfe00 67e444d7 -20400288 -20400288 +2040025c +2040025c 67e44632 -20400288 +2040025c 67e44634 -202002a1 +20200275 20200040 6fe24c18 c01c8007 c01d000e c00a8012 c00b0017 -202002d5 +202002a9 df200005 -204002dd +204002b1 58000001 e7e20005 6fe64147 e7e60005 -20200351 -20400297 -2040028b +20200325 +2040026b +2040025f 67e64147 -202002d9 +202002ad df200003 -204002dd +204002b1 6fe44ef2 e7e40005 -20200351 -20400288 +20200325 +2040025c 67e44ef2 -202002d9 +202002ad 00000000 00000000 00000000 @@ -3015,8 +3399,8 @@ c02b002d c0360031 c0368036 -202007d4 -204002d9 +202007c3 +204002ad 5800003f 67f04c6c 5fffffff @@ -3029,40 +3413,40 @@ 67e244de 67e244d9 67e24133 -202002a5 -20400219 -242282d7 -20400288 +20200279 +204001ed +242282ab +2040025c 67e40051 df200003 -204002dd +204002b1 6fe20046 e7e40005 7042a71d -20200351 -20400297 +20200325 +2040026b 67e24c98 df200064 d8a00183 -20400285 -202002d9 +20400259 +202002ad df200002 -204002dd +204002b1 6fe24c97 e7e20005 -20200351 -20400297 +20200325 +2040026b 67e24c97 -203a02d3 -202002d9 +203a02a7 +202002ad df200003 -204002dd +204002b1 6fe44de7 e7e40005 -20200351 -20400288 +20200325 +2040025c 67e44de7 -202002d9 +202002ad 00000000 00000000 00000000 @@ -3073,15 +3457,15 @@ 20200040 6fe24c18 c00e8004 -202002d5 -20400288 +202002a9 +2040025c 67e242a8 20402284 -242282ed +242282c1 1a208c01 efe20006 c280001b -204002e9 +204002bd 6fe24ef6 203a3420 2020000f @@ -3089,15 +3473,15 @@ c4028000 704c8808 704c870c -20400347 +2040031b 58000000 e7e20005 6fe20046 e7e40005 6fea4ef7 e7ea0005 -20200351 -204002e9 +20200325 +204002bd 202048f0 00000000 00000000 @@ -3140,44 +3524,44 @@ c00f8016 c0158023 c0160033 -202007d2 -20400219 -242282d7 -20400288 +202007c1 +204001ed +242282ab +2040025c 67e44ef4 -204002e9 +204002bd 704c8805 704c871d -20400347 +2040031b 58000000 e7e20005 6fe20046 e7e40005 6fe44ef4 e7e40005 -20200351 -20400219 -242282d7 -204002e9 +20200325 +204001ed +242282ab +204002bd 704c8805 704c871c -20400347 +2040031b 18007e00 e7e20005 6fe20046 e7e40005 6fe4013e e7e40005 -20200351 -2040028e +20200325 +20400262 67ec42a9 -2040028b +2040025f 67e647ce df200007 -204002dd +204002b1 6fec0040 e7ec0005 -20400351 +20400325 6fe24c9f c0008030 7042a716 @@ -3185,14 +3569,14 @@ 204033e5 700b9b01 20600000 -2040028e +20400262 67ec42a9 df200007 -204002dd +204002b1 6fec0040 e7ec0005 -20400351 -2020067e +20400325 +20200669 00000000 00000000 00000000 @@ -3203,13 +3587,13 @@ c00c8006 c00e0017 c00d801f -202007d0 +202007bf 704ea601 -2040028e +20400262 67ec42a9 -20400288 +2040025c 67e200b6 -20400288 +2040025c 9c40fe00 1fe17ffc 67e800b7 @@ -3220,35 +3604,35 @@ 20228015 704ea602 7042a703 -202002e9 +202002bd 6fe24c9b -c08102ed -20400288 -203a02ed -20400297 +c08102c1 +2040025c +203a02c1 +2040026b 67e206a7 7042a715 -202002e9 +202002bd 6fe24c9b -c08102ed -20400288 +c08102c1 +2040025c 67e242a8 -203a02ed -204002e9 +203a02c1 +204002bd 6ff04e1a 243a0029 7042a704 20600000 704c880b 704c870b -20400347 +2040031b 58000000 e7e20005 6fe20046 e7e40005 6ff04e1a e7f00005 -20200351 +20200325 00000000 00000000 00000000 @@ -3270,53 +3654,53 @@ c0070024 c008802c c0098031 -202007ce -2040028e +202007bd +20400262 67ec42a9 d8a04297 18007210 -20400285 +20400259 70429301 7042a70b 20200027 -2040028e +20400262 67ec42a9 7042a70c 20400027 -2040066c +20400657 6fe24c97 247a0000 6fe24ef0 -c0008274 +c0008248 20600000 -2040028e +20400262 67ec42a9 -20400297 +2040026b 67e247f1 98007200 d8a047f2 -20400285 +20400259 7042a709 20200027 -2040028e +20400262 67ec42a9 7042a70a df200007 -204002dd +204002b1 6fec0040 e7ec0005 -20200351 -20400288 +20200325 +2040025c 67e242a8 7042a70d 704ef001 -202002e9 -20400288 +202002bd +2040025c 67e242a8 -20400297 +2040026b 1fe0fe0e 67e242a7 -202002e9 +202002bd 00000000 00000000 00000000 @@ -3331,13 +3715,13 @@ c0030006 c004001c c005002f -202007cc -20400288 +202007bb +2040025c 67e242a8 -20400297 +2040026b 67e206a4 20402284 -242282ed +242282c1 1a208c01 efe20006 c2800018 @@ -3345,16 +3729,16 @@ 6fe242a8 6842439b 98467c00 -242282e9 +242282bd 7042a711 6fe2439a 67e242a8 -202002e9 +202002bd 6fe206a4 67e20f12 20404894 -202002e9 -2040028e +202002bd +20400262 67ec42a9 7042a71a 6fe24c9b @@ -3369,23 +3753,23 @@ 202001b7 704c9602 df200007 -204002de +204002b2 6fec42a9 e7ec0005 -20200351 +20200325 6fe24ca1 -c00002ed -c00102eb +c00002c1 +c00102bf 6fe24c9b -c00102eb +c00102bf 704ca102 -2040028e +20400262 67ec42a9 -20400297 +2040026b 67e24c8a 7042a708 7006a416 -204002e9 +204002bd 202001b7 00000000 00000000 @@ -3404,69 +3788,69 @@ c0230033 c0238034 c0288036 -202007ca -20400288 +202007b9 +2040025c 67e44153 -20400288 +2040025c 67e44151 -202002d9 +202002ad df200005 -204002dd +204002b1 6fe4414f e7e40005 6fe4414d e7e40005 -20200351 -20400288 +20200325 +2040025c 67e4414f -20400288 +2040025c 67e4414d -202002d9 +202002ad df200004 -204002dd +204002b1 6fe6414a e7e60005 -20200351 -2040028b +20200325 +2040025f 67e6414a -202002d9 -202002d5 -20400297 -202002d5 +202002ad +202002a9 +2040026b +202002a9 df200002 -204002dd +204002b1 6fe24c9c e7e20005 -20200351 -20400297 +20200325 +2040026b 67e24c9c -202002d9 -202002d5 -20400297 -202002d5 +202002ad +202002a9 +2040026b +202002a9 df2000f2 -204002dd +204002b1 6fe24c98 e7e20005 d8c00183 df200064 2040713a -20200351 +20200325 00000000 00000000 20200040 6fe24c18 c0070005 c007800a -202002d5 +202002a9 df200003 -204002dd +204002b1 6fe44de9 e7e40005 -20200351 -20400288 +20200325 +2040025c 67e44de9 -202002d9 +202002ad 00000000 00000000 00000000 @@ -3525,62 +3909,62 @@ c0058022 c006002d c0068036 -202007c8 +202007b7 6fe44deb -c30102eb +c30102bf 6fe44de9 -c30102eb +c30102bf 6fe24c9b -c08102ed -20400288 +c08102c1 +2040025c 67e40253 -20400288 +2040025c 67e40255 -20400288 +2040025c 67e40257 58000040 67e4430b -20400288 +2040025c 67e4430d -20400288 +2040025c 67e4430f 7042a712 -202002e9 -20400288 +202002bd +2040025c 67e40253 6fe20031 -c30302eb +c30302bf 7042a713 -202002e9 +202002bd 6fe24c9b -c08102ed +c08102c1 6fe44deb -c30002eb +c30002bf 6fe44de9 -c30002eb -2040028e +c30002bf +20400262 67ec42a9 -20400297 +2040026b 7042a718 -202002e9 -20400219 -242282d7 +202002bd +204001ed +242282ab df200005 -204002dd +204002b1 6fe20046 e7e40005 6fe44deb e7e40005 -20200351 -20400219 -242282d7 -20400288 +20200325 +204001ed +242282ab +2040025c 67e44deb df200003 -204002dd +204002b1 6fe20046 e7e40005 -20200351 +20200325 00000000 20200040 6fe24c18 @@ -3589,44 +3973,44 @@ c0018010 c0028015 c003001a -202007c6 -20400294 +202007b5 +20400268 67f04c6c -202002d9 +202002ad df200004 -204002dd +204002b1 580400fb e7e60005 -20200351 +20200325 df200009 -204002dd +204002b1 6ff04ddf e7f00005 -20200351 +20200325 6fe244de -243a02d7 -2040028e +243a02ab +20400262 67ec4c7a -202002d9 +202002ad 6fe244de -243a02d7 -20400288 +243a02ab +2040025c 67e44617 -20400288 +2040025c 67e44619 -20400297 +2040026b 2040002d 6042461b -20400297 +2040026b 205a0035 245a0039 -20400297 -2040028e -20400297 +2040026b +20400262 +2040026b 67e24624 -20400297 +2040026b 67e24e11 -202002d9 +202002ad d8400000 c1000000 d8400002 @@ -3654,30 +4038,30 @@ c002001e c002801e c0048019 -202002d5 +202002a9 df200009 -204002dd +204002b1 6ff04c24 e7f00005 -20200351 +20200325 df200041 -204002dd +204002b1 d8c04c2c df200040 2040713a -20200351 +20200325 df200009 -204002dd +204002b1 6ff04138 e7f00005 -20200351 +20200325 df200007 -204002dd +204002b1 6fec4140 e7ec0005 -20200351 +20200325 df200008 -204002dd +204002b1 580002a8 e7e40005 5800003c @@ -3685,7 +4069,7 @@ 58000008 e7e40005 e7e40005 -20200351 +20200325 00000000 00000000 00000000 @@ -3720,11 +4104,11 @@ c00c8028 c00d002d c00d8030 -202007c4 -20400294 +202007b3 +20400268 67f04c1c -202002d9 -2040029c +202002ad +20400270 d8a0468a df200042 2040713a @@ -3733,38 +4117,38 @@ d8400000 20400191 60424689 -202002d9 +202002ad df2000f9 -204002dd +204002b1 d8c0468a df200040 2040713c df200017 204070e4 -20200351 +20200325 df200003 -204002dd +204002b1 6fe44159 e7e40005 -20200351 -20400288 +20200325 +2040025c 67e44159 -202002d9 +202002ad df200002 -204002dd +204002b1 6fe24133 e7e20005 -20200351 -20400297 +20200325 +2040026b 67e24133 -202002d9 +202002ad df200005 -204002dd +204002b1 6fe44153 e7e40005 6fe44151 e7e40005 -20200351 +20200325 00000000 00000000 00000000 @@ -3779,12 +4163,12 @@ c0008007 c0010017 c0028019 -c0048025 -202007c2 +c004802a +202007b1 7920001c -2040028b +2040025f 67e64147 -20400297 +2040026b d8400800 984ffe00 d840ffff @@ -3793,42 +4177,42 @@ 18427e00 18000e02 20407141 -20400297 +2040026b 67e24c99 67e24c9a -202002e9 +202002bd 7042a702 -202002d9 -2040028e +202002ad +20400262 67ec42a9 -20400288 +2040025c 67e40251 -20400288 +2040025c 67e200b6 -20400288 -20400297 +2040025c +2040026b 67e24ad0 +245a0026 704c9b01 7042a705 -202002e9 +202002bd +6fe44deb +79207e00 +67e44deb +20600000 6fe24ca1 -c00002ed -c00102eb +c00002c1 +c00102bf 6fe24c9b -c00102eb +c00102bf 704ca100 -2040028e +20400262 67ec42a9 7042a707 -20400297 -c00082e9 +2040026b +c00082bd 7042a719 -202002e9 -00000000 -00000000 -00000000 -00000000 -00000000 +202002bd 00000000 00000000 00000000