mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
ALSA: fireface: add protocol-dependent operation to get clock status
This commit adds a member for a callback function to get clock status to former protocol. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
ae3053c28b
commit
b1d0cb0ae5
5 changed files with 71 additions and 70 deletions
|
@ -152,7 +152,7 @@ static int pcm_open(struct snd_pcm_substream *substream)
|
|||
if (err < 0)
|
||||
goto release_lock;
|
||||
|
||||
err = snd_ff_transaction_get_clock(ff, &rate, &src);
|
||||
err = ff->spec->protocol->get_clock(ff, &rate, &src);
|
||||
if (err < 0)
|
||||
goto release_lock;
|
||||
|
||||
|
|
|
@ -12,6 +12,70 @@
|
|||
#define FORMER_REG_SYNC_STATUS 0x0000801c0000ull
|
||||
/* For block write request. */
|
||||
#define FORMER_REG_FETCH_PCM_FRAMES 0x0000801c0000ull
|
||||
#define FORMER_REG_CLOCK_CONFIG 0x0000801c0004ull
|
||||
|
||||
static int former_get_clock(struct snd_ff *ff, unsigned int *rate,
|
||||
enum snd_ff_clock_src *src)
|
||||
{
|
||||
__le32 reg;
|
||||
u32 data;
|
||||
int err;
|
||||
|
||||
err = snd_fw_transaction(ff->unit, TCODE_READ_QUADLET_REQUEST,
|
||||
FORMER_REG_CLOCK_CONFIG, ®, sizeof(reg), 0);
|
||||
if (err < 0)
|
||||
return err;
|
||||
data = le32_to_cpu(reg);
|
||||
|
||||
/* Calculate sampling rate. */
|
||||
switch ((data >> 1) & 0x03) {
|
||||
case 0x01:
|
||||
*rate = 32000;
|
||||
break;
|
||||
case 0x00:
|
||||
*rate = 44100;
|
||||
break;
|
||||
case 0x03:
|
||||
*rate = 48000;
|
||||
break;
|
||||
case 0x02:
|
||||
default:
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
if (data & 0x08)
|
||||
*rate *= 2;
|
||||
else if (data & 0x10)
|
||||
*rate *= 4;
|
||||
|
||||
/* Calculate source of clock. */
|
||||
if (data & 0x01) {
|
||||
*src = SND_FF_CLOCK_SRC_INTERNAL;
|
||||
} else {
|
||||
/* TODO: 0x02, 0x06, 0x07? */
|
||||
switch ((data >> 10) & 0x07) {
|
||||
case 0x00:
|
||||
*src = SND_FF_CLOCK_SRC_ADAT1;
|
||||
break;
|
||||
case 0x01:
|
||||
*src = SND_FF_CLOCK_SRC_ADAT2;
|
||||
break;
|
||||
case 0x03:
|
||||
*src = SND_FF_CLOCK_SRC_SPDIF;
|
||||
break;
|
||||
case 0x04:
|
||||
*src = SND_FF_CLOCK_SRC_WORD;
|
||||
break;
|
||||
case 0x05:
|
||||
*src = SND_FF_CLOCK_SRC_LTC;
|
||||
break;
|
||||
default:
|
||||
return -EIO;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int former_switch_fetching_mode(struct snd_ff *ff, bool enable)
|
||||
{
|
||||
|
@ -56,7 +120,7 @@ static void dump_clock_config(struct snd_ff *ff, struct snd_info_buffer *buffer)
|
|||
int err;
|
||||
|
||||
err = snd_fw_transaction(ff->unit, TCODE_READ_BLOCK_REQUEST,
|
||||
SND_FF_REG_CLOCK_CONFIG, ®, sizeof(reg), 0);
|
||||
FORMER_REG_CLOCK_CONFIG, ®, sizeof(reg), 0);
|
||||
if (err < 0)
|
||||
return;
|
||||
|
||||
|
@ -383,6 +447,7 @@ static void ff800_handle_midi_msg(struct snd_ff *ff, __le32 *buf, size_t length)
|
|||
|
||||
const struct snd_ff_protocol snd_ff_protocol_ff800 = {
|
||||
.handle_midi_msg = ff800_handle_midi_msg,
|
||||
.get_clock = former_get_clock,
|
||||
.switch_fetching_mode = former_switch_fetching_mode,
|
||||
.begin_session = ff800_begin_session,
|
||||
.finish_session = ff800_finish_session,
|
||||
|
@ -532,6 +597,7 @@ static void ff400_handle_midi_msg(struct snd_ff *ff, __le32 *buf, size_t length)
|
|||
|
||||
const struct snd_ff_protocol snd_ff_protocol_ff400 = {
|
||||
.handle_midi_msg = ff400_handle_midi_msg,
|
||||
.get_clock = former_get_clock,
|
||||
.switch_fetching_mode = former_switch_fetching_mode,
|
||||
.begin_session = ff400_begin_session,
|
||||
.finish_session = ff400_finish_session,
|
||||
|
|
|
@ -113,7 +113,7 @@ int snd_ff_stream_start_duplex(struct snd_ff *ff, unsigned int rate)
|
|||
if (ff->substreams_counter == 0)
|
||||
return 0;
|
||||
|
||||
err = snd_ff_transaction_get_clock(ff, &curr_rate, &src);
|
||||
err = ff->spec->protocol->get_clock(ff, &curr_rate, &src);
|
||||
if (err < 0)
|
||||
return err;
|
||||
if (curr_rate != rate ||
|
||||
|
|
|
@ -11,69 +11,6 @@
|
|||
#define SND_FF_REG_MIDI_RX_PORT_0 0x000080180000ull
|
||||
#define SND_FF_REG_MIDI_RX_PORT_1 0x000080190000ull
|
||||
|
||||
int snd_ff_transaction_get_clock(struct snd_ff *ff, unsigned int *rate,
|
||||
enum snd_ff_clock_src *src)
|
||||
{
|
||||
__le32 reg;
|
||||
u32 data;
|
||||
int err;
|
||||
|
||||
err = snd_fw_transaction(ff->unit, TCODE_READ_QUADLET_REQUEST,
|
||||
SND_FF_REG_CLOCK_CONFIG, ®, sizeof(reg), 0);
|
||||
if (err < 0)
|
||||
return err;
|
||||
data = le32_to_cpu(reg);
|
||||
|
||||
/* Calculate sampling rate. */
|
||||
switch ((data >> 1) & 0x03) {
|
||||
case 0x01:
|
||||
*rate = 32000;
|
||||
break;
|
||||
case 0x00:
|
||||
*rate = 44100;
|
||||
break;
|
||||
case 0x03:
|
||||
*rate = 48000;
|
||||
break;
|
||||
case 0x02:
|
||||
default:
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
if (data & 0x08)
|
||||
*rate *= 2;
|
||||
else if (data & 0x10)
|
||||
*rate *= 4;
|
||||
|
||||
/* Calculate source of clock. */
|
||||
if (data & 0x01) {
|
||||
*src = SND_FF_CLOCK_SRC_INTERNAL;
|
||||
} else {
|
||||
/* TODO: 0x02, 0x06, 0x07? */
|
||||
switch ((data >> 10) & 0x07) {
|
||||
case 0x00:
|
||||
*src = SND_FF_CLOCK_SRC_ADAT1;
|
||||
break;
|
||||
case 0x01:
|
||||
*src = SND_FF_CLOCK_SRC_ADAT2;
|
||||
break;
|
||||
case 0x03:
|
||||
*src = SND_FF_CLOCK_SRC_SPDIF;
|
||||
break;
|
||||
case 0x04:
|
||||
*src = SND_FF_CLOCK_SRC_WORD;
|
||||
break;
|
||||
case 0x05:
|
||||
*src = SND_FF_CLOCK_SRC_LTC;
|
||||
break;
|
||||
default:
|
||||
return -EIO;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void finish_transmit_midi_msg(struct snd_ff *ff, unsigned int port,
|
||||
int rcode)
|
||||
{
|
||||
|
|
|
@ -35,8 +35,6 @@
|
|||
#define SND_FF_IN_MIDI_PORTS 2
|
||||
#define SND_FF_OUT_MIDI_PORTS 2
|
||||
|
||||
#define SND_FF_REG_CLOCK_CONFIG 0x0000801c0004ull
|
||||
|
||||
enum snd_ff_stream_mode {
|
||||
SND_FF_STREAM_MODE_LOW = 0,
|
||||
SND_FF_STREAM_MODE_MID,
|
||||
|
@ -106,6 +104,8 @@ enum snd_ff_clock_src {
|
|||
|
||||
struct snd_ff_protocol {
|
||||
void (*handle_midi_msg)(struct snd_ff *ff, __le32 *buf, size_t length);
|
||||
int (*get_clock)(struct snd_ff *ff, unsigned int *rate,
|
||||
enum snd_ff_clock_src *src);
|
||||
int (*switch_fetching_mode)(struct snd_ff *ff, bool enable);
|
||||
int (*begin_session)(struct snd_ff *ff, unsigned int rate);
|
||||
void (*finish_session)(struct snd_ff *ff);
|
||||
|
@ -115,8 +115,6 @@ struct snd_ff_protocol {
|
|||
extern const struct snd_ff_protocol snd_ff_protocol_ff800;
|
||||
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);
|
||||
|
|
Loading…
Reference in a new issue