michaelh/zephyr
1
0
Fork 0
Code Releases Activity

counter: Fix warning due to deprecation of legacy API

Browse source 
counter_callback_t has been previously prefixed with __deprecated
but it is used in prototype of deprecated function (counter_set_alarm).
It seems that compiler generates the warning even though function is
not used. Removed __deprecated prefix from the typedef, keeping it for
the function only.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2019-01-22 09:21:25 +01:00 • committed by Anas Nashif
commit f81b225f6a
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/counter.h
View file

@ -77,9 +77,6 @@ struct counter_alarm_cfg {
*/ */
typedef void (*counter_wrap_callback_t)(struct device *dev, void *user_data); typedef void (*counter_wrap_callback_t)(struct device *dev, void *user_data);
__deprecated typedef void (*counter_callback_t)(struct device *dev,
void *user_data);
/** @brief Structure with generic counter features. */ /** @brief Structure with generic counter features. */
struct counter_config_info { struct counter_config_info {
u32_t max_wrap; /*!< Maximal (default) wrap value on which counter is u32_t max_wrap; /*!< Maximal (default) wrap value on which counter is
@ -405,9 +402,8 @@ static inline u32_t _impl_counter_get_max_relative_alarm(struct device *dev)
return api->get_max_relative_alarm(dev); return api->get_max_relative_alarm(dev);
} }
#ifdef __cplusplus /* Deprecated */
} typedef void (*counter_callback_t)(struct device *dev, void *user_data);
#endif
__deprecated static inline int counter_set_alarm(struct device *dev, __deprecated static inline int counter_set_alarm(struct device *dev,
counter_callback_t callback, counter_callback_t callback,
@ -436,6 +432,11 @@ __deprecated static inline void *counter_get_user_data(struct device *dev)
return NULL; return NULL;
} }
} }
#ifdef __cplusplus
}
#endif
/** /**
* @} * @}
*/ */