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

Commit d568121c authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[PATCH] Assign device pointer to OSS devices 



Add register_sound_special_device() function to allow assignment of
device pointer to a specific OSS device for HAL.

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

include/linux/sound.h

+2 −0
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ 
 *	Sound core interface functions

 */

 

struct device;

extern int register_sound_special(struct file_operations *fops, int unit);

extern int register_sound_special_device(struct file_operations *fops, int unit, struct device *dev);

extern int register_sound_mixer(struct file_operations *fops, int dev);

extern int register_sound_midi(struct file_operations *fops, int dev);

extern int register_sound_dsp(struct file_operations *fops, int dev);

sound/core/sound_oss.c

+5 −2
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ int snd_register_oss_device(int type, snd_card_t * card, int dev, snd_minor_t * 
	int cidx = SNDRV_MINOR_OSS_CARD(minor);

	int track2 = -1;

	int register1 = -1, register2 = -1;

	struct device *carddev = NULL;



	if (minor < 0)

		return minor;
@@ -121,11 +122,13 @@ int snd_register_oss_device(int type, snd_card_t * card, int dev, snd_minor_t * 
		track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_DMMIDI1);

		break;

	}

	register1 = register_sound_special(reg->f_ops, minor);

	if (card)

		carddev = card->dev;

	register1 = register_sound_special_device(reg->f_ops, minor, carddev);

	if (register1 != minor)

		goto __end;

	if (track2 >= 0) {

		register2 = register_sound_special(reg->f_ops, track2);

		register2 = register_sound_special_device(reg->f_ops, track2, carddev);

		if (register2 != track2)

			goto __end;

	}

sound/sound_core.c

+18 −9
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static DEFINE_SPINLOCK(sound_loader_lock); 
 *	list. Acquires locks as needed

 */



static int sound_insert_unit(struct sound_unit **list, struct file_operations *fops, int index, int low, int top, const char *name, umode_t mode)

static int sound_insert_unit(struct sound_unit **list, struct file_operations *fops, int index, int low, int top, const char *name, umode_t mode, struct device *dev)

{

	struct sound_unit *s = kmalloc(sizeof(*s), GFP_KERNEL);

	int r;
@@ -175,7 +175,7 @@ static int sound_insert_unit(struct sound_unit **list, struct file_operations *f 
	devfs_mk_cdev(MKDEV(SOUND_MAJOR, s->unit_minor),

			S_IFCHR | mode, s->name);

	class_device_create(sound_class, MKDEV(SOUND_MAJOR, s->unit_minor),

				NULL, s->name+6);

			    dev, s->name+6);

	return r;



 fail:
@@ -227,16 +227,18 @@ static void sound_remove_unit(struct sound_unit **list, int unit) 
static struct sound_unit *chains[SOUND_STEP];



/**

 *	register_sound_special - register a special sound node

 *	register_sound_special_device - register a special sound node

 *	@fops: File operations for the driver

 *	@unit: Unit number to allocate

 *      @dev: device pointer

 *

 *	Allocate a special sound device by minor number from the sound

 *	subsystem. The allocated number is returned on succes. On failure

 *	a negative error code is returned.

 */

 

int register_sound_special(struct file_operations *fops, int unit)

int register_sound_special_device(struct file_operations *fops, int unit,

				  struct device *dev)

{

	const int chain = unit % SOUND_STEP;

	int max_unit = 128 + chain;
@@ -294,7 +296,14 @@ int register_sound_special(struct file_operations *fops, int unit) 
		break;

	}

	return sound_insert_unit(&chains[chain], fops, -1, unit, max_unit,

				 name, S_IRUSR | S_IWUSR);

				 name, S_IRUSR | S_IWUSR, dev);

}

 

EXPORT_SYMBOL(register_sound_special_device);



int register_sound_special(struct file_operations *fops, int unit)

{

	return register_sound_special_device(fops, unit, NULL);

}



EXPORT_SYMBOL(register_sound_special);
@@ -312,7 +321,7 @@ EXPORT_SYMBOL(register_sound_special); 
int register_sound_mixer(struct file_operations *fops, int dev)

{

	return sound_insert_unit(&chains[0], fops, dev, 0, 128,

				 "mixer", S_IRUSR | S_IWUSR);

				 "mixer", S_IRUSR | S_IWUSR, NULL);

}



EXPORT_SYMBOL(register_sound_mixer);
@@ -330,7 +339,7 @@ EXPORT_SYMBOL(register_sound_mixer); 
int register_sound_midi(struct file_operations *fops, int dev)

{

	return sound_insert_unit(&chains[2], fops, dev, 2, 130,

				 "midi", S_IRUSR | S_IWUSR);

				 "midi", S_IRUSR | S_IWUSR, NULL);

}



EXPORT_SYMBOL(register_sound_midi);
@@ -356,7 +365,7 @@ EXPORT_SYMBOL(register_sound_midi); 
int register_sound_dsp(struct file_operations *fops, int dev)

{

	return sound_insert_unit(&chains[3], fops, dev, 3, 131,

				 "dsp", S_IWUSR | S_IRUSR);

				 "dsp", S_IWUSR | S_IRUSR, NULL);

}



EXPORT_SYMBOL(register_sound_dsp);
@@ -375,7 +384,7 @@ EXPORT_SYMBOL(register_sound_dsp); 
int register_sound_synth(struct file_operations *fops, int dev)

{

	return sound_insert_unit(&chains[9], fops, dev, 9, 137,

				 "synth", S_IRUSR | S_IWUSR);

				 "synth", S_IRUSR | S_IWUSR, NULL);

}



EXPORT_SYMBOL(register_sound_synth);