Merge tag 'clk-for-linus-3.16-part2' of git://git.linaro.org/people/mike.turquette...

[deliverable/linux.git] / sound / firewire / amdtp.h

diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
index 05f1b8b30e2b6630e39f71a89cafce87a31e2dae..d8ee7b0e938629a828571fcd45ce5da5edc02469 100644 (file)
--- a/sound/firewire/amdtp.h
+++ b/sound/firewire/amdtp.h
@@ -23,6 +23,12 @@
  *     corresponds to the end of event in the packet. Out of IEC 61883.
  * @CIP_WRONG_DBS: Only for in-stream. The value of dbs is wrong in in-packets.
  *     The value of data_block_quadlets is used instead of reported value.
+ * @SKIP_DBC_ZERO_CHECK: Only for in-stream.  Packets with zero in dbc is
+ *     skipped for detecting discontinuity.
+ * @CIP_SKIP_INIT_DBC_CHECK: Only for in-stream. The value of dbc in first
+ *     packet is not continuous from an initial value.
+ * @CIP_EMPTY_HAS_WRONG_DBC: Only for in-stream. The value of dbc in empty
+ *     packet is wrong but the others are correct.
  */
 enum cip_flags {
        CIP_NONBLOCKING         = 0x00,
@@ -31,6 +37,9 @@ enum cip_flags {
        CIP_EMPTY_WITH_TAG0     = 0x04,
        CIP_DBC_IS_END_EVENT    = 0x08,
        CIP_WRONG_DBS           = 0x10,
+       CIP_SKIP_DBC_ZERO_CHECK = 0x20,
+       CIP_SKIP_INIT_DBC_CHECK = 0x40,
+       CIP_EMPTY_HAS_WRONG_DBC = 0x80,
 };
 
 /**
@@ -122,6 +131,9 @@ struct amdtp_stream {
        /* quirk: fixed interval of dbc between previos/current packets. */
        unsigned int tx_dbc_interval;
 
+       /* quirk: the first count of data blocks in an rx packet for MIDI */
+       unsigned int rx_blocks_for_midi;
+
        bool callbacked;
        wait_queue_head_t callback_wait;
        struct amdtp_stream *sync_slave;