retronetworking
/
dahdi-linux
mirror of https://gerrit.osmocom.org/dahdi-linux
13
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Shaun Ruffell 2011-03-15 19:06:05 +00:00
parent c4f6f1f225
commit e27f89b0b6
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/dahdi/wctdm24xxp/base.c
View File

@ -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;

3
drivers/dahdi/wctdm24xxp/wctdm24xxp.h
View File

@ -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 */