ALSA: fireface: share register for async transaction of MIDI messages

[linux.git] / sound / firewire / fireface / ff.h

diff --git a/sound/firewire/fireface/ff.h b/sound/firewire/fireface/ff.h
index 64df44beb95058ab42f51d195edc4f6497edea88..ea905285beabbe1fc954ca60d2cb9ca05ebc47b2 100644 (file)
--- a/sound/firewire/fireface/ff.h
+++ b/sound/firewire/fireface/ff.h
@@ -37,6 +37,11 @@
 #define SND_FF_IN_MIDI_PORTS           2
 #define SND_FF_OUT_MIDI_PORTS          2
 
+#define SND_FF_REG_SYNC_STATUS         0x0000801c0000ull
+/* For block wriet request. */
+#define SND_FF_REG_FETCH_PCM_FRAMES    0x0000801c0000ull
+#define SND_FF_REG_CLOCK_CONFIG                0x0000801c0004ull
+
 struct snd_ff_protocol;
 struct snd_ff_spec {
        const char *const name;
@@ -89,31 +94,25 @@ struct snd_ff {
 enum snd_ff_clock_src {
        SND_FF_CLOCK_SRC_INTERNAL,
        SND_FF_CLOCK_SRC_SPDIF,
-       SND_FF_CLOCK_SRC_ADAT,
+       SND_FF_CLOCK_SRC_ADAT1,
+       SND_FF_CLOCK_SRC_ADAT2,
        SND_FF_CLOCK_SRC_WORD,
        SND_FF_CLOCK_SRC_LTC,
-       /* TODO: perhaps ADAT2 and TCO exists. */
+       /* TODO: perhaps TCO exists. */
 };
 
 struct snd_ff_protocol {
-       int (*get_clock)(struct snd_ff *ff, unsigned int *rate,
-                        enum snd_ff_clock_src *src);
        int (*begin_session)(struct snd_ff *ff, unsigned int rate);
        void (*finish_session)(struct snd_ff *ff);
        int (*switch_fetching_mode)(struct snd_ff *ff, bool enable);
 
-       void (*dump_sync_status)(struct snd_ff *ff,
-                                struct snd_info_buffer *buffer);
-       void (*dump_clock_config)(struct snd_ff *ff,
-                                 struct snd_info_buffer *buffer);
-
        u64 midi_high_addr_reg;
-       u64 midi_rx_port_0_reg;
-       u64 midi_rx_port_1_reg;
 };
 
 extern const struct snd_ff_protocol snd_ff_protocol_ff400;
 
+int snd_ff_transaction_get_clock(struct snd_ff *ff, unsigned int *rate,
+                                enum snd_ff_clock_src *src);
 int snd_ff_transaction_register(struct snd_ff *ff);
 int snd_ff_transaction_reregister(struct snd_ff *ff);
 void snd_ff_transaction_unregister(struct snd_ff *ff);