0c298bdc38
The calls of snd_info_register() are superfluous and should be avoided at the procfs creation time. They are called at the end of the whole initialization via snd_card_register(). This patch drops such superfluous calls. Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Tested-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
106 lines
2.5 KiB
C
106 lines
2.5 KiB
C
/*
|
|
* oxfw_proc.c - a part of driver for OXFW970/971 based devices
|
|
*
|
|
* Copyright (c) 2014 Takashi Sakamoto
|
|
*
|
|
* Licensed under the terms of the GNU General Public License, version 2.
|
|
*/
|
|
|
|
#include "./oxfw.h"
|
|
|
|
static void proc_read_formation(struct snd_info_entry *entry,
|
|
struct snd_info_buffer *buffer)
|
|
{
|
|
struct snd_oxfw *oxfw = entry->private_data;
|
|
struct snd_oxfw_stream_formation formation, curr;
|
|
u8 *format;
|
|
char flag;
|
|
int i, err;
|
|
|
|
/* Show input. */
|
|
err = snd_oxfw_stream_get_current_formation(oxfw,
|
|
AVC_GENERAL_PLUG_DIR_IN,
|
|
&curr);
|
|
if (err < 0)
|
|
return;
|
|
|
|
snd_iprintf(buffer, "Input Stream to device:\n");
|
|
snd_iprintf(buffer, "\tRate\tPCM\tMIDI\n");
|
|
for (i = 0; i < SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {
|
|
format = oxfw->rx_stream_formats[i];
|
|
if (format == NULL)
|
|
continue;
|
|
|
|
err = snd_oxfw_stream_parse_format(format, &formation);
|
|
if (err < 0)
|
|
continue;
|
|
|
|
if (memcmp(&formation, &curr, sizeof(curr)) == 0)
|
|
flag = '*';
|
|
else
|
|
flag = ' ';
|
|
|
|
snd_iprintf(buffer, "%c\t%d\t%d\t%d\n", flag,
|
|
formation.rate, formation.pcm, formation.midi);
|
|
}
|
|
|
|
if (!oxfw->has_output)
|
|
return;
|
|
|
|
/* Show output. */
|
|
err = snd_oxfw_stream_get_current_formation(oxfw,
|
|
AVC_GENERAL_PLUG_DIR_OUT,
|
|
&curr);
|
|
if (err < 0)
|
|
return;
|
|
|
|
snd_iprintf(buffer, "Output Stream from device:\n");
|
|
snd_iprintf(buffer, "\tRate\tPCM\tMIDI\n");
|
|
for (i = 0; i < SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {
|
|
format = oxfw->tx_stream_formats[i];
|
|
if (format == NULL)
|
|
continue;
|
|
|
|
err = snd_oxfw_stream_parse_format(format, &formation);
|
|
if (err < 0)
|
|
continue;
|
|
|
|
if (memcmp(&formation, &curr, sizeof(curr)) == 0)
|
|
flag = '*';
|
|
else
|
|
flag = ' ';
|
|
|
|
snd_iprintf(buffer, "%c\t%d\t%d\t%d\n", flag,
|
|
formation.rate, formation.pcm, formation.midi);
|
|
}
|
|
}
|
|
|
|
static void add_node(struct snd_oxfw *oxfw, struct snd_info_entry *root,
|
|
const char *name,
|
|
void (*op)(struct snd_info_entry *e,
|
|
struct snd_info_buffer *b))
|
|
{
|
|
struct snd_info_entry *entry;
|
|
|
|
entry = snd_info_create_card_entry(oxfw->card, name, root);
|
|
if (entry)
|
|
snd_info_set_text_ops(entry, oxfw, op);
|
|
}
|
|
|
|
void snd_oxfw_proc_init(struct snd_oxfw *oxfw)
|
|
{
|
|
struct snd_info_entry *root;
|
|
|
|
/*
|
|
* All nodes are automatically removed at snd_card_disconnect(),
|
|
* by following to link list.
|
|
*/
|
|
root = snd_info_create_card_entry(oxfw->card, "firewire",
|
|
oxfw->card->proc_root);
|
|
if (root == NULL)
|
|
return;
|
|
root->mode = S_IFDIR | 0555;
|
|
|
|
add_node(oxfw, root, "formation", proc_read_formation);
|
|
}
|