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

ALSA: oxfw: code refactoring for wrong_dbs quirk 



A new entry is added to the quirk enumeration for wrong_dbs quirk to
obsolete structure member.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210518084557.102681-11-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6a3ce97d

sound/firewire/oxfw/oxfw-stream.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int init_stream(struct snd_oxfw *oxfw, struct amdtp_stream *stream) 


		if (oxfw->quirks & SND_OXFW_QUIRK_JUMBO_PAYLOAD)

			flags |= CIP_JUMBO_PAYLOAD;

		if (oxfw->wrong_dbs)

		if (oxfw->quirks & SND_OXFW_QUIRK_WRONG_DBS)

			flags |= CIP_WRONG_DBS;

	} else {

		conn = &oxfw->in_conn;

sound/firewire/oxfw/oxfw.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int detect_quirks(struct snd_oxfw *oxfw) 
	 * value in 'dbs' field of CIP header against its format information.

	 */

	if (vendor == VENDOR_LOUD && model == MODEL_SATELLITE)

		oxfw->wrong_dbs = true;

		oxfw->quirks |= SND_OXFW_QUIRK_WRONG_DBS;



	return 0;

}

sound/firewire/oxfw/oxfw.h

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ enum snd_oxfw_quirk { 
	// Postpone transferring packets during handling asynchronous transaction. As a result,

	// next isochronous packet includes more events than one packet can include.

	SND_OXFW_QUIRK_JUMBO_PAYLOAD = 0x01,

	// The dbs field of CIP header in tx packet is wrong.

	SND_OXFW_QUIRK_WRONG_DBS = 0x02,

};



/* This is an arbitrary number for convinience. */
@@ -51,7 +53,6 @@ struct snd_oxfw { 


	// The combination of snd_oxfw_quirk enumeration-constants.

	unsigned int quirks;

	bool wrong_dbs;

	bool has_output;

	bool has_input;

	u8 *tx_stream_formats[SND_OXFW_STREAM_FORMAT_ENTRIES];