summaryrefslogtreecommitdiff
path: root/drivers/dahdi
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2008-05-23 15:34:23 +0000
committerKevin P. Fleming <kpfleming@digium.com>2008-05-23 15:34:23 +0000
commitaecec1da2a0b47eb06bca37396510f66104863a0 (patch)
treebf0332a1163f8fe29ccdb2e7a417af2bbf92a93c /drivers/dahdi
parent1475ad236a4f91beef3765ac6e7df7472afd934f (diff)
make wctdm.h a public header file
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4345 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi')
-rw-r--r--drivers/dahdi/wctdm.c4
-rw-r--r--drivers/dahdi/wctdm.h69
-rw-r--r--drivers/dahdi/wctdm24xxp/base.c2
3 files changed, 3 insertions, 72 deletions
diff --git a/drivers/dahdi/wctdm.c b/drivers/dahdi/wctdm.c
index 3f1308f..0f23ce3 100644
--- a/drivers/dahdi/wctdm.c
+++ b/drivers/dahdi/wctdm.c
@@ -34,7 +34,7 @@
#include <linux/moduleparam.h>
#include <asm/io.h>
#include "proslic.h"
-#include "wctdm.h"
+
/*
* Define for audio vs. register based ring detection
*
@@ -109,9 +109,9 @@ static alpha indirect_regs[] =
{43,66,"LOOP_CLOSE_TRES_LOW",0x1000},
};
-
#include <dahdi/kernel.h>
#include <dahdi/user.h>
+#include <dahdi/wctdm_user.h>
#include "fxo_modes.h"
diff --git a/drivers/dahdi/wctdm.h b/drivers/dahdi/wctdm.h
deleted file mode 100644
index 297a542..0000000
--- a/drivers/dahdi/wctdm.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Wildcard S100P FXS Interface Driver for DAHDI Telephony interface
- *
- * Written by Mark Spencer <markster@linux-support.net>
- *
- * Copyright (C) 2001, Linux Support Services, Inc.
- *
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef _WCTDM_H
-#define _WCTDM_H
-
-#include <linux/ioctl.h>
-
-#define NUM_REGS 109
-#define NUM_INDIRECT_REGS 105
-
-struct wctdm_stats {
- int tipvolt; /* TIP voltage (mV) */
- int ringvolt; /* RING voltage (mV) */
- int batvolt; /* VBAT voltage (mV) */
-};
-
-struct wctdm_regs {
- unsigned char direct[NUM_REGS];
- unsigned short indirect[NUM_INDIRECT_REGS];
-};
-
-struct wctdm_regop {
- int indirect;
- unsigned char reg;
- unsigned short val;
-};
-
-struct wctdm_echo_coefs {
- unsigned char acim;
- unsigned char coef1;
- unsigned char coef2;
- unsigned char coef3;
- unsigned char coef4;
- unsigned char coef5;
- unsigned char coef6;
- unsigned char coef7;
- unsigned char coef8;
-};
-
-#define WCTDM_GET_STATS _IOR (DAHDI_CODE, 60, struct wctdm_stats)
-#define WCTDM_GET_REGS _IOR (DAHDI_CODE, 61, struct wctdm_regs)
-#define WCTDM_SET_REG _IOW (DAHDI_CODE, 62, struct wctdm_regop)
-#define WCTDM_SET_ECHOTUNE _IOW (DAHDI_CODE, 63, struct wctdm_echo_coefs)
-
-
-#endif /* _WCTDM_H */
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c
index 2b94201..dcf22b4 100644
--- a/drivers/dahdi/wctdm24xxp/base.c
+++ b/drivers/dahdi/wctdm24xxp/base.c
@@ -49,9 +49,9 @@ Tx Gain - W/Pre-Emphasis: -23.99 to 0.00 db
#include <dahdi/kernel.h>
#include <dahdi/user.h>
+#include <dahdi/wctdm_user.h>
#include "proslic.h"
-#include "wctdm.h"
#include "wctdm24xxp.h"