summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2009-03-16 17:45:46 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2009-03-16 17:45:46 +0000
commit96eca5d72ab2e0b4646df50d73285ed73922dcb7 (patch)
treef6cbb15bbfc3a1c51a6c5ab87e686cd6ac278b79
parent1956a5ce6f90e55f2dbd763746f1e43ae9543be8 (diff)
Make ecdis.h used by dahdi-base.h alone
ecdis.h is no longer #include-d in kernel.h . it was there because of decleration of some structs that are part of struct dahdi_chan. The declerations of those structs were moved into kernel.h directly. git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6170 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/biquad.h12
-rw-r--r--drivers/dahdi/dahdi-base.c1
-rw-r--r--drivers/dahdi/ecdis.h12
-rw-r--r--include/dahdi/kernel.h23
4 files changed, 23 insertions, 25 deletions
diff --git a/drivers/dahdi/biquad.h b/drivers/dahdi/biquad.h
index 4fe8cd8..ea2c83d 100644
--- a/drivers/dahdi/biquad.h
+++ b/drivers/dahdi/biquad.h
@@ -25,18 +25,6 @@
* this program for more details.
*/
-typedef struct
-{
- int32_t gain;
- int32_t a1;
- int32_t a2;
- int32_t b1;
- int32_t b2;
-
- int32_t z1;
- int32_t z2;
-} biquad2_state_t;
-
static inline void biquad2_init (biquad2_state_t *bq,
int32_t gain,
int32_t a1,
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index 1d3c92a..01197b8 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -82,6 +82,7 @@
/* Grab fasthdlc with tables */
#define FAST_HDLC_NEED_TABLES
#include <dahdi/kernel.h>
+#include "ecdis.h"
#include "hpec/hpec_user.h"
diff --git a/drivers/dahdi/ecdis.h b/drivers/dahdi/ecdis.h
index 87abf48..205b2e3 100644
--- a/drivers/dahdi/ecdis.h
+++ b/drivers/dahdi/ecdis.h
@@ -28,18 +28,6 @@
#include "biquad.h"
-typedef struct
-{
- biquad2_state_t notch;
- int notch_level;
- int channel_level;
- int tone_present;
- int tone_cycle_duration;
- int good_cycles;
- int hit;
-} echo_can_disable_detector_state_t;
-
-
#define FALSE 0
#define TRUE (!FALSE)
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index f5d335b..8be64ab 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -96,7 +96,28 @@
#define RING_DEBOUNCE_TIME 2000 /*!< 2000 ms ring debounce time */
-#include "ecdis.h"
+typedef struct
+{
+ int32_t gain;
+ int32_t a1;
+ int32_t a2;
+ int32_t b1;
+ int32_t b2;
+
+ int32_t z1;
+ int32_t z2;
+} biquad2_state_t;
+
+typedef struct
+{
+ biquad2_state_t notch;
+ int notch_level;
+ int channel_level;
+ int tone_present;
+ int tone_cycle_duration;
+ int good_cycles;
+ int hit;
+} echo_can_disable_detector_state_t;
struct sf_detect_state {
long x1;