diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-14 12:32:10 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-31 13:57:14 +0200 |
| commit | 839d2a25c7d4e895f3726524e906605e69faddf1 (patch) | |
| tree | 364d762bea1905b0ae01ee10f42ac0c2e1032879 | |
| parent | 8722a342bbc95614b2297eb4698769df6e6ca7e2 (diff) | |
| download | dt-utils-839d2a25c7d4e895f3726524e906605e69faddf1.tar.gz dt-utils-839d2a25c7d4e895f3726524e906605e69faddf1.tar.xz | |
state: Add state to state_variable
A state variable should know which state it belongs to. Add field
for it to struct state_variable.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | src/barebox-state/state.h | 3 | ||||
| -rw-r--r-- | src/barebox-state/state_variables.c | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/barebox-state/state.h b/src/barebox-state/state.h index eb349af..1235dcb 100644 --- a/src/barebox-state/state.h +++ b/src/barebox-state/state.h @@ -137,6 +137,7 @@ struct variable_type { /* instance of a single variable */ struct state_variable { + struct state *state; enum state_variable_type type; struct list_head list; const char *name; @@ -151,7 +152,6 @@ struct state_variable { struct state_uint32 { struct state_variable var; struct param_d *param; - struct state *state; uint32_t value; uint32_t value_default; }; @@ -184,7 +184,6 @@ struct state_mac { struct state_string { struct state_variable var; struct param_d *param; - struct state *state; char *value; const char *value_default; char raw[]; diff --git a/src/barebox-state/state_variables.c b/src/barebox-state/state_variables.c index 0f4a10a..6a828f5 100644 --- a/src/barebox-state/state_variables.c +++ b/src/barebox-state/state_variables.c @@ -92,7 +92,7 @@ static int state_uint32_import(struct state_variable *sv, static int state_uint8_set(struct param_d *p, void *priv) { struct state_uint32 *su32 = priv; - struct state *state = su32->state; + struct state *state = su32->var.state; if (su32->value > 255) return -ERANGE; @@ -123,7 +123,7 @@ static struct state_variable *state_uint8_create(struct state *state, #else su32->var.raw = &su32->value + 3; #endif - su32->state = state; + su32->var.state = state; return &su32->var; } @@ -147,6 +147,7 @@ static struct state_variable *state_uint32_create(struct state *state, su32->param = param; su32->var.size = sizeof(uint32_t); su32->var.raw = &su32->value; + su32->var.state = state; return &su32->var; } @@ -236,6 +237,7 @@ static struct state_variable *state_enum32_create(struct state *state, enum32->num_names = num_names; enum32->var.size = sizeof(uint32_t); enum32->var.raw = &enum32->value; + enum32->var.state = state; for (i = 0; i < num_names; i++) { const char *name; @@ -308,6 +310,7 @@ static struct state_variable *state_mac_create(struct state *state, mac->var.size = ARRAY_SIZE(mac->value); mac->var.raw = mac->value; + mac->var.state = state; mac->param = dev_add_param_mac(&state->dev, name, state_set_dirty, NULL, mac->value, state); @@ -374,7 +377,7 @@ static int state_string_import(struct state_variable *sv, static int state_string_set(struct param_d *p, void *priv) { struct state_string *string = priv; - struct state *state = string->state; + struct state *state = string->var.state; int ret; ret = state_string_copy_to_raw(string, string->value); @@ -419,7 +422,7 @@ static struct state_variable *state_string_create(struct state *state, string = xzalloc(sizeof(*string) + start_size[1]); string->var.size = start_size[1]; string->var.raw = &string->raw; - string->state = state; + string->var.state = state; string->param = dev_add_param_string(&state->dev, name, state_string_set, state_string_get, |