against cvs: us122 support in snd-usb-us428
PATCH 1/1 against cvs: us122 support in snd-usb-us428
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.
Gruesse,
Karsten
#ifndef USBUSX2Y_H
#define USBUSX2Y_H
#include <linux/usb.h>
#include "../../alsa-kernel/usb/usbaudio.h"
#include "usbus428ctldefs.h"
#define NRURBS 2 /* */
#define NRPACKS 1 /* usb-frames/ms per urb */
#ifndef LINUX_2_2
typedef struct urb urb_t;
typedef struct urb* purb_t;
#endif
#define URBS_AsyncSeq 10
#define URB_DataLen_AsyncSeq 32
typedef struct {
urb_t* urb[URBS_AsyncSeq];
char* buffer;
} snd_usX2Y_AsyncSeq_t;typedef struct {
int submitted;
int len;
urb_t* urb[0];
} snd_usX2Y_urbSeq_t;typedef struct {
snd_usb_audio_t chip;
int stride;
purb_t In04urb;
void* In04Buf;
char In04Last[24];
unsigned In04IntCalls;
snd_usX2Y_urbSeq_t* US04;
int Seq04;
int Seq04Complete;
wait_queue_head_t In04WaitQueue;
snd_usX2Y_AsyncSeq_t AS04;
unsigned int rate,
format;
int refframes;
purb_t play_urb_waiting[2];
int pipe0Aframes[NRURBS][NRPACKS];
snd_hwdep_t* hwdep;
int chip_status;
struct semaphore open_mutex;
us428ctls_sharedmem_t* us428ctls_sharedmem;
wait_queue_head_t us428ctls_wait_queue_head;
} usX2Ydev_t;#define usX2Y(c) ((usX2Ydev_t*)(c)->private_data)
int snd_usX2Y_audio_create(snd_card_t* card);
#ifndef OLD_USB
void snd_usX2Y_Out04Int(urb_t* urb, struct pt_regs *regs); void snd_usX2Y_In04Int(urb_t* urb, struct pt_regs *regs); #else
void snd_usX2Y_Out04Int(urb_t* urb);
void snd_usX2Y_In04Int(urb_t* urb);
#endif
#ifndef CONFIG_SND_DEBUG
#define snd_usX2Y_Out04Int 0
#endif
#define NAME_ALLCAPS "US-X2Y"
#endif
At Mon, 24 Nov 2003 14:37:52 +0100,
Quoted 10 lines · Karsten Wiese
[1 <text/plain; us-ascii (7bit)>]
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.
oh it's nice to see the uniformed version.
please tell me *ASAP* whether it works for both us428 and us122. if they are confirmed, i can split this into 1.0 release...
thanks,
Takashi
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/
Quoted 8 lines · Karsten Wiese
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
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/
PATCH 1/1 against cvs: us122 and us428 support in snd-usb-usx2y
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:
Quoted 10 lines · Karsten Wiese
Quoted 8 lines
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.
Quoted 4 lines
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
INSTALL +2 -2
@@ -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
acore/Makefile +1 -1
@@ -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
include/amagic.h +1 -1
@@ -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
usb/Makefile +1 -1
@@ -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
utils/Modules.dep +2 -2
@@ -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
Re: [PATCH]against cvs: us122 and us428 support in snd-usb-usx2y
At Mon, 24 Nov 2003 23:13:35 +0100,
Quoted 7 lines · Karsten Wiese
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.
ok, i did that.
(in general, it's not good to move the directory in cvs tree because
all history will be gone. but in this case, the driver is young, so it doesn't matter much.)
thanks for your work!
Takashi
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/
Quoted 12 lines · Werner Schweer
Quoted 8 lines · Karsten Wiese
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
Same here. No problems. Everything works fine.
And this fix will show the correct USB ID in /proc/asound/cards in the future.
Thanks!
martin
usbus428.c renamed from usbus428.c.ORIGINAL +1 -1
@@ -255,7 +255,7 @@sprintf (card->shortname,"TASCAM " NAME_ALLCAPS "" );sprintf (card->longname,"%s (%x:%x if %d at %03d/%03d)" , card->shortname, - snd_usX2Y_usb_id_table[0 ].idVendor, snd_usX2Y_usb_id_table[0 ].idProduct, + device->descriptor.idVendor, device->descriptor.idProduct,0 ,//us428(card)->usbmidi.ifnum, usX2Y (card)->chip.dev->bus->busnum,usX2Y (card)->chip.dev->devnum );
Signature · 8 lines
The only nice thing about spam is that it doesn't ring. ------------------------------------------------------- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/
Quoted 25 lines · Martin Langer
Quoted 12 lines · Werner Schweer
Quoted 8 lines · Karsten Wiese
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
Same here. No problems. Everything works fine.
And this fix will show the correct USB ID in/proc/asound/cardsin the future.Thanks!
martin
usbus428.c line 261
Quoted 8 lines
usbus428.c renamed from usbus428.c.ORIGINAL +1
-1@@ -255,7 +255,7 @@sprintf (card->shortname,"TASCAM " NAME_ALLCAPS "" );sprintf (card->longname,"%s (%x:%x if %d at %03d/%03d)" , card->shortname, - snd_usX2Y_usb_id_table[0 ].idVendor, snd_usX2Y_usb_id_table[0 ].idProduct, + device->descriptor.idVendor, device->descriptor.idProduct,0 ,//us428(card)->usbmidi.ifnum, usX2Y (card)->chip.dev->bus->busnum,usX2Y (card)->chip.dev->devnum );
US122 support seems to be ok in pre3, but this patch wasn't committed.
martin
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/
At Wed, 26 Nov 2003 00:08:21 +0100,
Quoted 2 lines · Martin Langer
US122 support seems to be ok in pre3, but this patch wasn't committed.
sorry, i overlooked this one.
fixed now.
Takashi
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/