[dahdi-commits] dahdi/linux.git branch "master" updated.
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Wed Jan 22 17:47:43 CST 2014
branch "master" has been updated
via 438b2a36b30fa57a99f53ebb32b19c7c521ecd3f (commit)
from be94aa11bb2905c5e07428eec90b01030894cd0f (commit)
Summary of changes:
drivers/dahdi/wcaxx-base.c | 12 ------------
drivers/dahdi/wcte13xp-base.c | 13 -------------
drivers/dahdi/wcte43x-base.c | 18 ------------------
3 files changed, 43 deletions(-)
- Log -----------------------------------------------------------------
commit 438b2a36b30fa57a99f53ebb32b19c7c521ecd3f
Author: Russ Meyerriecks <rmeyerriecks at digium.com>
Date: Tue Dec 17 17:20:28 2013 -0600
wcte13xp: wcaxx: wcte43x: Remove VPM_SUPPORT compile option.
This was a legacy compile time option that is no longer necessary with the new
series of cards.
Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>
diff --git a/drivers/dahdi/wcaxx-base.c b/drivers/dahdi/wcaxx-base.c
index 5faf442..504cccf 100644
--- a/drivers/dahdi/wcaxx-base.c
+++ b/drivers/dahdi/wcaxx-base.c
@@ -75,8 +75,6 @@
#define NUM_MODULES 8
-#define VPM_SUPPORT
-
#define CMD_WR(addr, val) (((addr<<8)&0xff00) | (val&0xff))
enum battery_state {
@@ -245,7 +243,6 @@ static inline bool is_four_port(const struct wcaxx *wc)
return (4 == wc->desc->ports);
}
-#ifdef VPM_SUPPORT
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/string.h>
@@ -728,7 +725,6 @@ static int wcaxx_vpm_init(struct wcaxx *wc)
return 0;
}
-#endif /* VPM_SUPPORT */
static inline bool is_initialized(struct wcaxx *wc)
{
@@ -3084,11 +3080,9 @@ wcaxx_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long data)
((hwgain.tx) ? "tx" : "rx"));
}
break;
-#ifdef VPM_SUPPORT
case DAHDI_TONEDETECT:
/* Hardware DTMF detection is not supported. */
return -ENOSYS;
-#endif
case DAHDI_SETPOLARITY:
if (get_user(x, (__user int *) data))
return -EFAULT;
@@ -3414,10 +3408,8 @@ static const struct dahdi_span_ops wcaxx_span_ops = {
.chanconfig = wcaxx_chanconfig,
.dacs = wcaxx_dacs,
.assigned = wcaxx_assigned,
-#ifdef VPM_SUPPORT
.echocan_create = wcaxx_echocan_create,
.echocan_name = wcaxx_echocan_name,
-#endif
};
static struct wcaxx_chan *
@@ -4384,11 +4376,9 @@ static void __devexit wcaxx_remove_one(struct pci_dev *pdev)
flush_scheduled_work();
wcxb_stop(&wc->xb);
-#ifdef VPM_SUPPORT
if (wc->vpm)
release_vpm450m(wc->vpm);
wc->vpm = NULL;
-#endif
wcaxx_release(wc);
}
@@ -4527,9 +4517,7 @@ module_param(neonmwi_monitor, int, 0600);
module_param(neonmwi_level, int, 0600);
module_param(neonmwi_envelope, int, 0600);
module_param(neonmwi_offlimit, int, 0600);
-#ifdef VPM_SUPPORT
module_param(vpmsupport, int, 0400);
-#endif
module_param(forceload, int, 0600);
MODULE_PARM_DESC(forceload,
diff --git a/drivers/dahdi/wcte13xp-base.c b/drivers/dahdi/wcte13xp-base.c
index 02ba172..3ab89b1 100644
--- a/drivers/dahdi/wcte13xp-base.c
+++ b/drivers/dahdi/wcte13xp-base.c
@@ -47,7 +47,6 @@ static const char *TE133_FW_FILENAME = "dahdi-fw-te133.bin";
static const char *TE134_FW_FILENAME = "dahdi-fw-te134.bin";
static const u32 TE13X_FW_VERSION = 0x780017;
-#define VPM_SUPPORT
#define WC_MAX_IFACES 8
enum linemode {
@@ -107,9 +106,7 @@ struct t13x {
struct timer_list timer;
struct work_struct timer_work;
struct workqueue_struct *wq;
-#ifdef VPM_SUPPORT
struct vpm450m *vpm;
-#endif
struct mutex lock;
struct wcxb xb;
};
@@ -191,7 +188,6 @@ struct t13x_firm_header {
static void t13x_check_alarms(struct t13x *wc);
static void t13x_check_sigbits(struct t13x *wc);
-#ifdef VPM_SUPPORT
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/string.h>
@@ -787,7 +783,6 @@ static void t13x_vpm_init(struct t13x *wc)
"VPM450: Present and operational servicing %d span\n", 1);
}
-#endif /* VPM_SUPPORT */
static int t13x_clear_maint(struct dahdi_span *span);
@@ -2355,10 +2350,8 @@ static const struct dahdi_span_ops t13x_span_ops = {
.maint = t13x_maint,
.ioctl = t13x_ioctl,
.set_spantype = t13x_set_linemode,
-#ifdef VPM_SUPPORT
.echocan_create = t13x_echocan_create,
.echocan_name = t13x_echocan_name,
-#endif /* VPM_SUPPORT */
};
#define SPI_BASE 0x200
@@ -2576,10 +2569,8 @@ static int __devinit te13xp_init_one(struct pci_dev *pdev,
if (res)
goto fail_exit;
-#ifdef VPM_SUPPORT
if (!wc->vpm && vpmsupport && vpmcapable)
t13x_vpm_init(wc);
-#endif
if (wc->vpm)
wc->ddev->devicetype = kasprintf(GFP_KERNEL,
@@ -2644,11 +2635,9 @@ static void __devexit te13xp_remove_one(struct pci_dev *pdev)
/* Turn off status LED */
t13x_setleds(wc, 0);
-#ifdef VPM_SUPPORT
if (wc->vpm)
release_vpm450m(wc->vpm);
wc->vpm = NULL;
-#endif
dahdi_unregister_device(wc->ddev);
@@ -2723,9 +2712,7 @@ module_param(alarmdebounce, int, S_IRUGO | S_IWUSR);
module_param(losalarmdebounce, int, S_IRUGO | S_IWUSR);
module_param(aisalarmdebounce, int, S_IRUGO | S_IWUSR);
module_param(yelalarmdebounce, int, S_IRUGO | S_IWUSR);
-#ifdef VPM_SUPPORT
module_param(vpmsupport, int, 0600);
-#endif
module_param(force_firmware, int, S_IRUGO);
module_param(latency, int, S_IRUGO);
MODULE_PARM_DESC(latency, "How many milliseconds of audio to buffer between card and host (3ms default). This number will increase during runtime, dynamically, if dahdi detects that it is too small. This is commonly refered to as a \"latency bump\"");
diff --git a/drivers/dahdi/wcte43x-base.c b/drivers/dahdi/wcte43x-base.c
index eab2afc..aaae81a 100644
--- a/drivers/dahdi/wcte43x-base.c
+++ b/drivers/dahdi/wcte43x-base.c
@@ -55,7 +55,6 @@ static const char *TE435_FW_FILENAME = "dahdi-fw-te435.bin";
static const u32 TE435_VERSION = 0xe0017;
/* #define RPC_RCLK */
-#define VPM_SUPPORT
enum linemode {
T1 = 1,
@@ -129,10 +128,8 @@ struct t43x {
struct workqueue_struct *wq;
struct t43x_clksrc_work clksrc_work;
unsigned int not_ready; /* 0 when entire card is ready to go */
-#ifdef VPM_SUPPORT
struct vpm450m *vpm;
char *vpm_name;
-#endif
struct mutex lock;
bool latency_locked;
int syncsrc;
@@ -220,9 +217,6 @@ static void t43x_check_sigbits(struct t43x *wc, int span_idx);
static const struct dahdi_span_ops t43x_span_ops;
static void __t43x_set_timing_source_auto(struct t43x *wc);
-#ifndef VPM_SUPPORT
-static int vpmsupport;
-#else
static int vpmsupport = 1;
#include "oct6100api/oct6100_api.h"
@@ -772,7 +766,6 @@ static void t43x_vpm_init(struct t43x *wc)
wc->numspans);
}
-#endif /* VPM_SUPPORT */
static int t43x_clear_maint(struct dahdi_span *span);
@@ -3164,10 +3157,8 @@ static const struct dahdi_span_ops t43x_span_ops = {
.ioctl = t43x_ioctl,
.assigned = t43x_span_assigned,
.set_spantype = t43x_set_linemode,
-#ifdef VPM_SUPPORT
.echocan_create = t43x_echocan_create,
.echocan_name = t43x_echocan_name,
-#endif /* VPM_SUPPORT */
};
/**
@@ -3416,7 +3407,6 @@ static int __devinit t43x_init_one(struct pci_dev *pdev,
t43x_init_spans(wc, type);
-#ifdef VPM_SUPPORT
if (!wc->vpm)
t43x_vpm_init(wc);
@@ -3428,10 +3418,6 @@ static int __devinit t43x_init_one(struct pci_dev *pdev,
wc->ddev->devicetype = kasprintf(GFP_KERNEL,
"%s", wc->devtype->name);
}
-#else
- wc->ddev->devicetype = kasprintf(GFP_KERNEL,
- "%s", wc->devtype->name);
-#endif
res = dahdi_register_device(wc->ddev, &wc->xb.pdev->dev);
if (res) {
@@ -3484,11 +3470,9 @@ static void __devexit t43x_remove_one(struct pci_dev *pdev)
/* Turn off status LEDs */
t43x_setleds(wc, 0);
-#ifdef VPM_SUPPORT
if (wc->vpm)
release_vpm450m(wc->vpm);
wc->vpm = NULL;
-#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
cancel_work_sync(&wc->clksrc_work.work);
@@ -3574,9 +3558,7 @@ module_param(alarmdebounce, int, S_IRUGO | S_IWUSR);
module_param(losalarmdebounce, int, S_IRUGO | S_IWUSR);
module_param(aisalarmdebounce, int, S_IRUGO | S_IWUSR);
module_param(yelalarmdebounce, int, S_IRUGO | S_IWUSR);
-#ifdef VPM_SUPPORT
module_param(vpmsupport, int, 0600);
-#endif
module_param(force_firmware, int, S_IRUGO);
module_param(latency, int, S_IRUGO);
MODULE_PARM_DESC(latency, "How many milliseconds of audio to buffer between card and host (3ms default). This number will increase during runtime, dynamically, if dahdi detects that it is too small. This is commonly refered to as a \"latency bump\"");
-----------------------------------------------------------------------
--
dahdi/linux.git
More information about the dahdi-commits
mailing list