From cab040f16ffc6e82b4280d8f71a1e8c70289f07c Mon Sep 17 00:00:00 2001 From: Amin Ben Ramdhane Date: Fri, 10 Apr 2020 13:46:57 +0100 Subject: [PATCH] Fix compilation issues after removing deprecate objects --- dmtree/tr064/upnp_device.c | 6 ------ dmtree/tr181/deviceinfo.c | 13 ------------- dmtree/tr181/deviceinfo.h | 1 - dmtree/tr181/hosts-openwrt.c | 15 --------------- dmtree/tr181/os.h | 16 ---------------- 5 files changed, 51 deletions(-) diff --git a/dmtree/tr064/upnp_device.c b/dmtree/tr064/upnp_device.c index fea95a0b..ef1409fe 100644 --- a/dmtree/tr064/upnp_device.c +++ b/dmtree/tr064/upnp_device.c @@ -92,10 +92,7 @@ DMOBJ tRoot181ObjUPNPBBF[] = { #if BBF_TR104 {"VoiceService", &DMREAD, NULL, NULL, NULL, browseVoiceServiceInst, NULL, NULL, tServicesVoiceServiceObj, tServicesVoiceServiceParams, NULL, BBFDM_BOTH}, #endif -{CUSTOM_PREFIX"ICE", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_IceParam, NULL, BBFDM_BOTH}, {CUSTOM_PREFIX"IGMP", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_IgmpParam, NULL, BBFDM_BOTH}, -{CUSTOM_PREFIX"IpAccCfg", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,tSe_IpAccObj, NULL, NULL, BBFDM_BOTH}, -{CUSTOM_PREFIX"LoginCfg", &DMREAD, NULL, NULL, NULL, NULL,NULL, &DMNONE,NULL, tSe_LoginCfgParam, NULL, BBFDM_BOTH}, {CUSTOM_PREFIX"PowerManagement", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_PowerManagementParam, NULL, BBFDM_BOTH}, {CUSTOM_PREFIX"SyslogCfg", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,NULL, tSe_SyslogCfgParam, NULL, BBFDM_BOTH}, {"SoftwareModules", &DMREAD, NULL, NULL, NULL, NULL, NULL, &DMNONE,tSoftwareModulesObj, NULL, NULL, BBFDM_BOTH}, @@ -127,10 +124,7 @@ UPNP_SUPPORTED_DM tUPNPSupportedDM_181[] = { {"/BBF/Time/", DMROOT_URI_181, DMROOT_URL_181, "Time from "DMROOT_DESC_181, ""}, {"/BBF/UPnP/", DMROOT_URI_181, DMROOT_URL_181, "UPnP from "DMROOT_DESC_181, ""}, {"/BBF/VoiceService/", "urn:broadband-forum-org:wt-104-2-0-0", "https://www.broadband-forum.org/cwmp/tr-104-2-0-0.html", "TR-104 Voice:2 Service Object definition", ""}, -{"/BBF/"CUSTOM_PREFIX"ICE/", "urn:iopsys-eu:na", "https://www.iopsys.eu/", "iopsys extension for ICE", ""}, {"/BBF/"CUSTOM_PREFIX"IGMP/", "urn:iopsys-eu:na", "https://www.iopsys.eu/", "iopsys extension for ICE", ""}, -{"/BBF/"CUSTOM_PREFIX"IpAccCfg/", "urn:iopsys-eu:na", "https://www.iopsys.eu/", "iopsys extension for IGMP", ""}, -{"/BBF/"CUSTOM_PREFIX"LoginCfg/", "urn:iopsys-eu:na", "https://www.iopsys.eu/", "iopsys extension for LoginCfg", ""}, {"/BBF/"CUSTOM_PREFIX"PowerManagement/", "urn:iopsys-eu:na", "https://www.iopsys.eu/", "iopsys extension for PowerManagement", ""}, {"/BBF/"CUSTOM_PREFIX"SyslogCfg/", "urn:iopsys-eu:na", "https://www.iopsys.eu/", "iopsys extension for SyslogCfg", ""}, {"/BBF/SoftwareModules/", DMROOT_URI_181, DMROOT_URL_181, "SoftwareModules from "DMROOT_DESC_181, ""}, diff --git a/dmtree/tr181/deviceinfo.c b/dmtree/tr181/deviceinfo.c index 2c67cf4e..d647caaf 100644 --- a/dmtree/tr181/deviceinfo.c +++ b/dmtree/tr181/deviceinfo.c @@ -423,19 +423,6 @@ DMLEAF tDeviceInfoProcessStatusProcessParams[] = { {0} }; -/*** DeviceInfo.X_IOPSYS_EU_CATV. ***/ -DMLEAF tCatTvParams[] = { -#ifndef GENERIC_OPENWRT -/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/ -{"Enabled", &DMWRITE, DMT_STRING, os_iopsys_get_catv_enabled, os_iopsys_set_device_catvenabled, NULL, NULL, BBFDM_BOTH}, -{"OpticalInputLevel", &DMREAD, DMT_STRING, os_iopsys_get_catv_optical_input_level, NULL, NULL, NULL, BBFDM_BOTH}, -{"RFOutputLevel", &DMREAD, DMT_STRING, os_iopsys_get_catv_rf_output_level, NULL, NULL, NULL, BBFDM_BOTH}, -{"Temperature", &DMREAD, DMT_STRING, os_iopsys_get_catv_temperature, NULL, NULL, NULL, BBFDM_BOTH}, -{"Voltage", &DMREAD, DMT_STRING, os_iopsys_get_catv_voltage, NULL, NULL, NULL, BBFDM_BOTH}, -#endif -{0} -}; - /* *** Device.DeviceInfo.VendorLogFile.{i}. *** */ DMLEAF tDeviceInfoVendorLogFileParams[] = { /* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/ diff --git a/dmtree/tr181/deviceinfo.h b/dmtree/tr181/deviceinfo.h index e823644e..01f84b55 100644 --- a/dmtree/tr181/deviceinfo.h +++ b/dmtree/tr181/deviceinfo.h @@ -19,7 +19,6 @@ #define DEFAULT_CONFIG_DIR "/etc/config/" extern DMLEAF tDeviceInfoParams[]; -extern DMLEAF tCatTvParams[]; extern DMLEAF tDeviceInfoVendorConfigFileParams[]; extern DMLEAF tDeviceInfoVendorLogFileParams[]; extern DMLEAF tDeviceInfoMemoryStatusParams[]; diff --git a/dmtree/tr181/hosts-openwrt.c b/dmtree/tr181/hosts-openwrt.c index 9c887c6a..133bba7a 100644 --- a/dmtree/tr181/hosts-openwrt.c +++ b/dmtree/tr181/hosts-openwrt.c @@ -17,11 +17,6 @@ int os__get_host_nbr_entries(char *refparam, struct dmctx *ctx, void *data, char return not_implemented(value); } -int os__get_host_interfacetype(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) -{ - return not_implemented(value); -} - int os__get_host_associateddevice(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { return not_implemented(value); @@ -32,16 +27,6 @@ int os__get_host_layer3interface(char *refparam, struct dmctx *ctx, void *data, return not_implemented(value); } -int os__get_host_interface_type(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) -{ - return not_implemented(value); -} - -int os__get_host_interfacename(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) -{ - return not_implemented(value); -} - int os__get_host_ipaddress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { return not_implemented(value); diff --git a/dmtree/tr181/os.h b/dmtree/tr181/os.h index 31fdf014..a9e356e1 100644 --- a/dmtree/tr181/os.h +++ b/dmtree/tr181/os.h @@ -31,11 +31,8 @@ int os__browseProcessEntriesInst(struct dmctx *dmctx, DMNODE *parent_node, void int os__browsehostInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance); int os__get_host_nbr_entries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int os__get_host_interfacetype(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int os__get_host_associateddevice(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int os__get_host_layer3interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int os__get_host_interface_type(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int os__get_host_interfacename(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int os__get_host_ipaddress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int os__get_host_hostname(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int os__get_host_active(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); @@ -111,17 +108,4 @@ int os_get_wifi_access_point_status (char *refparam, struct dmctx *ctx, void *da int os_get_radio_operating_standard(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); char * os__get_default_wpa_key(); -/* IOPSYS-WRT only - */ -#ifndef GENERIC_OPENWRT -int os_iopsys_get_device_memory_bank(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int os_iopsys_set_device_memory_bank(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int os_iopsys_get_catv_enabled(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int os_iopsys_set_device_catvenabled(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int os_iopsys_get_catv_optical_input_level(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int os_iopsys_get_catv_rf_output_level(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int os_iopsys_get_catv_temperature(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int os_iopsys_get_catv_voltage(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -#endif - #endif