From 9cfdb81e913a8dd363ca4570b4eb4137de3b5837 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Sun, 19 Nov 2017 17:30:49 -0500 Subject: loader: Add dependency fields to module structures. * Declare 'requires' and 'enhances' text fields on module info structure. * Rename 'nonoptreq' to 'optional_modules'. * Update doxygen comments. Still need to investigate dependencies among modules I cannot compile. Change-Id: I3ad9547a0a6442409ff4e352a6d897bef2cc04bf --- apps/app_adsiprog.c | 2 +- apps/app_getcpeid.c | 2 +- apps/app_queue.c | 2 +- apps/app_speech_utils.c | 2 +- apps/app_stack.c | 2 +- apps/app_stasis.c | 2 +- apps/app_voicemail.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'apps') diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index 2dd226fbd..688168e52 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -1613,5 +1613,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk ADSI Programmin .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, - .nonoptreq = "res_adsi", + .requires = "res_adsi", ); diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c index e0b9f1239..868dc97c3 100644 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -140,5 +140,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Get ADSI CPE ID", .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, - .nonoptreq = "res_adsi", + .requires = "res_adsi", ); diff --git a/apps/app_queue.c b/apps/app_queue.c index c62828cfd..e7779b732 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -11345,5 +11345,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "True Call Queueing", .unload = unload_module, .reload = reload, .load_pri = AST_MODPRI_DEVSTATE_CONSUMER, - .nonoptreq = "res_monitor", + .optional_modules = "res_monitor", ); diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c index 339c3161f..2ba297e33 100644 --- a/apps/app_speech_utils.c +++ b/apps/app_speech_utils.c @@ -1003,5 +1003,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Dialplan Speech Applicat .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, - .nonoptreq = "res_speech", + .requires = "res_speech", ); diff --git a/apps/app_stack.c b/apps/app_stack.c index 459c06df2..1f98378c9 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -1320,5 +1320,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT | AST_MODFLAG_LOAD_ORDER, .load = load_module, .unload = unload_module, .load_pri = AST_MODPRI_APP_DEPEND, - .nonoptreq = "res_agi", + .optional_modules = "res_agi", ); diff --git a/apps/app_stasis.c b/apps/app_stasis.c index 81c58e8b0..8d09349b9 100644 --- a/apps/app_stasis.c +++ b/apps/app_stasis.c @@ -144,5 +144,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis dialplan applicat .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, - .nonoptreq = "res_stasis", + .requires = "res_stasis", ); diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 0bcfa4f3a..4853a53f9 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -16488,5 +16488,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc, .load = load_module, .unload = unload_module, .reload = reload, - .nonoptreq = "res_adsi,res_smdi", + .optional_modules = "res_adsi,res_smdi", ); -- cgit v1.2.3