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>

diff --git a/sound/firewire/oxfw/Makefile b/sound/firewire/oxfw/Makefile
index b107134d11d5caf5824afffc2df643898bab30c8..e9297c638aa181b3e9c25b343164ecfbb40f5cf4 100644 (file)
--- a/sound/firewire/oxfw/Makefile
+++ b/sound/firewire/oxfw/Makefile
@@ -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

diff --git a/sound/firewire/oxfw/oxfw-proc.c b/sound/firewire/oxfw/oxfw-proc.c
new file mode 100644 (file)
index 0000000..18e0305
--- /dev/null
+++ b/sound/firewire/oxfw/oxfw-proc.c
@@ -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);
+}

diff --git a/sound/firewire/oxfw/oxfw-stream.c b/sound/firewire/oxfw/oxfw-stream.c
index 17e3802e6ac25ab075577801bf835b57f124caea..210bf5a2f56e9577512f122488fa861a167844f1 100644 (file)
--- a/sound/firewire/oxfw/oxfw-stream.c
+++ b/sound/firewire/oxfw/oxfw-stream.c
@@ -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

diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index a8f9062b2884b94643560cd6c5a9596229db7ea6..a70149ab511b257defb31a962df7a2ecea40147a 100644 (file)
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -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;

diff --git a/sound/firewire/oxfw/oxfw.h b/sound/firewire/oxfw/oxfw.h
index 9c3d3e352665730cc13dd9c24aedb0e41ddea064..8c832ea6aae0f2b43328ad21de13cac1fcb68e38 100644 (file)
--- a/sound/firewire/oxfw/oxfw.h
+++ b/sound/firewire/oxfw/oxfw.h
@@ -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);