Skip to contentSkip to conversation

snd-usb-usx2y 0.7.2

PATCH New Karsten Wiese 1 participant 1 message Aug 2, 2004

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 snd-usb-usx2y 0.7.2

Hi,

This deletes struct snd_usX2Y_stream to simplify things.

cheers,
Karsten

Index: alsa-driver/usb/usx2y/usX2Yhwdep.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/usb/usx2y/usX2Yhwdep.c,v retrieving revision 1.7

usb/usx2y/usX2Yhwdep.c +0 -2
diff -u -r1.7 usX2Yhwdep.c
@@ -349,8 +349,6 @@
 	hw->ops.poll = snd_us428ctls_poll;
 	hw->exclusive = 1;
 	sprintf(hw->name, "/proc/bus/usb/%03d/%03d", device->bus->busnum, device->devnum);
-	usX2Y(card)->hwdep = hw;
-
 	return 0;
 }
 

Index: alsa-driver/usb/usx2y/usbusx2y.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/usb/usx2y/usbusx2y.c,v retrieving revision 1.14

usb/usx2y/usbusx2y.c +1 -1
diff -u -r1.14 usbusx2y.c
@@ -113,7 +113,7 @@
 
 
 MODULE_AUTHOR("Karsten Wiese <[email protected]>");
-MODULE_DESCRIPTION("TASCAM "NAME_ALLCAPS" Version 0.7.1");
+MODULE_DESCRIPTION("TASCAM "NAME_ALLCAPS" Version 0.7.2");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{TASCAM(0x1604), "NAME_ALLCAPS"(0x8001)(0x8005)(0x8007) }}");
 

Index: alsa-driver/usb/usx2y/usbusx2y.h
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/usb/usx2y/usbusx2y.h,v retrieving revision 1.7

usb/usx2y/usbusx2y.h +8 -6
diff -u -r1.7 usbusx2y.h
@@ -5,7 +5,8 @@
 #include "usbus428ctldefs.h" 
 
 #define NRURBS	        2	/* */
-#define NRPACKS		1	/* usb-frames/ms per urb: 1 and 2 are supported.
+#define NRPACKS		1	/* FIXME: Currently only 1 works.
+				   usb-frames/ms per urb: 1 and 2 are supported.
 				   setting to 2 will PERHAPS make it easier for slow machines.
 				   Jitter will be higher though.
 				   On my PIII 500Mhz Laptop setting to 1 is the only way to go 
@@ -26,25 +27,26 @@
 	struct urb*	urb[0];
 } snd_usX2Y_urbSeq_t;
 
+typedef struct snd_usX2Y_substream snd_usX2Y_substream_t;
 
 typedef struct {
 	snd_usb_audio_t 	chip;
 	int			stride;
-	struct urb*		In04urb;
-	void*			In04Buf;
+	struct urb		*In04urb;
+	void			*In04Buf;
 	char			In04Last[24];
 	unsigned		In04IntCalls;
-	snd_usX2Y_urbSeq_t*	US04;
+	snd_usX2Y_urbSeq_t	*US04;
 	wait_queue_head_t	In04WaitQueue;
 	snd_usX2Y_AsyncSeq_t	AS04;
 	unsigned int		rate,
 				format;
 	int			refframes;
-	snd_hwdep_t*		hwdep;
 	int			chip_status;
 	struct semaphore	open_mutex;
-	us428ctls_sharedmem_t*	us428ctls_sharedmem;
+	us428ctls_sharedmem_t	*us428ctls_sharedmem;
 	wait_queue_head_t	us428ctls_wait_queue_head;
+	snd_usX2Y_substream_t	*substream[4];
 } usX2Ydev_t;
 
 

Index: alsa-driver/usb/usx2y/usbusx2yaudio.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/usb/usx2y/usbusx2yaudio.c,v retrieving revision 1.17

usb/usx2y/usbusx2yaudio.c +169 -214

663 lines not on this page · raw message