diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-01-08 20:48:03 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-01-08 20:48:03 +0000 |
| commit | 8ed48876305e23ca69723aba8fa5f1465a794d9d (patch) | |
| tree | 2fec6c26ffa4e16ce0be0e4c5cf8f2dbd66dc0e9 /drivers/dahdi/wctdm24xxp | |
| parent | 4d3c52e9fa00c3f18744a08a15df24907129effb (diff) | |
voicebus: Remove framesize, buffer_cache, and cache_line members from struct.
Framesize is the same on all the clients, so it can be removed from the 'struct
voicebus' (and changed back again if needed). Since the framesize is the same,
each board doesn't need it's own buffer_cache, and cache_line is only used
during startup and can be read directly from pci configuration space, so we
don't need to keep it around in our context.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@7779 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wctdm24xxp')
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 5 | ||||
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/wctdm24xxp.h | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 0ea909b..0fd09aa 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -64,6 +64,10 @@ Tx Gain - W/Pre-Emphasis: -23.99 to 0.00 db #include "voicebus/GpakCust.h" #include "voicebus/GpakApi.h" +#if VOICEBUS_SFRAME_SIZE != SFRAME_SIZE +#error SFRAME_SIZE must match the VOICEBUS_SFRAME_SIZE +#endif + /* Experimental max loop current limit for the proslic Loop current limit is from 20 mA to 41 mA in steps of 3 @@ -3738,7 +3742,6 @@ static int __devinit wctdm_init_one(struct pci_dev *pdev, const struct pci_devic pci_set_drvdata(pdev, wc); wc->vb.ops = &voicebus_operations; - wc->vb.framesize = SFRAME_SIZE; wc->vb.pdev = pdev; wc->vb.debug = &debug; ret = voicebus_init(&wc->vb, wc->board_name); diff --git a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h index f8eb2ce..1ca027d 100644 --- a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h +++ b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h @@ -53,9 +53,9 @@ #define FLAG_3215 (1 << 0) #define FLAG_EXPRESS (1 << 1) -#define EFRAME_SIZE 108 -#define ERING_SIZE 16 /* Maximum ring size */ -#define EFRAME_GAP 20 +#define EFRAME_SIZE 108L +#define ERING_SIZE 16L /* Maximum ring size */ +#define EFRAME_GAP 20L #define SFRAME_SIZE ((EFRAME_SIZE * DAHDI_CHUNKSIZE) + (EFRAME_GAP * (DAHDI_CHUNKSIZE - 1))) #define MAX_ALARMS 10 |