Here's the Config.in and the changes to the Makefile from the vger tree
(as it was at 16:36 PST on the 14th). This patch is against the official
2.1.102; I have not tested it.
___
Trevor Johnson
--- linux/drivers/sound/lowlevel/Config.in Wed Dec 31 16:00:00 1969
+++ ../vger/linux/drivers/sound/lowlevel/Config.in Sat May 9 18:25:53 1998
@@ -0,0 +1,56 @@
+dep_tristate 'ACI mixer (miroPCM12)' CONFIG_ACI_MIXER $CONFIG_SOUND
+
+dep_tristate 'AWE32 synth' CONFIG_AWE32_SYNTH $CONFIG_SOUND
+
+if [ "$CONFIG_SOUND" = "y" -o "$CONFIG_SOUND" = "m" ]; then
+ dep_tristate 'Gallant Audio Cards (SC-6000 and SC-6600 based)' CONFIG_AEDSP16 $CONFIG_SOUND
+ if [ "$CONFIG_AEDSP16" = "y" -o "$CONFIG_AEDSP16" = "m" ]; then
+ hex ' I/O base for Audio Excel DSP 16 220 or 240' CONFIG_AEDSP16_BASE 220
+ fi
+
+ if [ "$CONFIG_AEDSP16" = "y" -o "$CONFIG_AEDSP16" = "m" ]; then
+ comment 'SC-6600 Audio Cards have no jumper switches at all'
+ bool 'SC-6600 based audio cards (new Audio Excel DSP 16)' CONFIG_SC6600
+ if [ "$CONFIG_SC6600" = "y" ]; then
+ comment 'SC-6600 specific configuration'
+ bool 'Activate SC-6600 Joystick Interface' CONFIG_SC6600_JOY
+ int 'SC-6600 CDROM Interface (4=None, 3=IDE, 1=Panasonic, 0=?Sony?)' CONFIG_SC6600_CDROM 4
+ hex 'SC-6600 CDROM Interface I/O Address' CONFIG_SC6600_CDROMBASE 0
+ fi
+
+ if [ "$CONFIG_SOUND_SB" = "y" -o "$CONFIG_SOUND_SB" = "m" ]; then
+ if [ "$CONFIG_AEDSP16_MSS" != "y" ]; then
+ bool 'Audio Excel DSP 16 (SBPro emulation)' CONFIG_AEDSP16_SBPRO
+ if [ "$CONFIG_AEDSP16_SBPRO" = "y" ]; then
+ comment 'Audio Excel DSP 16 [Sound Blaster Pro]'
+ hex 'I/O base for Audio Excel DSP 16 220, 240' CONFIG_AEDSP16_BASE $CONFIG_SB_BASE
+ int 'Audio Excel DSP 16 IRQ 5, 7, 9, 10, 11' CONFIG_AEDSP16_SB_IRQ $CONFIG_SB_IRQ
+ int 'Audio Excel DSP 16 DMA 0, 1 or 3' CONFIG_AEDSP16_SB_DMA $CONFIG_SB_DMA
+ fi
+ fi
+ fi
+
+ if [ "$CONFIG_SOUND_MSS" = "y" -o "$CONFIG_SOUND_MSS" = "m" ]; then
+ if [ "$CONFIG_AEDSP16_SBPRO" != "y" ]; then
+ bool 'Audio Excel DSP 16 (MSS emulation)' CONFIG_AEDSP16_MSS
+ if [ "$CONFIG_AEDSP16_MSS" = "y" ]; then
+ comment 'Audio Excel DSP 16 [Microsoft Sound System]'
+ hex 'I/O base for Audio Excel DSP 16 220 or 240' CONFIG_AEDSP16_BASE 220
+ int 'Audio Excel DSP 16 IRQ 5, 7, 9, 10, 11' CONFIG_AEDSP16_MSS_IRQ $CONFIG_MSS_IRQ
+ int 'Audio Excel DSP 16 DMA 0, 1 or 3' CONFIG_AEDSP16_MSS_DMA $CONFIG_MSS_DMA
+ fi
+ fi
+ fi
+
+ if [ "$CONFIG_SOUND_MPU401" = "y" -o "$CONFIG_SOUND_MPU401" = "m" ]; then
+ bool 'Audio Excel DSP 16 (MPU401 emulation)' CONFIG_AEDSP16_MPU401
+ if [ "$CONFIG_AEDSP16_MPU401" = "y" ]; then
+ comment 'Audio Excel DSP 16 [MPU-401]'
+ if [ "$CONFIG_AEDSP16_SBPRO" != "y" -a "$CONFIG_AEDSP16_MSS" != "y" ]; then
+ hex 'I/O base for Audio Excel DSP 16 220 or 240' CONFIG_AEDSP16_BASE 220
+ fi
+ int 'MPU401 IRQ for Audio Excel DSP 16 5, 7, 9, 10 or 0 (disable)' CONFIG_AEDSP16_MPU_IRQ $CONFIG_MPU_IRQ
+ fi
+ fi
+ fi
+fi
diff -ruN linux/drivers/sound/lowlevel/Makefile ../vger/linux/drivers/sound/lowlevel/Makefile
--- linux/drivers/sound/lowlevel/Makefile Mon Jan 5 01:41:01 1998
+++ ../vger/linux/drivers/sound/lowlevel/Makefile Sun Apr 26 08:43:57 1998
@@ -1,67 +1,24 @@
-all: lowlevel.o
-
-ALLOBJS = init.o aci.o awe_wave.o aedsp16.o
-OBJS = init.o
-
-ifeq ($(CONFIG_LOWLEVEL_SOUND),y)
-ifeq ($(CONFIG_ACI_MIXER),y)
- OBJS := $(OBJS) aci.o
-endif
-ifeq ($(CONFIG_AWE32_SYNTH),y)
-OBJS := $(OBJS) awe_wave.o
-else
- ifeq ($(CONFIG_AWE32_SYNTH),m)
- MX_OBJS := $(MX_OBJS) awe_wave.o
- endif
-endif
-ifeq ($(CONFIG_AEDSP16),y)
- OBJS := $(OBJS) aedsp16.o
-else
- ifeq ($(CONFIG_AEDSP16),m)
- MX_OBJS := $(MX_OBJS) aedsp16.o
- endif
-endif
-endif
-
-ifndef TOPDIR
-TOPDIR=/usr/src/linux
-endif
-
-lowlevel.o: $(OBJS)
- $(LD) -r -o lowlevel.o $(OBJS)
-
-module: manual_config.h
- rm -f lowlevel.o
- make CFLAGS="$(CFLAGS) -DLOWLEVEL_MODULE" $(ALLOBJS)
- $(LD) -r -o lowlevel.o $(ALLOBJS)
- touch module
-
-manual_config.h:
- @echo You should create `pwd`/manual_config.h.
- @echo See `pwd`/README for more info.
- @exit 1
+# Makefile for the Linux low-level sound card drivers.
+#
+# 11 Feb 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net>
+# Rewritten to use lists instead of if statements.
-clean:
- rm -f core x y z *~ *.o module .depend
+export-objs := init.o
-dep:
- $(CPP) -M $(CFLAGS) -I. *.c > .depend
+list-y :=
+list-m :=
+list-n :=
+list- :=
+
+obj-y += init.o
+obj-$(CONFIG_ACI_MIXER) += aci.o
+obj-$(CONFIG_AEDSP16) += aedsp16.o
+obj-$(CONFIG_AWE32_SYNTH) += awe_wave.o
+
+O_TARGET := lowlevel.o
+O_OBJS := $(sort $(filter-out $(export-objs), $(obj-y)))
+OX_OBJS := $(sort $(filter $(export-objs), $(obj-y)))
+M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))
+MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
-ifndef HOSTCC
-#
-# Running outside the kernel build.
-#
-CC = gcc
-HOSTCC = gcc
-CFLAGS = -O2 -D__KERNEL__ -DMODULE -I/usr/src/linux/include -Wall -Wstrict-prototypes -fomit-frame-pointer -pipe -m486
-USE_DEPEND=y
-else
include $(TOPDIR)/Rules.make
-endif
-
-ifdef USE_DEPEND
-# include a dependency file if one exists
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
-endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu