Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49c7b3fc authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-lib: rename macros with AM824 prefix 



This commit renames some macros just related to AM824 format. In later
commit, they're moved to AM824 layer.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 85130cb4

sound/firewire/amdtp-stream.c

+2 −2
Original line number Diff line number Diff line
@@ -202,8 +202,8 @@ int amdtp_stream_set_parameters(struct amdtp_stream *s, 
	midi_channels = DIV_ROUND_UP(midi_ports, 8);



	if (WARN_ON(amdtp_stream_running(s)) ||

	    WARN_ON(pcm_channels > AMDTP_MAX_CHANNELS_FOR_PCM) ||

	    WARN_ON(midi_channels > AMDTP_MAX_CHANNELS_FOR_MIDI))

	    WARN_ON(pcm_channels > AM824_MAX_CHANNELS_FOR_PCM) ||

	    WARN_ON(midi_channels > AM824_MAX_CHANNELS_FOR_MIDI))

		return -EINVAL;



	for (sfc = 0; sfc < ARRAY_SIZE(amdtp_rate_table); ++sfc) {

sound/firewire/amdtp-stream.h

+7 −7
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ enum cip_sfc { 
	CIP_SFC_COUNT

};



#define AMDTP_IN_PCM_FORMAT_BITS	SNDRV_PCM_FMTBIT_S32

#define AM824_IN_PCM_FORMAT_BITS	SNDRV_PCM_FMTBIT_S32



#define AMDTP_OUT_PCM_FORMAT_BITS	(SNDRV_PCM_FMTBIT_S16 | \

#define AM824_OUT_PCM_FORMAT_BITS	(SNDRV_PCM_FMTBIT_S16 | \

					 SNDRV_PCM_FMTBIT_S32)
@@ -91,7 +91,7 @@ enum cip_sfc { 
 * This module supports maximum 64 PCM channels for one PCM stream

 * This is for our convenience.

 */

#define AMDTP_MAX_CHANNELS_FOR_PCM	64

#define AM824_MAX_CHANNELS_FOR_PCM	64



/*

 * AMDTP packet can include channels for MIDI conformant data.
@@ -101,7 +101,7 @@ enum cip_sfc { 
 * This module supports maximum 1 MIDI conformant data channels.

 * Then this AMDTP packets can transfer maximum 8 MIDI data streams.

 */

#define AMDTP_MAX_CHANNELS_FOR_MIDI	1

#define AM824_MAX_CHANNELS_FOR_MIDI	1



struct fw_unit;

struct fw_iso_context;
@@ -157,13 +157,13 @@ struct amdtp_stream { 
	struct amdtp_stream *sync_slave;



	/* For AM824 processing. */

	struct snd_rawmidi_substream *midi[AMDTP_MAX_CHANNELS_FOR_MIDI * 8];

	struct snd_rawmidi_substream *midi[AM824_MAX_CHANNELS_FOR_MIDI * 8];

	int midi_fifo_limit;

	int midi_fifo_used[AMDTP_MAX_CHANNELS_FOR_MIDI * 8];

	int midi_fifo_used[AM824_MAX_CHANNELS_FOR_MIDI * 8];

	unsigned int pcm_channels;

	unsigned int midi_ports;



	u8 pcm_positions[AMDTP_MAX_CHANNELS_FOR_PCM];

	u8 pcm_positions[AM824_MAX_CHANNELS_FOR_PCM];

	u8 midi_position;



	void (*transfer_samples)(struct amdtp_stream *s,

sound/firewire/bebob/bebob_pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -122,11 +122,11 @@ pcm_init_hw_params(struct snd_bebob *bebob, 
			   SNDRV_PCM_INFO_MMAP_VALID;



	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

		runtime->hw.formats = AMDTP_IN_PCM_FORMAT_BITS;

		runtime->hw.formats = AM824_IN_PCM_FORMAT_BITS;

		s = &bebob->tx_stream;

		formations = bebob->tx_stream_formations;

	} else {

		runtime->hw.formats = AMDTP_OUT_PCM_FORMAT_BITS;

		runtime->hw.formats = AM824_OUT_PCM_FORMAT_BITS;

		s = &bebob->rx_stream;

		formations = bebob->rx_stream_formations;

	}

sound/firewire/bebob/bebob_stream.c

+3 −3
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ map_data_channels(struct snd_bebob *bebob, struct amdtp_stream *s) 
			case 0x09:	/* Digital */

			default:

				location = pcm + sec_loc;

				if (location >= AMDTP_MAX_CHANNELS_FOR_PCM) {

				if (location >= AM824_MAX_CHANNELS_FOR_PCM) {

					err = -ENOSYS;

					goto end;

				}
@@ -872,8 +872,8 @@ parse_stream_formation(u8 *buf, unsigned int len, 
		}

	}



	if (formation[i].pcm  > AMDTP_MAX_CHANNELS_FOR_PCM ||

	    formation[i].midi > AMDTP_MAX_CHANNELS_FOR_MIDI)

	if (formation[i].pcm  > AM824_MAX_CHANNELS_FOR_PCM ||

	    formation[i].midi > AM824_MAX_CHANNELS_FOR_MIDI)

		return -ENOSYS;



	return 0;

sound/firewire/dice/dice-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -133,11 +133,11 @@ static int init_hw_info(struct snd_dice *dice, 
		   SNDRV_PCM_INFO_BLOCK_TRANSFER;



	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

		hw->formats = AMDTP_IN_PCM_FORMAT_BITS;

		hw->formats = AM824_IN_PCM_FORMAT_BITS;

		stream = &dice->tx_stream;

		pcm_channels = dice->tx_channels;

	} else {

		hw->formats = AMDTP_OUT_PCM_FORMAT_BITS;

		hw->formats = AM824_OUT_PCM_FORMAT_BITS;

		stream = &dice->rx_stream;

		pcm_channels = dice->rx_channels;

	}