vserver 1.9.5.x5

[linux-2.6.git] / sound / usb / usx2y / usbusx2y.h

diff --git a/sound/usb/usx2y/usbusx2y.h b/sound/usb/usx2y/usbusx2y.h
index 71883dc..f65f3a7 100644 (file)
--- a/sound/usb/usx2y/usbusx2y.h
+++ b/sound/usb/usx2y/usbusx2y.h
@@ -3,15 +3,8 @@
 #include "../usbaudio.h"
 #include "usbus428ctldefs.h" 
 
-#define NRURBS         2       /* */
-#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 
-                                  for PLAYING synths. i.e. Jack & Aeolus sound quit nicely 
-                                  at 4 periods 64 frames. 
-                               */
+#define NRURBS         2       
+
 
 #define URBS_AsyncSeq 10
 #define URB_DataLen_AsyncSeq 32
@@ -27,6 +20,7 @@ typedef struct {
 } snd_usX2Y_urbSeq_t;
 
 typedef struct snd_usX2Y_substream snd_usX2Y_substream_t;
+#include "usx2yhwdeppcm.h"
 
 typedef struct {
        snd_usb_audio_t         chip;
@@ -40,15 +34,44 @@ typedef struct {
        snd_usX2Y_AsyncSeq_t    AS04;
        unsigned int            rate,
                                format;
-       int                     refframes;
        int                     chip_status;
-       struct semaphore        open_mutex;
+       struct semaphore        prepare_mutex;
        us428ctls_sharedmem_t   *us428ctls_sharedmem;
+       int                     wait_iso_frame;
        wait_queue_head_t       us428ctls_wait_queue_head;
-       snd_usX2Y_substream_t   *substream[4];
+       snd_usX2Y_hwdep_pcm_shm_t       *hwdep_pcm_shm;
+       snd_usX2Y_substream_t   *subs[4];
+       snd_usX2Y_substream_t   * volatile  prepare_subs;
+       wait_queue_head_t       prepare_wait_queue;
 } usX2Ydev_t;
 
 
+struct snd_usX2Y_substream {
+       usX2Ydev_t      *usX2Y;
+       snd_pcm_substream_t *pcm_substream;
+
+       int                     endpoint;               
+       unsigned int            maxpacksize;            /* max packet size in bytes */
+
+       atomic_t                state;
+#define state_STOPPED  0
+#define state_STARTING1 1
+#define state_STARTING2 2
+#define state_STARTING3 3
+#define state_PREPARED 4
+#define state_PRERUNNING  6
+#define state_RUNNING  8
+
+       int                     hwptr;                  /* free frame position in the buffer (only for playback) */
+       int                     hwptr_done;             /* processed frame position in the buffer */
+       int                     transfer_done;          /* processed frames since last period update */
+
+       struct urb              *urb[NRURBS];   /* data urb table */
+       struct urb              *completed_urb;
+       char                    *tmpbuf;                        /* temporary buffer for playback */
+};
+
+
 #define usX2Y(c) ((usX2Ydev_t*)(c)->private_data)
 
 int usX2Y_audio_create(snd_card_t* card);