Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 386e6a04 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "system/device: Remove UNUSED_ATTR" into main

parents bbceb923 1df3e520

system/device/src/device_iot_config_int.cc

+2 −3
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include "osi/include/alarm.h"

#include "osi/include/config.h"

#include "osi/include/future.h"

#include "osi/include/osi.h"

#include "osi/include/properties.h"

#include "types/raw_address.h"
@@ -189,7 +188,7 @@ EXPORT_SYMBOL module_t device_iot_config_module = { 
    .shut_down = device_iot_config_module_shut_down,

    .clean_up = device_iot_config_module_clean_up};



void device_iot_config_write(uint16_t event, UNUSED_ATTR char* p_param) {

void device_iot_config_write(uint16_t event, char* /* p_param */) {

  if (!InitFlags::IsDeviceIotConfigLoggingEnabled()) return;



  log::assert_that(config != NULL, "assert failed: config != NULL");
@@ -294,7 +293,7 @@ bool device_iot_config_compare_key(const entry_t& first, 
  }

}



void device_iot_config_timer_save_cb(UNUSED_ATTR void* data) {

void device_iot_config_timer_save_cb(void* /* data */) {

  // Moving file I/O to btif context instead of timer callback because

  // it usually takes a lot of time to be completed, introducing

  // delays during A2DP playback causing blips or choppiness.

system/device/src/device_iot_config_int.h

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#pragma once



#include "osi/include/config.h"

#include "osi/include/osi.h"



#define PROPERTY_ENABLE_LOGGING \

  "persist.bluetooth.device_iot_config.enablelogging"
@@ -90,7 +89,7 @@ void device_iot_config_save_async(void); 
int device_iot_config_get_device_num(const config_t& config);

void device_iot_config_restrict_device_num(config_t& config);

bool device_iot_config_compare_key(const entry_t& first, const entry_t& second);

void device_iot_config_timer_save_cb(UNUSED_ATTR void* data);

void device_iot_config_timer_save_cb(void* /* data */);

void device_iot_config_set_modified_time();

bool device_iot_config_is_factory_reset(void);

void device_iot_config_delete_files(void);