Index: Librarier/bt_rom/format/headset.format
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/bt_rom/format/headset.format (revision 5392)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/bt_rom/format/headset.format (working copy)
@@ -277,7 +277,7 @@
8 mem_remote_ext_features1
2 mem_le_scan_window_temp
- 256 mem_zcode_buff_user
+// 256 mem_zcode_buff_user
1 mem_queue_init_flag
2 mem_hci_version_svnid
@@ -305,6 +305,7 @@
1 mem_role_switch_enc_flag
1 mem_initiate_enc_master
1 mem_le_send_empty_flag
+ 2 mem_hci_conn_accept_timeout
0 mem_headset_end
)
(
@@ -329,6 +330,7 @@
0x02 UNKNOWN_CONNECTION_IDENTIFIER
0x04 PAGE_TIMEOUT
0x08 CONN_TIMEOUT
+ 0x10 Connection_Accept_Timeout_Exceeded
)
(
0x00 HCI_ROLE_MASTER
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 5392)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (working copy)
@@ -110,6 +110,9 @@
call p_inquiry_dispatch
call inquiry_scan_dispatch
call p_page_scan_dispatch
+
+ call p_rcv_conn_req_accept_timeout_dispatch
+
branch main_loop+11
p_inquiry_dispatch:
@@ -527,32 +530,6 @@
store 1,mem_lpm_write_temp_charge_control
rtn
-p_evt_first_power_on:
-ifdef FUNCTION_CHARGE_DEFAULT_DISABLE
- call p_lpm_charge_init_pwr_off
-else
- call p_lpm_charge_init_pwr_on
-endif //FUNCTION_CHARGE_DEFAULT_DISABLE
- jam BT_EVT_FIRST_PWR_ON,mem_fifo_temp
- branch ipc_tx_bt_event
-
-
-p_evt_restart:
- // Check if last have shutdown charge or not
- fetch 1,mem_hibernate_flag
- bbit0 4,p_evt_restart_continue
-ifdef FUNCTION_CHARGE_DEFAULT_DISABLE
- call p_lpm_charge_init_pwr_off_restart
-else
- // If last shutdown charge, need restart it.
- call p_lpm_charge_init_start_charge_ctrl
-endif //FUNCTION_CHARGE_DEFAULT_DISABLE
-p_evt_restart_continue:
- //call p_clear_charge_stop_power_off_flag
- //call p_clear_charge_reset_flag
- call p_clear_charge_reset_and_charge_stop_power_off_flag
- jam BT_EVT_RESTART,mem_fifo_temp
- branch ipc_tx_bt_event
/*
p_headset_cb_saradc_read_hvin_wait:
fetch 1,mem_saradc_flag
@@ -564,9 +541,9 @@
rtn
*/
// call p_clear_charge_reset_flag
- call p_clear_charge_reset_and_charge_stop_power_off_flag
- jam BT_EVT_RESTART,mem_fifo_temp
- branch ipc_tx_bt_event
+// call p_clear_charge_reset_and_charge_stop_power_off_flag
+// jam BT_EVT_RESTART,mem_fifo_temp
+// branch ipc_tx_bt_event
p_set_gpio_after_lpm:
@@ -591,14 +568,6 @@
p_vp_check_get_data:
rtn
-
-p_clear_charge_reset_flag:
-p_clear_charge_reset_and_charge_stop_power_off_flag:
- fetch 4,core_lpm_buck_cfg
-// set0 28,pdata
- set0 29,pdata
- store 4,core_lpm_reg
- branch p_lpm_write_ctrl_buck
p_set_first_pwr_on_flag:
// 0x8341 bit2, for first power on detect
@@ -860,8 +829,7 @@
call p_ipc_rx_hci_data_two_byte
fetcht 1,mem_conn_handle
isub temp,null
- rtn zero
- branch p_hci_send_event_command_complete_error_command_disallowed
+ rtn
p_roles_newconn_loop:
call master_newconn_once
@@ -3308,11 +3276,9 @@
set1 CHARGE_CHGR_SHUTDOWN_BIAS,pdata
branch p_lpm_write_charge_cfg
-wake_from_power_close_charge:
- call p_lpm_charge_init_pwr_off
- branch wake_from_power_continue
endif //FUNCTION_CHARGE_DEFAULT_DISABLE
+
p_lpm_charge_init_pwr_on:
ifdef CHARGE_DEBUG_LOG
// set flag
@@ -3401,8 +3367,6 @@
branch p_lpm_write_wait_clock
-
-
/////////////////////////////////////////////////////// CHARGE //////////////////////////////////////////////////////////////////
p_lpm_charge_set_wakeup_setting:
ifdef FSC_CHARGE
@@ -3461,7 +3425,9 @@
jam role_switch_enc,mem_role_switch_enc_flag
branch p_hci_send_event_command_status
endif
-
-//p_app_init:
-// call z_set_gpio_after_lpm,wake
-// branch z_app_init
+
+//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
\ No newline at end of file
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 5392)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (working copy)
@@ -60,6 +60,7 @@
beq 2,p_hci_send_event_command_status_err_command_disallowed
fetch 1,mem_conn_status
beq 2,p_hci_send_event_command_status_err_command_disallowed
+ jam 0,mem_conn_req_status
call p_ipc_rx_hci_data_six_byte
store 6,mem_hci_plap
jam hci_cmd_accept_conn,mem_hci_cmd
@@ -336,7 +337,8 @@
// branch p_switch_role_check_encryption
z_hci_parse_packet_cmd_ogf_link_policy_read_link_policy_settings:
- call p_hci_parse_connection_handle_check
+ call p_hci_parse_connection_handle_check
+ nbranch p_hci_send_event_command_complete_error_command_disallowed,zero
arg 5,loopcnt
call p_hci_prepare_send_event_command_complete_with_status_success
fetch 1,mem_conn_handle
@@ -347,6 +349,7 @@
z_hci_parse_packet_cmd_ogf_link_policy_write_link_policy_settings:
call p_hci_parse_connection_handle_check
+ nbranch p_hci_send_event_command_complete_error_command_disallowed,zero
call p_ipc_rx_hci_data_two_byte
store 2,mem_link_policy_settings
arg 3,loopcnt
@@ -551,6 +554,7 @@
call p_ipc_rx_hci_data_one_byte //todo
store 1,mem_mesh_event_parameter_status
jam hci_cmd_reject_conn,mem_hci_cmd
+ jam LOCAL_HOST,mem_disconn_reason_send
call p_hci_send_event_command_status
branch p_hci_send_connection_rtn_error
@@ -732,12 +736,28 @@
org z
z_hci_parse_packet_cmd_ogf_link_control4:
fetch 1,mem_mesh_hci_opcode_ocf
+ beq HCI_READ_CLOCK_OFFSET,z_hci_parse_packet_cmd_ogf_link_control_read_clock_offset
beq HCI_IO_CAP_REQUEST_REPLY,z_hci_parse_packet_cmd_ogf_link_control_io_cap_request_reply //2B
beq HCI_USER_CONFIRMATION_REQUEST_REPLY,z_hci_parse_packet_cmd_ogf_link_control_user_confirmation_request_reply //2C
// beq HCI_USER_CONFIRMATION_REQUEST_NEGATIVE_REPLY,z_hci_parse_packet_cmd_ogf_link_control_user_confirmation_request_negative_reply //2d
branch p_hci_send_event_command_complete_error_command_nuknown
+z_hci_parse_packet_cmd_ogf_link_control_read_clock_offset:
+ call p_hci_parse_connection_handle_check
+ nbranch p_hci_send_event_command_complete_error_command_disallowed,zero
+ call p_hci_send_event_command_status
+ jam 5,mem_mesh_event_para_total_length
+ jam HCI_EVENT_READ_CLOCK_OFFSET_COMPLETE,mem_mesh_event_head_event_code
+ call p_hci_prepare_send_event
+ force 0,pdata //Status
+ istore 1,contw
+ fetch 1,mem_conn_handle //conn_handle
+ istore 2,contw
+ fetch 2,mem_slot_offset //clock_offset
+ istore 2,contw
+ branch ipc_hci_tx_start
+
z_hci_parse_packet_cmd_ogf_link_control_io_cap_request_reply: //2B
//BD_ADDR, IO_Capability,
call p_ipc_rx_hci_data_six_byte
@@ -827,6 +847,7 @@
z_hci_parse_packet_cmd_ogf_controller_and_baseband_write_link_supervision_timeout: //37
call p_hci_parse_connection_handle_check
+ nbranch p_hci_send_event_command_complete_error_command_disallowed,zero
call p_ipc_rx_hci_data_two_byte
store 2,mem_supervision_to
arg 3,loopcnt
@@ -876,7 +897,8 @@
fetch 1,mem_mesh_hci_opcode_ocf
beq HCI_READ_CURRENT_IAC_LAP,z_hci_parse_packet_cmd_ogf_controller_and_baseband_read_current_IAC_LAP //39
beq HCI_WRITE_CURRENT_IAC_LAP,z_hci_parse_packet_cmd_ogf_controller_and_baseband_write_current_IAC_LAP //3a
-
+ 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
branch p_hci_send_event_command_complete_error_command_nuknown
z_hci_parse_packet_cmd_ogf_controller_and_baseband_read_current_IAC_LAP:
@@ -895,7 +917,17 @@
store 3,mem_glap
branch p_hci_send_event_command_complete_without_payload
+z_hci_parse_packet_cmd_ogf_controller_and_baseband_read_conn_accept_timeout: //15
+ arg 3,loopcnt
+ call p_hci_prepare_send_event_command_complete_with_status_success
+ fetch 2, mem_hci_conn_accept_timeout
+ istore 2,contw
+ branch ipc_hci_tx_start
+z_hci_parse_packet_cmd_ogf_controller_and_baseband_write_conn_accept_timeout:
+ call p_ipc_rx_hci_data_two_byte
+ store 2,mem_hci_conn_accept_timeout
+ branch p_hci_send_event_command_complete_without_payload
org z
z_hci_parse_packet_cmd_ogf_le_controller1:
@@ -2049,6 +2081,9 @@
org z
z_parse_lmp_conn_req:
// branch p_hci_send_conn_req_event
+ force temp_timer,queue
+ fetch 2,mem_hci_conn_accept_timeout
+ call timer_init
z_hci_send_conn_req_event:
fetch 1,mem_conn_req_status
@@ -2141,7 +2176,6 @@
set1 28,pdata
store 4,core_lpm_reg
branch p_lpm_write_ctrl_buck
- rtn
org z
z_hci_send_inquiry_comple:
@@ -2242,11 +2276,11 @@
call enable_xip
fetch 1,mem_hibernate_flag
- bbit0 2,p_evt_first_power_on
- bbit1 5,p_evt_restart
+ bbit0 2,z_evt_first_power_on
+ bbit1 5,z_evt_restart
ifdef FUNCTION_CHARGE_DEFAULT_DISABLE
// Check if last have shutdown charge or not
- fetch 1,mem_hibernate_flag
+// fetch 1,mem_hibernate_flag
bbit0 4,wake_from_power_close_charge
call p_lpm_charge_init_pwr_off_restart
else
@@ -2254,15 +2288,22 @@
call p_lpm_charge_init_pwr_on
endif //FUNCTION_CHARGE_DEFAULT_DISABLE
-wake_from_power_continue:
- jam BT_EVT_RESET,mem_fifo_temp
- branch ipc_tx_bt_event
-
-z_evt_restart:
- call p_clear_charge_reset_flag
- jam BT_EVT_RESTART,mem_fifo_temp
+z_evt_first_power_on:
+ifdef FUNCTION_CHARGE_DEFAULT_DISABLE
+ call p_lpm_charge_init_pwr_off
+else
+ call p_lpm_charge_init_pwr_on
+endif //FUNCTION_CHARGE_DEFAULT_DISABLE
+ jam BT_EVT_FIRST_PWR_ON,mem_fifo_temp
branch ipc_tx_bt_event
+//z_clear_charge_reset_flag:
+//z_clear_charge_reset_and_charge_stop_power_off_flag:
+// fetch 4,core_lpm_buck_cfg
+// //set0 28,pdata
+// set0 29,pdata
+// store 4,core_lpm_reg
+// branch p_lpm_write_ctrl_buck
z_set_gpio_after_lpm:
call qspi_init_set
@@ -2271,6 +2312,14 @@
branch qspi_release_powerdown_flash
// nop 100
//rtn
+ifdef FUNCTION_CHARGE_DEFAULT_DISABLE
+wake_from_power_close_charge:
+ call p_lpm_charge_init_pwr_off
+// branch wake_from_power_continue
+//wake_from_power_continue:
+ jam BT_EVT_RESET,mem_fifo_temp
+ branch ipc_tx_bt_event
+endif
z_buck_setting:
fetcht 4,core_lpm_buckctrl
@@ -2280,13 +2329,34 @@
jam 0x20,0x8005
branch p_lpm_write_wait_clock
-
//z_app_init_efuse_data:
// setarg EFUSE_UCODE_ADC_GPIO_0_5
// arg mem_efuse_adc_offset,rega
// arg 8,temp
// branch efuse_read_data
+org z
+z_evt_restart:
+ // Check if last have shutdown charge or not
+// fetch 1,mem_hibernate_flag
+ bbit0 4,z_evt_restart_continue
+ifdef FUNCTION_CHARGE_DEFAULT_DISABLE
+ call p_lpm_charge_init_pwr_off_restart
+else
+ // If last shutdown charge, need restart it.
+ call p_lpm_charge_init_start_charge_ctrl
+endif //FUNCTION_CHARGE_DEFAULT_DISABLE
+z_evt_restart_continue:
+ //call p_clear_charge_stop_power_off_flag
+// call z_clear_charge_reset_and_charge_stop_power_off_flag
+ fetch 4,core_lpm_buck_cfg
+ //set0 28,pdata
+ set0 29,pdata
+ store 4,core_lpm_reg
+ call p_lpm_write_ctrl_buck
+ jam BT_EVT_RESTART,mem_fifo_temp
+ branch ipc_tx_bt_event
+
org z
z_ipc_init:
@@ -2472,7 +2542,7 @@
beq hci_cmd_nopair,cmd_nopair
beq hci_cmd_linkkey,cmd_has_key
beq hci_cmd_nokey,cmd_no_key
- beq hci_cmd_reject_conn,cmd_disconn
+ beq hci_cmd_reject_conn,z_cmd_disconn
beq hci_cmd_role_switch,cmd_role_switch
beq hci_cmd_accept_conn,cmd_accept_conn
beq hci_cmd_accept_with_switch,z_cmd_accept_with_switch
@@ -2488,6 +2558,11 @@
beq hci_cmd_send_supervision,z_cmd_send_supervision
branch process_cmd_conn_handle+4
+z_cmd_disconn:
+ jam 10,mem_conn_timer
+ jam LMP_DETACH,mem_lmo_opcode2
+ branch cmd_exit
+
z_cmd_accept_with_switch:
jam role_switch_rec_conn_req,mem_role_switch_enc_flag
branch cmd_accept_with_switch
@@ -2962,6 +3037,41 @@
// jam 1,mem_initiate_enc_master
// branch send_lmp_accepted_enc_mode
+org z
+z_rcv_conn_req_accept_timeout:
+ force temp_timer,queue
+ call timer_check
+ branch z_rcv_conn_req_accept_timeout_reject_conn_req,blank
+ rtn
+
+z_rcv_conn_req_accept_timeout_reject_conn_req:
+ fetch 6,mem_plap
+ store 6,mem_hci_plap //to pass hci cmd handle check
+ jam Connection_Accept_Timeout_Exceeded,mem_disconn_reason_send
+ jam hci_cmd_reject_conn,mem_hci_cmd
+
+ jam Connection_Accept_Timeout_Exceeded,mem_mesh_event_parameter_status
+ jam 0,mem_conn_status
+ jam 0,mem_conn_req_status
+// branch p_hci_send_connection_error
+ jam 11,mem_mesh_event_para_total_length
+ jam HCI_EVENT_CONNECTION_COMPLETE,mem_mesh_event_head_event_code
+ call p_hci_prepare_send_event
+ fetch 1,mem_mesh_event_parameter_status
+ istore 1,contw
+ fetch 1,mem_conn_handle
+ istore 2,contw
+ fetch 6,mem_plap
+ istore 6,contw
+ force 1,pdata /* connection type=1:ACL */
+ istore 1,contw
+ force 0,pdata
+ fetcht 1,mem_state_map
+ isolate1 smap_encryption,temp
+ setflag true,0,pdata
+ istore 1,contw
+ branch ipc_hci_tx_start
+
org z
// Charge need this to generate clock.
Index: ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat (revision 5392)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/user.dat (working copy)
@@ -277,6 +277,7 @@
mem_le_conn_status:00
mem_io_cap_flag:00
mem_inquiry_mode:00
+mem_hci_conn_accept_timeout:a0 1f #default value : 5.06s
mem_param_alloc_normal_buffer_start_address:00 18
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 5392)
+++ /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
@@ -326,7 +325,7 @@
3
4
1
- 1
+ 0
0
0
..\..\..\..\..\..\Librarier\device\yc11xx.c
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 5392)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx (working copy)
@@ -16,7 +16,7 @@
ARMCM0
ARM
- ARM.CMSIS.5.5.1
+ ARM.CMSIS.5.3.0
http://www.keil.com/pack/
IROM(0x00000000,0x00040000) IRAM(0x20000000,0x00020000) CPUTYPE("Cortex-M0") CLOCK(12000000) ESEL ELITTLE
@@ -33,7 +33,7 @@
-
+ $$Device:ARMCM0$Device\ARM\SVD\ARMCM0.svd
0
0
@@ -184,7 +184,6 @@
0
0
0
- 0
0
0
8
Index: ModuleDemo/25_OTA/bt_demo/CM0/User/btreg.h
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/btreg.h (revision 5392)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/btreg.h (working copy)
@@ -1681,31 +1681,31 @@
#define mem_remote_ext_features0 0x4e22
#define mem_remote_ext_features1 0x4e2a
#define mem_le_scan_window_temp 0x4e32
-#define mem_zcode_buff_user 0x4e34
-#define mem_queue_init_flag 0x4f34
-#define mem_hci_version_svnid 0x4f35
-#define mem_bd_addr_new 0x4f37
-#define mem_efuse_encryp_data 0x4f3d
-#define mem_encryp_inital_value 0x4f5d
-#define mem_encryp_param 0x4f5f
-#define mem_encryp_count 0x4f61
-#define mem_qspi_lock_flag_cm0 0x4f62
-#define mem_qspi_lock_flag_respin 0x4f63
-#define mem_qspi_lock_victim 0x4f64
-#define mem_efuse_64_bytes 0x4f65
-#define mem_check_attempt_limit 0x4fa5
-#define mem_hci_remote_name_req_flag 0x4fa6
-#define mem_hci_remote_name 0x4fa7
-#define mem_le_wait_process_cmd 0x4fe7
-#define mem_loopcnt 0x4fe8
-#define mem_le_master_sm 0x4fea
-#define mem_adc_current_value 0x4feb
-#define mem_le_conn_status 0x4fed
-#define mem_le_hci_conn_peer_addr_type 0x4fee
-#define mem_role_switch_enc_flag 0x4fef
-#define mem_initiate_enc_master 0x4ff0
-#define mem_le_send_empty_flag 0x4ff1
-#define mem_headset_end 0x4ff2
+#define mem_queue_init_flag 0x4e34
+#define mem_hci_version_svnid 0x4e35
+#define mem_bd_addr_new 0x4e37
+#define mem_efuse_encryp_data 0x4e3d
+#define mem_encryp_inital_value 0x4e5d
+#define mem_encryp_param 0x4e5f
+#define mem_encryp_count 0x4e61
+#define mem_qspi_lock_flag_cm0 0x4e62
+#define mem_qspi_lock_flag_respin 0x4e63
+#define mem_qspi_lock_victim 0x4e64
+#define mem_efuse_64_bytes 0x4e65
+#define mem_check_attempt_limit 0x4ea5
+#define mem_hci_remote_name_req_flag 0x4ea6
+#define mem_hci_remote_name 0x4ea7
+#define mem_le_wait_process_cmd 0x4ee7
+#define mem_loopcnt 0x4ee8
+#define mem_le_master_sm 0x4eea
+#define mem_adc_current_value 0x4eeb
+#define mem_le_conn_status 0x4eed
+#define mem_le_hci_conn_peer_addr_type 0x4eee
+#define mem_role_switch_enc_flag 0x4eef
+#define mem_initiate_enc_master 0x4ef0
+#define mem_le_send_empty_flag 0x4ef1
+#define mem_hci_conn_accept_timeout 0x4ef2
+#define mem_headset_end 0x4ef4
#define mem_usb_mouse_data 0x4ace
#define mem_usb_kb_data 0x4ade
#define mem_usb_kb_multikey 0x4aee
Index: ModuleDemo/25_OTA/bt_demo/CM0/User/device/battery/yc11xx_dev_battery.c
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/device/battery/yc11xx_dev_battery.c (revision 5392)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/device/battery/yc11xx_dev_battery.c (working copy)
@@ -104,7 +104,8 @@
HWRITE(mem_battery_vol, gCurgadcVal);
// Normal state need set present wakeup
- Bat_UpdateChargeWakeupSetting(0, CHGR_IN_PRESENT);
+ Bat_UpdateChargeWakeupSetting(0, CHGR_IN_PRESENT); //high wakeup
+// Bat_UpdateChargeWakeupSetting(1, 0); //low wakeup
Bat_StateSwitchPooling();
SYS_SetTimer(&gReadBat_Timer,BAT_READ_ADC_COUNT,
TIMER_CYCLE,Bat_CBLevelCheck);
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 5392)
+++ /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 5392)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/memmap.format (working copy)
@@ -1679,31 +1679,31 @@
0x4e22 mem_remote_ext_features0
0x4e2a mem_remote_ext_features1
0x4e32 mem_le_scan_window_temp
-0x4e34 mem_zcode_buff_user
-0x4f34 mem_queue_init_flag
-0x4f35 mem_hci_version_svnid
-0x4f37 mem_bd_addr_new
-0x4f3d mem_efuse_encryp_data
-0x4f5d mem_encryp_inital_value
-0x4f5f mem_encryp_param
-0x4f61 mem_encryp_count
-0x4f62 mem_qspi_lock_flag_cm0
-0x4f63 mem_qspi_lock_flag_respin
-0x4f64 mem_qspi_lock_victim
-0x4f65 mem_efuse_64_bytes
-0x4fa5 mem_check_attempt_limit
-0x4fa6 mem_hci_remote_name_req_flag
-0x4fa7 mem_hci_remote_name
-0x4fe7 mem_le_wait_process_cmd
-0x4fe8 mem_loopcnt
-0x4fea mem_le_master_sm
-0x4feb mem_adc_current_value
-0x4fed mem_le_conn_status
-0x4fee mem_le_hci_conn_peer_addr_type
-0x4fef mem_role_switch_enc_flag
-0x4ff0 mem_initiate_enc_master
-0x4ff1 mem_le_send_empty_flag
-0x4ff2 mem_headset_end
+0x4e34 mem_queue_init_flag
+0x4e35 mem_hci_version_svnid
+0x4e37 mem_bd_addr_new
+0x4e3d mem_efuse_encryp_data
+0x4e5d mem_encryp_inital_value
+0x4e5f mem_encryp_param
+0x4e61 mem_encryp_count
+0x4e62 mem_qspi_lock_flag_cm0
+0x4e63 mem_qspi_lock_flag_respin
+0x4e64 mem_qspi_lock_victim
+0x4e65 mem_efuse_64_bytes
+0x4ea5 mem_check_attempt_limit
+0x4ea6 mem_hci_remote_name_req_flag
+0x4ea7 mem_hci_remote_name
+0x4ee7 mem_le_wait_process_cmd
+0x4ee8 mem_loopcnt
+0x4eea mem_le_master_sm
+0x4eeb mem_adc_current_value
+0x4eed mem_le_conn_status
+0x4eee mem_le_hci_conn_peer_addr_type
+0x4eef mem_role_switch_enc_flag
+0x4ef0 mem_initiate_enc_master
+0x4ef1 mem_le_send_empty_flag
+0x4ef2 mem_hci_conn_accept_timeout
+0x4ef4 mem_headset_end
0x4ace mem_usb_mouse_data
0x4ade mem_usb_kb_data
0x4aee mem_usb_kb_multikey
Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (revision 5392)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (working copy)
@@ -64,92 +64,93 @@
2000003f
c2840061
c0010088
-c00701c8
-c00801d6
-c00e01b6
-c00f01db
-c010026a
-c0120238
-c0190198
-c01c81a5
-c01d01a7
-c01f025d
-c020822d
-c0220791
-c02a0746
-c02c069e
-c02e06ba
-c02e86c0
-c0350793
-c0358795
-c036021f
-c03c0223
-c04080f6
-c0428110
-c04300d2
-c04f00d6
-c0500188
-c052072e
-c054071e
-c05c8797
-c05d061b
-c070017c
+c00701b9
+c00801c7
+c00e01a7
+c00f01cc
+c010025a
+c0120228
+c0190189
+c01c8196
+c01d0198
+c01f024d
+c020821d
+c0220784
+c02a0736
+c02c068e
+c02e06aa
+c02e86b0
+c0350786
+c0358788
+c0360210
+c03c0214
+c04080f7
+c0428111
+c04300d3
+c04f00d7
+c0500179
+c052071e
+c054070e
+c05c878a
+c05d060b
+c0700171
20202baf
-c0038799
-c0060287
-c009079b
-c00985be
-c00a059d
-c01185b1
-c01286c2
-c01306c6
-c01386c8
-c01406ca
-c01486cb
-c01506d0
-c01d8419
-c01f0422
-c01f83c5
-c0208512
-c021070f
-c02404b6
-c0258525
-c0278492
-c028813b
-c029063b
-c02c079d
-c02d8654
-c02e879f
-c030065e
-c032065a
-c03706e6
-c03807a1
-c03887a3
-c03a018c
-c03a87a5
-c04906d1
-c052866d
-c053066d
-c075077b
+c003878c
+c0060277
+c009078e
+c00985ae
+c00a058d
+c01185a1
+c01286b2
+c01306b6
+c01386b8
+c01406ba
+c01486bb
+c01506c0
+c01d8409
+c01f0412
+c01f83b5
+c0208502
+c02106ff
+c02404a6
+c0258515
+c0278482
+c028813c
+c029062b
+c02c0790
+c02d8644
+c02e8792
+c030064e
+c032064a
+c03706d6
+c0380794
+c0388796
+c03a017d
+c03a8798
+c04906c1
+c052865d
+c053065d
+c075076b
c1590000
c16a0000
20202baf
20406490
20406863
20406326
-204000a3
+204000a4
2040203c
20403153
-20400092
+20400093
2040233d
-20400098
+20400099
+20400781
20202021
c68e0000
18000e02
20407148
7d3a001c
243a209e
-202007a7
+2020079a
6fe24133
c4008000
6fe20030
@@ -162,7 +163,7 @@
18423600
202023b7
204045b4
-204000a6
+204000a7
2020455e
6fe244d9
c1808000
@@ -179,23 +180,23 @@
7854fc00
78487c00
69644e32
-204000c7
-243680c4
+204000c8
+243680c5
204047d5
1a227e00
67e24626
6fec04dd
67ec0633
6fe24c8b
-c00083e8
-20400327
+c00083d8
+20400317
204046d3
-243680c4
+243680c5
6fe204dc
-c00300c4
-20400327
+c00300c5
+20400317
6fe44e32
-243a00b2
+243a00b3
20600000
204045c7
204045bd
@@ -211,16 +212,16 @@
6fe24013
793ffe06
67e24013
-202000d8
-204000d8
+202000d9
+204000d9
20202bd8
20405900
-20558178
+2055816d
d8e00009
20407357
-205580e5
+205580e6
70894bba
-204000ed
+204000ee
708907ff
20402a70
70895074
@@ -231,13 +232,13 @@
793ffe13
67e8804c
70800502
-20400137
+20400138
6ff04246
98000000
20600000
6fe242b4
-c00080f0
-c00100f0
+c00080f1
+c00100f1
5888e0d0
67e68955
584a103c
@@ -245,7 +246,7 @@
70895468
20600000
20407a63
-20308102
+20308103
708955d4
20000004
708955d2
@@ -253,7 +254,7 @@
708955d1
20000004
6fe242b4
-c0008100
+c0008101
708955d0
708956e0
18002a08
@@ -277,7 +278,7 @@
20402a7b
58000250
20402bb1
-204000ed
+204000ee
6fe28906
79207e00
67e28906
@@ -291,14 +292,14 @@
2000000a
7089027d
6fe242b4
-c000012c
+c000012d
70894cfb
70894def
70894eec
70894f5e
-c000812e
+c000812f
20202a51
-20400132
+20400133
20202a49
708956f7
20402a5d
@@ -325,7 +326,7 @@
180a7e00
1fe17e0f
1fe67c04
-20210144
+20210145
67e2063c
67e208cd
1c40fe20
@@ -337,7 +338,7 @@
2020470c
20600000
58000000
-da204f65
+da204e65
d8400040
202056bd
58000023
@@ -345,13 +346,13 @@
d8400001
204056bd
6fe20f12
-245a0160
+245a0161
58000034
da204be7
d8400008
202056bd
1fe67c2a
-20210163
+20210164
5800002a
67e24bd8
1fe17e0f
@@ -362,45 +363,29 @@
9841fe00
67e24bd7
20600000
-2040074a
-700f0d9f
-20203f28
-6fe24bce
-c3020172
-2040074c
-2040017d
-700f0d6a
-20203f28
-2040017d
-700f0d6a
-20203f28
204054b0
204054b5
200007d0
2020553b
20600000
6fe8833e
-793ffe1d
-67e8804c
-20200185
-6fe8833e
79207e1a
67e8804c
-20200185
-20400137
+20200176
+20400138
70800520
-20200137
-20400772
-20400181
+20200138
+20400762
+20400172
d85fffff
20202cbe
78547c00
204052b0
6fe20048
207a0000
-202007a9
-204007ab
-20200276
+2020079c
+2040079e
+20200266
6fe2004b
79207e03
67e2004b
@@ -411,19 +396,19 @@
d8c00183
df2000f0
d8400000
-204001a0
+20400191
60440099
2020238d
efe80006
207a0000
18408404
-c20001a0
+c2000191
20600000
-704fa500
+704ea500
20202414
-6fe24fa5
+6fe24ea5
1fe0fe01
-67e24fa5
+67e24ea5
20405b02
20402588
2436a429
@@ -434,33 +419,33 @@
20402841
20402827
20404b89
-204001b9
+204001aa
20202425
20404b89
-204001b9
+204001aa
20202198
6fe242a7
207a0000
6fe2007c
247a0000
-202007ad
-204002e9
+202007a0
+204002d9
704c8a02
-202007af
+202007a2
704c9b02
704c8a00
-202001c6
+202001b7
704c9b00
704ca100
704c9f00
-202007b1
+202007a4
6fe24c9a
-203a07b3
+203a07a6
6fe24c99
-203a07a7
+203a079a
1fe0ffff
67e24c99
-202007b3
+202007a6
6fe20018
1ff18400
184f840a
@@ -469,23 +454,23 @@
18467e00
20600000
20402108
-6fe24fa6
-243a0203
+6fe24ea6
+243a01f4
704c8a04
-202001c4
+202001b5
204024d2
7854fc00
6fe24c9b
-c00081d6
+c00081c7
6fe2004c
c28221c5
6fe20030
c30221c4
-2020030c
+202002fc
6fe24c9c
-c00001ea
-c00081ed
-c00101f0
+c00001db
+c00081de
+c00101e1
704c8702
20600000
704c880f
@@ -497,7 +482,7 @@
704c88ff
704c872f
20600000
-6fe24fa6
+6fe24ea6
203a4dab
6fe4012c
1fe0f3fd
@@ -506,42 +491,42 @@
98408a00
d8c0073b
2040713a
-20400217
+20400208
68420053
6fe2073a
98467e00
1fe67c0e
-20210203
+202101f4
20204db7
704c88ff
704c8707
-20400357
+20400347
58000000
e7e20005
6fec42a9
e7ec0005
df200040
-d8c04fa7
+d8c04ea7
2040712d
df2000b8
204070e4
-20400361
-6fe24fa6
-704fa600
+20400351
+6fe24ea6
+704ea600
70005300
-c0010215
+c0010206
20204dbb
20404f5f
20204dbb
68420739
-58004fa7
+58004ea7
98408a00
6fe2073a
68420739
98467200
d8c0073b
2020712d
-6fe24fa5
+6fe24ea5
1fe67c64
242127fd
202027ea
@@ -550,22 +535,21 @@
98000c00
1d027e00
20202931
-20400298
+20400288
68420046
98467c00
-20628000
-202002e7
+20600000
20402337
-202c0235
+202c0225
204024ca
-243a022d
+243a021d
78587c00
1d027e00
67e84169
20600000
2040248f
704c8a00
-202007b5
+202007a8
204021ec
24740000
78547c00
@@ -573,15 +557,15 @@
793f800b
20402b71
2040232b
-c5058248
+c5058238
204024ca
-243a023d
+243a022d
78547c00
1c427e00
67e84169
78387c00
7834fc00
-202007b7
+202007aa
20402b6f
d8200010
20402321
@@ -590,10 +574,10 @@
20402917
204024ab
204024f3
-20368254
+20368244
204024ca
-243a024f
-20200242
+243a023f
+20200232
18000401
6fe20031
793ffe01
@@ -602,7 +586,7 @@
20402940
78347c00
704c8a01
-202007b5
+202007a8
70011600
70015000
204024d2
@@ -610,11 +594,11 @@
2040724d
6fe24c9b
207a0000
-2020030c
+202002fc
20404d8e
c6108000
-6fe24ff0
-c0008276
+6fe24ef0
+c0008266
20600000
6fe20030
c283a1e1
@@ -627,57 +611,57 @@
67e2004b
204021e1
c6108000
-202007ab
+2020079e
704c8803
704c8706
-20400357
+20400347
18007e00
e7e20005
6fe20046
e7e40005
-20200361
+20200351
704c8806
704c8717
-20400357
+20400347
6fec0040
e7ec0005
-20200361
+20200351
704c8806
704c8716
-20200280
-2040028d
-204005ff
+20200270
+2040027d
+204005ef
207a0000
20403e9d
20628000
-20200287
+20200277
6fe243de
207a0000
20403e9d
20628000
1fe20c00
20403e92
-c00582d7
+c00582c7
20203ef4
-204002ac
+2040029c
2040712d
-202002a9
-204002ac
+20200299
+2040029c
efe40006
-202002a9
-204002ac
+20200299
+2040029c
efe60006
-202002a9
-204002ac
+20200299
+2040029c
efec0006
-202002a9
-204002ac
+20200299
+2040029c
efee0006
-202002a9
-204002ac
+20200299
+2040029c
eff00006
-202002a9
-204002ac
+20200299
+2040029c
efe20006
18c20400
60464bf2
@@ -687,19 +671,19 @@
20600000
704e1102
20600000
-704fed01
+704eed01
7044d901
704c8b01
-202002f9
+202002e9
6fec4c8d
67ec4639
67ec4140
20600000
20600000
704ddb00
-202002be
+202002ae
704ddb03
-202002be
+202002ae
62464ddc
58004b4a
67e443e3
@@ -715,77 +699,77 @@
18007e06
67e243e2
20203f1a
-204007b9
+204007ac
6a464dd8
-202002ba
-204002d3
+202002aa
+204002c3
6a464dd8
-202005de
-204002ac
+202005ce
+2040029c
df200003
d8a04dd8
20203e88
20403e92
20403e92
67e24dd7
-204002a9
+20400299
6fe24dd7
-c00002d0
-204005ff
+c00002c0
+204005ef
207a0000
-204002d3
+204002c3
6fe24dd7
-c00182cd
+c00182bd
20202baf
704c9612
-202002ea
+202002da
704c9601
-202002ea
+202002da
704c960c
-202002ea
+202002da
704c9600
df200001
-204002ee
-20200361
+204002de
+20200351
704c9600
-204002f2
+204002e2
6fe24c96
e7e20005
20600000
704c870e
1f20fe03
67e24c88
-20400357
+20400347
6fe64c93
e7e60005
20600000
700f1200
-202002fe
+202002ee
700f120c
-202002fe
+202002ee
700f1202
704c870f
704c8804
-20400357
+20400347
6fe20f12
e7e20005
6fe64c93
e7e60005
-20200361
+20200351
6ff04c6c
c4020000
6fe20639
67e24e18
-704fed00
-202007bb
+704eed00
+202007ae
6fe20046
67e24e18
793f8021
-704ff000
+704ef000
70004600
704ca100
704c9b00
-202007bb
+202007ae
6fe20624
d8400000
c1018000
@@ -814,16 +798,16 @@
1fe0fe03
67e44db1
da204cca
-204005ae
+2040059e
1fe67c02
20610000
704c873e
-20400357
+20400347
58000002
e7e20005
58000001
e7e20005
-2040031b
+2040030b
e0420005
204047d5
1a227e00
@@ -835,40 +819,40 @@
e0420005
18427200
2040712d
-204001cf
+204001c0
e7e20005
-20200361
+20200351
6fe20046
67e242a8
-2020034d
+2020033d
6fe20639
67e242a8
704c8805
704c8713
-20400357
+20400347
58000001
e7e20005
6fe242a8
e7e40005
58000001
e7e40005
-20200361
+20200351
6fe24c88
1fe0fe03
67e44db1
-2040035e
+2040034e
6fe64c86
e7e60005
20600000
-204005bb
+204005ab
1a420a00
20600000
da204d84
20403fa5
-202002bc
+202002ac
18000400
18000201
-704ff101
+704ef101
60421001
6842063a
79200405
@@ -880,15 +864,15 @@
7920fe04
67e21000
20600000
-6fe24ff1
+6fe24ef1
207a0000
-20200364
+20200354
6fe2063a
-c2828372
-704ff100
-20400398
-204003ac
-203a0364
+c2828362
+704ef100
+20400388
+2040039c
+203a0354
efe20006
ea220006
9a267e00
@@ -904,8 +888,8 @@
18427200
2040712d
2040480e
-20400367
-204003ac
+20400357
+2040039c
efe20006
1fe22200
18c23000
@@ -920,15 +904,15 @@
202049f1
6fe24683
203a480c
-204003a2
+20400392
c6130000
da204d5c
-204005ae
+2040059e
c000480c
c000c80c
79200026
20600000
-204003ac
+2040039c
203a480c
efe20006
e8420006
@@ -940,7 +924,7 @@
20600000
da204d5c
20203fa1
-204003b0
+204003a0
20202739
204045bd
204045cd
@@ -966,11 +950,11 @@
20407a4f
204045aa
20404766
-20400375
-204003ae
-20400580
+20400365
+2040039e
+20400570
20404594
-20340593
+20340583
2020458a
6fe20623
79207e05
@@ -996,10 +980,10 @@
e7f20005
6fe40643
e7e40005
-20400469
-202007bd
+20400459
+202007b0
6fe24626
-68424fee
+68424eee
98467c00
24628000
6fec0633
@@ -1013,18 +997,18 @@
7042a700
70065b00
204047d2
-704fed02
+704eed02
704c8a00
-202007af
-2040060f
+202007a2
+204005ff
67e64e15
58000000
67e64d2e
6fe20046
67e242a8
704ddb05
-20200409
-20400615
+202003f9
+20400605
67e64e15
58000000
67e64d31
@@ -1059,21 +1043,21 @@
204045b4
2040315c
6fe20624
-c0018450
+c0018440
20204579
-20400298
+20400288
67e242a8
-20400298
+20400288
67e444d7
-20400298
-20400298
+20400288
+20400288
67e44632
-20400298
+20400288
67e44634
-2040046b
-202002f9
-204003b0
-20200597
+2040045b
+202002e9
+204003a0
+20200587
6fe20623
79207e06
67e20623
@@ -1081,7 +1065,7 @@
67e84528
5800001f
e7e20005
-704fea00
+704eea00
da200008
d8200003
204049ab
@@ -1094,50 +1078,50 @@
e7e40005
67e40643
20600000
-6fe24fea
+6fe24eea
c1828000
-704fea06
+704eea06
20600000
-6fe24fea
+6fe24eea
c1810000
-704fea03
+704eea03
20600000
7834fc00
204048fd
-2021071b
-6fe24fea
-245a07bf
-20400375
+2021070b
+6fe24eea
+245a07b2
+20400365
204045fc
7856fc00
-20400432
-24368486
+20400422
+24368476
20407a4f
-20400480
+20400470
20404766
-20400580
+20400570
20404594
-2034046d
-20400463
+2034045d
+20400453
7854fc00
20202739
6fe20623
c3830000
-6fe24fe7
+6fe24ee7
207a0000
-c00983ce
+c00983be
20202baf
-704fe700
+704ee700
20600000
-704fe713
+704ee713
20600000
-20400375
-20400473
+20400365
+20400463
78377c00
-20400597
-2036845a
-20200460
-20400475
+20400587
+2036844a
+20200450
+20400465
20202739
204045bd
204045cd
@@ -1146,24 +1130,24 @@
782efc00
78307c00
7850fc00
-2040047e
-202003b8
+2040046e
+202003a8
37c18200
20600000
6fe20623
c3818000
79207e03
67e20623
-704fea01
+704eea01
20600000
6fe20623
-c2818460
+c2818450
6fe24e17
1fe67c06
-2421071b
+2421070b
1fe0fe01
67e24e17
-20200460
+20200450
684c4639
20600000
684c4c7a
@@ -1181,8 +1165,8 @@
67e24537
18427200
6fe2461c
-205a048e
-245a0490
+205a047e
+245a0480
604c4538
d8c044e0
2040712d
@@ -1195,7 +1179,7 @@
67e40124
24610000
2040473e
-202007bd
+202007b0
6a280f1e
6a480f22
6a660f26
@@ -1204,8 +1188,8 @@
62480f22
62660f26
20600000
-204004b2
-67244fe8
+204004a2
+67244ee8
1a208c01
efe20006
c4000000
@@ -1213,11 +1197,11 @@
efe40005
1fe0fe01
e7e40005
-204004e5
-204004d1
+204004d5
+204004c1
20404618
-204004ae
-6f244fe8
+2040049e
+6f244ee8
20600000
1a208c31
efea0006
@@ -1226,7 +1210,7 @@
c3004628
18408401
1fe37e00
-c20004c9
+c20004b9
1840ffff
1a208a22
e7e20005
@@ -1250,7 +1234,7 @@
6fea4528
1a208a31
e7ea0005
-202004c5
+202004b5
1a208c00
efe20006
c4028000
@@ -1262,7 +1246,7 @@
6fe40643
98467e00
1fe67c01
-202284fb
+202284eb
20600000
1a208c1a
efe40006
@@ -1271,7 +1255,7 @@
98467e00
d840ffff
98467c00
-202284fb
+202284eb
20600000
efe20011
793ffe05
@@ -1296,12 +1280,12 @@
1a208a2d
e7e80005
20600000
-20400516
+20400506
2040475a
-204004a5
+20400495
20202940
7855fc00
-20370519
+20370509
2436c981
20402d74
6fe44161
@@ -1328,15 +1312,15 @@
78507c00
19623600
37c18400
-20370535
+20370525
1b420400
604c00a4
242c2739
-2037053c
+2037052c
dd2001e0
1c225000
6fe20623
-c301853c
+c301852c
2055ac9c
20402abc
7823fc00
@@ -1354,37 +1338,37 @@
67e204dc
1fe27200
67e2068c
-203a0567
+203a0557
6fe204db
1fe17e03
-c001855c
-c507855e
+c001854c
+c507854e
da204cca
-204005ae
-c000855e
-203a055e
-2040060b
-203a055e
-20400615
+2040059e
+c000854e
+203a054e
+204005fb
+203a054e
+20400605
18c20a00
6fe404db
e7e40005
-20200563
+20200553
d8a004dd
-20200563
+20200553
09800008
19897e00
-c200055e
+c200054e
78367c00
-20200567
+20200557
09800008
19897e00
e7e20005
-c2000563
+c2000553
09800018
78287c00
db600664
-2036056e
+2036055e
1fef7e00
1ff17e00
e7e60005
@@ -1392,7 +1376,7 @@
20232739
7836fc00
6fe242b5
-243a0576
+243a0566
6fe20017
1fe0a200
20402a7b
@@ -1410,23 +1394,23 @@
c68d0000
20760000
6fe204dc
-203a058d
+203a057d
6fe204db
1fe17e03
c001c866
-20400615
-20400578
+20400605
+20400568
6fe2068c
207a0000
-20200402
+202003f2
6fe64d31
207a0000
1fe22400
58000000
67e64d31
-202005de
+202005ce
78377c00
-20400597
+20400587
2036c582
2020458a
68420017
@@ -1434,7 +1418,7 @@
20402a23
78287c00
d9601388
-2020052a
+2020051a
1a208409
efe20002
203a2baf
@@ -1459,13 +1443,13 @@
6fe204d5
c1018000
20204146
-204005d0
+204005c0
da204d34
20203f94
da204d34
20403fa5
-202005de
-204005d0
+202005ce
+204005c0
da204d84
20203f94
1a20fe04
@@ -1486,57 +1470,57 @@
1a420c00
1a427e00
20600000
-204005f2
+204005e2
203a2baf
6fe44dd1
1fe0fff6
68444db1
98467c00
-202105d9
+202105c9
da204cca
20203fa5
da204ca2
-204005ae
-203a05d7
+2040059e
+203a05c7
da204ca2
20203fa5
-204005ea
+204005da
da204ca2
-203a05e3
+203a05d3
da204cca
20203f94
-204005e7
+204005d7
203a2baf
da204ca2
20203f94
6f224caa
d8c04cf2
-202005ec
+202005dc
6f224cd2
d8c04d10
efe60006
9a467c00
-202285f0
-c20005ec
+202285e0
+c20005dc
1f227e00
20600000
6fe44dd1
1fe0fff6
68444db1
98467c00
-202105f9
+202105e9
da204cca
-202005ae
+2020059e
da204ca2
-204005ae
+2040059e
247a0000
-202005f7
+202005e7
6fe44dd5
-20200600
+202005f0
58000010
67e44db1
62280f1e
-204005f2
+204005e2
6a280f1e
20600000
da204cca
@@ -1544,20 +1528,20 @@
6fe44d2e
247a0000
da204cca
-202005ae
+2020059e
6fe44d31
247a0000
da204cca
-202005ae
+2020059e
6fe64d2e
243a7111
-20400605
+204005f5
1a427e00
67e64d2e
20207111
6fe64d31
243a7111
-20400605
+204005f5
1a427e00
67e64d31
20207111
@@ -1568,12 +1552,12 @@
20203190
1a627e00
c00a326c
-c00a8624
+c00a8614
20203168
704c8c00
704c1700
-204007c1
-20400306
+204007b4
+204002f6
202031c3
6842063a
284c0005
@@ -1590,11 +1574,11 @@
6fe245b5
c0014794
6fe21002
-c001071b
+c001070b
c002c790
20600000
20404906
-20400629
+20400619
6fe204db
2feffe04
79208027
@@ -1603,9 +1587,9 @@
2feffe02
7920800f
6fe204dc
-203a064d
+203a063d
6fe20623
-c302064d
+c302063d
c6078000
20406246
204061b6
@@ -1623,13 +1607,13 @@
d8e00001
20407148
247a0000
-202007c3
-2040066a
+202007b6
+2040065a
18227e00
c1018000
-2020034b
+2020033b
62244db1
-20400667
+20400657
1a420a00
6fe44db1
e7e20005
@@ -1637,23 +1621,23 @@
e7e20005
e0220005
20600000
-204005d0
+204005c0
da204d5c
20203f94
da204d5c
20403fa5
-202005de
+202005ce
6fe20b97
-243a07c5
+243a07b8
6fe20b98
-243a07c5
+243a07b8
20600000
6fe2004b
79207e02
67e2004b
20404f51
7006ae01
-20400284
+20400274
204052de
2420cf59
2434cd67
@@ -1667,24 +1651,24 @@
1a208c01
efe20006
c4008000
-20400688
+20400678
704c9f01
20600000
704c8806
704c8731
-20400357
+20400347
6fec0040
e7ec0005
-20200361
+20200351
204063ce
704c8807
704c8736
-20400357
+20400347
58000000
e7e20005
6fec0040
e7ec0005
-20200361
+20200351
6fe20151
1fe17e03
c080a68a
@@ -1694,11 +1678,11 @@
2020268a
1f227e00
67e4012c
-203a0697
+203a0687
9ea67c00
20212729
18017e01
-243a06a9
+243a0699
6fe20151
1fe17e03
c001a649
@@ -1709,11 +1693,11 @@
98467c00
20212729
da204cca
-204005ae
+2040059e
c000a739
-20400607
+204005f7
203a2739
-2040060f
+204005ff
18c20a00
6fe20151
e7e20005
@@ -1726,24 +1710,24 @@
c58026ba
793f8000
20600000
-204003fa
+204003ea
202026dd
62244db1
-204005b5
+204005a5
6a244db1
20600000
da204d34
20203fa1
-204005b8
-20200348
-202005b8
-204005fd
+204005a8
+20200338
+202005a8
+204005ed
203a729b
2020729d
da204d34
-202005ae
+2020059e
20202baf
-204006ce
+204006be
207a0000
6fe2004b
c3830000
@@ -1756,7 +1740,7 @@
18c27e00
67e4013c
6fe4442c
-203a06e0
+203a06d0
20205b2e
6fe40099
203a2baf
@@ -1767,7 +1751,7 @@
70429300
20204b77
67e40fb7
-202006ea
+202006da
68440fb7
18518400
6fe44881
@@ -1786,14 +1770,14 @@
67e40241
58017f00
67e4023f
-2040073f
+2040072f
204057e8
6fe280a0
67e20124
-20400706
+204006f6
6fe20124
67e280a0
-704f6300
+704e6300
5800ff00
20205866
204057e8
@@ -1813,59 +1797,59 @@
793ffe00
793ffe01
67e20623
-704fed00
+704eed00
704c8b00
700f0d15
20206b2e
-20400710
+20400700
7854fc00
20600000
6fe24040
c3800000
c3818000
6fe247cd
-203a0725
+203a0715
6fe24724
207a0000
20202d53
6fe206ab
67e24bef
704bf000
-20400772
-202007c7
+20400762
+202007ba
7043dd01
20403f41
-202007c7
+202007ba
6fe20fd6
-c055073e
+c055072e
6fe24131
207a0000
-204006ce
+204006be
247a0000
da204d5c
-204005ae
+2040059e
247a0000
da204ca2
-204005ae
+2040059e
c1850000
da204cca
-204005ae
+2040059e
c1850000
20202d15
20202001
-704f6301
-704f6453
-6fe24f62
+704e6301
+704e6453
+6fe24e62
207a0000
-6fe24f64
+6fe24e64
c1a98000
-20200741
+20200731
18227e00
c003a739
c0032739
202025df
6fe84bd7
-2020076d
+2020075d
20006a60
6fe84bd7
79207e16
@@ -1873,46 +1857,46 @@
79207e15
67e84bd7
df200032
-204007c9
+204007bc
6fe84bd7
793ffe15
-2040076d
+2040075d
6fe84bd7
793ffe14
-2040076d
+2040075d
200004b0
6fe84bd7
793ffe16
-2040076d
+2040075d
200004b0
20600000
6fe84bd7
79207e16
-2040076d
+2040075d
200004b0
6fe84bd7
79207e14
-2040076d
+2040075d
200004b0
6fe84bd7
79207e15
-2040076d
+2040075d
200004b0
20600000
67e84bd7
67e8804c
-20400137
+20400138
70800540
-20200137
+20200138
d8400000
58000000
1fed7e00
1febfe00
9841fe00
67e8804c
-20400137
+20400138
70801902
-20200137
+20200138
20406b27
da2047e1
2040725d
@@ -1920,128 +1904,135 @@
20406b2b
18427e00
207a0000
-c04c0785
+c04c0775
67e20fba
-202007cb
+202007be
20405875
20001770
68448352
18427e00
-205a078e
-60444feb
+205a077e
+60444eeb
20405882
700f0d9e
20203f28
20001770
68448352
20600000
-58000310
-202006e8
-580002d0
-202006e8
+6fe24ca1
+c1808000
+202007c0
+58000320
+202006d8
580002e0
-202006e8
+202006d8
+580002f0
+202006d8
58000270
-202006e8
-58000280
-202006e8
+202006d8
+58000290
+202006d8
58000100
-202006e8
-58000360
-202006e8
-58000320
-202006e8
+202006d8
+58000370
+202006d8
+58000330
+202006d8
58000210
-202006e8
+202006d8
580001d0
-202006e8
-58000380
-202006e8
+202006d8
+58000390
+202006d8
58000260
-202006e8
-58000330
-202006e8
+202006d8
+58000340
+202006d8
580001a0
-202006e8
-580002c0
-202006e8
+202006d8
+580002d0
+202006d8
580001b0
-202006e8
+202006d8
58000130
-202006e8
+202006d8
58000180
-202006e8
-580002f0
-202006e8
+202006d8
58000300
-202006e8
+202006d8
+58000310
+202006d8
580001f0
-202006e8
+202006d8
58000150
-202006e8
+202006d8
580001c0
-202006e8
-58000350
-202006e8
+202006d8
+58000360
+202006d8
58000200
-202006e8
-58000290
-202006e8
+202006d8
580002a0
-202006e8
+202006d8
580002b0
-202006e8
-58000390
-202006e8
+202006d8
+580002c0
+202006d8
+580003b0
+202006d8
58000250
-202006e8
+202006d8
+580003a0
+202006d8
58000080
-202006e8
+202006d8
58000070
-202006e8
+202006d8
580000e0
-202006e8
+202006d8
58000060
-202006e8
+202006d8
580000c0
-202006e8
+202006d8
58000090
-202006e8
+202006d8
580000a0
-202006e8
+202006d8
580000b0
-202006e8
+202006d8
580000d0
-202006e8
+202006d8
580000f0
-202006e8
+202006d8
58000170
-202006e8
+202006d8
58000110
-202006e8
+202006d8
58000010
-202006e8
+202006d8
58000020
-202006e8
+202006d8
58000030
-202006e8
+202006d8
58000040
-202006e8
+202006d8
58000050
-202006e8
+202006d8
58000120
-202006e8
+202006d8
58000220
-202006e8
+202006d8
58000240
-202006e8
+202006d8
58000230
-202006e8
+202006d8
+58000280
+202006d8
58000160
-202006e8
+202006d8
58000190
-202006e8
-58000340
-202006e8
-58000370
-202006e8
+202006d8
+58000350
+202006d8
+58000380
+202006d8
Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom
===================================================================
--- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom (revision 5392)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/sched.rom (working copy)
@@ -255,7 +255,7 @@
# debug log define
#mem_param_debug_log_mem_block_start_addr
-mem_param_debug_log_func_enable:00
+mem_param_debug_log_func_enable:01
mem_param_debug_log_initial_flag_addr:10 db 01
mem_param_debug_log_lock_flag_cm0_addr:11 db 01
@@ -344,6 +344,7 @@
mem_le_conn_status:00
mem_io_cap_flag:00
mem_inquiry_mode:00
+mem_hci_conn_accept_timeout:a0 1f #default value : 5.06s
mem_param_alloc_normal_buffer_start_address:00 18
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 5392)
+++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (working copy)
@@ -1,10 +1,10 @@
20200040
6fe84bd7
793ffe15
-2040076d
+2040075d
6fe84bd7
79207e15
-2040076d
+2040075d
c2000001
20600000
00000000
@@ -63,6 +63,70 @@
00000000
00000000
20200040
+18000e0c
+20407148
+203a0005
+20600000
+6fec0040
+67ec42a9
+7006a410
+7042a708
+704c8a10
+704c9b00
+704ca100
+704c880b
+704c8703
+20400347
+6fe24c8a
+e7e20005
+6fe20046
+e7e40005
+6fec0040
+e7ec0005
+18007e01
+e7e20005
+18007e00
+6842004c
+284ffe02
+7920fe00
+e7e20005
+20200351
+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
18007e02
2040528d
6fe20049
@@ -151,14 +215,14 @@
60444957
704c880b
704c873e
-20400357
+20400347
58000007
e7e20005
6fe20639
e7e40005
6ff04953
e7f00005
-20200361
+20200351
2040000d
da200009
d8200003
@@ -197,7 +261,7 @@
c006002b
c0008008
c0004880
-202007fd
+202007f4
efea0006
67ea4528
efe40006
@@ -220,22 +284,22 @@
20600000
eff00006
67f04c0a
-20400448
+20400438
6ff04c6c
c4018000
704c880c
704c873e
-20400357
+20400347
58000004
e7e40005
6fe20639
e7e40005
6ff04c0a
e7f00005
-20200361
+20200351
efea0006
67ea4c12
-2040044c
+2040043c
20348034
6fe24c17
247a0000
@@ -246,31 +310,31 @@
c4028000
704c8808
704c870c
-20400357
+20400347
58000000
e7e20005
6fe20639
e7e40005
6fea4c12
e7ea0005
-20200361
+20200351
20200040
-6fe24fea
+6fe24eea
c0000009
c000800c
c001800e
c0020010
c003000a
-c0050434
+c0050424
20600000
20600000
-704fea0a
+704eea0a
20600000
-704fea02
+704eea02
202048f0
-704fea04
+704eea04
20600000
-704fea05
+704eea05
da200009
d8200003
204049ab
@@ -343,7 +407,7 @@
20600000
c6908000
793f8021
-20200191
+20200182
00000000
00000000
00000000
@@ -387,9 +451,9 @@
68420048
20407a08
6fe20048
-c28387f9
+c28387f0
c0188021
-c00607fb
+c00607f2
c0038030
c005800b
20204f6c
@@ -427,7 +491,7 @@
18007e01
2040528d
204052a6
-202001c1
+202001b2
70004800
20600000
18007e02
@@ -435,7 +499,7 @@
6fe206a4
e7e20005
204052a6
-20200193
+20200184
00000000
00000000
00000000
@@ -458,7 +522,7 @@
2040493a
6fec0633
67ec4627
-202007af
+202007a2
00000000
00000000
00000000
@@ -580,14 +644,14 @@
704c8a01
704c8808
704c8712
-20400357
+20400347
18007e35
e7e20005
6fec0040
e7ec0005
6fe24c8a
e7e20005
-20200361
+20200351
00000000
00000000
00000000
@@ -641,14 +705,14 @@
20200040
704c8808
704c8712
-20400357
+20400347
18007e00
e7e20005
6fec0040
e7ec0005
6fe24c8a
e7e20005
-20200361
+20200351
00000000
00000000
00000000
@@ -711,7 +775,7 @@
67e4003e
7855fc00
704c8a00
-202007f7
+202007ee
00000000
00000000
00000000
@@ -802,7 +866,7 @@
24348023
18808fff
704c8a02
-202007f7
+202007ee
00000000
00000000
00000000
@@ -839,21 +903,27 @@
c00533f4
c005b3fa
c0063404
-c0043446
+c0040017
c00c33da
c003b3d4
-c00c8017
+c00c801d
c00d345d
c0093422
-c009801b
-c03e001d
+c0098021
+c03e0023
204033d0
247a0000
6fe242a7
-c006801f
-c00e8019
+c0068025
+c00e801f
202033bf
-704fef03
+6fe24ff3
+1fe0fe01
+67e24ff3
+7000720a
+70007c07
+202033ca
+704eef03
202033d8
70007c37
202033ca
@@ -866,7 +936,7 @@
67e2004b
6fe20030
c283b413
-2040027e
+2040026e
202033ca
00000000
00000000
@@ -888,12 +958,6 @@
00000000
00000000
00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
20200040
2040554f
20400012
@@ -978,7 +1042,7 @@
20206481
20400015
20778000
-2020068e
+2020067e
7857fc00
6fe247d4
247a0000
@@ -996,12 +1060,12 @@
20200024
704c880a
704c8733
-20400357
+20400347
6fec0040
e7ec0005
6fe80ba1
e7e80005
-20200361
+20200351
202052d6
700b960f
204052da
@@ -1045,8 +1109,8 @@
67e24537
18427200
6fe2461c
-205a048e
-245a0490
+205a047e
+245a0480
604c4538
d8c04500
2040713a
@@ -1151,26 +1215,90 @@
00000000
00000000
20200040
+c3020003
+2040073c
+6fe8833e
+793ffe1d
+67e8804c
+20400176
+700f0d6a
+20203f28
+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
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+20200040
700fd600
71f0001c
70804205
-20400035
+20400033
6fe28341
67e24bce
6fe24bef
67e206ab
-24558156
+24558157
20407988
2040001f
-58000620
+58000610
67e4431d
-5800017c
+58000171
67e4431f
-58000151
+58000152
67e4431b
-58000726
+58000716
67e44315
-5800072b
+5800071b
67e44313
24358023
20403e79
@@ -1182,22 +1310,20 @@
700f0d6b
20203f28
58000000
-da204f65
+da204e65
d8400040
202056bd
6fec4140
67ec4340
-20400785
+20400775
70801002
204057bf
6fe24bce
-c301016c
-c282816f
-2040074a
-700f0d65
-20203f28
-2040017d
-700f0d6a
+c301002c
+c28287ec
+2040073a
+2040073a
+700f0d9f
20203f28
204054b0
204054b5
@@ -1206,9 +1332,11 @@
6848833e
6048804c
70804de6
-20400137
+20400138
70800520
-20200137
+20200138
+00000000
+00000000
00000000
00000000
00000000
@@ -1218,10 +1346,10 @@
793f801c
704c8801
704c8701
-20400357
+20400347
58000000
e7e20005
-20200361
+20200351
00000000
00000000
00000000
@@ -1289,20 +1417,20 @@
6fe8833e
79207e1d
67e8804c
-20200185
-2020074c
+20200176
+2020073c
6fe84bd7
79207e02
-2020076d
+2020075d
6fe84bd7
793ffe02
-2020076d
-20400760
+2020075d
+20400750
6fe8833e
79207e1c
67e8804c
-20200185
-20600000
+20200176
+00000000
00000000
00000000
00000000
@@ -1343,12 +1471,15 @@
00000000
00000000
20200040
+18000e0c
+6fe44ef2
+20407141
6fe24ca1
-c0008010
-20400015
+c0008013
+20400018
704c880a
704c8704
-20400357
+20400347
6fec0040
e7ec0005
6fe60146
@@ -1356,12 +1487,12 @@
58000001
e7e20005
6fec0040
-67ec4f37
-20200361
-6fec4f37
+67ec4e37
+20200351
+6fec4e37
684c0040
98467c00
-20228003
+20228006
20600000
704ca101
704c9b00
@@ -1403,27 +1534,24 @@
00000000
00000000
00000000
-00000000
-00000000
-00000000
20200040
6fe2007d
c0018012
c0088005
20204ba4
20404e14
-6fe24fef
+6fe24eef
c0010009
2020001a
-704fef00
+704eef00
704c8803
704c8730
-20400357
+20400347
58000000
e7e20005
68420046
e0440005
-20200361
+20200351
6fe20739
67e206a3
c0088018
@@ -1434,21 +1562,21 @@
2020001a
704c8804
704c8708
-20400357
+20400347
58000000
e7e20005
68420046
e0440005
58000001
e7e20005
-20200361
-6fe24fef
+20200351
+6fe24eef
c1808000
-704fef02
+704eef02
7042a718
20600000
-6fe24fef
-704fef00
+6fe24eef
+704eef00
c001002d
c001802f
70007c98
@@ -1475,17 +1603,17 @@
c006000a
c00b8011
c0058014
-c01987f3
+c01987e8
c017001e
c0208026
c0098034
-202007f5
+202007ea
da200040
2040604d
6fe80739
68480779
98467c00
-20228265
+20228255
20204d8b
6fe44de9
c3014e10
@@ -1499,7 +1627,7 @@
6fe20030
c3830000
20404d80
-2020027e
+2020026e
6fe24170
1fe0fe01
68420739
@@ -1516,12 +1644,12 @@
20600000
704c8803
704c871b
-20400357
+20400347
6fe20046
e7e40005
6fe24170
e7e20005
-20200361
+20200351
6fe44deb
c3004e21
6fe44de9
@@ -1543,9 +1671,9 @@
c013801f
c0140027
c0038023
-c0040672
-c00101f3
-202007f1
+c0040662
+c00101e4
+202007e6
6fe20739
67e206a3
c0058010
@@ -1561,9 +1689,9 @@
c1830000
60420055
700b9b01
-2040067c
+2040066c
6fe24c97
-203a0284
+203a0274
20600000
20404dc7
6ff00739
@@ -1571,7 +1699,7 @@
20600000
6fe20739
67e206a4
-20400193
+20400184
20204d51
20404edd
20200020
@@ -1606,14 +1734,14 @@
dfe04d5c
67e40f12
6a240f12
-204005ae
+2040059e
207a0000
6a240f12
20403fa5
-204005de
+204005ce
20200007
1fe22400
-202005de
+202005ce
00000000
00000000
00000000
@@ -1664,12 +1792,12 @@
00000000
20200040
68464dd8
-204002aa
-204002a7
+2040029a
+20400297
c0008007
c0010012
20202baf
-20400298
+20400288
67e44c94
d84003ff
98410400
@@ -1677,13 +1805,13 @@
1feb7e00
1fecfe00
67e24c1a
-204002a7
+20400297
67e24c1b
-202007ef
-20400298
+202007e4
+20400288
67e242a8
20400034
-20400298
+20400288
67e40f12
20402284
24628000
@@ -1692,7 +1820,7 @@
c280002c
6fe40f12
67e44db1
-204005f2
+204005e2
205a723a
6fe40f12
1fe22200
@@ -1704,7 +1832,7 @@
e0220005
6fe40f12
1fe27200
-204002ac
+2040029c
2020712d
6fe40f12
2040003a
@@ -1720,7 +1848,7 @@
c1008000
18000202
20600000
-20400600
+204005f0
203a729b
2020729d
00000000
@@ -1728,46 +1856,46 @@
00000000
20200040
dfe00020
-da204f3d
+da204e3d
d8400020
204056bd
-d8c04f3d
+d8c04e3d
efe40006
207a0000
-67e44f5f
+67e44e5f
2040000d
20400011
2040000d
2020001d
-da204f3f
+da204e3f
df200006
-704f6101
+704e6101
20600000
efe40011
-68444f5d
+68444e5d
9840fe00
-67e44f5d
-6fe24f61
+67e44e5d
+6fe24e61
9a20a200
1a20a202
-6fe24f61
+6fe24e61
1fe0fe01
-67e24f61
+67e24e61
c2000011
20600000
efe40011
-68444f5d
+68444e5d
9842fe00
-67e44f5d
-6fe24f61
+67e44e5d
+6fe24e61
9a20a200
1a20a202
-6fe24f61
+6fe24e61
1fe0fe01
-67e24f61
+67e24e61
c200001d
-6fe44f5d
-68444f5f
+6fe44e5d
+68444e5f
98467c00
2422abaf
20600000
@@ -1808,7 +1936,7 @@
2020000a
20404c78
20400019
-20200688
+20200678
20400019
20404c78
20404c7c
@@ -1817,12 +1945,12 @@
20600000
704c8809
704c8732
-20400357
+20400347
6fec0040
e7ec0005
6fe647d3
e7e60005
-20200361
+20200351
00000000
00000000
00000000
@@ -1859,14 +1987,14 @@
c4010000
704c880a
704c873e
-20400357
+20400347
58000003
e7e40005
6fe20639
e7e40005
6fec4530
e7ec0005
-20200361
+20200351
00000000
00000000
00000000
@@ -1923,18 +2051,18 @@
c4000000
704c8813
704c873e
-20400357
+20400347
58000001
e7e20005
6fe24c8a
e7e20005
6fe20639
e7e40005
-20400314
-6fe24fed
-245a0319
+20400304
+6fe24eed
+245a0309
e0420005
-6fe24fee
+6fe24eee
e7e20005
6fec4627
e7ec0005
@@ -1946,7 +2074,7 @@
6fe2065b
e7e20005
6fe20639
-20200361
+20200351
00000000
00000000
00000000
@@ -1985,7 +2113,7 @@
20200040
704c8817
704c8718
-20400357
+20400347
6fec0040
e7ec0005
d8c04297
@@ -1993,7 +2121,7 @@
2040712d
18007e00
e7e20005
-20200361
+20200351
00000000
00000000
00000000
@@ -2119,8 +2247,8 @@
684c0149
20402289
20628000
-204001e4
-20400357
+204001d5
+20400347
58000001
e7e20005
6fec0149
@@ -2141,18 +2269,18 @@
6fe80132
9c467e00
e7e40005
-20200361
+20200351
6fe60146
e7e60005
6fe80132
9c467e00
e7e40005
6fe20018
-204001cf
+204001c0
e7e20005
6fe24c9c
c001002b
-20200361
+20200351
6fe64d2e
1fe20c00
efe20006
@@ -2163,7 +2291,7 @@
2040712d
184672f0
20407100
-20200361
+20200351
00000000
00000000
00000000
@@ -2178,18 +2306,18 @@
6fe24c18
c0090005
c011001a
-202002e5
+202002d5
6fe24ded
-203a02e7
-204002a1
+203a02d7
+20400291
67ee4e0a
2040000e
6fe24ded
1fe0ffff
67e24ded
-202002e9
-204002b9
-243a02e7
+202002d9
+204002a9
+243a02d7
1a420a00
1a40a407
1a420c00
@@ -2200,16 +2328,16 @@
18a08bf9
e7ee0005
20600000
-20400298
+20400288
67e4495f
-20400298
+20400288
67e44961
20400024
df200003
-204002ed
+204002dd
6fe20639
e7e40005
-20200361
+20200351
da400014
da200009
d8200003
@@ -2241,7 +2369,7 @@
20200040
704c8806
704c8714
-20400357
+20400347
6fe24c89
e7e20005
6fe20046
@@ -2254,7 +2382,7 @@
2020000f
58000000
e7e40005
-20200361
+20200351
00000000
00000000
00000000
@@ -2305,7 +2433,7 @@
20200040
704c8804
704c8705
-20400357
+20400347
58000000
e7e20005
6fe24e18
@@ -2315,7 +2443,7 @@
6fe2004c
793ffe05
67e2004c
-20200361
+20200351
00000000
00000000
00000000
@@ -2369,12 +2497,12 @@
20200040
704c8807
704c8720
-20400357
+20400347
6fec0040
e7ec0005
6fe24ca0
e7e20005
-20200361
+20200351
00000000
00000000
00000000
@@ -2433,7 +2561,7 @@
20200040
704c880b
704c8703
-20400357
+20400347
6fe24c8a
e7e20005
6fe20046
@@ -2448,7 +2576,7 @@
7920fe00
e7e20005
6fe20046
-20200361
+20200351
00000000
00000000
00000000
@@ -2504,33 +2632,33 @@
c0030011
c004000e
c01f8012
-202002e5
-202007e5
-202007e7
-202007e9
-202007eb
-202007ed
-202002e5
-202002e5
+202002d5
+202007da
+202007dc
+202007de
+202007e0
+202007e2
+202002d5
+202002d5
6fe24c18
c0008019
c00b801d
c010001f
c0518024
c0300034
-202002e5
-2040029e
+202002d5
+2040028e
67ec4c8d
-204002b5
-202002e9
+204002a5
+202002d9
704e193f
-202002e9
+202002d9
df200002
-204002f2
+204002e2
58000000
e7e40005
-20200361
-20400298
+20200351
+20400288
68420046
98467c00
2022802b
@@ -2539,18 +2667,18 @@
24628000
604242a8
df200003
-204002f2
+204002e2
6fe242a8
e7e40005
6fe20018
-204001cf
+204001c0
e7e20005
-20200361
+20200351
df200002
-204002f2
-6fe44f35
+204002e2
+6fe44e35
e7e40005
-20200361
+20200351
00000000
00000000
00000000
@@ -2567,14 +2695,14 @@
67e40f12
20200008
6a240f12
-204005ae
+2040059e
207a0000
6a240f12
20403fa5
-204005de
+204005ce
20200008
1fe22400
-202005de
+202005ce
00000000
00000000
00000000
@@ -2623,9 +2751,9 @@
00000000
00000000
20200040
-6fe24f34
-243a07e3
-704f3401
+6fe24e34
+243a07d8
+704e3401
20400023
6f224cd2
6a444dd3
@@ -2690,7 +2818,7 @@
6fe24c18
c005001a
c007001d
-c0098427
+c0098417
c00b000f
c00b8019
c00c0019
@@ -2700,9 +2828,9 @@
c0078022
c0080027
c008802b
-202007e1
-20400298
-204002f9
+202007d6
+20400288
+204002e9
da200009
d8200003
204049ab
@@ -2711,31 +2839,31 @@
6ff04ddf
e7f00005
20600000
-202002e5
-204002a7
+202002d5
+20400297
67e244de
-202002e9
+202002d9
7044d900
704c8b00
-6fe24fed
-c00081be
-202002e7
+6fe24eed
+c00081af
+202002d7
df200002
-204002ed
+204002dd
58000004
e7e20005
-20200361
+20200351
704ded00
704e0a00
704dee00
-202002e9
+202002d9
68424ded
18467c04
-202282e7
-204002a1
+202282d7
+20400291
67ee4e0a
20400032
-202002e9
+202002d9
6fe24ded
d8a04dee
1feffe07
@@ -2757,89 +2885,89 @@
c0058012
c0060025
c0068029
-202007df
-204002a7
+202007d4
+20400297
67e244df
1fe27200
-20400295
-202002e9
-204002a7
+20400285
+202002d9
+20400297
67e244ff
1fe27200
-20400295
-202002e9
+20400285
+202002d9
6fe244d9
-243a02e7
-204002a7
+243a02d7
+20400297
67e24636
-20400298
+20400288
67e444da
-20400298
+20400288
67e444dc
-204002a7
+20400297
67e24637
-204002a7
+20400297
67e24e11
6fe444da
684444dc
98467c00
-242282e9
+242282d9
1fe3fe00
67e444da
-202002e9
-204002a7
+202002d9
+20400297
67e244d9
-204002a7
-202002e9
-20400298
+20400297
+202002d9
+20400288
67e444da
-20400298
+20400288
67e444dc
-204002a7
+20400297
67e24e11
98267c00
-204282af
-204002a7
-67e24fee
-2040029e
+2042829f
+20400297
+67e24eee
+2040028e
67ec4627
-204002a7
+20400297
67e2462d
-20400298
+20400288
1febfe00
67e444d7
-20400298
-20400298
+20400288
+20400288
67e44632
-20400298
+20400288
67e44634
-202002b1
+202002a1
20200040
6fe24c18
-c01c8005
-c01d000c
-202002e5
+c01c8007
+c01d000e
+c00a8012
+c00b0017
+202002d5
df200005
-204002ed
+204002dd
58000001
e7e20005
6fe64147
e7e60005
-20200361
-204002a7
-2040029b
+20200351
+20400297
+2040028b
67e64147
-202002e9
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
+202002d9
+df200003
+204002dd
+6fe44ef2
+e7e40005
+20200351
+20400288
+67e44ef2
+202002d9
00000000
00000000
00000000
@@ -2882,13 +3010,13 @@
6fe24c18
c001800a
c01b8017
-c0290020
-c02a8026
-c02b002b
-c036002f
-c0368034
-202007dd
-204002e9
+c0290021
+c02a8027
+c02b002c
+c0360030
+c0368035
+202007d2
+204002d9
5800003f
67f04c6c
5fffffff
@@ -2900,40 +3028,40 @@
67e244de
67e244d9
67e24133
-202002b5
-20400228
-20400298
+202002a5
+20400219
+242282d7
+20400288
67e40051
df200003
-204002ed
+204002dd
6fe20046
e7e40005
7042a71d
-20200361
-204002a7
+20200351
+20400297
67e24c98
df200064
d8a00183
-20400295
-202002e9
+20400285
+202002d9
df200002
-204002ed
+204002dd
6fe24c97
e7e20005
-20200361
-204002a7
+20200351
+20400297
67e24c97
-203a02e3
-202002e9
+203a02d3
+202002d9
df200003
-204002ed
+204002dd
6fe44de7
e7e40005
-20200361
-20400298
+20200351
+20400288
67e44de7
-202002e9
-00000000
+202002d9
00000000
00000000
00000000
@@ -2944,47 +3072,47 @@
00000000
20200040
6fe24c18
-c0158005
-c0160015
-202002e5
-2040029e
+c00f8006
+c0158013
+c0160023
+202002d5
+20400219
+242282d7
+204002e9
+704c8805
+704c871c
+20400347
+18007e00
+e7e20005
+6fe20046
+e7e40005
+6fe4013e
+e7e40005
+20200351
+2040028e
67ec42a9
-2040029b
+2040028b
67e647ce
df200007
-204002ed
+204002dd
6fec0040
e7ec0005
-20400361
+20400351
6fe24c9f
-c0008012
+c0008020
7042a716
20600000
204033e5
700b9b01
20600000
-2040029e
+2040028e
67ec42a9
df200007
-204002ed
+204002dd
6fec0040
e7ec0005
-20400361
-2020068e
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
-00000000
+20400351
+2020067e
00000000
00000000
00000000
@@ -3012,63 +3140,63 @@
c00e0018
c00e8020
c00d802b
-202007db
-704fa601
-2040029e
+202007d0
+704ea601
+2040028e
67ec42a9
-20400298
+20400288
67e200b6
-20400298
+20400288
9c40fe00
1fe17ffc
67e800b7
df200008
-d8a04fa7
+d8a04ea7
204070e4
20402287
20228016
-704fa602
+704ea602
7042a703
-202002f9
+202002e9
6fe24c9b
-c08102fd
-20400298
-203a02fd
-204002a7
+c08102ed
+20400288
+203a02ed
+20400297
67e206a7
7042a715
-202002f9
-20400298
+202002e9
+20400288
67e242a8
20402284
-242282fd
+242282ed
1a208c01
efe20006
c2800029
-204002f9
+204002e9
20203420
-204002f9
+204002e9
202048f0
6fe24c9b
-c08102fd
-20400298
+c08102ed
+20400288
67e242a8
-203a02fd
-204002f9
+203a02ed
+204002e9
6ff04e1a
243a0035
7042a704
20600000
704c880b
704c870b
-20400357
+20400347
58000000
e7e20005
6fe20046
e7e40005
6ff04e1a
e7f00005
-20200361
+20200351
00000000
20200040
6fe24c18
@@ -3078,53 +3206,53 @@
c0070024
c008802c
c0098031
-202007d9
-2040029e
+202007ce
+2040028e
67ec42a9
d8a04297
18007210
-20400295
+20400285
70429301
7042a70b
20200027
-2040029e
+2040028e
67ec42a9
7042a70c
20400027
-2040067c
+2040066c
6fe24c97
247a0000
-6fe24ff0
-c0008284
+6fe24ef0
+c0008274
20600000
-2040029e
+2040028e
67ec42a9
-204002a7
+20400297
67e247f1
98007200
d8a047f2
-20400295
+20400285
7042a709
20200027
-2040029e
+2040028e
67ec42a9
7042a70a
df200007
-204002ed
+204002dd
6fec0040
e7ec0005
-20200361
-20400298
+20200351
+20400288
67e242a8
7042a70d
-704ff001
-202002f9
-20400298
+704ef001
+202002e9
+20400288
67e242a8
-204002a7
+20400297
1fe0fe0e
67e242a7
-202002f9
+202002e9
00000000
00000000
00000000
@@ -3139,13 +3267,13 @@
c0030006
c004001c
c005002f
-202007d7
-20400298
+202007cc
+20400288
67e242a8
-204002a7
+20400297
67e206a4
20402284
-242282fd
+242282ed
1a208c01
efe20006
c2800018
@@ -3153,16 +3281,16 @@
6fe242a8
6842439b
98467c00
-242282f9
+242282e9
7042a711
6fe2439a
67e242a8
-202002f9
+202002e9
6fe206a4
67e20f12
20404894
-202002f9
-2040029e
+202002e9
+2040028e
67ec42a9
7042a71a
6fe24c9b
@@ -3174,27 +3302,27 @@
704c9600
2040002a
704c8a02
-202001c6
+202001b7
704c9602
df200007
-204002ee
+204002de
6fec42a9
e7ec0005
-20200361
+20200351
6fe24ca1
-c00002fd
-c00102fb
+c00002ed
+c00102eb
6fe24c9b
-c00102fb
+c00102eb
704ca102
-2040029e
+2040028e
67ec42a9
-204002a7
+20400297
67e24c8a
7042a708
-204002f9
-202001c6
-00000000
+7006a416
+204002e9
+202001b7
00000000
00000000
00000000
@@ -3212,69 +3340,69 @@
c0230033
c0238034
c0288036
-202007d5
-20400298
+202007ca
+20400288
67e44153
-20400298
+20400288
67e44151
-202002e9
+202002d9
df200005
-204002ed
+204002dd
6fe4414f
e7e40005
6fe4414d
e7e40005
-20200361
-20400298
+20200351
+20400288
67e4414f
-20400298
+20400288
67e4414d
-202002e9
+202002d9
df200004
-204002ed
+204002dd
6fe6414a
e7e60005
-20200361
-2040029b
+20200351
+2040028b
67e6414a
-202002e9
-202002e5
-204002a7
-202002e5
+202002d9
+202002d5
+20400297
+202002d5
df200002
-204002ed
+204002dd
6fe24c9c
e7e20005
-20200361
-204002a7
+20200351
+20400297
67e24c9c
-202002e9
-202002e5
-204002a7
-202002e5
+202002d9
+202002d5
+20400297
+202002d5
df2000f2
-204002ed
+204002dd
6fe24c98
e7e20005
d8c00183
df200064
2040713a
-20200361
+20200351
00000000
00000000
20200040
6fe24c18
c0070005
c007800a
-202002e5
+202002d5
df200003
-204002ed
+204002dd
6fe44de9
e7e40005
-20200361
-20400298
+20200351
+20400288
67e44de9
-202002e9
+202002d9
00000000
00000000
00000000
@@ -3332,63 +3460,63 @@
c002001c
c0058022
c006002d
-c0068035
-202007d3
+c0068036
+202007c8
6fe44deb
-c30102fb
+c30102eb
6fe44de9
-c30102fb
+c30102eb
6fe24c9b
-c08102fd
-20400298
+c08102ed
+20400288
67e40253
-20400298
+20400288
67e40255
-20400298
+20400288
67e40257
58000040
67e4430b
-20400298
+20400288
67e4430d
-20400298
+20400288
67e4430f
7042a712
-202002f9
-20400298
+202002e9
+20400288
67e40253
6fe20031
-c30302fb
+c30302eb
7042a713
-202002f9
+202002e9
6fe24c9b
-c08102fd
+c08102ed
6fe44deb
-c30002fb
+c30002eb
6fe44de9
-c30002fb
-2040029e
+c30002eb
+2040028e
67ec42a9
-204002a7
+20400297
7042a718
-202002f9
-20400228
+202002e9
+20400219
+242282d7
df200005
-204002ed
+204002dd
6fe20046
e7e40005
6fe44deb
e7e40005
-20200361
-20400228
-20400298
+20200351
+20400219
+242282d7
+20400288
67e44deb
df200003
-204002ed
+204002dd
6fe20046
e7e40005
-20200361
-00000000
-00000000
+20200351
00000000
20200040
6fe24c18
@@ -3397,44 +3525,44 @@
c0018010
c0028015
c003001a
-202007d1
-204002a4
+202007c6
+20400294
67f04c6c
-202002e9
+202002d9
df200004
-204002ed
+204002dd
580400fb
e7e60005
-20200361
+20200351
df200009
-204002ed
+204002dd
6ff04ddf
e7f00005
-20200361
+20200351
6fe244de
-243a02e7
-2040029e
+243a02d7
+2040028e
67ec4c7a
-202002e9
+202002d9
6fe244de
-243a02e7
-20400298
+243a02d7
+20400288
67e44617
-20400298
+20400288
67e44619
-204002a7
+20400297
2040002d
6042461b
-204002a7
+20400297
205a0035
245a0039
-204002a7
-2040029e
-204002a7
+20400297
+2040028e
+20400297
67e24624
-204002a7
+20400297
67e24e11
-202002e9
+202002d9
d8400000
c1000000
d8400002
@@ -3462,30 +3590,30 @@
c002001e
c002801e
c0048019
-202002e5
+202002d5
df200009
-204002ed
+204002dd
6ff04c24
e7f00005
-20200361
+20200351
df200041
-204002ed
+204002dd
d8c04c2c
df200040
2040713a
-20200361
+20200351
df200009
-204002ed
+204002dd
6ff04138
e7f00005
-20200361
+20200351
df200007
-204002ed
+204002dd
6fec4140
e7ec0005
-20200361
+20200351
df200008
-204002ed
+204002dd
580002a8
e7e40005
5800003c
@@ -3493,7 +3621,7 @@
58000008
e7e40005
e7e40005
-20200361
+20200351
00000000
00000000
00000000
@@ -3528,51 +3656,51 @@
c00c8028
c00d002d
c00d8030
-202007cf
-204002a4
+202007c4
+20400294
67f04c1c
-202002e9
-204002ac
+202002d9
+2040029c
d8a0468a
df200042
2040713a
df200042
d8c0468a
d8400000
-204001a0
+20400191
60424689
-202002e9
+202002d9
df2000f9
-204002ed
+204002dd
d8c0468a
df200040
2040713c
df200017
204070e4
-20200361
+20200351
df200003
-204002ed
+204002dd
6fe44159
e7e40005
-20200361
-20400298
+20200351
+20400288
67e44159
-202002e9
+202002d9
df200002
-204002ed
+204002dd
6fe24133
e7e20005
-20200361
-204002a7
+20200351
+20400297
67e24133
-202002e9
+202002d9
df200005
-204002ed
+204002dd
6fe44153
e7e40005
6fe44151
e7e40005
-20200361
+20200351
00000000
00000000
00000000
@@ -3588,11 +3716,11 @@
c0010017
c0028019
c0048025
-202007cd
+202007c2
7920001c
-2040029b
+2040028b
67e64147
-204002a7
+20400297
d8400800
984ffe00
d840ffff
@@ -3601,37 +3729,37 @@
18427e00
18000e02
20407141
-204002a7
+20400297
67e24c99
67e24c9a
-202002f9
-7042a702
202002e9
-2040029e
+7042a702
+202002d9
+2040028e
67ec42a9
-20400298
+20400288
67e40251
-20400298
+20400288
67e200b6
-20400298
-204002a7
+20400288
+20400297
67e24ad0
704c9b01
7042a705
-202002f9
+202002e9
6fe24ca1
-c00002fd
-c00102fb
+c00002ed
+c00102eb
6fe24c9b
-c00102fb
-2040029e
+c00102eb
+704ca100
+2040028e
67ec42a9
7042a707
-204002a7
-c00082f9
+20400297
+c00082e9
7042a719
-202002f9
-00000000
+202002e9
00000000
00000000
00000000