summaryrefslogtreecommitdiff
path: root/drivers/dahdi/tor2.c
diff options
context:
space:
mode:
authorRuss Meyerriecks <rmeyerreicks@digium.com>2010-12-08 22:11:53 +0000
committerRuss Meyerriecks <rmeyerreicks@digium.com>2010-12-08 22:11:53 +0000
commita745081ca1e96d4031e7bbcea6b9961d71523cc2 (patch)
tree6896a9e89aa1abec5c3f6c915feedbbf1ab69d12 /drivers/dahdi/tor2.c
parent8d8596085f963e521c88721a2e2178aead8751db (diff)
dahdi: Removing loopstop maint function
DAHDI_MAINT_LOOPSTOP is being removed due to the redundancy with DAHDI_MAINT_NONE. Also removing some timing logic, as amount of time a loopup or loopdown signal is held on the line, is now defined in userspace with dahdi_maint. Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com> Acked-by: Shaun Ruffell <sruffell@digium.com> Acked-by: Kinsey Moore <kmoore@digium.com> git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9515 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/tor2.c')
-rw-r--r--drivers/dahdi/tor2.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/dahdi/tor2.c b/drivers/dahdi/tor2.c
index b181e3f..396ad05 100644
--- a/drivers/dahdi/tor2.c
+++ b/drivers/dahdi/tor2.c
@@ -1042,7 +1042,6 @@ static int tor2_maint(struct dahdi_span *span, int cmd)
break;
case DAHDI_MAINT_LOOPUP:
case DAHDI_MAINT_LOOPDOWN:
- case DAHDI_MAINT_LOOPSTOP:
return -ENOSYS;
default:
printk(KERN_NOTICE "Tor2: Unknown maint command: %d\n", cmd);
@@ -1054,6 +1053,7 @@ static int tor2_maint(struct dahdi_span *span, int cmd)
case DAHDI_MAINT_NONE:
t1out(p->tor,tspan,0x19,(japan ? 0x80 : 0x00)); /* no local loop */
t1out(p->tor,tspan,0x0a,0); /* no remote loop */
+ t1out(p->tor, tspan, 0x30, 0); /* stop sending loopup code */
break;
case DAHDI_MAINT_LOCALLOOP:
t1out(p->tor,tspan,0x19,0x40 | (japan ? 0x80 : 0x00)); /* local loop */
@@ -1073,9 +1073,6 @@ static int tor2_maint(struct dahdi_span *span, int cmd)
t1out(p->tor,tspan,0x12,0x62); /* send loopdown code */
t1out(p->tor,tspan,0x13,0x90); /* send loopdown code */
break;
- case DAHDI_MAINT_LOOPSTOP:
- t1out(p->tor,tspan,0x30,0); /* stop sending loopup code */
- break;
default:
printk(KERN_NOTICE "Tor2: Unknown maint command: %d\n", cmd);
break;