Index: Librarier/bt_rom/format/bt.format =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/Librarier/bt_rom/format/bt.format (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/Librarier/bt_rom/format/bt.format (working copy) @@ -828,8 +828,8 @@ 4 page_length_timer 5 iscan_interval_timer 6 pscan_interval_timer -7 lpo_delay_timer -8 ui_hundred_millisecond_timer +7 rtk_sniff_timer +8 le_create_conn_timer 9 ui_led_blink 10 switch_wait_timer 11 enpt_delay_timer Index: Librarier/bt_rom/format/hci.format =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/Librarier/bt_rom/format/hci.format (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/Librarier/bt_rom/format/hci.format (working copy) @@ -497,6 +497,7 @@ 0x41 HCI_LE_SET_EXT_SCAN_PARAM 0x42 HCI_LE_SET_EXT_SCAN_ENABLE +0x43 HCI_LE_EXTENDED_CREATE_CONNECTION ) // HCI event code ( Index: Librarier/bt_rom/format/headset.format =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/Librarier/bt_rom/format/headset.format (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/Librarier/bt_rom/format/headset.format (working copy) @@ -342,6 +342,9 @@ 1 mem_fsc_rtk_host_20_seq 2 mem_fsc_rtk_host_94_seq + 2 mem_fsc_rtk_host_94_sniff_timeout + 1 mem_le_rtk_94_sniff_check_enable + 1 mem_le_lost_anchor_cnt 10 mem_local_ext_features 10 mem_local_ext_features1 Index: ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (working copy) @@ -1,14 +1,14 @@ //define EFUSE_CODE //define FUNCTION_WATCH_DOG //define TEST_QUEUE_DEBUG -define RF_DEBUG -//define WHITE_LIST +//define RF_DEBUG +define WHITE_LIST define MINZHAN_SDK //define FUNCTION_CHARGE_DEFAULT_DISABLE define FSC_RTK_HOST //define LE_CONN_RCV_DEBUG //define CHARGE_DEBUG_LOG -define PATCH_DEBUG_LOG +//define PATCH_DEBUG_LOG define FSC_CHARGE /******************************************/ @@ -111,7 +111,8 @@ call inquiry_scan_dispatch call p_page_scan_dispatch - call p_rcv_conn_req_accept_timeout_dispatch +// call p_rcv_conn_req_accept_timeout_dispatch + call p_rtk_fsc_94_sniff_timer_check branch main_loop+11 @@ -120,9 +121,27 @@ force inquiry_length_timer,queue call timer_check nsetflag blank,mark_inquiry_on,mark - nbranch inquiry_start,blank + nbranch p_inquiry_start,blank branch z_hci_send_inquiry_comple - + +p_inquiry_start: + fetcht 2,mem_inq_window + force 4,queue + call sniff_check_window + branch p_inquiry_lost_le_anchor,user + branch inquiry_start+5 + +p_inquiry_lost_le_anchor: + fetch 1,mem_le_lost_anchor_cnt + rtn blank + jam 0,mem_le_lost_anchor_cnt + fetch 1,mem_mesh_creat_connection_flag + nrtn blank +// fetcht 2,mem_inq_window +// copy temp,stop_watch + arg 4,stop_watch + branch inquiry_start+5 + p_page_scan_dispatch: fetch 1,mem_scan_mode rtnbit0 page_scan_mode @@ -146,12 +165,18 @@ branch le_disable p_le_scan: + fetch 1,mem_mesh_creat_connection_flag + ncall p_le_create_conn_timer_check,blank fetch 1,mem_le_scan_enable rtnne LE_SCAN_ENABLE fetch 1,mem_le_state bbit0 state_inconn,p_le_scan_without_link rtnbit1 lestate_update_map rtnbit1 lestate_update_param + bmark0 mark_inquiry_on,p_le_scan_without_link + fetch 1,mem_le_lost_anchor_cnt + rtneq 1 + jam 1,mem_le_lost_anchor_cnt p_le_scan_without_link: arg le_scan_interval_timer,queue call timer_check @@ -162,6 +187,7 @@ call timer_init call le_init_adv + call p_le_adv_channel_init_check call le_next_adv_channel fetch 2,mem_le_scan_window store 2,mem_le_scan_window_temp @@ -177,20 +203,22 @@ copy rega,pdata store 1,mem_le_conn_peer_addr_type ifdef WHITE_LIST + fetch 1,mem_le_white_list_filter_policy + branch p_le_scan_match_send_event,blank 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_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 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 +// 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 @@ -211,6 +239,23 @@ nbranch p_le_scan_loop,blank rtn +p_le_create_conn_timer_init: + lshift4 pdata,pdata + force le_create_conn_timer,queue + branch timer_init +p_le_create_conn_timer_check: + force le_create_conn_timer,queue + call timer_check + nrtn blank + branch z_hci_rcv_create_conn_send_le_connection_complete_1 + +p_le_adv_channel_init_check: + fetch 1,mem_le_ch_mapped + sub pdata,37,null + nrtn positive + jam 37,mem_le_ch_mapped + rtn + p_le_receive_packet: call lerx_setfreq p_le_receive_rxon: @@ -657,6 +702,7 @@ p_slave_loop: +ifdef CLASSIC_FUNC // bpatch patch07_2,mem_patch07 fetch 1,mem_check_attempt_limit increase 1,pdata @@ -673,6 +719,9 @@ call parse_lmp call p_process_cmd branch slave_loop+12 +else + branch slave_loop+1 +endif p_master_loop: call parse_lmp @@ -809,6 +858,7 @@ p_role_switch_master: +ifdef CLASSIC_FUNC call role_switch_check nrtn user disable user @@ -852,6 +902,9 @@ enable user jam 1,mem_mesh_event_parameter_status branch z_hci_send_role_change +else + branch role_switch_master+1 +endif // will call zcode, so should not push to zcode p_slave_disconnect: @@ -1014,6 +1067,7 @@ jam ON,mem_le_scan_enable jam CREAT_CONNECTION,mem_mesh_creat_connection_flag branch p_hci_send_event_command_status + /* p_hci_parse_packet_acl: @@ -1305,6 +1359,7 @@ fetch 1,mem_le_conn_handle store 1,mem_hci_record_disc_conn_handle jam 0,mem_le_conn_status + jam 0,mem_le_rtk_94_sniff_check_enable branch z_hci_send_disconnect_complete p_hci_send_disconnect_complete: //status(1), connection_handle(2), Reason(1) @@ -1618,7 +1673,7 @@ call le_check_md branch p_le_slave_more_data,user branch le_slave_cont - + p_le_create_conn: fetch 1,mem_le_conn_peer_addr_type fetcht 1,mem_le_hci_conn_peer_addr_type @@ -1649,6 +1704,9 @@ jam 2,mem_le_conn_status //arg MASTER_CONNECTION_HANDLE,temp jam 0x00,mem_mesh_event_parameter_status + //reset white_list_filter,reset create_conn_flag + jam 0,mem_le_white_list_filter_policy + jam 0,mem_mesh_creat_connection_flag branch z_hci_send_event_le_connection_complete @@ -1804,8 +1862,10 @@ rtn -p_le_master_dispatch: +p_le_master_dispatch: enable master +// fetch 1,mem_le_conn_status +// rtn blank call le_supervision_update branch p_le_master_disconn,positive fetch 1,mem_le_master_sm @@ -2680,6 +2740,9 @@ and pdata,0x03,pdata beq LLID_LE_LL,le_decrypt + fetch 3,mem_rcv_ble_queue_ptr + rtn blank + fetcht 5,mem_le_pcnt_rx force 0,rega call first_block_data @@ -3420,11 +3483,23 @@ endif //connection accept timeout loop -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 +//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 +p_rtk_fsc_94_sniff_timer_check: + fetch 1,mem_le_conn_handle + rtn blank + fetch 1,mem_le_rtk_94_sniff_check_enable + rtn blank + force rtk_sniff_timer,queue + call timer_check + call p_soft_reset,blank + rtn +p_soft_reset: + jam 3,0x8010 + branch assert p_hci_inquiry_reply_mode2_return_event_with_rssi: copy contw,rega Index: ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (working copy) @@ -543,6 +543,7 @@ branch p_hci_send_event_command_status z_hci_control_disconnect_le: + jam 0,mem_le_rtk_94_sniff_check_enable fetch 1,mem_disconn_reason_send store 1,mem_temp call le_send_terminate_ind @@ -897,7 +898,6 @@ beq HCI_READ_SIMPLE_PAIRING_MODE,z_hci_parse_packet_cmd_ogf_controller_and_baseband_read_simple_pairing_mode //55 beq HCI_WRITE_SIMPLE_PAIRING_MODE,z_hci_parse_packet_cmd_ogf_controller_and_baseband_write_simple_pairing_mode //56 beq HCI_READ_LE_HOST_SUPPORT,z_hci_parse_packet_cmd_ogf_controller_and_baseband_read_le_host_support //6C - beq HCI_WRITE_LE_HOST_SUPPORT,z_hci_parse_packet_cmd_ogf_controller_and_baseband_write_le_host_support //6D beq HCI_HOST_BUFFER_SIZE,p_hci_send_event_command_complete_without_payload //0x33 @@ -928,7 +928,8 @@ setarg 0xec42 store 2,mem_mesh_read_local_version_info_lmp_subversion - branch p_hci_init_bd_address + call p_hci_init_bd_address + branch z_l2cap_init_queue z_hci_parse_packet_cmd_ogf_controller_and_baseband_write_link_supervision_timeout: //37 call p_hci_parse_connection_handle_check @@ -971,11 +972,6 @@ istore 2,contw branch ipc_hci_tx_start -z_hci_parse_packet_cmd_ogf_controller_and_baseband_write_le_host_support: //6D - call p_ipc_rx_hci_data_two_byte - store 2,mem_le_supported_host - branch p_hci_send_event_command_complete_without_payload - org z z_hci_parse_packet_cmd_ogf_controller_and_baseband3: @@ -985,12 +981,13 @@ beq HCI_READ_CONN_ACCEPT_TIMEOUT,z_hci_parse_packet_cmd_ogf_controller_and_baseband_read_conn_accept_timeout //15 beq HCI_WRITE_CONN_ACCEPT_TIMEOUT,z_hci_parse_packet_cmd_ogf_controller_and_baseband_write_conn_accept_timeout //16 - beq HCI_WRITE_SECURE_CONNECTIONS_HOST_SUPPORT,p_hci_send_event_command_complete_without_payload //6D - beq HCI_WRITE_VOICE_SETTING,p_hci_send_event_command_complete_without_payload //6D + beq HCI_WRITE_SECURE_CONNECTIONS_HOST_SUPPORT,p_hci_send_event_command_complete_without_payload + beq HCI_WRITE_VOICE_SETTING,p_hci_send_event_command_complete_without_payload //beq HCI_WRITE_INQUIRY_SCAN_TYPE,p_hci_send_event_command_complete_without_payload //43 //beq HCI_WRITE_PAGE_SCAN_TYPE,p_hci_send_event_command_complete_without_payload beq HCI_SET_EVENT_FILTER,p_hci_send_event_command_complete_without_payload//47 + beq HCI_WRITE_LE_HOST_SUPPORT,z_hci_parse_packet_cmd_ogf_controller_and_baseband_write_le_host_support //6D branch p_hci_send_event_command_complete_error_command_nuknown @@ -1022,6 +1019,12 @@ store 2,mem_hci_conn_accept_timeout branch p_hci_send_event_command_complete_without_payload +z_hci_parse_packet_cmd_ogf_controller_and_baseband_write_le_host_support: //6D + call p_ipc_rx_hci_data_two_byte + store 2,mem_le_supported_host + branch p_hci_send_event_command_complete_without_payload + + org z z_hci_parse_packet_cmd_ogf_le_controller1: fetch 1,mem_mesh_hci_opcode_ocf @@ -1029,7 +1032,6 @@ beq HCI_LE_SET_SCAN_RESPONSE_DATA,z_hci_parse_packet_cmd_ogf_le_controller_set_scan_rsp_data //09 beq HCI_LE_SET_SCAN_PARAMETERS,z_hci_parse_packet_cmd_ogf_le_controller_set_scan_para //0b beq HCI_LE_SET_SCAN_ENABLE,z_hci_parse_packet_cmd_ogf_le_controller_set_scan_enable //0c - beq HCI_LE_CREATE_CONNECTION,z_hci_parse_packet_cmd_ogf_le_controller_create_connection //0d branch z_hci_parse_packet_cmd_ogf_le_controller2 @@ -1049,8 +1051,8 @@ branch p_hci_send_event_command_complete_without_payload z_hci_parse_packet_cmd_ogf_le_controller_set_scan_para: //OCF:0x000B - fetch 1,mem_le_scan_enable - nbranch p_hci_send_event_command_complete_error_command_disallowed,blank +// fetch 1,mem_le_scan_enable +// nbranch p_hci_send_event_command_complete_error_command_disallowed,blank call p_ipc_rx_hci_data_one_byte //LE Scan Type store 1,mem_le_scan_type call p_ipc_rx_hci_data_two_byte //LE Scan Interval @@ -1077,33 +1079,6 @@ call p_ipc_rx_hci_data_one_byte //Filter Duplicates branch p_hci_send_event_command_complete_without_payload -z_hci_parse_packet_cmd_ogf_le_controller_create_connection: //OCF:0x000D - call p_ipc_rx_hci_data_two_byte //LE Scan Interval - store 2,mem_le_scan_interval - call p_ipc_rx_hci_data_two_byte //LE Scan Window - store 2,mem_le_scan_window - call p_ipc_rx_hci_data_one_byte //initiator filter policy - //do not support white_list_filter -// store 1,mem_le_white_list_filter_policy -// sub pdata,1,null -// call p_white_filter_connect_filter,zero - call p_ipc_rx_hci_data_one_byte //peer address type - store 1,mem_le_hci_conn_peer_addr_type - call p_ipc_rx_hci_data_six_byte //peer address - store 6,mem_le_conn_peer_addr - call p_ipc_rx_hci_data_one_byte //own address type - store 1,mem_le_conn_own_addr_type - call p_ipc_rx_hci_data_two_byte //connect interval min - lshift2 pdata,pdata - store 2,mem_le_conn_interval - call p_ipc_rx_hci_data_two_byte //connect interval max - call p_ipc_rx_hci_data_two_byte //connect latency - store 2,mem_le_conn_latency - call p_ipc_rx_hci_data_two_byte //supervision timeout - store 2,mem_le_conn_superto - branch p_parse_le_controller_create_connection - - org z z_hci_parse_packet_cmd_ogf_le_controller2: fetch 1,mem_mesh_hci_opcode_ocf @@ -1155,13 +1130,18 @@ z_hci_parse_packet_cmd_ogf_le_controller_read_white_list_size: arg 2,loopcnt call p_hci_prepare_send_event_command_complete_with_status_success - setarg LE_WHITE_LIST_MAX_SIZE + //setarg LE_WHITE_LIST_MAX_SIZE + setarg 1 istore 1,contw branch ipc_hci_tx_start z_hci_parse_packet_cmd_ogf_le_controller_clear_white_list: - jam 0,mem_le_white_list_cnt - jam 0,mem_le_white_list_type_and_bd_addr - jam 0,mem_le_white_list + arg 4,loopcnt + arg mem_le_white_list_cnt,contw + call memset0 + istore 4,contw +// jam 0,mem_le_white_list_cnt +// jam 0,mem_le_white_list_type_and_bd_addr +// jam 0,mem_le_white_list branch p_hci_send_event_command_complete_without_payload z_hci_parse_packet_cmd_ogf_le_controller_add_device_to_white_list: fetcht 1,mem_le_white_list_cnt @@ -1176,6 +1156,9 @@ // input: rega z_le_add_device_to_white_list: + fetcht 7,mem_le_white_list + isub temp,null + rtn zero fetch 1,mem_le_white_list_cnt arg mem_le_white_list,contw mul32 pdata,7,pdata @@ -1399,7 +1382,7 @@ beq 0x17,z_hci_parse_packet_cmd_ogf_vendorspecific_rtk_17 beq 0x20,z_hci_parse_packet_cmd_ogf_vendorspecific_rtk_20 beq 0xa3,z_hci_parse_packet_cmd_ogf_vendorspecific_rtk_a3 - beq 0x60,z_hci_parse_packet_cmd_ogf_vendorspecific_rtk_read_svn_version +// beq 0x60,z_hci_parse_packet_cmd_ogf_vendorspecific_rtk_read_svn_version beq 0x6d,z_hci_parse_packet_cmd_ogf_vendorspecific_rtk_6d beq 0x94,z_hci_parse_packet_cmd_ogf_vendorspecific_rtk_94 branch p_hci_send_event_command_complete_error_command_nuknown @@ -1433,6 +1416,10 @@ branch ipc_hci_tx_start z_hci_parse_packet_cmd_ogf_vendorspecific_rtk_94: + fetch 1,mem_le_conn_status + sub pdata,2,null + call z_rtk_94_set_sniff_timer,zero + arg 0x03,loopcnt call p_hci_prepare_send_event_command_complete setarg 0 @@ -1442,6 +1429,11 @@ increase 1,pdata store 2,mem_fsc_rtk_host_94_seq branch ipc_hci_tx_start +z_rtk_94_set_sniff_timer: + jam 1,mem_le_rtk_94_sniff_check_enable + force rtk_sniff_timer,queue + fetch 2,mem_fsc_rtk_host_94_sniff_timeout + branch timer_init z_hci_parse_packet_cmd_ogf_vendorspecific_rtk_6d: arg 0x02,loopcnt @@ -1469,12 +1461,12 @@ istore 1,contw branch ipc_hci_tx_start -z_hci_parse_packet_cmd_ogf_vendorspecific_rtk_read_svn_version: - arg 2,loopcnt - call p_hci_prepare_send_event_command_complete - fetch 2,mem_hci_version_svnid - istore 2,contw - branch ipc_hci_tx_start +//z_hci_parse_packet_cmd_ogf_vendorspecific_rtk_read_svn_version: +// arg 2,loopcnt +// call p_hci_prepare_send_event_command_complete +// fetch 2,mem_hci_version_svnid +// istore 2,contw +// branch ipc_hci_tx_start endif org z @@ -1635,6 +1627,9 @@ beq HCI_LE_SET_DATA_LENGTH,z_hci_parse_packet_cmd_ogf_le_controller_set_data_length //22 + + beq HCI_LE_READ_MAX_ADV_DATA_LEN,z_hci_parse_packet_cmd_ogf_le_controller_read_max_adv_data_len + beq HCI_LE_READ_READ_NUM_ADV_SETS,z_hci_parse_packet_cmd_ogf_le_controller_read_num_adv_sets branch z_hci_parse_packet_cmd_ogf_le_controller5 z_hci_parse_packet_cmd_ogf_le_controller_encryption: @@ -1698,19 +1693,6 @@ 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 - beq HCI_LE_READ_SUPPORTED_STATES,z_hci_parse_packet_cmd_ogf_le_controller_read_supported_states - - beq HCI_LE_READ_MAX_ADV_DATA_LEN,z_hci_parse_packet_cmd_ogf_le_controller_read_max_adv_data_len - beq HCI_LE_READ_READ_NUM_ADV_SETS,z_hci_parse_packet_cmd_ogf_le_controller_read_num_adv_sets - - beq HCI_LE_SET_EXT_SCAN_PARAM,p_hci_send_event_command_complete_without_payload - beq HCI_LE_SET_EXT_SCAN_ENABLE,p_hci_send_event_command_complete_without_payload - branch p_hci_send_event_command_complete_error_command_nuknown - z_hci_parse_packet_cmd_ogf_le_controller_read_max_adv_data_len: arg 3,loopcnt call p_hci_prepare_send_event_command_complete_with_status_success @@ -1724,6 +1706,16 @@ setarg 4 istore 1,contw branch ipc_hci_tx_start +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 + beq HCI_LE_READ_SUPPORTED_STATES,z_hci_parse_packet_cmd_ogf_le_controller_read_supported_states + + beq HCI_LE_SET_EXT_SCAN_PARAM,p_hci_send_event_command_complete_without_payload + beq HCI_LE_SET_EXT_SCAN_ENABLE,p_hci_send_event_command_complete_without_payload + beq HCI_LE_CREATE_CONNECTION,z_hci_parse_packet_cmd_ogf_le_controller_create_connection //0d + branch z_hci_parse_packet_cmd_ogf_le_controller6 z_hci_parse_packet_cmd_ogf_le_controller_read_supported_states: arg 9,loopcnt @@ -1751,6 +1743,90 @@ call generate_random_another jam FLAG_LE_ENC_START,mem_le_enc_state branch p_hci_send_event_command_status + +z_hci_parse_packet_cmd_ogf_le_controller_create_connection: //OCF:0x000D + call p_ipc_rx_hci_data_two_byte //LE Scan Interval + store 2,mem_le_scan_interval + call p_ipc_rx_hci_data_two_byte //LE Scan Window + store 2,mem_le_scan_window + call p_ipc_rx_hci_data_one_byte //initiator filter policy + store 1,mem_le_white_list_filter_policy + sub pdata,1,null + call p_white_filter_connect_filter,zero + ncall z_le_store_peer_addr_use_white_list,blank + fetch 1,mem_le_white_list_filter_policy + call z_le_store_peer_addr_check,blank + call p_ipc_rx_hci_data_one_byte //own address type + store 1,mem_le_conn_own_addr_type + call p_ipc_rx_hci_data_two_byte //connect interval min + lshift2 pdata,pdata + store 2,mem_le_conn_interval + call p_ipc_rx_hci_data_two_byte //connect interval max + call p_ipc_rx_hci_data_two_byte //connect latency + store 2,mem_le_conn_latency + call p_ipc_rx_hci_data_two_byte //supervision timeout + store 2,mem_le_conn_superto + call p_le_create_conn_timer_init + branch p_parse_le_controller_create_connection +z_le_store_peer_addr_use_white_list: + fetch 1,mem_le_white_list + store 1,mem_le_hci_conn_peer_addr_type + fetch 6,mem_le_white_list+1 + store 6,mem_le_conn_peer_addr + branch p_ipc_rx_hci_data_seven_byte +z_le_store_peer_addr_check: + call p_ipc_rx_hci_data_one_byte //peer address type + store 1,mem_le_hci_conn_peer_addr_type + call p_ipc_rx_hci_data_six_byte //peer address + store 6,mem_le_conn_peer_addr + rtn + +org z +z_hci_parse_packet_cmd_ogf_le_controller6: + fetch 1,mem_mesh_hci_opcode_ocf + beq HCI_LE_EXTENDED_CREATE_CONNECTION,z_hci_parse_packet_cmd_ogf_le_controller_ext_create_connection + branch p_hci_send_event_command_complete_error_command_nuknown + +z_hci_parse_packet_cmd_ogf_le_controller_ext_create_connection: + call ice_break + call p_ipc_rx_hci_data_one_byte //init_filter_policy + store 1,mem_le_white_list_filter_policy + sub pdata,1,null + call p_white_filter_connect_filter,zero + call p_ipc_rx_hci_data_one_byte //own_addr_type + store 1,mem_le_conn_own_addr_type + fetch 1,mem_le_white_list_filter_policy + ncall z_le_store_peer_addr_use_white_list_sub1,blank + fetch 1,mem_le_white_list_filter_policy + call z_le_store_peer_addr_check_sub1,blank + call p_ipc_rx_hci_data_one_byte //initiating_PHYs + call p_ipc_rx_hci_data_two_byte //scan_interval + store 2,mem_le_scan_interval + call p_ipc_rx_hci_data_two_byte //scan_window + store 2,mem_le_scan_window + call p_ipc_rx_hci_data_two_byte //conn_interval_min + lshift2 pdata,pdata + store 2,mem_le_conn_interval + call p_ipc_rx_hci_data_two_byte //conn_interval_max + call p_ipc_rx_hci_data_two_byte //conn_latency + store 2,mem_le_conn_latency + call p_ipc_rx_hci_data_two_byte //supervision_timeout + store 2,mem_le_conn_superto + call p_ipc_rx_hci_data_two_byte //min_CE_len + call p_ipc_rx_hci_data_two_byte //max_CE_len + branch p_parse_le_controller_create_connection +z_le_store_peer_addr_use_white_list_sub1: + fetch 1,mem_le_white_list_type_and_bd_addr + store 1,mem_le_hci_conn_peer_addr_type + fetch 6,mem_le_white_list_type_and_bd_addr+1 + store 6,mem_le_conn_peer_addr + branch p_ipc_rx_hci_data_seven_byte +z_le_store_peer_addr_check_sub1: + call p_ipc_rx_hci_data_one_byte //peer address type + store 1,mem_le_hci_conn_peer_addr_type + call p_ipc_rx_hci_data_six_byte //peer address + store 6,mem_le_conn_peer_addr + rtn org z z_hci_inquiry_reply_check_eir: @@ -1907,6 +1983,53 @@ branch ipc_hci_tx_start org z +z_hci_rcv_create_conn_send_le_connection_complete_1: + fetch 8,mem_mesh_le_event_mask + rtnbit0 LE_CONNECTION_COMPLETE_EVENT + jam 19,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_COMPLETE + istore 1,contw //subevent code & status + setarg 0 + istore 1,contw + fetch 1,mem_handle_num + pincrease 25 + istore 2,contw //connection handle + setarg 0 //0:role master; 1:slave + istore 1,contw + 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 + fetch 2,mem_le_tsniff + rshift2 pdata,pdata + istore 2,contw //connection interval + fetch 4,mem_le_conn_latency + istore 4,contw //connect latency & supervision timeout + fetch 1,mem_le_peer_sca + istore 1,contw //master clock accuracy + call ipc_hci_tx_start +z_hci_le_master_send_disconnection_complete: + jam 0,mem_mesh_creat_connection_flag + jam 0,mem_le_conn_status + jam 0,mem_le_rtk_94_sniff_check_enable + fetch 8,mem_mesh_le_event_mask + rtnbit0 DISCONNECTION_COMPLETE_EVENT + jam 4,mem_mesh_event_para_total_length + jam HCI_EVENT_DISCONNECTION_COMPLETE,mem_mesh_event_head_event_code + call p_hci_prepare_send_event + setarg 0x00 + istore 1,contw + fetch 1,mem_handle_num + pincrease 25 + istore 2,contw + setarg 0x3e + istore 1,contw + branch ipc_hci_tx_start + + +org z z_le_send_connection_update_ind: fetch 1,mem_le_state set1 lestate_update_param,pdata Index: ModuleDemo/25_OTA/bt_demo/BT/sched/rf.dat =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/BT/sched/rf.dat (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/BT/sched/rf.dat (working copy) @@ -8,7 +8,7 @@ mem_iscan_interval:00 04 mem_pscan_window:16 00 mem_pscan_interval:00 04 -mem_inq_window:20 00 +mem_inq_window:08 00 mem_page_window:30 00 mem_page_to:00 30 mem_rx_window_init:80 03 Index: ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat (working copy) @@ -58,7 +58,7 @@ mem_lap:45 FF 31 FF FF FF mem_discovery_timeout:00 07 -mem_ssp_enable:01 +mem_ssp_enable:00 mem_ui_profile_supported:48 mem_app_connection_options:17 mem_eir_enable:01 @@ -268,6 +268,7 @@ mem_simple_pairing_mode:00 mem_conn_status:00 mem_le_conn_status:00 +mem_le_white_list_filter_policy:00 mem_io_cap_flag:00 mem_inquiry_mode:00 mem_hci_conn_accept_timeout:a0 1f #default value : 5.06s @@ -311,10 +312,10 @@ 61 87 #LPM_subversion mem_mesh_read_local_support_command:ff -ff ff 03 CC FF FF FF 3F FF FC 9F +ff f7 03 CC FF FF FF 3F FF FC 9F F3 0F E8 FE 3F F7 8F FF 1C 00 00 00 61 F7 FF FF 7F 00 E0 FF FF 00 -00 00 00 00 00 00 00 00 00 00 00 +00 00 00 80 00 00 00 00 00 00 00 00 mem_local_ext_features:00 02 FF FF FF FE DB FD 7B 87 @@ -327,6 +328,8 @@ mem_local_rx_max_octets:fb 00 48 08 fb 00 48 08 +mem_fsc_rtk_host_94_sniff_timeout:60 09 + mem_lpm_write_temp_adc_low: bb 3a 48 00 mem_lpm_write_temp_adc_high:14 00 00 00 Index: ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvoptx =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvoptx (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/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 - 0 + 1 0 0 ..\..\User\main.c Index: ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx (working copy) @@ -16,7 +16,7 @@ ARMCM0 ARM - ARM.CMSIS.5.7.0 + ARM.CMSIS.5.3.0 http://www.keil.com/pack/ IROM(0x00000000,0x00040000) IRAM(0x20000000,0x00020000) CPUTYPE("Cortex-M0") CLOCK(12000000) ESEL ELITTLE @@ -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_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/User/btreg.h (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/User/btreg.h (working copy) @@ -1729,12 +1729,15 @@ #define mem_le_encrypted_data 0x4efe #define mem_fsc_rtk_host_20_seq 0x4f0e #define mem_fsc_rtk_host_94_seq 0x4f0f -#define mem_local_ext_features 0x4f11 -#define mem_local_ext_features1 0x4f1b -#define mem_local_ext_features2 0x4f25 -#define mem_le_support_states 0x4f2f -#define mem_le_txpayload_unenc_opcode 0x4f37 -#define mem_headset_end 0x4f38 +#define mem_fsc_rtk_host_94_sniff_timeout 0x4f11 +#define mem_le_rtk_94_sniff_check_enable 0x4f13 +#define mem_le_lost_anchor_cnt 0x4f14 +#define mem_local_ext_features 0x4f15 +#define mem_local_ext_features1 0x4f1f +#define mem_local_ext_features2 0x4f29 +#define mem_le_support_states 0x4f33 +#define mem_le_txpayload_unenc_opcode 0x4f3b +#define mem_headset_end 0x4f3c #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/respin/memmap.format =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/memmap.format (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/memmap.format (working copy) @@ -1727,12 +1727,15 @@ 0x4efe mem_le_encrypted_data 0x4f0e mem_fsc_rtk_host_20_seq 0x4f0f mem_fsc_rtk_host_94_seq -0x4f11 mem_local_ext_features -0x4f1b mem_local_ext_features1 -0x4f25 mem_local_ext_features2 -0x4f2f mem_le_support_states -0x4f37 mem_le_txpayload_unenc_opcode -0x4f38 mem_headset_end +0x4f11 mem_fsc_rtk_host_94_sniff_timeout +0x4f13 mem_le_rtk_94_sniff_check_enable +0x4f14 mem_le_lost_anchor_cnt +0x4f15 mem_local_ext_features +0x4f1f mem_local_ext_features1 +0x4f29 mem_local_ext_features2 +0x4f33 mem_le_support_states +0x4f3b mem_le_txpayload_unenc_opcode +0x4f3c 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_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (working copy) @@ -64,93 +64,105 @@ 2000003f c2840062 c0010088 -c00701bc -c00801ca -c00e01aa -c00f01cf -c0100231 -c01201ff -c019018c -c01c8199 -c01d019b -c01f0224 -c02081f4 -c0220773 -c02a070a -c02c0664 -c02e0680 -c02e8686 -c0350775 -c0358777 -c03601e7 -c03c01eb -c04080fe -c0428118 -c04300d9 -c0460762 -c04f00dd -c050017c -c0520701 -c05406f1 -c05c8779 -c05d05ca -c0700174 +c00701d4 +c00801e2 +c00e01c2 +c00f01e7 +c0100225 +c0120217 +c01901b2 +c01c81bf +c01d01c1 +c01f0218 +c020820c +c022076e +c02a06fe +c02c0658 +c02e0674 +c02e867a +c0350770 +c0358772 +c03601ff +c03c0203 +c0408125 +c042813e +c0430100 +c046075d +c04f0104 +c05001a2 +c05206f5 +c05406e5 +c05c8774 +c05d05bc +c070019a 20202baf -c003877b -c006024e -c009077d -c009856d -c00a054c -c0118560 -c0128691 -c0130695 -c0138697 -c0140699 -c014869a -c015069f -c01d83e2 -c01f03eb -c01f83a0 -c02084be -c02106e0 -c0240462 -c02584d1 -c0278447 -c02905ed -c02c077f -c02d8606 -c02e8781 -c0300635 -c0320631 -c03706b5 -c0380783 -c0388785 -c03a0180 -c03a8787 -c04906a0 -c0528646 -c0530646 -c075073f +c0038776 +c0060242 +c0090778 +c009855f +c00a053e +c0118552 +c0128685 +c0130689 +c013868b +c014068d +c014868e +c0150693 +c01d83da +c01f03e3 +c01f8397 +c02084b4 +c02106d4 +c0240458 +c02584c7 +c027843d +c02905df +c02c077a +c02d85f8 +c02e877c +c0300629 +c0320625 +c03706a9 +c038077e +c0388780 +c03a01a6 +c03a8782 +c0490694 +c052863a +c053063a +c0750733 c1590000 c16a0000 20202baf 20406490 20406863 20406326 -204000a4 +204000b0 2040203c 20403153 20400093 2040233d -20400099 -20400755 +204000a5 +20400749 20202021 c68e0000 18000e02 20407148 7d3a001c -243a209e -20200789 +243a0099 +20200784 +6844415b +18000e04 +2040281e +2034009e +202020a3 +6fe24f14 +207a0000 +704f1400 +6fe24c8b +247a0000 +db600004 +202020a3 6fe24133 c4008000 6fe20030 @@ -163,16 +175,22 @@ 18423600 202023b7 204045b4 -204000a9 +204000b5 20404909 204029f6 202045b8 +6fe24c8b +245a00ec 6fe244d9 c1808000 6fe20623 -c30000af +c30000c1 c3830000 c3828000 +c58e00c1 +6fe24f14 +c1008000 +704f1401 d8e00003 20407148 247a0000 @@ -180,29 +198,50 @@ d8e00003 20407141 20404735 +204000f0 2040460a 6fe444dc 67e44e34 7854fc00 78487c00 69644e34 -204000ce -243680cb +204000f5 +243680e6 204047d5 1a227e00 67e24626 +6fe24e12 +203a00dc +d8a04e0b +e7e20005 +6fec04dd +e7ec0005 +6fe24e12 +c00100dc 6fec04dd 67ec0633 6fe24c8b -c00083a9 -2040078b +c000839f +20400786 204046d3 -243680cb +243680e6 6fe204dc -c00300cb -2040078b +c00300e6 +20400786 6fe44e34 -243a00b9 +243a00cc +20600000 +1ff27e00 +18000e08 +20207141 +18000e08 +20407148 +247a0000 +20200788 +6fe24527 +1fe67c25 +24610000 +70452725 20600000 204045c7 204045bd @@ -218,17 +257,17 @@ 6fe24013 793ffe06 67e24013 -202000df -204000df +20200106 +20400106 20202bd8 20405900 2040633a -20558170 +20558196 d8e00009 20407357 -205580ed +20558114 70894bba -204000f5 +2040011c 708907ff 20402a70 70895074 @@ -239,21 +278,20 @@ 793ffe13 67e8804c 70800502 -2040013f +20400165 6ff04246 98000000 20600000 6fe242b4 -c00080f8 -c00100f8 +c000811f +c001011f 5888e0d0 67e68955 584a103c 67e68958 70895468 20600000 -20407a63 -2030810a +20308130 708955d4 20000004 708955d2 @@ -261,7 +299,7 @@ 708955d1 20000004 6fe242b4 -c0008108 +c000812e 708955d0 708956e0 18002a08 @@ -285,7 +323,7 @@ 20402a7b 58000250 20402bb1 -204000f5 +2040011c 6fe28906 79207e00 67e28906 @@ -299,14 +337,14 @@ 2000000a 7089027d 6fe242b4 -c0000134 +c000015a 70894cfb 70894def 70894eec 70894f5e -c0008136 +c000815c 20202a51 -2040013a +20400160 20202a49 708956f7 20402a5d @@ -333,7 +371,7 @@ 180a7e00 1fe17e0f 1fe67c04 -2021014c +20210172 67e2063c 67e208cd 1c40fe20 @@ -350,12 +388,12 @@ 202056bd 6fe24e8a 67e20f12 -245a0164 +245a018a 6ff04e9b 67f04be7 20600000 1fe67c2a -20210167 +2021018d 5800002a 67e24bd8 1fe17e0f @@ -374,21 +412,21 @@ 6fe8833e 79207e1a 67e8804c -20200179 -2040013f +2020019f +20400165 70800520 -2020013f -20400736 -20400175 +20200165 +2040072a +2040019b d85fffff 20202cb8 78547c00 204052b0 6fe20048 207a0000 -2020078d -2040078f -2020023d +2020078a +2040078c +20200231 6fe2004b 79207e03 67e2004b @@ -399,56 +437,42 @@ d8c00183 df2000f0 d8400000 -20400194 +204001ba 60440099 2020238d efe80006 207a0000 18408404 -c2000194 +c20001ba 20600000 704ea700 20202414 -6fe24ea7 -1fe0fe01 -67e24ea7 -20405b02 -20402588 -2436a429 -20402bab -20405b20 -20402500 -2040245a -20402841 -20402827 -20404b89 -204001ad -20202425 +2020241a 20404b89 -204001ad +204001c5 20202198 6fe242a7 207a0000 6fe2007c 247a0000 -20200791 -204002b0 +2020078e +204002af 704c8a02 -20200793 +20200790 704c9b02 704c8a00 -202001ba +202001d2 704c9b00 704ca200 704ca000 -20200795 +20200792 6fe24c9a -203a0797 +203a0794 6fe24c99 -203a0789 +203a0784 1fe0ffff 67e24c99 -20200797 +20200794 6fe20018 1ff18400 184f840a @@ -458,22 +482,22 @@ 20600000 20402108 6fe24ea8 -243a0799 +243a0796 704c8a04 -202001b8 +202001d0 204024d2 7854fc00 6fe24c9b -c00081ca +c00081e2 6fe2004c c28221c5 6fe20030 c30221c4 202002d3 6fe24c9d -c00001de -c00081e1 -c00101e4 +c00001f6 +c00081f9 +c00101fc 704c8702 20600000 704c880f @@ -494,58 +518,22 @@ 98000c00 1d027e00 20202931 -2040025f +20400253 68420046 98467c00 20600000 20402337 -202c01fc +202c0214 204024ca -243a01f4 +243a020c 78587c00 1d027e00 67e84169 20600000 2040248f 704c8a00 -2020079b -204021ec -24740000 -78547c00 -70001120 -793f800b -20402b71 -2040232b -c505820f -204024ca -243a0204 -78547c00 -1c427e00 -67e84169 -78387c00 -7834fc00 -2020079d -20402b6f -d8200010 -20402321 -78587c00 -7854fc00 -20402917 -204024ab -204024f3 -2036821b -204024ca -243a0216 -20200209 -18000401 -6fe20031 -793ffe01 -67e20031 -20402bab -20402940 -78347c00 -704c8a01 -2020079b +20200798 +20202205 70011600 70015000 204024d2 @@ -557,7 +545,7 @@ 20404d8e c6108000 6fe24ef2 -c000823d +c0008231 20600000 6fe20030 c283a1e1 @@ -570,7 +558,7 @@ 67e2004b 204021e1 c6108000 -2020078f +2020078c 704c8803 704c8706 204002f1 @@ -587,40 +575,40 @@ 202002fb 704c8806 704c8716 -20200247 -20400254 -204005ae +2020023b +20400248 +204005a0 207a0000 20403e9d 20628000 -2020024e +20200242 20403e9d 20628000 20403e9d 20628000 1fe20c00 20403e92 -c005829e +c005829d 20203ef4 -20400273 +20400267 2040712d -20200270 -20400273 +20200264 +20400267 efe40006 -20200270 -20400273 +20200264 +20400267 efe60006 -20200270 -20400273 +20200264 +20400267 efec0006 -20200270 -20400273 +20200264 +20400267 efee0006 -20200270 -20400273 +20200264 +20400267 eff00006 -20200270 -20400273 +20200264 +20400267 efe20006 18c20400 60464bf2 @@ -633,16 +621,27 @@ 704eef01 7044d901 704c8b01 -202002c0 +202002bf 6fec4c8d 67ec4639 67ec4140 20600000 +6fe24dee +1fe27200 +da404def +efee0012 +684e4e0b +98467c00 +58000000 +20628000 +1a40a407 +c2000277 +58000001 20600000 704ddc00 -20200285 +20200284 704ddc03 -20200285 +20200284 62464ddd 58004b4a 67e443e3 @@ -658,40 +657,40 @@ 18007e06 67e243e2 20203f1a -2040079f +2040079a 6a464dd9 -20200281 -2040029a +20200280 +20400299 6a464dd9 -2020058d -20400273 +2020057f +20400267 df200003 d8a04dd9 20203e88 20403e92 20403e92 67e24dd8 -20400270 +20400264 6fe24dd8 -c0000297 -204005ae +c0000296 +204005a0 207a0000 -2040029a +20400299 6fe24dd8 -c0018294 +c0018293 20202baf 704c9612 -202002b1 +202002b0 704c9601 -202002b1 +202002b0 704c960c -202002b1 +202002b0 704c9600 df200001 -204002b5 +204002b4 202002fb 704c9600 -204002b9 +204002b8 6fe24c96 e7e20005 20600000 @@ -703,9 +702,9 @@ e7e60005 20600000 700f1200 -202002c5 +202002c4 700f120c -202002c5 +202002c4 700f1202 704c870f 704c8804 @@ -720,7 +719,8 @@ 6fe20639 67e24e19 704eef00 -202007a1 +704f1300 +2020079c 6fe20046 67e24e19 793f8021 @@ -728,7 +728,7 @@ 70004600 704ca200 704c9b00 -202007a1 +2020079c 6fe20624 d8400000 c1018000 @@ -758,12 +758,12 @@ 6fe64c86 e7e60005 20600000 -2040056a +2040055c 1a420a00 20600000 da204d85 20403fa5 -20200283 +20200282 18000400 18000201 704ef301 @@ -834,8 +834,8 @@ 6fe2063a c282833e 704ef300 -20400373 -20400387 +2040036a +2040037e 203a02fe efe20006 ea220006 @@ -852,20 +852,11 @@ 18427200 2040712d 2040480e -20400370 +20400367 20400301 -20400363 -da204002 -68441002 -20407a08 -6fe21002 -28200603 -24608000 -da204003 -68424f37 -20407a08 +2040035a 20600000 -20400387 +2040037e efe20006 1fe22200 18c23000 @@ -879,19 +870,19 @@ 24628000 202049f1 6fe21002 -67e24f37 +67e24f3b 20600000 6fe24683 203a480c -2040037d +20400374 c6130000 da204d5d -2040055d +2040054f c000480c c000c80c 79200026 20600000 -20400387 +2040037e 203a480c efe20006 e8420006 @@ -903,7 +894,7 @@ 20600000 da204d5d 20203fa1 -2040038b +20400382 20202739 204045bd 204045cd @@ -926,26 +917,25 @@ 08008608 2022c6a6 202046a3 -20407a4f 204045aa 20404766 20400341 -20400389 -2040052c +20400380 +20400521 20404594 -20340542 +20340534 2020458a 6fe24626 68424ef0 98467c00 -242280cb +242280e6 6fec0633 684c4627 98467c00 -242280cb +242280e6 20402266 24628000 -20400143 +20400169 2040454a 58000000 67ea4562 @@ -960,16 +950,18 @@ 204047d2 704eef02 704c8a00 -20200793 -204005be +704e1200 +704c8b00 +20200790 +204005b0 67e64e16 58000000 67e64d2f 6fe20046 67e242a8 704ddc05 -202003d2 -204005c4 +202003ca +204005b6 67e64e16 58000000 67e64d32 @@ -1004,21 +996,21 @@ 204045b4 2040315c 6fe20624 -c0018405 +c00183fd 20204579 -2040025f +20400253 67e242a8 -2040025f +20400253 67e444d7 -2040025f -2040025f +20400253 +20400253 67e44632 -2040025f +20400253 67e44634 -20400420 -202002c0 -2040038b -20200546 +20400417 +202002bf +20400382 +20200538 6fe24eec c1828000 704eec06 @@ -1029,50 +1021,48 @@ 20600000 7834fc00 204048fd -202106ec +202106e0 6fe24eec -245a07a3 +245a079e 20400341 204045fc 7856fc00 -204003fb -2436843b -20407a4f -20400435 +204003f3 +24368431 +2040042b 20404766 -2040052c +20400521 20404594 -20340422 -20400418 +20340419 +2040040f 7854fc00 20202739 6fe20623 c3830000 6fe24ee9 207a0000 -c00987a5 +c00987a0 20202baf 704ee900 20600000 704ee913 20600000 20400341 -20400428 +2040041f 78377c00 -20400546 -2036840f -20200415 -2040042a +20400538 +20368407 +2020040c +20400421 20202739 204045bd 204045cd -20407a47 79202a00 782efc00 78307c00 7850fc00 -20400433 -20200393 +20400429 +2020038a 37c18200 20600000 6fe20623 @@ -1082,13 +1072,13 @@ 704eec01 20600000 6fe20623 -c2818415 +c281840c 6fe24e18 1fe67c06 -242106ec +242106e0 1fe0fe01 67e24e18 -20200415 +2020040c 684c4639 20600000 684c4c7a @@ -1106,8 +1096,8 @@ 67e24537 18427200 6fe2461c -205a0443 -245a0445 +205a0439 +245a043b 604c4538 d8c044e0 2040712d @@ -1120,7 +1110,7 @@ 62480f22 62660f26 20600000 -2040045e +20400454 67244eea 1a208c01 efe20006 @@ -1129,10 +1119,10 @@ efe40005 1fe0fe01 e7e40005 -20400491 -2040047d +20400487 +20400473 20404618 -2040045a +20400450 6f244eea 20600000 1a208c31 @@ -1142,7 +1132,7 @@ c3004628 18408401 1fe37e00 -c2000475 +c200046b 1840ffff 1a208a22 e7e20005 @@ -1166,7 +1156,7 @@ 6fea4528 1a208a31 e7ea0005 -20200471 +20200467 1a208c00 efe20006 c4028000 @@ -1178,7 +1168,7 @@ 6fe40643 98467e00 1fe67c01 -202284a7 +2022849d 20600000 1a208c1a efe40006 @@ -1187,7 +1177,7 @@ 98467e00 d840ffff 98467c00 -202284a7 +2022849d 20600000 efe20011 793ffe05 @@ -1212,12 +1202,12 @@ 1a208a2d e7e80005 20600000 -204004c2 +204004b8 2040475a -204007a7 +204007a2 20202940 7855fc00 -203704c5 +203704bb 2436c981 20402d74 6fe44161 @@ -1244,15 +1234,15 @@ 78507c00 19623600 37c18400 -203704e1 +203704d7 1b420400 604c00a4 242c2739 -203704e8 +203704de dd2001e0 1c225000 6fe20623 -c30184e8 +c30184de 2055ac9c 20402abc 7823fc00 @@ -1270,45 +1260,44 @@ 67e204dc 1fe27200 67e2068c -203a0513 +203a0509 6fe204db 1fe17e03 -c0018508 -c507850a +c00184fe +c5078500 da204ccb -2040055d -c000850a -203a050a -204005ba -203a050a -204005c4 +2040054f +c0008500 +203a0500 +204005ac +203a0500 +204005b6 18c20a00 6fe404db e7e40005 -2020050f +20200505 d8a004dd -2020050f +20200505 09800008 19897e00 -c200050a +c2000500 78367c00 -20200513 +20200509 09800008 19897e00 e7e20005 -c200050f +c2000505 09800018 78287c00 db600664 -2036051a +20360510 1fef7e00 1ff17e00 e7e60005 -20437a57 20232739 7836fc00 6fe242b5 -243a0522 +243a0517 6fe20017 1fe0a200 20402a7b @@ -1326,26 +1315,23 @@ c68d0000 20760000 6fe204dc -203a053c -da204000 -684404db -20407a08 +203a052e 6fe204db 1fe17e03 c001c866 -204005c4 -20400524 +204005b6 +20400519 6fe2068c 207a0000 -202003cb +202003c3 6fe64d32 207a0000 1fe22400 58000000 67e64d32 -2020058d +2020057f 78377c00 -20400546 +20400538 2036c582 2020458a 68420017 @@ -1353,7 +1339,7 @@ 20402a23 78287c00 d9601388 -202004d6 +202004cc 1a208409 efe20002 203a2baf @@ -1378,13 +1364,13 @@ 6fe204d5 c1018000 20204146 -2040057f +20400571 da204d35 20203f94 da204d35 20403fa5 -2020058d -2040057f +2020057f +20400571 da204d85 20203f94 1a20fe04 @@ -1405,57 +1391,57 @@ 1a420c00 1a427e00 20600000 -204005a1 +20400593 203a2baf 6fe44dd2 1fe0fff6 68444db2 98467c00 -20210588 +2021057a da204ccb 20203fa5 da204ca3 -2040055d -203a0586 +2040054f +203a0578 da204ca3 20203fa5 -20400599 +2040058b da204ca3 -203a0592 +203a0584 da204ccb 20203f94 -20400596 +20400588 203a2baf da204ca3 20203f94 6f224cab d8c04cf3 -2020059b +2020058d 6f224cd3 d8c04d11 efe60006 9a467c00 -2022859f -c200059b +20228591 +c200058d 1f227e00 20600000 6fe44dd2 1fe0fff6 68444db2 98467c00 -202105a8 +2021059a da204ccb -2020055d +2020054f da204ca3 -2040055d +2040054f 247a0000 -202005a6 +20200598 6fe44dd6 -202005af +202005a1 58000010 67e44db2 62280f1e -204005a1 +20400593 6a280f1e 20600000 da204ccb @@ -1463,20 +1449,20 @@ 6fe44d2f 247a0000 da204ccb -2020055d +2020054f 6fe44d32 247a0000 da204ccb -2020055d +2020054f 6fe64d2f 243a7111 -204005b4 +204005a6 1a427e00 67e64d2f 20207111 6fe64d32 243a7111 -204005b4 +204005a6 1a427e00 67e64d32 20207111 @@ -1487,12 +1473,12 @@ 20203190 1a627e00 c00a326c -c00a85d3 +c00a85c5 20203168 704c8c00 704c1700 -204007a9 -204002cd +204007a4 +204002cc 202031c3 6842063a 284c0005 @@ -1509,14 +1495,14 @@ 6fe245b5 c0014794 6fe21002 -c00285eb -6fe24f37 -c00106ef +c00285dd +6fe24f3b +c00106e3 20600000 2040615d 20204790 20404906 -204005d8 +204005ca 6fe204db 2feffe04 79208027 @@ -1525,12 +1511,12 @@ 2feffe02 7920800f 6fe204dc -203a05ff +203a05f1 6fe20623 -c30205ff +c30205f1 c6078000 20406246 -2040060c +204005fe 793a001a 247a0000 20760000 @@ -1545,10 +1531,12 @@ d8e00001 20407148 247a0000 -202007ab +202007a6 6fe204db 1fe17e03 c001e1b6 +6fe64d32 +207a0000 684a4562 18002200 20406168 @@ -1583,13 +1571,13 @@ 67ea4562 18007e00 20600000 -20400643 +20400637 18227e00 c1018000 202002e5 62680f26 62244db2 -20400640 +20400634 1a420a00 6fe44db2 e7e20005 @@ -1598,16 +1586,16 @@ e0220005 6a680f26 20600000 -2040057f +20400571 da204d5d 20203f94 da204d5d 20403fa5 -2020058d +2020057f 6fe20b97 -243a07ad +243a07a8 6fe20b98 -243a07ad +243a07a8 20600000 6fe24c97 207a0000 @@ -1618,7 +1606,7 @@ 1a208c01 efe20006 c4008000 -20400657 +2040064b 704ca001 20600000 704c8806 @@ -1636,14 +1624,14 @@ 2020268a 1f227e00 67e4012c -203a065d +203a0651 9ea67c00 20212729 18017e01 -243a066f +243a0663 6fe20151 1fe17e03 -c0018688 +c001867c c507a6f0 684444d2 184085fd @@ -1651,11 +1639,11 @@ 98467c00 20212729 da204ccb -2040055d +2040054f c000a739 -204005b6 +204005a8 203a2739 -204005be +204005b0 18c20a00 6fe20151 e7e20005 @@ -1668,9 +1656,9 @@ c58026ba 793f8000 20600000 -204003c3 +204003bb 202026dd -2040068b +2040067f 243a2729 20202649 6fe20078 @@ -1680,21 +1668,21 @@ 6fe20048 20600000 62244db2 -20400564 +20400556 6a244db2 20600000 da204d35 20203fa1 -20400567 +20400559 202002e2 -20200567 -204005ac +20200559 +2040059e 203a729b 2020729d da204d35 -2020055d +2020054f 20202baf -2040069d +20400691 207a0000 6fe2004b c3830000 @@ -1707,7 +1695,7 @@ 18c27e00 67e4013c 6fe4442c -203a06af +203a06a3 20205b2e 6fe40099 203a2baf @@ -1718,7 +1706,7 @@ 70429300 20204b77 67e40fb7 -202006b9 +202006ad 68440fb7 18518400 6fe44881 @@ -1737,11 +1725,11 @@ 67e40241 5801df00 67e4023f -20400703 +204006f7 204057e8 6fe280a0 67e20124 -204006d7 +204006cb 6fe20124 67e280a0 704e6500 @@ -1770,27 +1758,27 @@ 704c8b00 700f0d15 20206b2e -204006e1 +204006d5 7854fc00 20600000 -704f3700 -202006ec +704f3b00 +202006e0 6fe24040 c3800000 c3818000 6fe247cd -203a06f8 +203a06ec 6fe24724 207a0000 20202d53 6fe206ab 67e24bef 704bf000 -20400736 -202007af +2040072a +202007aa 7043dd01 20403f41 -202007af +202007aa 20600000 20202001 704e6501 @@ -1799,13 +1787,13 @@ 207a0000 6fe24e66 c1a98000 -20200705 +202006f9 18227e00 c003a739 c0032739 202025df 6fe84bd7 -20200731 +20200725 20006a60 6fe84bd7 79207e16 @@ -1813,46 +1801,46 @@ 79207e15 67e84bd7 df200032 -204007b1 +204007ac 6fe84bd7 793ffe15 -20400731 +20400725 6fe84bd7 793ffe14 -20400731 +20400725 200004b0 6fe84bd7 793ffe16 -20400731 +20400725 200004b0 20600000 6fe84bd7 79207e16 -20400731 +20400725 200004b0 6fe84bd7 79207e14 -20400731 +20400725 200004b0 6fe84bd7 79207e15 -20400731 +20400725 200004b0 20600000 67e84bd7 67e8804c -2040013f +20400165 70800540 -2020013f +20200165 d8400000 58000000 1fed7e00 1febfe00 9841fe00 67e8804c -2040013f +20400165 70801902 -2020013f +20200165 20406b27 da2047e1 2040725d @@ -1860,14 +1848,14 @@ 20406b2b 18427e00 207a0000 -c04c0749 +c04c073d 67e20fba -202007b3 +202007ae 20405875 20001770 68448352 18427e00 -205a0752 +205a0746 60444eed 20405882 700f0d9e @@ -1875,9 +1863,16 @@ 20001770 68448352 20600000 -6fe24ca2 -c1808000 -202007b5 +6fe20639 +207a0000 +6fe24f13 +207a0000 +18000e07 +20407148 +205a0751 +20600000 +70801003 +20202baf 18a22200 704c9c00 704c880f @@ -1905,141 +1900,141 @@ 6ff04c0a e7f00005 202002fb -58000390 -202006b7 -58000350 -202006b7 -58000360 -202006b7 -580002e0 -202006b7 -58000300 -202006b7 -58000110 -202006b7 -580003e0 -202006b7 -580003a0 -202006b7 -58000260 -202006b7 -58000220 -202006b7 -58000430 -202006b7 -580002d0 -202006b7 -58000460 -202006b7 580003b0 -202006b7 -580001e0 -202006b7 -58000340 -202006b7 -580001f0 -202006b7 -58000150 -202006b7 -580001c0 -202006b7 -580002a0 -202006b7 +202006ab 58000370 -202006b7 +202006ab 58000380 -202006b7 +202006ab +58000300 +202006ab +58000320 +202006ab +58000110 +202006ab +58000400 +202006ab +580003c0 +202006ab +58000280 +202006ab 58000240 -202006b7 -58000170 -202006b7 +202006ab +58000450 +202006ab +580002f0 +202006ab +58000480 +202006ab +58000210 +202006ab 580003d0 -202006b7 +202006ab +580001f0 +202006ab +58000360 +202006ab 58000200 -202006b7 -58000210 -202006b7 -58000250 -202006b7 -58000310 -202006b7 -58000320 -202006b7 -58000330 -202006b7 -58000450 -202006b7 +202006ab +58000150 +202006ab +580001d0 +202006ab 580002c0 -202006b7 -58000440 -202006b7 +202006ab +58000390 +202006ab +58000260 +202006ab +58000170 +202006ab +580003f0 +202006ab +58000220 +202006ab +58000230 +202006ab +58000270 +202006ab +58000330 +202006ab +58000340 +202006ab +58000350 +202006ab +58000470 +202006ab +580002e0 +202006ab 58000080 -202006b7 +202006ab 58000070 -202006b7 +202006ab 580000f0 -202006b7 +202006ab 58000060 -202006b7 +202006ab 580000d0 -202006b7 +202006ab 58000090 -202006b7 +202006ab 580000a0 -202006b7 +202006ab 580000b0 -202006b7 +202006ab 580000c0 -202006b7 -58000470 -202006b7 -580003f0 -202006b7 +202006ab +58000490 +202006ab +58000410 +202006ab 580000e0 -202006b7 +202006ab 58000100 -202006b7 +202006ab 58000190 -202006b7 +202006ab 58000120 -202006b7 +202006ab 58000010 -202006b7 +202006ab 58000020 -202006b7 +202006ab 58000030 -202006b7 +202006ab 58000040 -202006b7 +202006ab 58000050 -202006b7 +202006ab 58000140 -202006b7 +202006ab 580001a0 -202006b7 +202006ab 580001b0 -202006b7 +202006ab +580001c0 +202006ab 58000130 -202006b7 -58000270 -202006b7 -580002b0 -202006b7 -58000280 -202006b7 +202006ab 58000290 -202006b7 -580002f0 -202006b7 +202006ab +580002d0 +202006ab +580002a0 +202006ab +580002b0 +202006ab +58000310 +202006ab 58000180 -202006b7 -580001d0 -202006b7 -580003c0 -202006b7 -58000400 -202006b7 -58000410 -202006b7 +202006ab +580001e0 +202006ab +580003e0 +202006ab 58000420 -202006b7 +202006ab +58000430 +202006ab +58000440 +202006ab Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom (working copy) @@ -125,7 +125,7 @@ mem_lap:45 FF 31 FF FF FF mem_discovery_timeout:00 07 -mem_ssp_enable:01 +mem_ssp_enable:00 mem_ui_profile_supported:48 mem_app_connection_options:17 mem_eir_enable:01 @@ -335,6 +335,7 @@ mem_simple_pairing_mode:00 mem_conn_status:00 mem_le_conn_status:00 +mem_le_white_list_filter_policy:00 mem_io_cap_flag:00 mem_inquiry_mode:00 mem_hci_conn_accept_timeout:a0 1f #default value : 5.06s @@ -378,10 +379,10 @@ 61 87 #LPM_subversion mem_mesh_read_local_support_command:ff -ff ff 03 CC FF FF FF 3F FF FC 9F +ff f7 03 CC FF FF FF 3F FF FC 9F F3 0F E8 FE 3F F7 8F FF 1C 00 00 00 61 F7 FF FF 7F 00 E0 FF FF 00 -00 00 00 00 00 00 00 00 00 00 00 +00 00 00 80 00 00 00 00 00 00 00 00 mem_local_ext_features:00 02 FF FF FF FE DB FD 7B 87 @@ -394,6 +395,8 @@ mem_local_rx_max_octets:fb 00 48 08 fb 00 48 08 +mem_fsc_rtk_host_94_sniff_timeout:60 09 + mem_lpm_write_temp_adc_low: bb 3a 48 00 mem_lpm_write_temp_adc_high:14 00 00 00 @@ -414,7 +417,7 @@ mem_iscan_interval:00 04 mem_pscan_window:16 00 mem_pscan_interval:00 04 -mem_inq_window:20 00 +mem_inq_window:08 00 mem_page_window:30 00 mem_page_to:00 30 mem_rx_window_init:80 03 Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (revision 6190) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle_JinJu_Rtk/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (working copy) @@ -72,7 +72,7 @@ 1fe0fe03 67e44db2 da204ccb -2040055d +2040054f 1fe67c02 20610000 704c873e @@ -93,7 +93,7 @@ e0420005 18427200 2040712d -204001c3 +204001db e7e20005 202002fb 6fe204db @@ -129,10 +129,10 @@ 20200040 6fe84bd7 793ffe15 -20400731 +20400725 6fe84bd7 79207e15 -20400731 +20400725 c2000001 20600000 00000000 @@ -386,7 +386,7 @@ 6fe204dd c0018005 c003001e -202007fb +202007f6 6ff04de0 c4000000 6fe204dd @@ -452,7 +452,7 @@ c00a8014 c001000d c0090007 -202007f9 +202007f4 da200001 d8200003 204049ab @@ -575,16 +575,13 @@ 00000000 00000000 20200040 -da204001 -684404dd -20407a08 6fe204dd -c004000a -c0048013 -c0060017 -c007000a -202007f7 -20400013 +c0040007 +c0048010 +c0060014 +c0070007 +202007f2 +20400010 da200009 d8200003 204049ab @@ -595,12 +592,12 @@ 20600000 eff00006 67f04c0a -204003fd -20200020 +204003f5 +2020001d efea0006 67ea4c12 -20400401 -203487cb +204003f9 +203487c4 6fe24c17 247a0000 1fe0fe01 @@ -638,6 +635,9 @@ 00000000 00000000 00000000 +00000000 +00000000 +00000000 20200040 6fe24eec c000801e @@ -727,7 +727,7 @@ 20600000 c6908000 793f8021 -20200185 +202001ab 00000000 00000000 00000000 @@ -767,22 +767,19 @@ 00000000 00000000 20200040 -da201001 -68420048 -20407a08 6fe20048 -c28387f3 -c0188021 -c00607f5 -c0038030 -c005800b +c28387ee +c018801e +c00607f0 +c003802d +c0058008 20204f6c 6fe20b9c -203a0011 +203a000e 204052e7 2040d2da 2440d2d6 -20200012 +2020000f 204052da 204052f6 18007e11 @@ -793,7 +790,7 @@ 18410401 6fe20048 1fe3fe00 -c590801e +c590801b 7d34fe00 202052ab 7934fe00 @@ -805,13 +802,13 @@ 1c427e00 67e806c2 6fe206ab -c281802e +c281802b 79207e03 67e206ab 18007e01 2040528d 204052a6 -202001b5 +202001cd 70004800 20600000 18007e02 @@ -819,7 +816,10 @@ 6fe206a4 e7e20005 204052a6 -20200187 +202001ad +00000000 +00000000 +00000000 00000000 00000000 00000000 @@ -842,7 +842,7 @@ 2040493a 6fec0633 67ec4627 -20200793 +20200790 00000000 00000000 00000000 @@ -1095,7 +1095,7 @@ 67e4003e 7855fc00 704c8a00 -202007f1 +202007ec 00000000 00000000 00000000 @@ -1186,7 +1186,7 @@ 24348023 18808fff 704c8a02 -202007f1 +202007ec 00000000 00000000 00000000 @@ -1253,7 +1253,7 @@ 67e2004b 6fe20030 c283b413 -20400245 +20400239 202033ca 00000000 00000000 @@ -1362,7 +1362,7 @@ 20206481 20400015 20778000 -202007c9 +202007c2 7857fc00 6fe247d4 247a0000 @@ -1429,8 +1429,8 @@ 67e24537 18427200 6fe2461c -205a0443 -245a0445 +205a0439 +245a043b 604c4538 d8c04500 2040713a @@ -1536,11 +1536,11 @@ 00000000 20200040 c3020003 -20400710 +20400704 6fe8833e 793ffe1d 67e8804c -20400179 +2040019f 700f0d6a 20203f28 00000000 @@ -1608,17 +1608,17 @@ 6fe24bef 67e206ab 2040001f -2455815e +24558184 20407988 -580005cf +580005c1 67e4431d -58000174 +5800019a 67e4431f -58000159 +5800017f 67e4431b -580006f9 +580006ed 67e44315 -580006fe +580006f2 67e44313 24358023 20403e79 @@ -1635,14 +1635,14 @@ 202056bd 6fec4140 67ec4340 -20400749 +2040073d 70801002 204057bf 6fe24bce c301002c -c28287ef -2040070e -2040070e +c28287ea +20400702 +20400702 700f0d9f 20203f28 204054b0 @@ -1652,9 +1652,9 @@ 6848833e 6048804c 70804de6 -2040013f +20400165 70800520 -2020013f +20200165 00000000 00000000 00000000 @@ -1737,19 +1737,19 @@ 6fe8833e 79207e1d 67e8804c -20200179 -20200710 +2020019f +20200704 6fe84bd7 79207e02 -20200731 +20200725 6fe84bd7 793ffe02 -20200731 -20400724 +20200725 +20400718 6fe8833e 79207e1c 67e8804c -20200179 +2020019f 00000000 00000000 00000000 @@ -1928,7 +1928,7 @@ 67e2004b 20404f51 7006ae01 -2040024b +2040023f 204052de 2420cf59 2434cd67 @@ -1947,7 +1947,7 @@ 6fe2073a 98467e00 1fe67c0e -20210799 +20210796 20204db7 68420739 58004ea9 @@ -1986,7 +1986,7 @@ 6fe2007d c0018012 c0088005 -202007ed +202007e8 20404e14 6fe24ef1 c0010009 @@ -2051,17 +2051,17 @@ c006000a c00b8011 c0058014 -c01987e9 +c01987e4 c017001e c0208022 c0098030 -202007eb +202007e6 da200040 2040604d 6fe80739 68480779 98467c00 -2022822c +20228220 20204d8b 6fe44dea c3014e10 @@ -2075,7 +2075,7 @@ 6fe20030 c3830000 20404d80 -20200245 +20200239 68420739 60424170 20404d51 @@ -2120,7 +2120,7 @@ c0140026 c0038022 c0130028 -202007e7 +202007e2 6fe20739 67e206a3 c005800f @@ -2136,9 +2136,9 @@ c1830000 60420055 700b9b01 -2040064b +2040063f 6fe24c97 -203a024b +203a023f 20600000 20404dc7 6ff00739 @@ -2146,7 +2146,7 @@ 20600000 6fe20739 67e206a4 -20400187 +204001ad 20204d51 20404edd 2020001f @@ -2182,14 +2182,14 @@ dfe04d5d 67e40f12 6a240f12 -2040055d +2040054f 207a0000 6a240f12 20403fa5 -2040058d +2040057f 20200007 1fe22400 -2020058d +2020057f 00000000 00000000 00000000 @@ -2240,12 +2240,12 @@ 00000000 20200040 68464dd9 -20400271 -2040026e +20400265 +20400262 c0008007 c0010012 20202baf -2040025f +20400253 67e44c94 d84003ff 98410400 @@ -2253,13 +2253,13 @@ 1feb7e00 1fecfe00 67e24c1a -2040026e +20400262 67e24c1b -202007e5 -2040025f +202007e0 +20400253 67e242a8 20400034 -2040025f +20400253 67e40f12 20402284 24628000 @@ -2268,7 +2268,7 @@ c280002c 6fe40f12 67e44db2 -204005a1 +20400593 205a723a 6fe40f12 1fe22200 @@ -2280,7 +2280,7 @@ e0220005 6fe40f12 1fe27200 -20400273 +20400267 2020712d 6fe40f12 2040003a @@ -2296,7 +2296,7 @@ c1008000 18000202 20600000 -204005af +204005a1 203a729b 2020729d 00000000 @@ -2385,7 +2385,7 @@ 2020000a 20404c78 2040001a -20200657 +2020064b 2040001a 20404c78 20404c7c @@ -2514,7 +2514,7 @@ e7e20005 6ff2452d e7f20005 -2040041e +20400415 6ff04c6c c4010000 704c880a @@ -2566,6 +2566,70 @@ 204002f1 58000001 e7e20005 +58000000 +e7e20005 +6fe2416f +1fe0fe19 +e7e40005 +58000000 +e7e20005 +6fe24626 +e7e20005 +6fec4627 +e7ec0005 +6fe40625 +1feb7e00 +e7e40005 +6fe84632 +e7e80005 +6fe2065b +e7e20005 +204002fb +704c8b00 +704eef00 +704f1300 +6ff04c6c +c4020000 +704c8804 +704c8705 +204002f1 +58000000 +e7e20005 +6fe2416f +1fe0fe19 +e7e40005 +5800003e +e7e20005 +202002fb +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +20200040 +6ff04c6c +c4000000 +704c8813 +704c873e +204002f1 +58000001 +e7e20005 6fe24c8a e7e20005 6fe20639 @@ -2763,7 +2827,7 @@ 684c0149 20402289 20628000 -204001d8 +204001f0 204002f1 58000001 e7e20005 @@ -2792,10 +2856,10 @@ 9c467e00 e7e40005 6fe20018 -204001c3 +204001db e7e20005 6fe24c9c -243a0758 +243a0753 6fe24c9d c0010031 202002fb @@ -2816,45 +2880,46 @@ 00000000 20200040 6fe24c18 -c00c8018 -c00e0013 -c01d0009 -c01d800e -c02082b0 -c02102b0 -202002ac -df200003 -204002b4 -58000400 -e7e40005 -202002fb -df200002 -204002b4 -58000004 -e7e20005 -202002fb -df200009 -204002b4 -6ff04f2f -e7f00005 -202002fb -2040025f -67e242a8 -2040026b -67f045bd -2040025f -67e445bb -d8a04573 -18007210 -2040025c -d8a005e3 -18007208 -204052f8 -d8a0456b -18007204 -204052f8 -7045b501 -202002c0 +c0218004 +202002ab +2040723a +20400262 +67e24e12 +1fe67c01 +2042826a +20400262 +67e2462d +6fe24e12 +245a001f +6fe24e12 +205a0024 +20400262 +20400253 +67e444da +20400253 +67e444dc +20400253 +1febfe00 +67e444d7 +20400253 +20400253 +67e44632 +20400253 +67e44634 +20400253 +20400253 +2020026c +6fe24e0b +67e24ef0 +6fec4e0c +67ec4627 +2020025c +20400262 +67e24ef0 +20400259 +67ec4627 +20600000 +00000000 00000000 00000000 00000000 @@ -2877,31 +2942,96 @@ 00000000 00000000 00000000 +20200040 +6fe24c18 +c00c800d +c00e0008 +c02082af +c02102af +c006801e +202007de +df200009 +204002b3 +6ff04f33 +e7f00005 +202002fb +20400253 +67e242a8 +2040025f +67f045bd +20400253 +67e445bb +d8a04573 +18007210 +20400250 +d8a005e3 +18007208 +204052f8 +d8a0456b +18007204 +204052f8 +7045b501 +202002bf +20400253 +67e444da +20400253 +67e444dc +20400262 +67e24e12 +1fe67c01 +2042826a +245a0035 +6fe24e12 +205a003a +20400262 +67e2462d +20400253 +1febfe00 +67e444d7 +20400253 +20400253 +67e44632 +20400253 +67e44634 +204000e9 +2020026c +6fe24def +67e24ef0 +6fec4df0 +67ec4627 +2020025c +20400262 +67e24ef0 +20400259 +67ec4627 +20600000 00000000 20200040 6fe24c18 -c00b8006 -c00d8021 -c011002a -202007e3 +c00b8008 +c00d8023 +c011002c +c01d0036 +c01d803b +202007dc 18007210 d8a00603 -2040025c +20400250 18007210 d8a00613 -2040025c +20400250 18007000 df200004 d8c00613 -2040001c +2040001e df200004 d8c00603 -2040001c +2040001e 204061e6 d8a04efe 20406250 df200011 -204002b4 +204002b3 df200010 d8c04efe 2040712d @@ -2909,61 +3039,59 @@ efe80006 98005e00 1f00f001 -c200001c +c200001e 20600000 -2040025f +20400253 67e242a8 df200003 -204002b4 +204002b3 6fe20639 e7e40005 204002fb 204048b8 202048ae -2040025f +20400253 67e4495f -2040025f +20400253 67e44961 20400030 df200003 -204002b4 +204002b3 6fe20639 e7e40005 202002fb -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 +df200003 +204002b3 +58000400 +e7e40005 +202002fb +df200002 +204002b3 +58000004 +e7e20005 +202002fb 20200040 6fe24c18 c00c0006 c009000b c00d0020 -202007e1 +202007da df200009 -204002b4 +204002b3 18007208 204052f8 202002fb 6fe24dee -203a02ae -20400268 +203a02ad +2040025c 67ee4e0b 20400014 6fe24dee 1fe0ffff 67e24dee -202002b0 -20400280 -243a02ae +202002af +20400274 +243a02ad 1a420a00 1a40a407 1a420c00 @@ -2974,13 +3102,13 @@ 18a08bf9 e7ee0005 20600000 -2040025f +20400253 67e242a8 d8a04573 18007210 -2040025c +20400250 df200003 -204002b4 +204002b3 6fe20639 e7e40005 204002fb @@ -3264,30 +3392,32 @@ 00000000 20200040 6fe24c18 -c00b8009 -c010000f -c0518026 -c0300036 -c0368021 -c04a0018 -202002ac +c00b8008 +c010000e +c051802c +c0368027 +c04a0017 +202002ab 704e1a3f 58000000 67e24f0e 58000001 67e44f0f -202002b0 -2040026e +202002af +20400262 67e24f0e df200002 -204002b9 +204002b8 58000000 e7e20005 6fe24f0e e7e20005 202002fb +6fe24eef +1fe67c02 +20428023 df200003 -204002b9 +204002b8 58000000 e7e20005 6fe44f0f @@ -3295,33 +3425,31 @@ 1fe0fe01 67e44f0f 202002fb +704f1301 +18000e07 +6fe44f11 +20207141 df200002 -204002b9 +204002b8 58000100 e7e40005 202002fb -2040025f +20400253 68420046 98467c00 -2022802d +20228033 68420639 98467c00 24628000 604242a8 df200003 -204002b9 +204002b8 6fe242a8 e7e40005 6fe20018 -204001c3 +204001db e7e20005 202002fb -df200002 -204002b9 -6fe44e37 -e7e40005 -202002fb -00000000 00000000 00000000 00000000 @@ -3336,21 +3464,21 @@ c0030011 c004000e c01f8012 -202002ac -202007d5 -202007d7 -202007d9 -202007db -202007dd -202002ac -202002ac +202002ab +202007ce +202007d0 +202007d2 +202007d4 +202007d6 +202002ab +202002ab 6fe24c18 c0008015 -202007df -20400265 +202007d8 +20400259 67ec4c8d -2040027c -202002b0 +20400270 +202002af 00000000 00000000 00000000 @@ -3399,14 +3527,14 @@ 67e40f12 20200008 6a240f12 -2040055d +2040054f 207a0000 6a240f12 20403fa5 -2040058d +2040057f 20200008 1fe22400 -2020058d +2020057f 00000000 00000000 00000000 @@ -3456,7 +3584,7 @@ 00000000 20200040 6fe24e36 -243a07d3 +243a07cc 704e3601 20400023 6f224cd3 @@ -3522,16 +3650,16 @@ 6fe24c18 c0050018 c007001b -c00983f0 +c00983e8 c00b000a c0078020 c0080025 -c0088029 -202007d1 -2040025f -204002c0 +c008802a +202007ca +20400253 +204002bf 6ff04c0a -243a0767 +243a0762 6fe24eec 207a0000 da200009 @@ -3542,30 +3670,34 @@ 6ff04de0 e7f00005 20600000 -2040026e +20400262 67e244de -202002b0 +202002af 7044d900 704c8b00 6fe24eef -c00081b2 -202002ae +c00081ca +202002ad df200002 -204002b4 -58000004 +204002b3 +58000001 e7e20005 202002fb -704dee00 -704e0b00 -704def00 -202002b0 +df200004 +d8a04dee +204070e4 +e7e80005 +202002af 68424dee 18467c04 -202282ae -20400268 +202282ad +2040025c 67ee4e0b -20400030 -202002b0 +20400031 +202002af +684e4def +98467c00 +20628000 6fe24dee d8a04def 1feffe07 @@ -3578,107 +3710,103 @@ 20600000 00000000 00000000 -00000000 -00000000 -00000000 -00000000 20200040 6fe24c18 -c0040008 -c004800d -c0058012 -c0060025 -c0068029 -202007cf -2040026e +c0040007 +c004800c +c0058011 +c0060022 +202007c8 +20400262 67e244df 1fe27200 -2040025c -202002b0 -2040026e +20400250 +202002af +20400262 67e244ff 1fe27200 -2040025c -202002b0 -6fe244d9 -243a02ae -2040026e +20400250 +202002af +20400262 67e24636 -2040025f +20400253 67e444da -2040025f +20400253 67e444dc -2040026e +20400262 67e24637 -2040026e +20400262 67e24e12 6fe444da 684444dc 98467c00 -242282b0 +242282af 1fe3fe00 67e444da -202002b0 -2040026e +202002af +20400262 67e244d9 -2040026e -202002b0 -2040025f -67e444da -2040025f -67e444dc -2040026e -2040026e -67e24ef0 -20400265 -67ec4627 -2040026e -67e2462d -2040025f -1febfe00 -67e444d7 -2040025f -2040025f -67e44632 -2040025f -67e44634 -20200278 +20400262 +202002af +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 -c01c800a -c01d0011 -c00a8015 -c00b001a -c03d02b0 -c01302b0 -c00282b0 -202002ac +c01c800b +c01d0012 +c00a8016 +c00b001b +c03d02af +c01302af +c00282af +c036801e +202002ab df200005 -204002b4 +204002b3 58000001 e7e20005 6fe64147 e7e60005 202002fb -2040026e 20400262 +20400256 67e64147 -202002b0 +202002af df200003 -204002b4 +204002b3 6fe44ef4 e7e40005 202002fb -2040025f +20400253 67e44ef4 -202002b0 -00000000 -00000000 -00000000 -00000000 +202002af +20400253 +67e44de8 +202002af 00000000 00000000 00000000 @@ -3712,16 +3840,15 @@ 00000000 20200040 6fe24c18 -c001800b +c001800a c01b801f c0290029 c02a802f c02b0034 c0360038 -c036803d -c01982b0 -202007cd -204002b0 +c01982af +202007c6 +204002af 5800003f 67f04c6c 5fffffff @@ -3740,52 +3867,53 @@ 67e44c25 5800ec42 67e44c2a -2020027c -204001f0 -242282ae -2040025f +20400270 +20200778 +20400208 +242282ad +20400253 67e40051 df200003 -204002b4 +204002b3 6fe20046 e7e40005 7042a71d 202002fb -2040026e +20400262 67e24c98 df200064 d8a00183 -2040025c -202002b0 +20400250 +202002af df200002 -204002b4 +204002b3 6fe24c97 e7e20005 202002fb -2040026e +20400262 67e24c97 -203a02aa -202002b0 +203a02a9 +202002af df200003 -204002b4 +204002b3 6fe44de8 e7e40005 202002fb -2040025f -67e44de8 -202002b0 +00000000 +00000000 +00000000 20200040 6fe24c18 c00e8004 -202002ac -2040025f +202002ab +20400253 67e242a8 20402284 -242282c4 +242282c3 1a208c01 efe20006 c280001b -204002c0 +204002bf 6fe24ef8 203a3420 2020000f @@ -3801,9 +3929,9 @@ 6fea4ef9 e7ea0005 202002fb -204002c0 +204002bf 6fea4c12 -243a07cb +243a07c4 6fe24eec 207a0000 202048f0 @@ -3844,12 +3972,12 @@ c00f8016 c0158023 c0160033 -202007c7 -204001f0 -242282ae -2040025f +202007c0 +20400208 +242282ad +20400253 67e44ef6 -204002c0 +204002bf 704c8805 704c871d 204002f1 @@ -3860,9 +3988,9 @@ 6fe44ef6 e7e40005 202002fb -204001f0 -242282ae -204002c0 +20400208 +242282ad +204002bf 704c8805 704c871c 204002f1 @@ -3873,12 +4001,12 @@ 6fe4013e e7e40005 202002fb -20400265 +20400259 67ec42a9 -20400262 +20400256 67e647ce df200007 -204002b4 +204002b3 6fec0040 e7ec0005 204002fb @@ -3889,14 +4017,14 @@ 204033e5 700b9b01 20600000 -20400265 +20400259 67ec42a9 df200007 -204002b4 +204002b3 6fec0040 e7ec0005 204002fb -202007c9 +202007c2 00000000 00000000 00000000 @@ -3907,13 +4035,13 @@ c00c8006 c00e0017 c00d801f -202007c5 +202007be 704ea801 -20400265 +20400259 67ec42a9 -2040025f +20400253 67e200b6 -2040025f +20400253 9c40fe00 1fe17ffc 67e800b7 @@ -3924,21 +4052,21 @@ 20228015 704ea802 7042a703 -202002c0 +202002bf 6fe24c9b -c08102c4 -2040025f -203a02c4 -2040026e +c08102c3 +20400253 +203a02c3 +20400262 67e206a7 7042a715 -202002c0 +202002bf 6fe24c9b -c08102c4 -2040025f +c08102c3 +20400253 67e242a8 -203a02c4 -204002c0 +203a02c3 +204002bf 6ff04e1b 243a0029 7042a704 @@ -3974,53 +4102,53 @@ c0070024 c008802c c0098031 -202007c3 -20400265 +202007bc +20400259 67ec42a9 d8a04297 18007210 -2040025c +20400250 70429301 7042a70b 20200027 -20400265 +20400259 67ec42a9 7042a70c 20400027 -2040064b +2040063f 6fe24c97 247a0000 6fe24ef2 -c000824b +c000823f 20600000 -20400265 +20400259 67ec42a9 -2040026e +20400262 67e247f1 98007200 d8a047f2 -2040025c +20400250 7042a709 20200027 -20400265 +20400259 67ec42a9 7042a70a df200007 -204002b4 +204002b3 6fec0040 e7ec0005 202002fb -2040025f +20400253 67e242a8 7042a70d 704ef201 -202002c0 -2040025f +202002bf +20400253 67e242a8 -2040026e +20400262 1fe0fe0e 67e242a7 -202002c0 +202002bf 00000000 00000000 00000000 @@ -4033,15 +4161,15 @@ 20200040 6fe24c18 c0030006 -c004001c -c005002f -202007c1 -2040025f +c004001d +c0050030 +202007ba +20400253 67e242a8 -2040026e +20400262 67e206a4 20402284 -242282c4 +242282c3 1a208c01 efe20006 c2800018 @@ -4049,49 +4177,49 @@ 6fe242a8 6842439b 98467c00 -242282c0 +242282bf 7042a711 6fe2439a 67e242a8 -202002c0 +202002bf +704f1300 6fe206a4 67e20f12 20404894 -202002c0 -20400265 +202002bf +20400259 67ec42a9 7042a71a 6fe24c9b -c0008025 -c0010023 -20200029 -704c960b +c0008026 +c0010024 2020002a +704c960b +2020002b 704c9600 -2040002a +2040002b 704c8a02 -202001ba +202001d2 704c9602 df200007 -204002b5 +204002b4 6fec42a9 e7ec0005 202002fb 6fe24ca2 -c00002c4 -c00102c2 +c00002c3 +c00102c1 6fe24c9b -c00102c2 +c00102c1 704ca202 -20400265 +20400259 67ec42a9 -2040026e +20400262 67e24c8a 7042a708 7006a416 -204002c0 -202001ba -00000000 +204002bf +202001d2 00000000 00000000 20200040 @@ -4108,48 +4236,48 @@ c0230033 c0238034 c0288036 -202007bf -2040025f +202007b8 +20400253 67e44153 -2040025f +20400253 67e44151 -202002b0 +202002af df200005 -204002b4 +204002b3 6fe4414f e7e40005 6fe4414d e7e40005 202002fb -2040025f +20400253 67e4414f -2040025f +20400253 67e4414d -202002b0 +202002af df200004 -204002b4 +204002b3 6fe6414a e7e60005 202002fb -20400262 +20400256 67e6414a -202002b0 -202002ac -2040026e -202002b0 +202002af +202002ab +20400262 +202002af df200002 -204002b4 +204002b3 6fe24c9d e7e20005 202002fb -2040026e +20400262 67e24c9d -202002b0 -202002ac -2040026e -202002b0 +202002af +202002ab +20400262 +202002af df2000f2 -204002b4 +204002b3 6fe24c98 e7e20005 d8c00183 @@ -4162,15 +4290,15 @@ 6fe24c18 c0070005 c007800a -202002ac +202002ab df200003 -204002b4 +204002b3 6fe44dea e7e40005 202002fb -2040025f +20400253 67e44dea -202002b0 +202002af 00000000 00000000 00000000 @@ -4229,59 +4357,59 @@ c0058022 c006002d c0068036 -202007bd +202007b6 6fe44dec -c30102c2 +c30102c1 6fe44dea -c30102c2 +c30102c1 6fe24c9b -c08102c4 -2040025f +c08102c3 +20400253 67e40253 -2040025f +20400253 67e40255 -2040025f +20400253 67e40257 58000040 67e4430b -2040025f +20400253 67e4430d -2040025f +20400253 67e4430f 7042a712 -202002c0 -2040025f +202002bf +20400253 67e40253 6fe20031 -c30302c2 +c30302c1 7042a713 -202002c0 +202002bf 6fe24c9b -c08102c4 +c08102c3 6fe44dec -c30002c2 +c30002c1 6fe44dea -c30002c2 -20400265 +c30002c1 +20400259 67ec42a9 -2040026e +20400262 7042a718 -202002c0 -204001f0 -242282ae +202002bf +20400208 +242282ad df200005 -204002b4 +204002b3 6fe20046 e7e40005 6fe44dec e7e40005 202002fb -204001f0 -242282ae -2040025f +20400208 +242282ad +20400253 67e44dec df200003 -204002b4 +204002b3 6fe20046 e7e40005 202002fb @@ -4293,46 +4421,46 @@ c0018012 c0028017 c003001c -202007bb -2040026b +202007b4 +2040025f 67f04c6c -202002b0 +202002af df200004 -204002b4 +204002b3 580000fb e7e40005 58000005 e7e20005 202002fb df200009 -204002b4 +204002b3 6ff04de0 e7f00005 202002fb 6fe244de -243a02ae -20400265 +243a02ad +20400259 67ec4c7a -202002b0 +202002af 6fe244de -243a02ae -2040025f +243a02ad +20400253 67e44617 -2040025f +20400253 67e44619 -2040026e +20400262 2040002f 6042461b -2040026e +20400262 205a0037 245a003b -2040026e -20400265 -2040026e +20400262 +20400259 +20400262 67e24624 -2040026e +20400262 67e24e12 -202002b0 +202002af d8400000 c1000000 d8400002 @@ -4358,46 +4486,46 @@ c002001e c002802e c0048019 -202002ac +202002ab df200009 -204002b4 +204002b3 6ff04c24 e7f00005 202002fb df200041 -204002b4 +204002b3 d8c04c2c df200040 2040713a 202002fb df200009 -204002b4 +204002b3 6ff04138 e7f00005 202002fb df200007 -204002b4 +204002b3 6fec4140 e7ec0005 202002fb -2040026e +20400262 67e20f12 df20000b -204002b4 +204002b3 6fe20f12 c000802a c001002c -6ff04f11 +6ff04f15 e7f00005 efe40006 e7e40005 202002fb -6ff04f1b +6ff04f1f 20200026 -6ff04f25 +6ff04f29 20200026 df200008 -204002b4 +204002b3 580003fd e7e40005 580000ff @@ -4424,22 +4552,22 @@ c00c8028 c00d002d c00d8030 -202007b9 -2040026b +202007b2 +2040025f 67f04c1c -202002b0 -20400273 +202002af +20400267 d8a0468a df200042 2040713a df200042 d8c0468a d8400000 -20400194 +204001ba 60424689 -202002b0 +202002af df2000f9 -204002b4 +204002b3 d8c0468a df200040 2040713c @@ -4447,23 +4575,23 @@ 204070e4 202002fb df200003 -204002b4 +204002b3 6fe44159 e7e40005 202002fb -2040025f +20400253 67e44159 -202002b0 +202002af df200002 -204002b4 +204002b3 6fe24133 e7e20005 202002fb -2040026e +20400262 67e24133 -202002b0 +202002af df200005 -204002b4 +204002b3 6fe44153 e7e40005 6fe44151 @@ -4484,11 +4612,11 @@ c0010017 c0028019 c004802a -202007b7 +202007b0 7920001c -20400262 +20400256 67e64147 -2040026e +20400262 d8400800 984ffe00 d840ffff @@ -4497,42 +4625,42 @@ 18427e00 18000e02 20407141 -2040026e +20400262 67e24c99 67e24c9a -202002c0 +202002bf 7042a702 -202002b0 -20400265 +202002af +20400259 67ec42a9 -2040025f +20400253 67e40251 -2040025f +20400253 67e200b6 -2040025f -2040026e +20400253 +20400262 67e24ad0 245a0026 704c9b01 7042a705 -202002c0 +202002bf 6fe44dec 79207e00 67e44dec 20600000 6fe24ca2 -c00002c4 -c00102c2 +c00002c3 +c00102c1 6fe24c9b -c00102c2 +c00102c1 704ca200 -20400265 +20400259 67ec42a9 7042a707 -2040026e -c00082c0 +20400262 +c00082bf 7042a719 -202002c0 +202002bf 00000000 00000000 00000000