FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wcte12xp, wctdm24xxp: Remove unused support for booting VPMADT032 from SPI.

Browse Source 
Since there never was a VPMADT032 module shipped with non-volatile
memory no need to check that bit contantly in interrupt context.  Also
remove the unused VPM150M_DTMFDETECT bit.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9781 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2011-02-28 14:19:25 +00:00
parent dc06b57f14
commit c4f6f1f225
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dahdi/voicebus/GpakCust.h
View File

@ -72,10 +72,8 @@
#define __VPM150M_TX (1 << 0)
/* Some Bit ops for different operations */
#define VPM150M_SPIRESET 0
#define VPM150M_HPIRESET 1
#define VPM150M_SWRESET 2
#define VPM150M_DTMFDETECT 3
#define VPM150M_ACTIVE 4
#define NLPTYPE_NONE 0

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

@ -479,18 +479,21 @@ static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *eframe)
/* Skip audio */
eframe += 24;
if (test_bit(VPM150M_SPIRESET, &vpmadt032->control) || test_bit(VPM150M_HPIRESET, &vpmadt032->control)) {
if (test_bit(VPM150M_HPIRESET, &vpmadt032->control)) {
if (debug & DEBUG_ECHOCAN)
dev_info(&wc->vb.pdev->dev, "HW Resetting VPMADT032...\n");
spin_lock_irqsave(&wc->reglock, flags);
for (x = 24; x < 28; x++) {
if (x == 24) {
if (test_and_clear_bit(VPM150M_SPIRESET, &vpmadt032->control))
eframe[CMD_BYTE(x, 0, 0)] = 0x08;
else if (test_and_clear_bit(VPM150M_HPIRESET, &vpmadt032->control))
if (test_and_clear_bit(VPM150M_HPIRESET,
&vpmadt032->control)) {
eframe[CMD_BYTE(x, 0, 0)] = 0x0b;
} else
eframe[CMD_BYTE(x, 0, 0)] = 0x00 | leds;
} else {
eframe[CMD_BYTE(x, 0, 0)] = leds;
}
} else {
eframe[CMD_BYTE(x, 0, 0)] = leds;
}
eframe[CMD_BYTE(x, 1, 0)] = 0;
eframe[CMD_BYTE(x, 2, 0)] = 0x00;
}
@ -4840,7 +4843,6 @@ static void __devexit wctdm_remove_one(struct pci_dev *pdev)
remove_sysfs_files(wc);
if (vpm) {
clear_bit(VPM150M_DTMFDETECT, &vpm->control);
clear_bit(VPM150M_ACTIVE, &vpm->control);
flush_scheduled_work();
}

16
drivers/dahdi/wcte12xp/base.c
View File

@ -405,16 +405,19 @@ static void cmd_dequeue_vpmadt032(struct t1 *wc, unsigned char *eframe)
/* Skip audio */
eframe += 66;
if (test_bit(VPM150M_SPIRESET, &vpm->control) || test_bit(VPM150M_HPIRESET, &vpm->control)) {
if (test_bit(VPM150M_HPIRESET, &vpm->control)) {
debug_printk(wc, 1, "HW Resetting VPMADT032 ...\n");
for (x = 0; x < 4; x++) {
if (!x) {
if (test_and_clear_bit(VPM150M_SPIRESET, &vpm->control))
eframe[CMD_BYTE(x, 0, 1)] = 0x08;
else if (test_and_clear_bit(VPM150M_HPIRESET, &vpm->control))
eframe[CMD_BYTE(x, 0, 1)] = 0x0b;
} else
if (test_and_clear_bit(VPM150M_HPIRESET,
&vpm->control)) {
eframe[CMD_BYTE(x, 0, 0)] = 0x0b;
} else {
eframe[CMD_BYTE(x, 0, 0)] = leds;
}
} else {
eframe[CMD_BYTE(x, 0, 1)] = 0x00 | leds;
}
eframe[CMD_BYTE(x, 1, 1)] = 0;
eframe[CMD_BYTE(x, 2, 1)] = 0x00;
}
@ -2350,7 +2353,6 @@ static void __devexit te12xp_remove_one(struct pci_dev *pdev)
#ifdef VPM_SUPPORT
if(vpm) {
wc->vpmadt032 = NULL;
clear_bit(VPM150M_DTMFDETECT, &vpm->control);
clear_bit(VPM150M_ACTIVE, &vpm->control);
vpmadt032_free(vpm);
}