Commit a6830306 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: seq: ump: Use the common RPN/bank conversion context 

The UMP core conversion helper API already defines the context needed
to record the bank and RPN/NRPN values, and we can simply re-use the
same struct instead of re-defining the same content as a different
name.

Link: https://patch.msgid.link/20240731130528.12600-4-tiwai@suse.de


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

sound/core/seq/seq_ports.h

+2 −12
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#define __SND_SEQ_PORTS_H



#include <sound/seq_kernel.h>

#include <sound/ump_convert.h>

#include "seq_lock.h"



/* list of 'exported' ports */
@@ -42,17 +43,6 @@ struct snd_seq_port_subs_info { 
	int (*close)(void *private_data, struct snd_seq_port_subscribe *info);

};



/* context for converting from legacy control event to UMP packet */

struct snd_seq_ump_midi2_bank {

	bool rpn_set;

	bool nrpn_set;

	bool bank_set;

	unsigned char cc_rpn_msb, cc_rpn_lsb;

	unsigned char cc_nrpn_msb, cc_nrpn_lsb;

	unsigned char cc_data_msb, cc_data_lsb;

	unsigned char cc_bank_msb, cc_bank_lsb;

};



struct snd_seq_client_port {



	struct snd_seq_addr addr;	/* client/port number */
@@ -88,7 +78,7 @@ struct snd_seq_client_port { 
	unsigned char ump_group;



#if IS_ENABLED(CONFIG_SND_SEQ_UMP)

	struct snd_seq_ump_midi2_bank midi2_bank[16]; /* per channel */

	struct ump_cvt_to_ump_bank midi2_bank[16]; /* per channel */

#endif

};

sound/core/seq/seq_ump_convert.c

+5 −5
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static int cvt_ump_midi1_to_midi2(struct snd_seq_client *dest, 
	struct snd_seq_ump_event ev_cvt;

	const union snd_ump_midi1_msg *midi1 = (const union snd_ump_midi1_msg *)event->ump;

	union snd_ump_midi2_msg *midi2 = (union snd_ump_midi2_msg *)ev_cvt.ump;

	struct snd_seq_ump_midi2_bank *cc;

	struct ump_cvt_to_ump_bank *cc;



	ev_cvt = *event;

	memset(&ev_cvt.ump, 0, sizeof(ev_cvt.ump));
@@ -790,7 +790,7 @@ static int paf_ev_to_ump_midi2(const struct snd_seq_event *event, 
}



/* set up the MIDI2 RPN/NRPN packet data from the parsed info */

static void fill_rpn(struct snd_seq_ump_midi2_bank *cc,

static void fill_rpn(struct ump_cvt_to_ump_bank *cc,

		     union snd_ump_midi2_msg *data,

		     unsigned char channel)

{
@@ -822,7 +822,7 @@ static int cc_ev_to_ump_midi2(const struct snd_seq_event *event, 
	unsigned char channel = event->data.control.channel & 0x0f;

	unsigned char index = event->data.control.param & 0x7f;

	unsigned char val = event->data.control.value & 0x7f;

	struct snd_seq_ump_midi2_bank *cc = &dest_port->midi2_bank[channel];

	struct ump_cvt_to_ump_bank *cc = &dest_port->midi2_bank[channel];



	/* process special CC's (bank/rpn/nrpn) */

	switch (index) {
@@ -887,7 +887,7 @@ static int pgm_ev_to_ump_midi2(const struct snd_seq_event *event, 
			       unsigned char status)

{

	unsigned char channel = event->data.control.channel & 0x0f;

	struct snd_seq_ump_midi2_bank *cc = &dest_port->midi2_bank[channel];

	struct ump_cvt_to_ump_bank *cc = &dest_port->midi2_bank[channel];



	data->pg.status = status;

	data->pg.channel = channel;
@@ -924,7 +924,7 @@ static int ctrl14_ev_to_ump_midi2(const struct snd_seq_event *event, 
{

	unsigned char channel = event->data.control.channel & 0x0f;

	unsigned char index = event->data.control.param & 0x7f;

	struct snd_seq_ump_midi2_bank *cc = &dest_port->midi2_bank[channel];

	struct ump_cvt_to_ump_bank *cc = &dest_port->midi2_bank[channel];

	unsigned char msb, lsb;



	msb = (event->data.control.value >> 7) & 0x7f;