From alsa-devel-owner@alsa.jcu.cz  Fri Mar 20 19:11:17 1998
Received: from sandy.force9.co.uk (root@218.hiper01.shef.dialup.force9.net [195.166.132.218] (may be forged))
	by marvin.jcu.cz (8.8.8/8.8.8) with ESMTP id TAA17253
	for <alsa-devel@alsa.jcu.cz>; Fri, 20 Mar 1998 19:10:57 +0100
Received: (from chrisb@localhost)
	by sandy.force9.co.uk (8.8.5/8.8.5) id MAA01509
	for alsa-devel@alsa.jcu.cz; Fri, 20 Mar 1998 12:30:27 GMT
From: Christopher Butler <chrisb@sandy.force9.co.uk>
Message-Id: <199803201230.MAA01509@sandy.force9.co.uk>
Subject: Fixed bug in cards/sb8.c
To: alsa-devel@alsa.jcu.cz
Date: Fri, 20 Mar 1998 12:30:27 +0000 (GMT)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Reply-To: alsa-devel@alsa.jcu.cz
Sender: alsa-devel-owner@alsa.jcu.cz
Precedence: list

Hi!

The following patch fixes a bug in cards/sb8.c, where a variable had
been left out after the format string, leaving the two after it
incorrect, and the last one random (pointing anywhere)..

I also made a few changes to the Makefiles (added a distclean to
remove things like config.cache etc, and also used a SUBDIRS variable
and for constructs instead of separate make -C statements, which
should make adding subdirs easier). Its pretty self-explanatory
:-)

**** Cut ****
diff -urN alsadriver-0.0.6.orig/Makefile alsadriver-0.0.6/Makefile
--- alsadriver-0.0.6.orig/Makefile	Sat Mar  7 19:52:14 1998
+++ alsadriver-0.0.6/Makefile	Fri Mar 20 12:13:33 1998
@@ -3,6 +3,8 @@
 # Copyright (c) 1994-98 by Jaroslav Kysela <perex@jcu.cz>
 #
 
+SUBDIRS = kernel lowlevel cards detect
+
 ifeq (Makefile.conf,$(wildcard Makefile.conf))
 include Makefile.conf
 else
@@ -14,10 +16,7 @@
 
 
 all:
-	$(MAKE) -C kernel
-	$(MAKE) -C lowlevel
-	$(MAKE) -C cards
-	$(MAKE) -C detect
+	@for d in $(SUBDIRS); do $(MAKE) -C $$d; done
 	@echo
 	@echo "ALSA modules were sucessfully compiled."
 	@echo
@@ -88,19 +87,16 @@
 	install -m 644 include/sounddetect.h /usr/include/linux
 
 clean:
-	make -C include clean
-	make -C kernel clean
-	make -C lowlevel clean
-	make -C cards clean
-	make -C detect clean
-	make -C test clean
+	@for d in $(SUBDIRS) include test; do $(MAKE) -C $$d clean; done
 	rm -f core .depend *.o *.orig snd.map snd.map? *~
 	rm -f `find . -name "out.txt"`
 	rm -f modules/*.o
 	rm -f doc/*~
 
-pack: clean
+distclean: clean
 	rm -f config.cache config.log config.status Makefile.conf
+
+pack: distclean
 	chown -R root.root ../alsadriver
 	tar cvz -C .. -f ../alsadriver-$(SND_VERSION).tar.gz alsadriver
 
diff -urN alsadriver-0.0.6.orig/cards/sb8.c alsadriver-0.0.6/cards/sb8.c
--- alsadriver-0.0.6.orig/cards/sb8.c	Sun Mar  8 09:51:53 1998
+++ alsadriver-0.0.6/cards/sb8.c	Fri Mar 20 12:07:49 1998
@@ -162,6 +162,7 @@
   snd_enable_irq( card, acard -> irqnum );
   sprintf( card -> name, "%s at 0x%x, irq %i, dma %i",
   	pcm -> name,
+	codec -> port,
   	card -> irqs[ acard -> irqnum ] -> irq,
   	card -> dmas[ acard -> dma8num ] -> dma );
   acard -> card = card;
diff -urN alsadriver-0.0.6.orig/lowlevel/Makefile alsadriver-0.0.6/lowlevel/Makefile
--- alsadriver-0.0.6.orig/lowlevel/Makefile	Tue Mar  3 08:07:54 1998
+++ alsadriver-0.0.6/lowlevel/Makefile	Fri Mar 20 12:14:23 1998
@@ -3,18 +3,16 @@
 # Copyright (c) 1994-98 by Jaroslav Kysela <perex@jcu.cz>
 #
 
+SUBDIRS = gus sb others
+
 include ../Makefile.conf
 
 all:
-	$(MAKE) -C gus
-	$(MAKE) -C sb
-	$(MAKE) -C others
+	@for d in $(SUBDIRS); do $(MAKE) -C $$d; done
 	@echo
 	@echo "ALSA lowlevel drivers were sucessfully compiled."
 	@echo
 
 clean:
-	make -C gus clean
-	make -C sb clean
-	make -C others clean
+	@for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done
 	rm -f core .depend *.o *.orig ultra.map ultra.map? *~
**** Cut ****

--
Chris Butler <chrisb@sandy.force9.co.uk>

