|
|
|
@ -281,10 +281,6 @@ END_CONFIG
|
|
|
|
|
#define MAX(a,b) ((a) > (b) ? (a) : (b))
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int usecnt;
|
|
|
|
|
AST_MUTEX_DEFINE_STATIC(usecnt_lock);
|
|
|
|
|
|
|
|
|
|
static char *config = "oss.conf"; /* default config file */
|
|
|
|
|
|
|
|
|
|
static int oss_debug;
|
|
|
|
@ -841,9 +837,6 @@ static int oss_hangup(struct ast_channel *c)
|
|
|
|
|
c->tech_pvt = NULL;
|
|
|
|
|
o->owner = NULL;
|
|
|
|
|
ast_verbose(" << Hangup on console >> \n");
|
|
|
|
|
ast_mutex_lock(&usecnt_lock); /* XXX not sure why */
|
|
|
|
|
usecnt--;
|
|
|
|
|
ast_mutex_unlock(&usecnt_lock);
|
|
|
|
|
if (o->hookstate) {
|
|
|
|
|
if (o->autoanswer || o->autohangup) {
|
|
|
|
|
/* Assume auto-hangup too */
|
|
|
|
@ -1022,10 +1015,6 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *o, char *ext, char *ctx,
|
|
|
|
|
|
|
|
|
|
o->owner = c;
|
|
|
|
|
ast_setstate(c, state);
|
|
|
|
|
ast_mutex_lock(&usecnt_lock);
|
|
|
|
|
usecnt++;
|
|
|
|
|
ast_mutex_unlock(&usecnt_lock);
|
|
|
|
|
ast_update_use_count();
|
|
|
|
|
ast_jb_configure(c, &global_jbconf);
|
|
|
|
|
if (state != AST_STATE_DOWN) {
|
|
|
|
|
if (ast_pbx_start(c)) {
|
|
|
|
@ -1033,7 +1022,6 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *o, char *ext, char *ctx,
|
|
|
|
|
ast_hangup(c);
|
|
|
|
|
o->owner = c = NULL;
|
|
|
|
|
/* XXX what about the channel itself ? */
|
|
|
|
|
/* XXX what about usecnt ? */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|