Jacob/zmk
1
0
Fork 0
forked from kofal.net/zmk
Code Pull Requests Activity

refactor(behaviors): Make label property optional

Browse Source 
Changed all code (except for layer names) which used the label property
to use DEVICE_DT_NAME() instead, which uses the label if set or falls
back to the full node name. This matches how Zephyr determines the node
names used with device_get_binding() and allows us to start removing the
deprecated label property from things.
This commit is contained in:
Joel Spadin
2023-09-05 11:35:51 -05:00
parent dbe5dfb1d8
commit 179bdbc41a
15 changed files with 71 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app/src/ext_power_generic.c
View File

@@ -39,7 +39,7 @@ static void ext_power_save_state_work(struct k_work *work) {
const struct device *ext_power = DEVICE_DT_GET(DT_DRV_INST(0));
struct ext_power_generic_data *data = ext_power->data;
snprintf(setting_path, 40, "ext_power/state/%s", DT_INST_PROP(0, label));
snprintf(setting_path, sizeof(setting_path), "ext_power/state/%s", ext_power->name);
settings_save_one(setting_path, &data->status, sizeof(data->status));
}
@@ -86,38 +86,38 @@ static int ext_power_generic_get(const struct device *dev) {
}
#if IS_ENABLED(CONFIG_SETTINGS)
static int ext_power_settings_set_status(const struct device *dev, size_t len,
settings_read_cb read_cb, void *cb_arg) {
struct ext_power_generic_data *data = dev->data;
if (len != sizeof(data->status)) {
return -EINVAL;
}
int rc = read_cb(cb_arg, &data->status, sizeof(data->status));
if (rc >= 0) {
data->settings_init = true;
if (data->status) {
ext_power_generic_enable(dev);
} else {
ext_power_generic_disable(dev);
}
return 0;
}
return rc;
}
static int ext_power_settings_set(const char *name, size_t len, settings_read_cb read_cb,
void *cb_arg) {
const struct device *ext_power = DEVICE_DT_GET(DT_DRV_INST(0));
const char *next;
int rc;
if (settings_name_steq(name, DT_INST_PROP(0, label), &next) && !next) {
const struct device *ext_power = DEVICE_DT_GET(DT_DRV_INST(0));
struct ext_power_generic_data *data = ext_power->data;
if (len != sizeof(data->status)) {
return -EINVAL;
}
rc = read_cb(cb_arg, &data->status, sizeof(data->status));
if (rc >= 0) {
data->settings_init = true;
if (ext_power == NULL) {
LOG_ERR("Unable to retrieve ext_power device: %s", DT_INST_PROP(0, label));
return -EIO;
}
if (data->status) {
ext_power_generic_enable(ext_power);
} else {
ext_power_generic_disable(ext_power);
}
return 0;
}
return rc;
if (settings_name_steq(name, ext_power->name, &next) && !next) {
return ext_power_settings_set_status(ext_power, len, read_cb, cb_arg);
}
return -ENOENT;
}