[svn-commits] tzafrir: linux/trunk r6170 - in /linux/trunk: drivers/dahdi/ include/dahdi/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon Mar 16 12:45:46 2009
New Revision: 6170

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6170
Log:
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.

Modified:
    linux/trunk/drivers/dahdi/biquad.h
    linux/trunk/drivers/dahdi/dahdi-base.c
    linux/trunk/drivers/dahdi/ecdis.h
    linux/trunk/include/dahdi/kernel.h

Modified: linux/trunk/drivers/dahdi/biquad.h
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/biquad.h?view=diff&rev=6170&r1=6169&r2=6170
==============================================================================
--- linux/trunk/drivers/dahdi/biquad.h (original)
+++ linux/trunk/drivers/dahdi/biquad.h Mon Mar 16 12:45:46 2009
@@ -24,18 +24,6 @@
  * Free Software Foundation. See the LICENSE file included with
  * 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,

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=6170&r1=6169&r2=6170
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Mon Mar 16 12:45:46 2009
@@ -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"
 

Modified: linux/trunk/drivers/dahdi/ecdis.h
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/ecdis.h?view=diff&rev=6170&r1=6169&r2=6170
==============================================================================
--- linux/trunk/drivers/dahdi/ecdis.h (original)
+++ linux/trunk/drivers/dahdi/ecdis.h Mon Mar 16 12:45:46 2009
@@ -27,18 +27,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)

Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=6170&r1=6169&r2=6170
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Mon Mar 16 12:45:46 2009
@@ -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;