Skip to content

Commit

Permalink
Merge branch 'optimize/bt_make_alarm_num_configurable_v4.4' into 'rel…
Browse files Browse the repository at this point in the history
…ease/v4.4'

optimize(ble_mesh): Make alarm number configurable (v4.4)

See merge request espressif/esp-idf!30509
  • Loading branch information
wmy-espressif committed May 10, 2024
2 parents be2fba6 + 50b301f commit 5510aab
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 1 deletion.
6 changes: 6 additions & 0 deletions components/bt/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ menu "Bluetooth"
This option is to configure the buffer size of the hci adv report cache in hci debug mode.
This is a ring buffer, the new data will overwrite the oldest data if the buffer is full.

menu "Common Options"
visible if (BT_BLUEDROID_ENABLED || BT_NIMBLE_ENABLED)

source "$IDF_PATH/components/bt/common/Kconfig.in"
endmenu

endmenu

menuconfig BLE_MESH
Expand Down
6 changes: 6 additions & 0 deletions components/bt/common/Kconfig.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
config BT_ALARM_MAX_NUM
int "Maximum number of Bluetooth alarms"
default 50
help
This option decides the maximum number of alarms which
could be used by Bluetooth host.
9 changes: 9 additions & 0 deletions components/bt/common/include/bt_user_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@
#define UC_BTC_TASK_STACK_SIZE 4096
#endif

/**********************************************************
* Alarm reference
**********************************************************/
#ifdef CONFIG_BT_ALARM_MAX_NUM
#define UC_ALARM_MAX_NUM CONFIG_BT_ALARM_MAX_NUM
#else
#define UC_ALARM_MAX_NUM 50
#endif

/**********************************************************
* Trace reference
**********************************************************/
Expand Down
3 changes: 2 additions & 1 deletion components/bt/common/osi/include/osi/alarm.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include <stdint.h>
#include "esp_timer.h"
#include "bt_user_config.h"

typedef struct alarm_t osi_alarm_t;
typedef uint64_t period_ms_t;
Expand All @@ -33,7 +34,7 @@ typedef enum {
OSI_ALARM_ERR_INVALID_STATE = -3,
} osi_alarm_err_t;

#define ALARM_CBS_NUM 50
#define ALARM_CBS_NUM UC_ALARM_MAX_NUM
#define ALARM_ID_BASE 1000

int osi_alarm_create_mux(void);
Expand Down

0 comments on commit 5510aab

Please sign in to comment.