ALSA: oxfw: Add proc interface for debugging purpose
This commit adds proc interface to get information about stream formation. This commit also adds snd_oxfw_stream_get_current_formation() to get current stream formation. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Acked-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
5cd1d3f47a
commit
3c96101f19
|
@ -1,2 +1,3 @@
|
|||
snd-oxfw-objs := oxfw-command.o oxfw-stream.o oxfw-control.o oxfw-pcm.o oxfw.o
|
||||
snd-oxfw-objs := oxfw-command.o oxfw-stream.o oxfw-control.o oxfw-pcm.o \
|
||||
oxfw-proc.o oxfw.o
|
||||
obj-m += snd-oxfw.o
|
||||
|
|
84
sound/firewire/oxfw/oxfw-proc.c
Normal file
84
sound/firewire/oxfw/oxfw-proc.c
Normal file
|
@ -0,0 +1,84 @@
|
|||
/*
|
||||
* 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;
|
||||
unsigned 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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
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 == NULL)
|
||||
return;
|
||||
|
||||
snd_info_set_text_ops(entry, oxfw, op);
|
||||
if (snd_info_register(entry) < 0)
|
||||
snd_info_free_entry(entry);
|
||||
}
|
||||
|
||||
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 | S_IRUGO | S_IXUGO;
|
||||
if (snd_info_register(root) < 0) {
|
||||
snd_info_free_entry(root);
|
||||
return;
|
||||
}
|
||||
|
||||
add_node(oxfw, root, "formation", proc_read_formation);
|
||||
}
|
|
@ -108,6 +108,33 @@ void snd_oxfw_stream_update_simplex(struct snd_oxfw *oxfw)
|
|||
amdtp_stream_update(&oxfw->rx_stream);
|
||||
}
|
||||
|
||||
int snd_oxfw_stream_get_current_formation(struct snd_oxfw *oxfw,
|
||||
enum avc_general_plug_dir dir,
|
||||
struct snd_oxfw_stream_formation *formation)
|
||||
{
|
||||
u8 *format;
|
||||
unsigned int len;
|
||||
int err;
|
||||
|
||||
len = AVC_GENERIC_FRAME_MAXIMUM_BYTES;
|
||||
format = kmalloc(len, GFP_KERNEL);
|
||||
if (format == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
err = avc_stream_get_format_single(oxfw->unit, dir, 0, format, &len);
|
||||
if (err < 0)
|
||||
goto end;
|
||||
if (len < 3) {
|
||||
err = -EIO;
|
||||
goto end;
|
||||
}
|
||||
|
||||
err = snd_oxfw_stream_parse_format(format, formation);
|
||||
end:
|
||||
kfree(format);
|
||||
return err;
|
||||
}
|
||||
|
||||
/*
|
||||
* See Table 6.16 - AM824 Stream Format
|
||||
* Figure 6.19 - format_information field for AM824 Compound
|
||||
|
|
|
@ -101,6 +101,8 @@ static int oxfw_probe(struct fw_unit *unit,
|
|||
if (err < 0)
|
||||
goto error;
|
||||
|
||||
snd_oxfw_proc_init(oxfw);
|
||||
|
||||
err = snd_oxfw_stream_init_simplex(oxfw);
|
||||
if (err < 0)
|
||||
goto error;
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include <sound/initval.h>
|
||||
#include <sound/pcm.h>
|
||||
#include <sound/pcm_params.h>
|
||||
#include <sound/info.h>
|
||||
|
||||
#include "../lib.h"
|
||||
#include "../fcp.h"
|
||||
|
@ -108,3 +109,5 @@ int snd_oxfw_stream_discover(struct snd_oxfw *oxfw);
|
|||
int snd_oxfw_create_pcm(struct snd_oxfw *oxfw);
|
||||
|
||||
int snd_oxfw_create_mixer(struct snd_oxfw *oxfw);
|
||||
|
||||
void snd_oxfw_proc_init(struct snd_oxfw *oxfw);
|
||||
|
|
Loading…
Reference in a new issue