diff --git a/dmentry.c b/dmentry.c index 4f839636..b58e570a 100644 --- a/dmentry.c +++ b/dmentry.c @@ -479,21 +479,6 @@ void free_all_list_enabled_lwnotify() } } -int dm_entry_load_enabled_notify(unsigned int dm_type, unsigned int amd_version, int instance_mode, void (*add_list_value_change)(char *param_name, char *param_data, char *param_type), void (*send_active_value_change)(void)) -{ - struct dmctx dmctx = {0}; - - dm_ctx_init(&dmctx, dm_type, amd_version, instance_mode); - dmctx.in_param = ""; - - free_all_list_enabled_lwnotify(); - dm_entry_enabled_notify_check_value_change(&dmctx, add_list_value_change, send_active_value_change); - dm_entry_enabled_notify(&dmctx, add_list_enabled_lwnotify); - - dm_ctx_clean(&dmctx); - return 0; -} - int dm_entry_reload_enabled_notify(unsigned int dm_type, unsigned int amd_version, int instance_mode) { struct dmctx dmctx = {0}; diff --git a/dmentry.h b/dmentry.h index 83748374..7fd790fe 100644 --- a/dmentry.h +++ b/dmentry.h @@ -31,7 +31,6 @@ int dm_ctx_init(struct dmctx *ctx, unsigned int dm_type, unsigned int amd_versio int dm_ctx_init_sub(struct dmctx *ctx, unsigned int dm_type, unsigned int amd_version, unsigned int instance_mode); int dm_entry_param_method(struct dmctx *ctx, int cmd, char *inparam, char *arg1, char *arg2); int dm_entry_apply(struct dmctx *ctx, int cmd, char *arg1, char *arg2); -int dm_entry_load_enabled_notify(unsigned int dm_type, unsigned int amd_version, int instance_mode, void (*add_list_value_change)(char *param_name, char *param_data, char *param_type), void (*send_active_value_change)(void)); int dm_entry_reload_enabled_notify(unsigned int dm_type, unsigned int amd_version, int instance_mode); int adm_entry_get_linker_param(struct dmctx *ctx, char *param, char *linker, char **value); int adm_entry_get_linker_value(struct dmctx *ctx, char *param, char **value); diff --git a/libbbf_api/dmbbf.c b/libbbf_api/dmbbf.c index d01753bd..4476ca8d 100644 --- a/libbbf_api/dmbbf.c +++ b/libbbf_api/dmbbf.c @@ -81,8 +81,6 @@ static int enabled_tracked_param_check_param(DMPARAM_ARGS); #endif static int enabled_notify_check_obj(DMOBJECT_ARGS); static int enabled_notify_check_param(DMPARAM_ARGS); -static int enabled_notify_check_value_change_param(DMPARAM_ARGS); -static int enabled_notify_check_value_change_obj(DMOBJECT_ARGS); static int get_linker_check_obj(DMOBJECT_ARGS); static int get_linker_check_param(DMPARAM_ARGS); static int get_linker_value_check_obj(DMOBJECT_ARGS); @@ -106,7 +104,6 @@ char dmroot[64] = "Device"; int bbfdatamodel_type = BBFDM_BOTH; -void (*api_add_list_value_change)(char *param_name, char *param_data, char *param_type) = NULL; void (*api_send_active_value_change)(void) = NULL; void (*api_add_list_enabled_lwnotify)(char *param, char *notification, char *value) = NULL; @@ -1982,75 +1979,6 @@ static int enabled_notify_check_param(DMPARAM_ARGS) return 0; } -/********************* - * Check enabled notify value change - ********************/ -int dm_entry_enabled_notify_check_value_change(struct dmctx *dmctx, void (*add_list_value_change_arg)(char *param_name, char *param_data, char *param_type), void (*send_active_value_change_arg)(void)) -{ - DMOBJ *root = dmctx->dm_entryobj; - FILE *fp; - char buf[512]; - char *jval; - - fp = fopen(DM_ENABLED_NOTIFY, "r"); - if (fp == NULL) { - return 0; - } - api_add_list_value_change = add_list_value_change_arg; - api_send_active_value_change = send_active_value_change_arg; - - while (fgets(buf, 512, fp) != NULL) { - DMNODE node = {.current_object = ""}; - int len = strlen(buf); - if (len) - buf[len-1] = '\0'; - bbf_api_dmjson_parse_init(buf); - bbf_api_dmjson_get_string("parameter", &jval); - if (jval == NULL || strlen(jval) == 0) - continue; - dmctx->in_param = dmstrdup(jval?jval:""); - bbf_api_dmjson_get_string("value", &jval); - dmctx->in_value = dmstrdup(jval?jval:""); - bbf_api_dmjson_get_string("notification", &jval); - dmctx->in_notification = dmstrdup(jval?jval:""); - bbf_api_dmjson_parse_fini(); - dmctx->checkobj = NULL ; - dmctx->checkleaf = NULL; - dmctx->method_obj = enabled_notify_check_value_change_obj; - dmctx->method_param = enabled_notify_check_value_change_param; - dm_browse(dmctx, &node, root, NULL, NULL); - } - fclose(fp); - return 0; -} - -static int enabled_notify_check_value_change_obj(DMOBJECT_ARGS) -{ - return FAULT_9005; -} - -static int enabled_notify_check_value_change_param(DMPARAM_ARGS) -{ - char *refparam, *value = ""; - dmastrcat(&refparam, node->current_object, lastname); - if (strcmp(refparam, dmctx->in_param) != 0) { - dmfree(refparam); - return FAULT_9005; - } - (get_cmd)(refparam, dmctx, data, instance, &value); - - if (value && strcmp(value, dmctx->in_value) != 0) { - if (api_add_list_value_change) { - api_add_list_value_change(refparam, value, DMT_TYPE[type]); - } - if(dmctx->in_notification[0] =='2' && api_send_active_value_change) { - api_send_active_value_change(); - } - } - dmfree(refparam); - return 0; -} - /****************** * get linker param *****************/ diff --git a/libbbf_api/dmbbf.h b/libbbf_api/dmbbf.h index dc7b3b64..4a44e385 100644 --- a/libbbf_api/dmbbf.h +++ b/libbbf_api/dmbbf.h @@ -66,7 +66,6 @@ extern struct dm_notif_s DMNONE; extern struct dm_notif_s DMACTIVE; extern struct dm_notif_s DMPASSIVE; -extern void (*api_add_list_value_change)(char *param_name, char *param_data, char *param_type); extern void (*api_send_active_value_change)(void); extern void (*api_add_list_enabled_lwnotify)(char *param, char *notification, char *value); #define DMPARAM_ARGS \ @@ -569,7 +568,6 @@ int dm_entry_delete_object(struct dmctx *ctx); int dm_entry_set_value(struct dmctx *ctx); int dm_entry_set_notification(struct dmctx *ctx); int dm_entry_enabled_notify(struct dmctx *dmctx, void (*add_list_enabled_lwnotify_arg)(char *param, char *notification, char *value)); -int dm_entry_enabled_notify_check_value_change(struct dmctx *dmctx, void (*add_list_value_change_arg)(char *param_name, char *param_data, char *param_type), void (*send_active_value_change_arg)(void)); int dm_entry_get_linker(struct dmctx *ctx); int dm_entry_get_linker_value(struct dmctx *ctx); #ifdef BBF_TR064