Skip to contentSkip to conversation

echoaudio cleanup

PATCH Applied Giuliano Pochini 2 participants 2 messages Feb 13, 2005 – Feb 14, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 echoaudio cleanup

- Trivial cleanup: move some duplicated defines into echoaudio.h

pci/echoaudio/darla20.c +0 -11
diff -du alsa-driver_orig/pci/echoaudio/darla20.c alsa-driver/pci/echoaudio/darla20.c
@@ -35,17 +35,6 @@
 #define BX_DIGITAL_IN	10	/* 0 */
 #define BX_NUM		10
 
-/* Number of channels */
-#define NUM_PIPES	PX_NUM
-#define NUM_PIPES_OUT	(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN	(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT	(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN	(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
 
 #include <sound/driver.h>
 #include <linux/delay.h>
pci/echoaudio/darla24.c +0 -11
diff -du alsa-driver_orig/pci/echoaudio/darla24.c alsa-driver/pci/echoaudio/darla24.c
@@ -39,17 +39,6 @@
 #define BX_DIGITAL_IN	10	/* 0 */
 #define BX_NUM		10
 
-/* Number of channels */
-#define NUM_PIPES	PX_NUM
-#define NUM_PIPES_OUT	(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN	(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT	(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN	(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
 
 #include <sound/driver.h>
 #include <linux/delay.h>
pci/echoaudio/echoaudio.h +11 -0
diff -du alsa-driver_orig/pci/echoaudio/echoaudio.h alsa-driver/pci/echoaudio/echoaudio.h
@@ -288,6 +288,17 @@
 #define PIPE_STATE_STARTED	2	// Pipe has been started
 #define PIPE_STATE_PENDING	3	// Pipe has pending start
 
+/* Number of channels */
+#define NUM_PIPES		PX_NUM
+#define NUM_PIPES_OUT		(PX_ANALOG_IN - PX_ANALOG_OUT)
+#define NUM_PIPES_IN		(PX_NUM - PX_ANALOG_IN)
+#define NUM_BUSSES_OUT		(BX_ANALOG_IN - BX_ANALOG_OUT)
+#define NUM_BUSSES_IN		(BX_NUM - BX_ANALOG_IN)
+#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
+#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
+#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
+#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
+
 
 /* Debug initialization */
 #if (CONFIG_SND_DEBUG)
pci/echoaudio/gina20.c +0 -11
diff -du alsa-driver_orig/pci/echoaudio/gina20.c alsa-driver/pci/echoaudio/gina20.c
@@ -39,17 +39,6 @@
 #define BX_DIGITAL_IN	12	/* 2 */
 #define BX_NUM		14
 
-/* Number of channels */
-#define NUM_PIPES	PX_NUM
-#define NUM_PIPES_OUT	(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN	(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT	(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN	(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
 
 #include <sound/driver.h>
 #include <linux/delay.h>
pci/echoaudio/gina24.c +0 -12
diff -du alsa-driver_orig/pci/echoaudio/gina24.c alsa-driver/pci/echoaudio/gina24.c
@@ -46,18 +46,6 @@
 #define BX_NUM		26
 
 
-/* Number of channels */
-#define NUM_PIPES	PX_NUM
-#define NUM_PIPES_OUT	(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN	(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT	(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN	(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
-
 #include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/init.h>
pci/echoaudio/gina3g.c +0 -12
diff -du alsa-driver_orig/pci/echoaudio/gina3g.c alsa-driver/pci/echoaudio/gina3g.c
@@ -48,18 +48,6 @@
 #define BX_NUM		24
 
 
-/* Number of channels */
-#define NUM_PIPES		PX_NUM
-#define NUM_PIPES_OUT		(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN		(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT		(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN		(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
-
 #include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/init.h>
pci/echoaudio/indigo.c +0 -12
diff -du alsa-driver_orig/pci/echoaudio/indigo.c alsa-driver/pci/echoaudio/indigo.c
@@ -38,18 +38,6 @@
 #define BX_NUM		2
 
 
-/* Number of channels */
-#define NUM_PIPES		PX_NUM
-#define NUM_PIPES_OUT		(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN		(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT		(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN		(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
-
 #include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/init.h>
pci/echoaudio/indigodj.c +0 -12
diff -du alsa-driver_orig/pci/echoaudio/indigodj.c alsa-driver/pci/echoaudio/indigodj.c
@@ -38,18 +38,6 @@
 #define BX_NUM		4
 
 
-/* Number of channels */
-#define NUM_PIPES		PX_NUM
-#define NUM_PIPES_OUT		(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN		(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT		(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN		(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
-
 #include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/init.h>
pci/echoaudio/indigoio.c +0 -12
diff -du alsa-driver_orig/pci/echoaudio/indigoio.c alsa-driver/pci/echoaudio/indigoio.c
@@ -39,18 +39,6 @@
 #define BX_NUM		4
 
 
-/* Number of channels */
-#define NUM_PIPES		PX_NUM
-#define NUM_PIPES_OUT		(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN		(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT		(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN		(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
-
 #include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/init.h>
pci/echoaudio/layla20.c +0 -11
diff -du alsa-driver_orig/pci/echoaudio/layla20.c alsa-driver/pci/echoaudio/layla20.c
@@ -44,17 +44,6 @@
 #define BX_DIGITAL_IN	20	/*  2 */
 #define BX_NUM		22
 
-/* Number of channels */
-#define NUM_PIPES	PX_NUM
-#define NUM_PIPES_OUT	(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN	(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT	(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN	(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
 
 #include <sound/driver.h>
 #include <linux/delay.h>
pci/echoaudio/layla24.c +0 -11
diff -du alsa-driver_orig/pci/echoaudio/layla24.c alsa-driver/pci/echoaudio/layla24.c
@@ -46,17 +46,6 @@
 #define BX_DIGITAL_IN	24	/* 8 */
 #define BX_NUM		32
 
-/* Number of channels */
-#define NUM_PIPES	PX_NUM
-#define NUM_PIPES_OUT	(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN	(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT	(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN	(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
 
 #include <sound/driver.h>
 #include <linux/delay.h>
pci/echoaudio/layla3g.c +0 -12
diff -du alsa-driver_orig/pci/echoaudio/layla3g.c alsa-driver/pci/echoaudio/layla3g.c
@@ -47,18 +47,6 @@
 #define BX_NUM		32
 
 
-/* Number of channels */
-#define NUM_PIPES		PX_NUM
-#define NUM_PIPES_OUT		(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN		(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT		(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN		(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
-
 #include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/init.h>
pci/echoaudio/mia.c +0 -11
diff -du alsa-driver_orig/pci/echoaudio/mia.c alsa-driver/pci/echoaudio/mia.c
@@ -44,17 +44,6 @@
 #define BX_DIGITAL_IN	6	/* 2 */
 #define BX_NUM		8
 
-/* Number of channels */
-#define NUM_PIPES	PX_NUM
-#define NUM_PIPES_OUT	(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN	(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT	(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN	(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
 
 #include <sound/driver.h>
 #include <linux/delay.h>
pci/echoaudio/mona.c +0 -11
diff -du alsa-driver_orig/pci/echoaudio/mona.c alsa-driver/pci/echoaudio/mona.c
@@ -43,17 +43,6 @@
 #define BX_DIGITAL_IN	18	/* 8 */
 #define BX_NUM		26
 
-/* Number of channels */
-#define NUM_PIPES	PX_NUM
-#define NUM_PIPES_OUT	(PX_ANALOG_IN - PX_ANALOG_OUT)
-#define NUM_PIPES_IN	(PX_NUM - PX_ANALOG_IN)
-#define NUM_BUSSES_OUT	(BX_ANALOG_IN - BX_ANALOG_OUT)
-#define NUM_BUSSES_IN	(BX_NUM - BX_ANALOG_IN)
-#define NUM_ANALOG_BUSSES_OUT	(BX_DIGITAL_OUT - BX_ANALOG_OUT)
-#define NUM_ANALOG_BUSSES_IN	(BX_DIGITAL_IN - BX_ANALOG_IN)
-#define NUM_DIGITAL_BUSSES_OUT	(NUM_BUSSES_OUT - NUM_ANALOG_BUSSES_OUT)
-#define NUM_DIGITAL_BUSSES_IN	(NUM_BUSSES_IN - NUM_ANALOG_BUSSES_IN)
-
 
 #include <sound/driver.h>
 #include <linux/delay.h>

--
Giuliano.

-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

Applied
#1 lore raw

At Sun, 13 Feb 2005 21:46:12 +0100,

Quoted 7 lines · Giuliano Pochini

- Trivial cleanup: move some duplicated defines into echoaudio.h

Thanks, applied to CVS.

Takashi

-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click