[asterisk-commits] kpfleming: branch group/new_loader_completion
r40552 - in /team/group/new_loa...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sat Aug 19 15:40:26 MST 2006
Author: kpfleming
Date: Sat Aug 19 17:40:26 2006
New Revision: 40552
URL: http://svn.digium.com/view/asterisk?rev=40552&view=rev
Log:
more cleanups
get rid of some compiler warnings building misdn_lib
Modified:
team/group/new_loader_completion/Makefile
team/group/new_loader_completion/Makefile.moddir_rules
team/group/new_loader_completion/build_tools/embed_modules.xml
team/group/new_loader_completion/channels/misdn/isdn_lib.c
team/group/new_loader_completion/channels/misdn/isdn_lib.h
team/group/new_loader_completion/channels/misdn/isdn_lib_intern.h
team/group/new_loader_completion/channels/misdn/isdn_msg_parser.c
Modified: team/group/new_loader_completion/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/Makefile?rev=40552&r1=40551&r2=40552&view=diff
==============================================================================
--- team/group/new_loader_completion/Makefile (original)
+++ team/group/new_loader_completion/Makefile Sat Aug 19 17:40:26 2006
@@ -211,15 +211,15 @@
ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
-MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs
+MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs main
OTHER_SUBDIRS:=utils agi
-SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
+SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
MOD_SUBDIRS_DEPEND:=$(MOD_SUBDIRS:%=%-depend)
OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
-SUBDIRS_DEPEND:=$(MOD_SUBDIRS_DEPEND) $(OTHER_SUBDIRS_DEPEND)
+SUBDIRS_DEPEND:=$(OTHER_SUBDIRS_DEPEND) $(MOD_SUBDIRS_DEPEND)
SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
@@ -248,7 +248,7 @@
HAVEDOT=no
endif
-all: cleantest main
+all: cleantest $(SUBDIRS)
@echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, but +"
@echo " + cannot be run before being installed by +"
@@ -276,19 +276,19 @@
@echo "EMBED_LIBS+="`$(MAKE) -s -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
makeopts.embed_rules: menuselect.makeopts
+ @echo "Generating embedded module rules ..."
@rm -f $@
@$(MAKE) -s $(MOD_SUBDIRS_EMBED_LDSCRIPT)
@$(MAKE) -s $(MOD_SUBDIRS_EMBED_LDFLAGS)
@$(MAKE) -s $(MOD_SUBDIRS_EMBED_LIBS)
-$(MOD_SUBDIRS): depend menuselect.makeopts
+$(SUBDIRS): depend makeopts.embed_rules
+
+$(MOD_SUBDIRS):
@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@ SUBDIR=$@ all
-$(OTHER_SUBDIRS): depend menuselect.makeopts
+$(OTHER_SUBDIRS):
@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@ SUBDIR=$@ all
-
-main: makeopts.embed_rules $(SUBDIRS)
- @CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
Modified: team/group/new_loader_completion/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/Makefile.moddir_rules?rev=40552&r1=40551&r2=40552&view=diff
==============================================================================
--- team/group/new_loader_completion/Makefile.moddir_rules (original)
+++ team/group/new_loader_completion/Makefile.moddir_rules Sat Aug 19 17:40:26 2006
@@ -98,4 +98,4 @@
depend: .depend
.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c *.cc`
+ ../build_tools/mkdep $(CFLAGS) `ls *.c *.cc 2> /dev/null`
Modified: team/group/new_loader_completion/build_tools/embed_modules.xml
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/build_tools/embed_modules.xml?rev=40552&r1=40551&r2=40552&view=diff
==============================================================================
--- team/group/new_loader_completion/build_tools/embed_modules.xml (original)
+++ team/group/new_loader_completion/build_tools/embed_modules.xml Sat Aug 19 17:40:26 2006
@@ -1,4 +1,4 @@
- <category name="MENUSELECT_EMBED" displayname="Module Embedding" positive_output="yes">
+ <category name="MENUSELECT_EMBED" displayname="Module Embedding" positive_output="yes" remove_on_change="main/asterisk">
<member name="apps" displayname="Applications" remove_on_change="apps/*.o">
</member>
<member name="cdr" displayname="Call Detail Recording" remove_on_change="cdr/*.o">
Modified: team/group/new_loader_completion/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/misdn/isdn_lib.c?rev=40552&r1=40551&r2=40552&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/misdn/isdn_lib.c (original)
+++ team/group/new_loader_completion/channels/misdn/isdn_lib.c Sat Aug 19 17:40:26 2006
@@ -15,8 +15,8 @@
#include <syslog.h>
#include <mISDNuser/isdn_debug.h>
+#include "isdn_lib_intern.h"
#include "isdn_lib.h"
-#include "isdn_lib_intern.h"
void misdn_join_conf(struct misdn_bchannel *bc, int conf_id);
void misdn_split_conf(struct misdn_bchannel *bc, int conf_id);
@@ -234,11 +234,6 @@
void manager_bchannel_setup (struct misdn_bchannel *bc);
void manager_bchannel_cleanup (struct misdn_bchannel *bc);
-int isdn_msg_get_index(struct isdn_msg msgs[], msg_t *frm, int nt);
-enum event_e isdn_msg_get_event(struct isdn_msg msgs[], msg_t *frm, int nt);
-int isdn_msg_parse_event(struct isdn_msg msgs[], msg_t *frm, struct misdn_bchannel *bc, int nt);
-char * isdn_get_info(struct isdn_msg msgs[], enum event_e event, int nt);
-msg_t * isdn_msg_build_event(struct isdn_msg msgs[], struct misdn_bchannel *bc, enum event_e event, int nt);
void ec_chunk( struct misdn_bchannel *bc, unsigned char *rxchunk, unsigned char *txchunk, int chunk_size);
/* end */
int bchdev_echocancel_activate(struct misdn_bchannel* dev);
Modified: team/group/new_loader_completion/channels/misdn/isdn_lib.h
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/misdn/isdn_lib.h?rev=40552&r1=40551&r2=40552&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/misdn/isdn_lib.h (original)
+++ team/group/new_loader_completion/channels/misdn/isdn_lib.h Sat Aug 19 17:40:26 2006
@@ -458,5 +458,4 @@
void bc_state_change(struct misdn_bchannel *bc, enum bchannel_state state);
-
#endif
Modified: team/group/new_loader_completion/channels/misdn/isdn_lib_intern.h
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/misdn/isdn_lib_intern.h?rev=40552&r1=40551&r2=40552&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/misdn/isdn_lib_intern.h (original)
+++ team/group/new_loader_completion/channels/misdn/isdn_lib_intern.h Sat Aug 19 17:40:26 2006
@@ -10,7 +10,6 @@
#include <pthread.h>
#include "isdn_lib.h"
-
#if !defined MISDNUSER_VERSION_CODE || (MISDNUSER_VERSION_CODE < MISDNUSER_VERSION(1, 0, 3))
#error "You need a newer version of mISDNuser ..."
@@ -104,6 +103,13 @@
struct misdn_stack* get_stack_by_bc(struct misdn_bchannel *bc);
+int isdn_msg_get_index(struct isdn_msg msgs[], msg_t *frm, int nt);
+enum event_e isdn_msg_get_event(struct isdn_msg msgs[], msg_t *frm, int nt);
+int isdn_msg_parse_event(struct isdn_msg msgs[], msg_t *frm, struct misdn_bchannel *bc, int nt);
+char * isdn_get_info(struct isdn_msg msgs[], enum event_e event, int nt);
+msg_t * isdn_msg_build_event(struct isdn_msg msgs[], struct misdn_bchannel *bc, enum event_e event, int nt);
+int isdn_msg_get_index_by_event(struct isdn_msg msgs[], enum event_e event, int nt);
+char * isdn_msg_get_info(struct isdn_msg msgs[], msg_t *msg, int nt);
#endif
Modified: team/group/new_loader_completion/channels/misdn/isdn_msg_parser.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/misdn/isdn_msg_parser.c?rev=40552&r1=40551&r2=40552&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/misdn/isdn_msg_parser.c (original)
+++ team/group/new_loader_completion/channels/misdn/isdn_msg_parser.c Sat Aug 19 17:40:26 2006
@@ -1199,8 +1199,7 @@
#define msgs_max (sizeof(msgs_g)/sizeof(struct isdn_msg))
/** INTERFACE FCTS ***/
-#if 0
-static int isdn_msg_get_index(struct isdn_msg msgs[], msg_t *msg, int nt)
+int isdn_msg_get_index(struct isdn_msg msgs[], msg_t *msg, int nt)
{
int i;
@@ -1220,10 +1219,8 @@
return -1;
}
-#endif
-
-#if 0
-static int isdn_msg_get_index_by_event(struct isdn_msg msgs[], enum event_e event, int nt)
+
+int isdn_msg_get_index_by_event(struct isdn_msg msgs[], enum event_e event, int nt)
{
int i;
for (i=0; i< msgs_max; i++)
@@ -1233,25 +1230,20 @@
return -1;
}
-#endif
-
-#if 0
-static enum event_e isdn_msg_get_event(struct isdn_msg msgs[], msg_t *msg, int nt)
+
+enum event_e isdn_msg_get_event(struct isdn_msg msgs[], msg_t *msg, int nt)
{
int i=isdn_msg_get_index(msgs, msg, nt);
if(i>=0) return msgs[i].event;
return EVENT_UNKNOWN;
}
-#endif
-
-#if 0
-static char * isdn_msg_get_info(struct isdn_msg msgs[], msg_t *msg, int nt)
+
+char * isdn_msg_get_info(struct isdn_msg msgs[], msg_t *msg, int nt)
{
int i=isdn_msg_get_index(msgs, msg, nt);
if(i>=0) return msgs[i].info;
return NULL;
}
-#endif
char EVENT_CLEAN_INFO[] = "CLEAN_UP";
@@ -1264,8 +1256,7 @@
char EVENT_BCHAN_ACTIVATED_INFO[] = "BCHAN_ACTIVATED";
char EVENT_TONE_GENERATE_INFO[] = "TONE_GENERATE";
-#if 0
-static char * isdn_get_info(struct isdn_msg msgs[], enum event_e event, int nt)
+char * isdn_get_info(struct isdn_msg msgs[], enum event_e event, int nt)
{
int i=isdn_msg_get_index_by_event(msgs, event, nt);
@@ -1283,10 +1274,8 @@
return NULL;
}
-#endif
-
-#if 0
-static int isdn_msg_parse_event(struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt)
+
+int isdn_msg_parse_event(struct isdn_msg msgs[], msg_t *msg, struct misdn_bchannel *bc, int nt)
{
int i=isdn_msg_get_index(msgs, msg, nt);
if(i<0) return -1;
@@ -1294,14 +1283,11 @@
msgs[i].msg_parser(msgs, msg, bc, nt);
return 0;
}
-#endif
-
-#if 0
-static msg_t * isdn_msg_build_event(struct isdn_msg msgs[], struct misdn_bchannel *bc, enum event_e event, int nt)
+
+msg_t * isdn_msg_build_event(struct isdn_msg msgs[], struct misdn_bchannel *bc, enum event_e event, int nt)
{
int i=isdn_msg_get_index_by_event(msgs, event, nt);
if(i<0) return NULL;
return msgs[i].msg_builder(msgs, bc, nt);
}
-#endif
More information about the asterisk-commits
mailing list