Hi Takashi, from the version, Werner tested, I only changed filenames to the 'usx2y'. So please commit snd-usb-usx2y_alsacvs.patch and cp the content of snd-usb-usx2y.tar.bz2 into alsa-driver/usb (thats also commit? ;-). alsa-driver/usb/us428 is obsoleted then.
Thanks, Karsten Am Montag, 24. November 2003 21:50 schrieb Werner Schweer: > On Monday 24 November 2003 14:37, Karsten Wiese wrote: > > Hi, > > > > would you please give this a try an your us122s? > > I integrated Martins stuff into mine. us428 still works here. > > besides patching you'll need to copy the attached header into > > alsa-driver/usb/us428. > > you'll probaply also still need Martin's patched usx2yloader & > > infrastructure files. > > it works! Tested with US-122: audio recording/play, midi play > > Werner >
Index: alsa-driver/INSTALL
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/INSTALL,v
retrieving revision 1.149
diff -u -r1.149 INSTALL
--- alsa-driver/INSTALL 10 Nov 2003 17:32:36 -0000 1.149
+++ alsa-driver/INSTALL 24 Nov 2003 21:41:25 -0000
@@ -214,10 +214,10 @@
Module supports up to 8 cards.
- Module snd-usb-us428
+ Module snd-usb-usx2y
--------------------
- Module for Tascam USB US-428 device.
+ Module for Tascam USB US-122 and US-428 devices.
This module supports up to 8 cards, autoprobe and hotplugging.
Index: alsa-driver/acore/Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- alsa-driver/acore/Makefile 11 Nov 2003 13:12:15 -0000 1.32
+++ alsa-driver/acore/Makefile 24 Nov 2003 21:41:25 -0000
@@ -11,7 +11,7 @@
obj-$(CONFIG_SND_MIXART) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-hwdep.o
obj-$(CONFIG_SND_SERIALMIDI) += snd-rawmidi.o snd.o
obj-$(CONFIG_SND_MSND_PINNACLE) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_USB_US428) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_USB_USX2Y) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
obj-$(CONFIG_SND_AU8810) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
obj-$(CONFIG_SND_AU8820) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
obj-$(CONFIG_SND_AU8830) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
Index: alsa-driver/include/amagic.h
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/include/amagic.h,v
retrieving revision 1.10
diff -u -r1.10 amagic.h
--- alsa-driver/include/amagic.h 6 Oct 2003 14:01:00 -0000 1.10
+++ alsa-driver/include/amagic.h 24 Nov 2003 21:41:25 -0000
@@ -6,7 +6,7 @@
#define snd_msndpinnacle_pcm_t_magic 0xa25a3e01
#define msndmidi_t_magic 0xa25a3e02
#define pdacf_t_magic 0xa25a3f00
-#define snd_us428_stream_t_magic 0xa25a5e03
+#define snd_usX2Y_stream_t_magic 0xa25a5e03
#define vortex_t_magic 0xa25a4001
#endif
Index: alsa-driver/usb/Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/usb/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- alsa-driver/usb/Makefile 11 Nov 2003 13:12:34 -0000 1.12
+++ alsa-driver/usb/Makefile 24 Nov 2003 21:41:27 -0000
@@ -10,7 +10,7 @@
# for compatibility
extra-snd-usb-audio-objs := usbcompat.o
-obj-$(CONFIG_SND) += us428/
+obj-$(CONFIG_SND) += usx2y/
export-objs := usbaudio.o usbmidi.o
Index: alsa-driver/utils/Modules.dep
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/utils/Modules.dep,v
retrieving revision 1.26
diff -u -r1.26 Modules.dep
--- alsa-driver/utils/Modules.dep 6 Oct 2003 14:01:07 -0000 1.26
+++ alsa-driver/utils/Modules.dep 24 Nov 2003 21:41:27 -0000
@@ -17,8 +17,8 @@
%dir linux/sound/pcmcia/pdaudiocf
|snd-pdaudiocf snd-pcm
-%dir linux/sound/usb/us428
-|snd-usb-us428 snd-usb-audio snd-hwdep
+%dir linux/sound/usb/usx2y
+|snd-usb-usx2y snd-usb-audio snd-hwdep
%dir linux/sound/pci/au88x0
|snd-au8810 snd-pcm snd-ac97-codec snd-mpu401-uart
snd-usb-usx2y.tar.bz2
Description: application/tbz
