@@ -43,7 +43,7 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_BRIDGE_MSC_LOG_LEVEL);
4343 *
4444 * Format: (_key, _presentation_name, _size, _default, _callback, _enabled)
4545 */
46- #define CONFIG_LIST \
46+ #define CFG_OPT_LIST \
4747 X(ble_enable, BLE_ENABLED, 1, "0", ble_enable_opt_cb, (IS_ENABLED(CONFIG_BRIDGE_BLE_ENABLE) && !IS_ENABLED(CONFIG_BRIDGE_BLE_ALWAYS_ON))) \
4848 X(ble_name, BLE_NAME, CONFIG_BT_DEVICE_NAME_MAX, CONFIG_BT_DEVICE_NAME, ble_name_opt_cb, IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC))
4949
@@ -59,36 +59,36 @@ struct cfg_option {
5959/* Define config value strings */
6060#define X (_key , _name , _size , _default , _cb , _enabled )\
6161 static char _key##_var[_size + 1] = _default;
62- CONFIG_LIST
62+ CFG_OPT_LIST
6363#undef X
6464
6565/* Forward declare callback functions */
6666#define X (_key , _name , _size , _default , _cb , _enabled )\
6767 static bool _cb(char *);
68- CONFIG_LIST
68+ CFG_OPT_LIST
6969#undef X
7070
7171/* Determine length of display name strings */
7272union cfg_opt_display_name_len {
7373#define X (_key , _name , _size , _default , _cb , _enabled )\
7474 uint8_t _key[sizeof(STRINGIFY(_name)) + 1];
75- CONFIG_LIST
75+ CFG_OPT_LIST
7676#undef X
7777};
7878
7979/* Determine length of config value strings */
8080union cfg_opt_value_len {
8181#define X (_key , _name , _size , _default , _cb , _enabled )\
8282 uint8_t _key[_size + 1];
83- CONFIG_LIST
83+ CFG_OPT_LIST
8484#undef X
8585};
8686
8787/* Determine length of settings key strings */
8888union cfg_opt_key_len {
8989#define X (_key , _name , _size , _default , _cb , _enabled )\
9090 uint8_t _key[sizeof(STRINGIFY(_key)) + 1];
91- CONFIG_LIST
91+ CFG_OPT_LIST
9292#undef X
9393};
9494
@@ -105,7 +105,7 @@ static struct cfg_option configs[] = {
105105 .settings_value_max_len = _size ,\
106106 .enabled = _enabled ,\
107107 .value_change_cb = _cb },
108- CONFIG_LIST
108+ CFG_OPT_LIST
109109#undef X
110110};
111111
0 commit comments