Skip to content

Commit b8067e2

Browse files
author
chaotang
committed
[int][bug][zbt] Fixed the issue where compilation could not be carried out under projects such as zbt/mesh
Project: Bluetooth redmine: #id, REDMINE-id ext-redmine: bug|feat#id [Description in detail] Affected branch: [master] Change-Id: Id148c7a39998ffbe711ff08afff7c765af00ea6c
1 parent d278e7d commit b8067e2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

service/internal/bluetooth_config.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,8 +1549,10 @@ void uart_ipc_path_change(void)
15491549
rt_pm_hw_device_start();
15501550

15511551
HAL_HPAON_WakeCore(CORE_ID_LCPU);
1552+
#ifdef AUDIO_USING_MANAGER
15521553
extern rt_err_t pm_scenario_start(pm_scenario_name_t scenario);
15531554
pm_scenario_start(PM_SCENARIO_AUDIO);
1555+
#endif
15541556
rt_thread_delay(500);
15551557
#ifdef SOC_SF32LB52X
15561558
HAL_RCC_HCPU_ClockSelect(RCC_CLK_MOD_HP_PERI,

zephyr_bt/settings/src/settings_sifli.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ Provides cached data to the framework when requested (required for direct loadin
378378
@param len Length of data to read (requested by framework)
379379
@return len on success, -EINVAL on invalid parameters
380380
*/
381-
static int settings_read_callback(void *arg, void *buf, size_t len)
381+
static ssize_t settings_read_callback(void *arg, void *buf, size_t len)
382382
{
383383
// Unpack callback data (cached value + length)
384384
struct
@@ -464,6 +464,7 @@ static int invoke_load_callback(const struct settings_load_arg *arg,
464464
{
465465
LOG_DBG("set-value OK. key: %s, %p", key, ch->h_set);
466466
}
467+
return rc;
467468
}
468469
}
469470

0 commit comments

Comments
 (0)