mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2026-02-13 11:30:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ticket refs #10037 : switch boot bank

Browse source
This commit is contained in:
imen.bhiri 2016-09-15 15:39:30 +01:00
parent 6c0a5084bc
commit aadd77fc23
3 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dm/dmtree/common/deviceinfo.c
View file

@ -216,10 +216,31 @@ int get_base_mac_addr(char *refparam, struct dmctx *ctx, char **value)
dmubus_call("router", "info", UBUS_ARGS{{}}, 0, &res);
DM_ASSERT(res, *value = "");
json_select(res, "system", 0, "basemac", value, NULL);
json_select(res, "system", 0, "basemac", value, NULL);
return 0;
}
int get_device_memory_bank(char *refparam, struct dmctx *ctx, char **value)
{
json_object *res;
dmubus_call("router", "memory_bank", UBUS_ARGS{{}}, 0, &res);
DM_ASSERT(res, *value = "");
json_select(res, "code", 0, NULL, value, NULL);
return 0;
}
int set_device_memory_bank(char *refparam, struct dmctx *ctx, int action, char *value)
{
switch (action) {
case VALUECHECK:
return 0;
case VALUESET:
dmubus_call_set("router", "memory_bank", UBUS_ARGS{{"bank", value, Integer}}, 1);
return 0;
}
return 0;
}
int get_catv_enabled(char *refparam, struct dmctx *ctx, char **value)
{
char *catv;
@ -380,6 +401,7 @@ int entry_method_root_DeviceInfo(struct dmctx *ctx)
DMPARAM("SpecVersion", ctx, "0", get_device_specversion, NULL, NULL, 1, 1, UNDEF, NULL);
DMPARAM("ProvisioningCode", ctx, "1", get_device_provisioningcode, set_device_provisioningcode, NULL, 1, 0, 2, NULL);
DMPARAM("X_INTENO_SE_BaseMacAddr", ctx, "0", get_base_mac_addr, NULL, NULL, 0, 1, UNDEF, NULL);
DMPARAM("X_INTENO_SE_MemoryBank", ctx, "1", get_device_memory_bank, set_device_memory_bank, NULL, 0, 1, UNDEF, NULL);
DMPARAM("X_INTENO_SE_CATVEnabled", ctx, "1", get_catv_enabled, set_device_catvenabled, NULL, 0, 1, UNDEF, NULL);
DMOBJECT(DMROOT"DeviceInfo.X_INTENO_SE_CATV.", ctx, "0", 0, NULL, NULL, NULL);
DMPARAM("Enabled", ctx, "1", get_catv_enabled, set_device_catvenabled, NULL, 0, 1, UNDEF, NULL);

6
dm/dmubus.c
View file

@ -95,8 +95,12 @@ int dmubus_call_set(char *obj, char *method, struct ubus_arg u_args[], int u_arg
sprintf(p, "{");
for (i = 0; i < u_args_size; i++) {
p += strlen(p);
if (i == 0)
if (i == 0 && u_args[i].type == 1)
sprintf(p, "\"%s\": %s", u_args[i].key, u_args[i].val);
else if (i == 0 && u_args[i].type == 0)
sprintf(p, "\"%s\": \"%s\"", u_args[i].key, u_args[i].val);
else if (i != 0 && u_args[i].type == 1)
sprintf(p, ", \"%s\": %s", u_args[i].key, u_args[i].val);
else
sprintf(p, ", \"%s\": \"%s\"", u_args[i].key, u_args[i].val);
}

6
dm/dmubus.h
View file

@ -50,6 +50,12 @@ struct ubus_msg {
struct ubus_arg{
char *key;
char *val;
int type;
};
enum ubus_args_enum {
String,
Integer,
};
extern struct dmubus_ctx dmubus_ctx;