diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 18:52:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 18:52:49 -0700 |
| commit | 7c5814c7199851c5fe9395d08fc1ab3c8c1531ea (patch) | |
| tree | 66cc9080e47c0be8bd9d4530626e54c77f9895ed /sound/usb/card.h | |
| parent | a042e26137d7674ac04b1cd2d5c06b9ebc1ee2d5 (diff) | |
| parent | 89e1e66d6be8a520cdcd26043cda2cc870a34015 (diff) | |
| download | kernel_samsung_smdk4412-7c5814c7199851c5fe9395d08fc1ab3c8c1531ea.zip kernel_samsung_smdk4412-7c5814c7199851c5fe9395d08fc1ab3c8c1531ea.tar.gz kernel_samsung_smdk4412-7c5814c7199851c5fe9395d08fc1ab3c8c1531ea.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: usb-audio: automatically detect feedback format
ASoC: sound/wm9090: add missing __devexit marker
ASoC: sound/max98088: add missing __devexit marker
ASoC: sound/ad73311: add missing __devexit marker
ASoC: fsl - fix build error in pcm030-audio-fabric.c
sound/oss/sb_ess.c: delete double assignment
ALSA: hda - Change BTL amp level on some HP notebooks
Diffstat (limited to 'sound/usb/card.h')
| -rw-r--r-- | sound/usb/card.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/card.h b/sound/usb/card.h index 1febf2f..ae4251d 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -62,12 +62,14 @@ struct snd_usb_substream { unsigned int syncinterval; /* P for adaptive mode, 0 otherwise */ unsigned int freqn; /* nominal sampling rate in fs/fps in Q16.16 format */ unsigned int freqm; /* momentary sampling rate in fs/fps in Q16.16 format */ + int freqshift; /* how much to shift the feedback value to get Q16.16 */ unsigned int freqmax; /* maximum sampling rate, used for buffer management */ unsigned int phase; /* phase accumulator */ unsigned int maxpacksize; /* max packet size in bytes */ unsigned int maxframesize; /* max packet size in frames */ unsigned int curpacksize; /* current packet size in bytes (for capture) */ unsigned int curframesize; /* current packet size in frames (for capture) */ + unsigned int syncmaxsize; /* sync endpoint packet size */ unsigned int fill_max: 1; /* fill max packet size always */ unsigned int txfr_quirk:1; /* allow sub-frame alignment */ unsigned int fmt_type; /* USB audio format type (1-3) */ |