diff options
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 10 | ||||
| -rw-r--r-- | drivers/dahdi/wct4xxp/base.c | 11 | ||||
| -rw-r--r-- | include/dahdi/user.h | 2 |
3 files changed, 7 insertions, 16 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index a54f3b0..a500329 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -3524,16 +3524,6 @@ void dahdi_alarm_notify(struct dahdi_span *span) "Span %d: Loss of Multi-Frame "\ "Alignment\n", span->spanno); } - if (span->alarms & DAHDI_ALARM_XLS) { - module_printk(KERN_NOTICE, - "Span %d: Transmit Line Short\n", - span->spanno); - } - if (span->alarms & DAHDI_ALARM_XLO) { - module_printk(KERN_NOTICE, - "Span %d: Transmit Line Open\n", - span->spanno); - } } } } diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index 9b658a7..9946b58 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -3007,10 +3007,13 @@ static void t4_check_alarms(struct t4 *wc, int span) alarms |= DAHDI_ALARM_LFA; if (c & FRS0_LMFA) alarms |= DAHDI_ALARM_LMFA; - if (d & FRS1_XLS) - alarms |= DAHDI_ALARM_XLS; - if (d & FRS1_XLO) - alarms |= DAHDI_ALARM_XLO; + } + + /* Check to ensure the transformer isn't busted */ + if (unlikely((d & FRS1_XLO) || (d & FRS1_XLS))) { + dev_info(&wc->dev->dev, + "Detected a possible hardware malfunction"\ + " this card may need servicing\n"); } if (((!ts->span.alarms) && alarms) || diff --git a/include/dahdi/user.h b/include/dahdi/user.h index fc0d494..fc688c0 100644 --- a/include/dahdi/user.h +++ b/include/dahdi/user.h @@ -325,8 +325,6 @@ enum { #define DAHDI_ALARM_LOS (1 << 8) /* Loss of Signal */ #define DAHDI_ALARM_LFA (1 << 9) /* Loss of Frame Alignment */ #define DAHDI_ALARM_LMFA (1 << 10)/* Loss of Multi-Frame Align */ -#define DAHDI_ALARM_XLS (1 << 11)/* Transmit line Short */ -#define DAHDI_ALARM_XLO (1 << 12)/* Transmit line Open */ /* Maintenance modes */ #define DAHDI_MAINT_NONE 0 /* Normal Mode */ |