diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-12-15 18:54:53 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-12-15 18:54:53 +0000 |
| commit | 36ff58b46688d46cc950a7dade3c99d7040a2e1d (patch) | |
| tree | e90adef7f01557e3b1fc952c0de111aa833846f7 /drivers/dahdi/voicebus | |
| parent | 2b931cae7f4b4342139a94521df836296dc0d5a1 (diff) | |
wcte12xp, wctdm24xxp: Use more descriptive symbols for the bus setup.
This is a cleanup patch to make it a little easier to see what the bits
mean.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>
Acked-By: Russ Meyerriecks <rmeyerriecks@digium.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9543 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/voicebus')
| -rw-r--r-- | drivers/dahdi/voicebus/voicebus.c | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/drivers/dahdi/voicebus/voicebus.c b/drivers/dahdi/voicebus/voicebus.c index 2848327..9a26ac9 100644 --- a/drivers/dahdi/voicebus/voicebus.c +++ b/drivers/dahdi/voicebus/voicebus.c @@ -628,7 +628,23 @@ vb_reset_interface(struct voicebus *vb) unsigned long timeout; u32 reg; u32 pci_access; - const u32 DEFAULT_PCI_ACCESS = 0xffdc0002; + enum { + /* Software Reset */ + SWR = (1 << 0), + /* Bus Arbitration (1 for priority transmit) */ + BAR = (1 << 1), + /* Memory Write Invalidate */ + MWI = (1 << 24), + /* Memory Read Line */ + MRL = (1 << 23), + /* Descriptor Skip Length */ + DSLShift = 2, + /* Cache Alignment */ + CALShift = 14, + /* Transmit Auto Pollling */ + TAPShift = 17, + }; + const u32 DEFAULT_PCI_ACCESS = MWI | MRL | (0x2 << TAPShift) | BAR; u8 cacheline_size; BUG_ON(in_interrupt()); @@ -641,13 +657,13 @@ vb_reset_interface(struct voicebus *vb) switch (cacheline_size) { case 0x08: - pci_access = DEFAULT_PCI_ACCESS | (0x1 << 14); + pci_access = DEFAULT_PCI_ACCESS | (0x1 << CALShift); break; case 0x10: - pci_access = DEFAULT_PCI_ACCESS | (0x2 << 14); + pci_access = DEFAULT_PCI_ACCESS | (0x2 << CALShift); break; case 0x20: - pci_access = DEFAULT_PCI_ACCESS | (0x3 << 14); + pci_access = DEFAULT_PCI_ACCESS | (0x3 << CALShift); break; default: if (*vb->debug) { @@ -661,16 +677,16 @@ vb_reset_interface(struct voicebus *vb) } /* The transmit and receive descriptors will have the same padding. */ - pci_access |= ((vb->txd.padding / sizeof(u32)) << 2) & 0x7c; + pci_access |= ((vb->txd.padding / sizeof(u32)) << DSLShift) & 0x7c; - vb_setctl(vb, 0x0000, pci_access | 1); + vb_setctl(vb, 0x0000, pci_access | SWR); timeout = jiffies + HZ/10; /* 100ms interval */ do { reg = vb_getctl(vb, 0x0000); - } while ((reg & 0x00000001) && time_before(jiffies, timeout)); + } while ((reg & SWR) && time_before(jiffies, timeout)); - if (reg & 0x00000001) { + if (reg & SWR) { if (-1 == reg) { dev_err(&vb->pdev->dev, "Unable to read I/O registers.\n"); |