diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-14 19:39:12 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-14 19:39:12 +0000 |
commit | f0424318479863edeed2a6a128e6d1ac926966e3 (patch) | |
tree | 4fd144260e58c9a66d331fc81b46473723452479 /channels/chan_phone.c | |
parent | c8ca7d2f263f5161ce1b29ec2c9de835131fc950 (diff) |
Add a massive set of changes for converting to use the ast_debug() macro.
(issue #9957, patches from mvanbaak, caio1982, critch, and dimas)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@69327 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_phone.c')
-rw-r--r-- | channels/chan_phone.c | 66 |
1 files changed, 23 insertions, 43 deletions
diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 31cabd4eb..e33d1a1d2 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -208,8 +208,7 @@ static int phone_indicate(struct ast_channel *chan, int condition, const void *d { struct phone_pvt *p = chan->tech_pvt; int res=-1; - if (option_debug) - ast_log(LOG_DEBUG, "Requested indication %d on channel %s\n", condition, chan->name); + ast_debug(1, "Requested indication %d on channel %s\n", condition, chan->name); switch(condition) { case AST_CONTROL_FLASH: ioctl(p->fd, IXJCTL_PSTN_SET_STATE, PSTN_ON_HOOK); @@ -249,7 +248,7 @@ static int phone_digit_end(struct ast_channel *ast, char digit, unsigned int dur struct phone_pvt *p; int outdigit; p = ast->tech_pvt; - ast_log(LOG_DEBUG, "Dialed %c\n", digit); + ast_debug(1, "Dialed %c\n", digit); switch(digit) { case '0': case '1': @@ -280,7 +279,7 @@ static int phone_digit_end(struct ast_channel *ast, char digit, unsigned int dur ast_log(LOG_WARNING, "Unknown digit '%c'\n", digit); return -1; } - ast_log(LOG_DEBUG, "Dialed %d\n", outdigit); + ast_debug(1, "Dialed %d\n", outdigit); ioctl(p->fd, PHONE_PLAY_TONE, outdigit); p->lastformat = -1; return 0; @@ -320,8 +319,7 @@ static int phone_call(struct ast_channel *ast, char *dest, int timeout) ast_log(LOG_WARNING, "phone_call called on %s, neither down nor reserved\n", ast->name); return -1; } - if (option_debug) - ast_log(LOG_DEBUG, "Ringing %s on %s (%d)\n", dest, ast->name, ast->fds[0]); + ast_debug(1, "Ringing %s on %s (%d)\n", dest, ast->name, ast->fds[0]); start = IXJ_PHONE_RING_START(cid); if (start == -1) @@ -346,8 +344,7 @@ static int phone_hangup(struct ast_channel *ast) { struct phone_pvt *p; p = ast->tech_pvt; - if (option_debug) - ast_log(LOG_DEBUG, "phone_hangup(%s)\n", ast->name); + ast_debug(1, "phone_hangup(%s)\n", ast->name); if (!ast->tech_pvt) { ast_log(LOG_WARNING, "Asked to hangup channel not connected\n"); return 0; @@ -365,16 +362,13 @@ static int phone_hangup(struct ast_channel *ast) /* If it's an FXO, hang them up */ if (p->mode == MODE_FXO) { - if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK)) { - if (option_debug) - ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",ast->name, strerror(errno)); - } + if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK)) + ast_debug(1, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",ast->name, strerror(errno)); } /* If they're off hook, give a busy signal */ if (ioctl(p->fd, PHONE_HOOKSTATE)) { - if (option_debug) - ast_log(LOG_DEBUG, "Got hunghup, giving busy signal\n"); + ast_debug(1, "Got hunghup, giving busy signal\n"); ioctl(p->fd, PHONE_BUSY); p->cpt = 1; } @@ -467,18 +461,13 @@ static int phone_answer(struct ast_channel *ast) p = ast->tech_pvt; /* In case it's a LineJack, take it off hook */ if (p->mode == MODE_FXO) { - if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_OFF_HOOK)) { - if (option_debug) - ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n", ast->name, strerror(errno)); - } - else { - if (option_debug) - ast_log(LOG_DEBUG, "Took linejack off hook\n"); - } + if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_OFF_HOOK)) + ast_debug(1, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n", ast->name, strerror(errno)); + else + ast_debug(1, "Took linejack off hook\n"); } phone_setup(ast); - if (option_debug) - ast_log(LOG_DEBUG, "phone_answer(%s)\n", ast->name); + ast_debug(1, "phone_answer(%s)\n", ast->name); ast->rings = 0; ast_setstate(ast, AST_STATE_UP); return 0; @@ -516,8 +505,7 @@ static struct ast_frame *phone_exception(struct ast_channel *ast) phonee.bytes = ioctl(p->fd, PHONE_EXCEPTION); if (phonee.bits.dtmf_ready) { - if (option_debug) - ast_log(LOG_DEBUG, "phone_exception(): DTMF\n"); + ast_debug(1, "phone_exception(): DTMF\n"); /* We've got a digit -- Just handle this nicely and easily */ digit = ioctl(p->fd, PHONE_GET_DTMF_ASCII); @@ -526,12 +514,10 @@ static struct ast_frame *phone_exception(struct ast_channel *ast) return &p->fr; } if (phonee.bits.hookstate) { - if (option_debug) - ast_log(LOG_DEBUG, "Hookstate changed\n"); + ast_debug(1, "Hookstate changed\n"); res = ioctl(p->fd, PHONE_HOOKSTATE); /* See if we've gone on hook, if so, notify by returning NULL */ - if (option_debug) - ast_log(LOG_DEBUG, "New hookstate: %d\n", res); + ast_debug(1, "New hookstate: %d\n", res); if (!res && (p->mode != MODE_FXO)) return NULL; else { @@ -943,8 +929,7 @@ static void phone_check_exception(struct phone_pvt *i) union telephony_exception phonee; /* XXX Do something XXX */ #if 0 - if (option_debug) - ast_log(LOG_DEBUG, "Exception!\n"); + ast_debug(1, "Exception!\n"); #endif phonee.bytes = ioctl(i->fd, PHONE_EXCEPTION); if (phonee.bits.dtmf_ready) { @@ -972,8 +957,7 @@ static void phone_check_exception(struct phone_pvt *i) /* XXX This should probably be justified better XXX */ } else if (!ast_canmatch_extension(NULL, "default", i->ext, 1, i->cid_num)) { /* It's not a valid extension, give a busy signal */ - if (option_debug) - ast_log(LOG_DEBUG, "%s can't match anything in %s or default\n", i->ext, i->context); + ast_debug(1, "%s can't match anything in %s or default\n", i->ext, i->context); ioctl(i->fd, PHONE_BUSY); i->cpt = 1; } @@ -1100,8 +1084,7 @@ static void *do_monitor(void *data) } /* Okay, select has finished. Let's see what happened. */ if (res < 0) { - if (option_debug) - ast_log(LOG_DEBUG, "select return %d: %s\n", res, strerror(errno)); + ast_debug(1, "select return %d: %s\n", res, strerror(errno)); continue; } /* If there are no fd's changed, just continue, it's probably time @@ -1189,22 +1172,19 @@ static struct phone_pvt *mkif(char *iface, int mode, int txgain, int rxgain) } if (mode == MODE_FXO) { if (ioctl(tmp->fd, IXJCTL_PORT, PORT_PSTN)) { - if (option_debug) - ast_log(LOG_DEBUG, "Unable to set port to PSTN\n"); + ast_debug(1, "Unable to set port to PSTN\n"); } } else { if (ioctl(tmp->fd, IXJCTL_PORT, PORT_POTS)) if (mode != MODE_FXS) - ast_log(LOG_DEBUG, "Unable to set port to POTS\n"); + ast_debug(1, "Unable to set port to POTS\n"); } ioctl(tmp->fd, PHONE_PLAY_STOP); ioctl(tmp->fd, PHONE_REC_STOP); ioctl(tmp->fd, PHONE_RING_STOP); ioctl(tmp->fd, PHONE_CPT_STOP); - if (ioctl(tmp->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK)) { - if (option_debug) - ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",iface, strerror(errno)); - } + if (ioctl(tmp->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK)) + ast_debug(1, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",iface, strerror(errno)); if (echocancel != AEC_OFF) ioctl(tmp->fd, IXJCTL_AEC_START, echocancel); if (silencesupression) |