espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/btdm_crash_when_inquiry_cancel_v3.1' into 'release/v3.1'

Browse Source 
Bugfix/btdm crash when inquiry cancel v3.1

See merge request idf/esp-idf!4278
This commit is contained in:
Jiang Jiang Jian
2019-02-18 20:01:34 +08:00
parent ef2bf23862 6743820bce
commit 83bd616b6f
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/bt/include/esp_bt.h
View File

@ -43,7 +43,7 @@ typedef struct {
} esp_bt_controller_config_t; } esp_bt_controller_config_t;
#ifdef CONFIG_BT_ENABLED #ifdef CONFIG_BT_ENABLED
/* While scanning, if the free memory value in controller is less than SCAN_SEND_ADV_RESERVED_SIZE, /* While scanning, if the free memory value in controller is less than SCAN_SEND_ADV_RESERVED_SIZE,
the adv packet will be discarded until the memory is restored. */ the adv packet will be discarded until the memory is restored. */
#define SCAN_SEND_ADV_RESERVED_SIZE 1000 #define SCAN_SEND_ADV_RESERVED_SIZE 1000
/* enable controller log debug when adv lost */ /* enable controller log debug when adv lost */
@ -285,8 +285,12 @@ bool esp_vhci_host_check_send_available(void);
/** @brief esp_vhci_host_send_packet /** @brief esp_vhci_host_send_packet
* host send packet to controller * host send packet to controller
*
* Should not call this function from within a critical section
* or when the scheduler is suspended.
*
* @param data the packet point * @param data the packet point
*,@param len the packet length * @param len the packet length
*/ */
void esp_vhci_host_send_packet(uint8_t *data, uint16_t len); void esp_vhci_host_send_packet(uint8_t *data, uint16_t len);

2
components/bt/lib

Submodule components/bt/lib updated: d473efc5ca...8d91e55a57

5
components/esp32/ld/esp32.rom.ld
View File

@ -89,6 +89,8 @@ PROVIDE ( esp_crc8 = 0x4005d144 );
PROVIDE ( _etext = 0x4000d66c ); PROVIDE ( _etext = 0x4000d66c );
PROVIDE ( ets_readySet_ = 0x3ffe01f0 ); PROVIDE ( ets_readySet_ = 0x3ffe01f0 );
PROVIDE ( ets_startup_callback = 0x3ffe0404 ); PROVIDE ( ets_startup_callback = 0x3ffe0404 );
PROVIDE ( rwip_coex_cfg = 0x3ff9914c );
PROVIDE ( rwip_priority = 0x3ff99159 );
PROVIDE ( exc_cause_table = 0x3ff991d0 ); PROVIDE ( exc_cause_table = 0x3ff991d0 );
PROVIDE ( _exit_r = 0x4000bd28 ); PROVIDE ( _exit_r = 0x4000bd28 );
PROVIDE ( free = 0x4000beb8 ); PROVIDE ( free = 0x4000beb8 );
@ -676,6 +678,9 @@ PROVIDE ( ld_sco_modify = 0x40031778 );
PROVIDE ( lm_cmd_cmp_send = 0x40051838 ); PROVIDE ( lm_cmd_cmp_send = 0x40051838 );
PROVIDE ( ld_sco_frm_cbk = 0x400349dc ); PROVIDE ( ld_sco_frm_cbk = 0x400349dc );
PROVIDE ( ld_acl_sniff_frm_cbk = 0x4003482c ); PROVIDE ( ld_acl_sniff_frm_cbk = 0x4003482c );
PROVIDE ( ld_inq_end = 0x4003ab48 );
PROVIDE ( ld_inq_sched = 0x4003aba4 );
PROVIDE ( ld_inq_frm_cbk = 0x4003ae4c );
PROVIDE ( r_ld_acl_active_hop_types_get = 0x40036e10 ); PROVIDE ( r_ld_acl_active_hop_types_get = 0x40036e10 );
PROVIDE ( r_ld_acl_afh_confirm = 0x40036d40 ); PROVIDE ( r_ld_acl_afh_confirm = 0x40036d40 );
PROVIDE ( r_ld_acl_afh_prepare = 0x40036c84 ); PROVIDE ( r_ld_acl_afh_prepare = 0x40036c84 );