diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-02-28 14:19:25 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-02-28 14:19:25 +0000 |
| commit | afd3fbf3745baf344918784d08ea0967c676fe67 (patch) | |
| tree | dca41ee007903ce5c6c77f8f37bd773ca0d64792 /drivers/dahdi/wcte12xp | |
| parent | 8e161e15e82ce6bb6f45c6e9f93246e97a3e5f93 (diff) | |
wcte12xp, wctdm24xxp: Remove unused support for booting VPMADT032 from SPI.
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
Diffstat (limited to 'drivers/dahdi/wcte12xp')
| -rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 94fbd8e..88a3c13 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -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); } |