Index: Librarier/device/yc11xx.h =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/device/yc11xx.h (revision 4360) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/device/yc11xx.h (working copy) @@ -226,6 +226,7 @@ #define CORE_CVSD_GRP_LEN 0X8126 #define CORE_FF_DITHER1 0X8128 #define CORE_FF_DITHER2 0X8129 +#define CORE_GPIO_CONF1 0x812a #define CORE_RAMP_CTRL 0X8138 #define CORE_UART_RXINTER 0x8132 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 4373) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (working copy) @@ -38,6 +38,8 @@ beq patch13_6,p_initialize_radio_cont_by_init_param beq patch14_0,p_lpm_hibernate + beq patch14_4,p_lpm_dispatch + beq patch15_0,p_lpm_dispatch_unconn beq patch17_1,p_app_init beq patch17_2,p_app_process_bb_event beq patch1c_0,p_vp_check_get_data @@ -63,7 +65,7 @@ beq patch29_3,p_le_receive_slave beq patch29_7,p_le_send_adv_ind beq patch2a_2,p_le_acknowledge - beq patch2a_4,p_le_scan_match +// beq patch2a_4,p_le_scan_match beq patch2b_0,p_le_parse_ll beq patch2b_3,p_le_adv beq patch2b_5,p_parse_connect_req @@ -124,46 +126,11 @@ p_le_dispatch: call le_enable - call p_le_scan + call z_le_scan call le_adv branch le_disable -p_le_scan: - fetch 1,mem_le_scan_enable - rtnne LE_SCAN_ENABLE - arg le_scan_interval_timer,queue - call timer_check - nrtn blank - - fetch 2,mem_le_scan_interval - arg le_scan_interval_timer,queue - call timer_init - - call le_init_adv - call le_next_adv_channel - fetch 2,mem_le_scan_window - store 2,mem_le_scan_window_temp -p_le_scan_loop: - disable master - disable swfine - fetchr timeup,2,mem_le_scan_window_temp - call p_le_receive_packet - nbranch p_le_scan_timeout_check,match - branch le_scan_match -p_le_receive_packet: - call lerx_setfreq -p_le_receive_rxon: - call le_prep - disable match - enable decode_fec0 - enable is_rx - disable is_tx - copy timeup,stop_watch - correlate null,timeout - deposit stop_watch - store 2,mem_le_scan_window_temp - branch le_receive_rxon+7 p_initialize_radio_cont: @@ -427,9 +394,12 @@ call p_buck_setting fetch 1,0x8341 store 1,mem_hibernate_flag - setarg 0x1171 - store 2,mem_encryp_inital_value - call z_efuse_custom_encryption + + fetch 1,mem_xlmp_conn_state + store 1,mem_lmp_conn_state + + ncall z_app_init_efuse_data,wake + ifdef FUNCTION_WATCH_DOG call wdt_init_reset_with_start @@ -443,16 +413,33 @@ store 2,mem_cb_event_timer setarg p_headset_cb_idle_process store 2,mem_cb_idle_process + + setarg cb_enter_lpm + store 2,mem_cb_before_lpm + setarg cb_enter_hibernate + store 2,mem_cb_before_hibernate + + //call headset_check_reconnet //call p_ipc_notify_m0_wakeup_flag_init - call enable_xip + + call p_set_gpio_after_lpm,wake +// call qspi_release_powerdown_flash,wake nbranch wake_from_power,wake wake_for_lpm: call ipc_lock_m0_lmp_wait_work_flag + call enable_xip jam BT_EVT_WAKEUP,mem_fifo_temp branch ipc_tx_bt_event wake_from_power: + + setarg 0x1171 + store 2,mem_encryp_inital_value + call z_efuse_custom_encryption + + call enable_xip + // store local addr fetch 6,mem_lap store 6,mem_local_bdaddr @@ -466,6 +453,15 @@ jam BT_EVT_RESTART,mem_fifo_temp branch ipc_tx_bt_event + +p_set_gpio_after_lpm: + call qspi_init_set + call qspi_gpio_init + nop 2000 // Delay for gpio26 work ready + call qspi_release_powerdown_flash +// nop 100 + rtn + //p_app_process_bb_event: // fetch 1,mem_state @@ -1867,44 +1863,7 @@ branch p_le_slave_more_data,user branch le_slave_cont -p_le_scan_match: - call le_scan_check_sender_addr_type - copy rega,pdata - store 1,mem_le_conn_peer_addr_type -ifdef WHITE_LIST - arg mem_le_white_list_type_and_bd_addr,contw - istore 1,contw - fetch 6,mem_le_rxbuf+2 - istore 6,contw - fetch 1,mem_le_white_list_cnt - beq 0,p_le_scan_match_send_event - fetch 1,mem_le_white_list_filter_policy - beq NONE_FILTER,p_le_scan_match_send_event - beq WHITE_LIST_SCAN_FILTER,p_white_filter_scan_check - beq WHITE_LIST_CONNECT_FILTER,p_le_scan_match_send_event - beq WHITE_LIST_CONN_SCAN_FILTER,p_white_filter_scan_check -p_white_filter_scan_check: - call p_check_addr_in_white_list - nbranch p_le_scan_timeout_check,blank -endif -p_le_scan_match_send_event: - fetch 6,mem_le_rxbuf+2 - store 6,mem_le_plap - - fetch 1,mem_mesh_creat_connection_flag - beq CREAT_CONNECTION,p_le_create_conn - call p_hci_send_event_le_advertising_report - - call le_send_scan_request - nbranch p_le_scan_timeout_check,match - fetch 1,mem_le_rxbuf+1 - beq 6,p_le_scan_timeout_check - call p_hci_send_event_le_advertising_report -p_le_scan_timeout_check: - fetch 2,mem_le_scan_window_temp - nbranch p_le_scan_loop,blank - rtn p_le_create_conn: fetch 6,mem_le_plap @@ -2877,6 +2836,8 @@ rtn p_le_adv: + branch z_le_adv +/* fetch 1,mem_le_adv_enable rtn blank arg le_adv_interval_timer,queue @@ -2912,7 +2873,7 @@ arg mem_le_scan_data,contr call memcpy branch le_transmit_norx - +*/ @@ -3227,9 +3188,9 @@ nbranch p_process_dmh_common_packet1,blank p_process_dmh_common_packet: // reserve one big buffer for host - arg mem_alloc_big_block,rega - call p_queue_get_len - beq 1,end_of_packet +// arg mem_alloc_big_block,rega +// call p_queue_get_len +// beq 1,end_of_packet fetch 1,mem_lch_code and_into 0x03,pdata @@ -3268,10 +3229,10 @@ call rf_debug_active_crc_error_line,crc_failed - fetch 1,mem_tws_state - beq TWS_STATE_SLAVE_CONNECTED,process_dmh_data_end_tws - beq TWS_STATE_MASTER_LISTEN,process_dmh_data_end_tws - beq TWS_STATE_MASTER_CONNECTED,process_dmh_data_end_tws +// fetch 1,mem_tws_state +// beq TWS_STATE_SLAVE_CONNECTED,process_dmh_data_end_tws +// beq TWS_STATE_MASTER_LISTEN,process_dmh_data_end_tws +// beq TWS_STATE_MASTER_CONNECTED,process_dmh_data_end_tws branch error_payload_crc,crc_failed bmark0 mark_fhs_eir,process_dmh_packet @@ -3515,3 +3476,70 @@ disable master rtn +p_lpm_dispatch_unconn: + fetch 1,mem_context + rtnbit1 state_inconn // wont sleep in connection + rtnbit1 state_inpage // wont sleep when paging + fetch 1,mem_ssp_enable + branch p_lpm_unconn_nossp,blank + fetch 1,mem_sp_local_key_invalid // simple pairing is not ready + rtn blank +p_lpm_unconn_nossp: +// fetch 1,mem_le_adv_enable +// nbranch lpm_unconn_cont,blank + branch lpm_unconn_cont + +cb_enter_lpm: + fetch 1,mem_lmp_conn_state + store 1,mem_xlmp_conn_state + branch enter_hibernate_prepare_work + + +cb_enter_hibernate: +// call ice_break + jam MCU_STATE_HIBERNATE,mem_ipc_mcu_state + call ipc_check_ack + +enter_hibernate_prepare_work: + call qspi_powerdown_flash +p_clear_gpio_before_sleep: + call p_clear_gpio_before_sleep_sub2 + arg 32,loopcnt + arg core_gpio_conf,contr +p_setgpio_loop: + copy contr,contw + ifetch 1,contr + beq gpcfg_qspi_sck,p_setgpio_pulldown + beq gpcfg_qspi_io0,p_setgpio_pulldown + beq gpcfg_qspi_io1,p_setgpio_pulldown + beq gpcfg_qspi_io3 ,p_setgpio_pulldown + beq gpcfg_iic_scl,p_setgpio_pulldown + beq gpcfg_iic_sda,p_setgpio_pulldown + bne gpcfg_input,p_setgpio_loop_end +p_setgpio_pulldown: + setarg gpcfg_pulldown + istore 1,contw +p_setgpio_loop_end: + loop p_setgpio_loop + rtn + +p_clear_gpio_before_sleep_sub2: + arg 8,loopcnt + arg core_gpio_conf1,contr + branch p_setgpio_loop + +p_lpm_dispatch: + fetch 1,mem_lpm_mode + rtn blank + call p_l2cap_malloc_is_fifo_empty + nrtn blank + arg mem_snd_ble_block,rega + call p_queue_get_len + nrtn blank + arg mem_alloc_big_block,rega + call p_queue_get_len + fetcht 1,mem_alloc_normal_total_size + isub temp,null + nrtn zero + branch lpm_dispatch+12 + 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 4373) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (working copy) @@ -1696,4 +1696,125 @@ z_l2cap_ble_queue_free_rx_buffer: copy pdata,regb branch free_buffer + +org z +z_le_adv: + fetch 1,mem_le_adv_enable + rtn blank + arg le_adv_interval_timer,queue + call timer_check + nrtn blank + disable master + enable swfine + call le_init_adv + call le_next_adv_channel + call le_send_adv_ind + nbranch le_adv_not_match,match + fetch 1,mem_le_req_rcv + increase 1,pdata + store 1,mem_le_req_rcv + fetch 1,mem_le_rxbuf + and pdata,0x0f,pdata + beq SCAN_REQ,z_le_send_scan_response + branch le_adv+18 + +z_le_send_scan_response: + arg SCAN_RSP,temp + fetch 1,mem_le_adv_own_addr_type + nsetflag blank,LE_SENDER_ADDR_BIT,temp + storet 1,mem_le_txheader + fetcht 1,mem_le_scan_data_len + add temp,6,pdata + store 1,mem_le_txlen + copy temp,loopcnt + fetch 1,mem_le_adv_own_addr_type + call p_le_get_public_addr,blank + ncall p_le_get_random_addr,blank + storet 6,mem_le_txpayload + arg mem_le_scan_data,contr + call memcpy + branch le_transmit_norx + + +org z +z_le_scan: + fetch 1,mem_le_scan_enable + rtnne LE_SCAN_ENABLE + arg le_scan_interval_timer,queue + call timer_check + nrtn blank + + fetch 2,mem_le_scan_interval + arg le_scan_interval_timer,queue + call timer_init + + call le_init_adv + call le_next_adv_channel + fetch 2,mem_le_scan_window + store 2,mem_le_scan_window_temp + branch z_le_scan_loop +z_le_scan_loop: + disable master + disable swfine + fetchr timeup,2,mem_le_scan_window_temp + call z_le_receive_packet + nbranch z_le_scan_timeout_check,match +z_le_scan_match: + call le_scan_check_sender_addr_type + copy rega,pdata + store 1,mem_le_conn_peer_addr_type +ifdef WHITE_LIST + arg mem_le_white_list_type_and_bd_addr,contw + istore 1,contw + fetch 6,mem_le_rxbuf+2 + istore 6,contw + fetch 1,mem_le_white_list_cnt + beq 0,z_le_scan_match_send_event + fetch 1,mem_le_white_list_filter_policy + beq NONE_FILTER,z_le_scan_match_send_event + beq WHITE_LIST_SCAN_FILTER,z_white_filter_scan_check + beq WHITE_LIST_CONNECT_FILTER,z_le_scan_match_send_event + beq WHITE_LIST_CONN_SCAN_FILTER,z_white_filter_scan_check +z_white_filter_scan_check: + call p_check_addr_in_white_list + nbranch z_le_scan_timeout_check,blank +endif +z_le_scan_match_send_event: + fetch 6,mem_le_rxbuf+2 + store 6,mem_le_plap + + fetch 1,mem_mesh_creat_connection_flag + beq CREAT_CONNECTION,p_le_create_conn + call p_hci_send_event_le_advertising_report + + call le_send_scan_request + nbranch z_le_scan_timeout_check,match + fetch 1,mem_le_rxbuf+1 + beq 6,z_le_scan_timeout_check + call p_hci_send_event_le_advertising_report +z_le_scan_timeout_check: + fetch 2,mem_le_scan_window_temp + nbranch z_le_scan_loop,blank + rtn + +z_le_receive_packet: + call lerx_setfreq +z_le_receive_rxon: + call le_prep + disable match + enable decode_fec0 + enable is_rx + disable is_tx + copy timeup,stop_watch + correlate null,timeout + deposit stop_watch + store 2,mem_le_scan_window_temp + branch le_receive_rxon+7 + +org z +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 Index: ModuleDemo/25_OTA/bt_demo/BT/sched/patch.dat =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/patch.dat (revision 4360) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/patch.dat (working copy) @@ -20,8 +20,8 @@ 00 #mem_patch11 00 #mem_patch12 40 #mem_patch13 -01 #mem_patch14 -00 #mem_patch15 +11 #mem_patch14 +01 #mem_patch15 00 #mem_patch16 06 #mem_patch17 00 #mem_patch18 @@ -42,7 +42,7 @@ c8 #mem_patch27 06 #mem_patch28 88 #mem_patch29 -14 #mem_patch2A +04 #mem_patch2A 29 #mem_patch2B 11 #mem_patch2C 40 #mem_patch2D Index: ModuleDemo/25_OTA/bt_demo/BT/sched/rf.dat =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/rf.dat (revision 4360) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/sched/rf.dat (working copy) @@ -14,7 +14,15 @@ mem_rx_window_init:80 03 mem_rx_window_sniff:00 06 -mem_lpm_xtalcnt:00 0a 1b ef 0b +#if you find lpo_time not near 0x2a, you must think the pre timer maybe error. +#DVDD 0.1uF, VFB 1uF Time: DVDD up time: 4us, VFB up time: 255us +#DVDD 0.1uF, VFB 10uF Time: DVDD up time: 4us, VFB up time: 305us +#clock unit is internal 32K, 1 step is near 32us +#so we set: +#1: digldo pre-on counter(DVDD): 0x02 +#2: exen pre-on counter(VFB): 0x14 +#3: xtal pre-on counter(XTAL) set to zero becouse it will set in lpm_cal_xtal_startup +mem_lpm_xtalcnt:00 20 18 bf 07 mem_ef_base:00 ff 87 mem_eeprom_block_size:80 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 4373) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvoptx (working copy) @@ -274,7 +274,7 @@ 1 1 1 - 0 + 1 0 0 ..\..\User\main.c Index: ModuleDemo/25_OTA/bt_demo/CM0/User/Drv_bt.c =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/Drv_bt.c (revision 4360) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/Drv_bt.c (working copy) @@ -263,11 +263,32 @@ { //gpio leakage of electricity //Bat_ClcGpio(); + uint8_t i; + + for(i=GPIO_0;i