From: Super User <root@isdn.jolly.ten>
Date: Sat, 26 Apr 2008 08:34:29 +0000 (+0200)
Subject: Merge branch 'master' of ssh://jolly@www.mISDN.org/var/git/lcr
X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=commitdiff_plain;h=27b95197734350cc99c29929c2527f2c6d5541d6

Merge branch 'master' of ssh://jolly@mISDN.org/var/git/lcr

Conflicts:

	chan_lcr.c
---

27b95197734350cc99c29929c2527f2c6d5541d6
diff --cc chan_lcr.c
index 493fd76,3d5b3bb..6458de5
--- a/chan_lcr.c
+++ b/chan_lcr.c
@@@ -781,40 -677,11 +756,43 @@@ int load_module(void
  	mISDN_created = 1;
  
  	if (ast_channel_register(&lcr_tech)) {
- 		ast_log(LOG_ERROR, "Unable to register channel class %s\n", misdn_type);
- 		unload_module();
+ 		ast_log(LOG_ERROR, "Unable to register channel class\n");
  		return -1;
  	}
-   
++ 
++#if 0	
 +	ast_cli_register(&cli_show_lcr);
 +	ast_cli_register(&cli_show_calls);
 +
 +	ast_cli_register(&cli_reload_routing);
 +	ast_cli_register(&cli_reload_interfaces);
 +	ast_cli_register(&cli_port_block);
 +	ast_cli_register(&cli_port_unblock);
 +	ast_cli_register(&cli_port_unload);
    
 +	ast_register_application("misdn_set_opt", misdn_set_opt_exec, "misdn_set_opt",
 +				 "misdn_set_opt(:<opt><optarg>:<opt><optarg>..):\n"
 +				 "Sets mISDN opts. and optargs\n"
 +				 "\n"
 +				 "The available options are:\n"
 +				 "    d - Send display text on called phone, text is the optparam\n"
 +				 "    n - don't detect dtmf tones on called channel\n"
 +				 "    h - make digital outgoing call\n" 
 +				 "    c - make crypted outgoing call, param is keyindex\n"
 +				 "    e - perform echo cancelation on this channel,\n"
 +				 "        takes taps as arguments (32,64,128,256)\n"
 +				 "    s - send Non Inband DTMF as inband\n"
 +				 "   vr - rxgain control\n"
 +				 "   vt - txgain control\n"
 +		);
 +
 +	
 +	lcr_cfg_get( 0, LCR_GEN_TRACEFILE, global_tracefile, BUFFERSIZE);
 +
 +	chan_lcr_log(0, 0, "-- mISDN Channel Driver Registred -- (BE AWARE THIS DRIVER IS EXPERIMENTAL!)\n");
++=======
+ 	//lcr_cfg_get( 0, LCR_GEN_TRACEFILE, global_tracefile, BUFFERSIZE);
++#endif
  
  	return 0;
  }