From a9dff9e62134c3b758afc243eee1da5ed8a0a439 Mon Sep 17 00:00:00 2001 From: vdutta Date: Fri, 11 Sep 2020 13:01:35 +0530 Subject: [PATCH] operate: remove dependency of cmwp uci config --- dmoperate.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/dmoperate.c b/dmoperate.c index b2aa21d4..e0e17349 100644 --- a/dmoperate.c +++ b/dmoperate.c @@ -41,25 +41,11 @@ bool is_str_eq(const char *s1, const char *s2) static void bbf_init(struct dmctx *dm_ctx, char *path) { - char *uci_amd = NULL, *uci_instance = NULL; - int amd = AMD_2, instance = INSTANCE_MODE_ALIAS; + unsigned int amd = AMD_5, instance = INSTANCE_MODE_NUMBER; - if(match(path, "[[]+")) { - if(!match(path, GLOB_EXPR)) { - amd = AMD_5; - } - } else { - dmuci_get_option_value_string("cwmp", "cpe", "amd_version", &uci_amd); - if(uci_amd) { - amd = atoi(uci_amd); - dmfree(uci_amd); - } - dmuci_get_option_value_string("cwmp", "cpe", "instance_mode", &uci_instance); - if(uci_instance) { - if(!is_str_eq(uci_instance, "InstanceAlias")) - instance = INSTANCE_MODE_NUMBER; - dmfree(uci_instance); - } + if (match(path, "[[]+")) { + if (!match(path, GLOB_EXPR)) + instance = INSTANCE_MODE_ALIAS; } dm_ctx_init_sub(dm_ctx, DM_CWMP, amd, instance); }