[svn-commits] russell: linux/trunk r4681 - in /linux/trunk: drivers/dahdi/ include/dahdi/

[SVN commits to the Digium repositories]

Author: russell
Date: Sun Aug  3 10:48:43 2008
New Revision: 4681

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4681
Log:
Get rid of another typedef, sf_detect_state_t, and fix references

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

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=4681&r1=4680&r2=4681
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Sun Aug  3 10:48:43 2008
@@ -6448,7 +6448,7 @@
 
 /* return 0 if nothing detected, 1 if lack of tone, 2 if presence of tone */
 /* modifies buffer pointed to by 'amp' with notched-out values */
-static inline int sf_detect (sf_detect_state_t *s,
+static inline int sf_detect(struct sf_detect_state *s,
                  short *amp,
                  int samples,long p1, long p2, long p3)
 {

Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svn.digium.com/view/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=4681&r1=4680&r2=4681
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Sun Aug  3 10:48:43 2008
@@ -90,8 +90,7 @@
 
 #include "ecdis.h"
 
-typedef struct
-{
+struct sf_detect_state {
 	long	x1;
 	long	x2;
 	long	y1;
@@ -100,7 +99,7 @@
 	long	e2;
 	int	samps;
 	int	lastdetect;
-} sf_detect_state_t;
+};
 
 struct dahdi_tone_state {
 	int v1_1;
@@ -149,7 +148,7 @@
 	int v2_1;
 	int v3_1;
 	int toneflags;
-	sf_detect_state_t rd;
+	struct sf_detect_state rd;
 
 	struct dahdi_chan *master;	/*!< Our Master channel (could be us) */
 	/*! \brief Next slave (if appropriate) */