diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2014-04-25 22:44:51 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-26 14:15:10 +0200 |
| commit | 10550bea44a8d7cec8a503c8f91fb6014e7849e9 (patch) | |
| tree | 9542b85416d83cbbbb58635c479e5a8c8fa9b2dd /sound/firewire/amdtp.h | |
| parent | 77d2a8a4f61c158ca34db167e5a9d57ceec0f0df (diff) | |
ALSA: dice/firewire-lib: Keep dualwire mode but obsolete CIP_HI_DUALWIRE
In previous commit, AMDTP functionality in firewire-lib supports mapping
for PCM data channels. With this mapping, firewire-lib can obsolete
a flag, CIP_HI_DUALWIRE, but Dice driver still keeps dual wire mode.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/amdtp.h')
| -rw-r--r-- | sound/firewire/amdtp.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h index e8d62ace6fff..db60425f2781 100644 --- a/sound/firewire/amdtp.h +++ b/sound/firewire/amdtp.h @@ -16,18 +16,13 @@ * @CIP_BLOCKING: In blocking mode, each packet contains either zero or * SYT_INTERVAL samples, with these two types alternating so that * the overall sample rate comes out right. - * @CIP_HI_DUALWIRE: At rates above 96 kHz, pretend that the stream runs - * at half the actual sample rate with twice the number of channels; - * two samples of a channel are stored consecutively in the packet. - * Requires blocking mode and SYT_INTERVAL-aligned PCM buffer size. * @CIP_SYNC_TO_DEVICE: In sync to device mode, time stamp in out packets is * generated by in packets. Defaultly this driver generates timestamp. */ enum cip_flags { CIP_NONBLOCKING = 0x00, CIP_BLOCKING = 0x01, - CIP_HI_DUALWIRE = 0x02, - CIP_SYNC_TO_DEVICE = 0x04, + CIP_SYNC_TO_DEVICE = 0x02, }; /** @@ -84,7 +79,6 @@ struct amdtp_stream { struct mutex mutex; enum cip_sfc sfc; - bool dual_wire; unsigned int data_block_quadlets; unsigned int pcm_channels; unsigned int midi_ports; |