diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-03-15 19:06:05 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-03-15 19:06:05 +0000 |
| commit | 522ce50a5ce47c75df37e84510f4f10952802b63 (patch) | |
| tree | d62ba9f2b48a2547cea84a15563583d1d29d7de6 | |
| parent | afd3fbf3745baf344918784d08ea0967c676fe67 (diff) | |
wctdm24xxp: Fix regression with LEDS on TDM410.
r9720 disabled the LEDs on the front panel of the TDM410. This commit
restores the behavior and clarify which part of the TDM410 eframes
control the LED operation.
(closes issue #18939)
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9827 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 25 | ||||
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/wctdm24xxp.h | 3 |
2 files changed, 21 insertions, 7 deletions
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index b1685a0..d0bb28a 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -898,12 +898,8 @@ static inline void wctdm_transmitprep(struct wctdm *wc, unsigned char *sframe) if (x < DAHDI_CHUNKSIZE - 1) { eframe[EFRAME_SIZE] = wc->ctlreg; eframe[EFRAME_SIZE + 1] = wc->txident++; - - if ((wc->desc->ports == 4) && ((wc->ctlreg & 0x10))) { - eframe[EFRAME_SIZE + 2] = 0; - for (y = 0; y < 4; y++) - eframe[EFRAME_SIZE + 2] |= (1 << y); - } + if (4 == wc->desc->ports) + eframe[EFRAME_SIZE + 2] = wc->tdm410leds; } eframe += (EFRAME_SIZE + EFRAME_GAP); } @@ -4510,6 +4506,21 @@ static inline void remove_sysfs_files(struct wctdm *wc) { return; } #endif /* CONFIG_VOICEBUS_SYSFS */ +static void wctdm_set_tdm410_leds(struct wctdm *wc) +{ + int i; + + if (4 != wc->desc->ports) + return; + + wc->tdm410leds = 0; /* all on by default */ + for (i = 0; i < wc->desc->ports; ++i) { + /* Turn off the LED for any module that isn't installed. */ + if (MOD_TYPE_NONE == wc->modtype[i]) + wc->tdm410leds |= (1 << i); + } +} + #ifdef USE_ASYNC_INIT struct async_data { struct pci_dev *pdev; @@ -4652,6 +4663,8 @@ __wctdm_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* Now track down what modules are installed */ wctdm_identify_modules(wc); + wctdm_set_tdm410_leds(wc); + if (fatal_signal_pending(current)) { wctdm_back_out_gracefully(wc); return -EINTR; diff --git a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h index 90c4aaa..99d8159 100644 --- a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h +++ b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h @@ -164,7 +164,8 @@ struct wctdm { unsigned char rxident; int flags[NUM_MODULES]; /* bitmap of board-specific + module-specific flags */ - unsigned char ctlreg; /* FIXME: something to do with VPM? */ + u8 ctlreg; + u8 tdm410leds; int mods_per_board; /* maximum number of modules for this board */ int digi_mods; /* number of digital modules present */ |