ALSA: usb-audio: refactor code

Clean up the usb audio driver by factoring out a lot of functions to
separate files. Code for procfs, quirks, urbs, format parsers etc all
got a new home now.

Moved almost all special quirk handling to quirks.c and introduced new
generic functions to handle them, so the exceptions do not pollute the
whole driver.

Renamed usbaudio.c to card.c because this is what it actually does now.
Renamed usbmidi.c to midi.c for namespace clarity.
Removed more things from usbaudio.h.

The non-standard drivers were adopted accordingly.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 163 insertions, 0 deletions

diff --git a/sound/usb/proc.c b/sound/usb/proc.c
new file mode 100644
index 000000000000..be3065ea1afa
--- /dev/null
+++ b/sound/usb/proc.c
@@ -0,0 +1,163 @@
+/*
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/usb.h>
+
+#include <sound/core.h>
+#include <sound/info.h>
+#include <sound/pcm.h>
+
+#include "usbaudio.h"
+#include "helper.h"
+#include "card.h"
+#include "proc.h"
+
+/* convert our full speed USB rate into sampling rate in Hz */
+static inline unsigned get_full_speed_hz(unsigned int usb_rate)
+{
+        return (usb_rate * 125 + (1 << 12)) >> 13;
+}
+
+/* convert our high speed USB rate into sampling rate in Hz */
+static inline unsigned get_high_speed_hz(unsigned int usb_rate)
+{
+        return (usb_rate * 125 + (1 << 9)) >> 10;
+}
+
+/*
+ * common proc files to show the usb device info
+ */
+static void proc_audio_usbbus_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
+{
+        struct snd_usb_audio *chip = entry->private_data;
+        if (!chip->shutdown)
+                snd_iprintf(buffer, "%03d/%03d\n", chip->dev->bus->busnum, chip->dev->devnum);
+}
+
+static void proc_audio_usbid_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
+{
+        struct snd_usb_audio *chip = entry->private_data;
+        if (!chip->shutdown)
+                snd_iprintf(buffer, "%04x:%04x\n", 
+                            USB_ID_VENDOR(chip->usb_id),
+                            USB_ID_PRODUCT(chip->usb_id));
+}
+
+void snd_usb_audio_create_proc(struct snd_usb_audio *chip)
+{
+        struct snd_info_entry *entry;
+        if (!snd_card_proc_new(chip->card, "usbbus", &entry))
+                snd_info_set_text_ops(entry, chip, proc_audio_usbbus_read);
+        if (!snd_card_proc_new(chip->card, "usbid", &entry))
+                snd_info_set_text_ops(entry, chip, proc_audio_usbid_read);
+}
+
+/*
+ * proc interface for list the supported pcm formats
+ */
+static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct snd_info_buffer *buffer)
+{
+        struct list_head *p;
+        static char *sync_types[4] = {
+                "NONE", "ASYNC", "ADAPTIVE", "SYNC"
+        };
+
+        list_for_each(p, &subs->fmt_list) {
+                struct audioformat *fp;
+                fp = list_entry(p, struct audioformat, list);
+                snd_iprintf(buffer, "  Interface %d\n", fp->iface);
+                snd_iprintf(buffer, "    Altset %d\n", fp->altsetting);
+                snd_iprintf(buffer, "    Format: %s\n",
+                            snd_pcm_format_name(fp->format));
+                snd_iprintf(buffer, "    Channels: %d\n", fp->channels);
+                snd_iprintf(buffer, "    Endpoint: %d %s (%s)\n",
+                            fp->endpoint & USB_ENDPOINT_NUMBER_MASK,
+                            fp->endpoint & USB_DIR_IN ? "IN" : "OUT",
+                            sync_types[(fp->ep_attr & USB_ENDPOINT_SYNCTYPE) >> 2]);
+                if (fp->rates & SNDRV_PCM_RATE_CONTINUOUS) {
+                        snd_iprintf(buffer, "    Rates: %d - %d (continuous)\n",
+                                    fp->rate_min, fp->rate_max);
+                } else {
+                        unsigned int i;
+                        snd_iprintf(buffer, "    Rates: ");
+                        for (i = 0; i < fp->nr_rates; i++) {
+                                if (i > 0)
+                                        snd_iprintf(buffer, ", ");
+                                snd_iprintf(buffer, "%d", fp->rate_table[i]);
+                        }
+                        snd_iprintf(buffer, "\n");
+                }
+                if (snd_usb_get_speed(subs->dev) == USB_SPEED_HIGH)
+                        snd_iprintf(buffer, "    Data packet interval: %d us\n",
+                                    125 * (1 << fp->datainterval));
+                // snd_iprintf(buffer, "    Max Packet Size = %d\n", fp->maxpacksize);
+                // snd_iprintf(buffer, "    EP Attribute = %#x\n", fp->attributes);
+        }
+}
+
+static void proc_dump_substream_status(struct snd_usb_substream *subs, struct snd_info_buffer *buffer)
+{
+        if (subs->running) {
+                unsigned int i;
+                snd_iprintf(buffer, "  Status: Running\n");
+                snd_iprintf(buffer, "    Interface = %d\n", subs->interface);
+                snd_iprintf(buffer, "    Altset = %d\n", subs->format);
+                snd_iprintf(buffer, "    URBs = %d [ ", subs->nurbs);
+                for (i = 0; i < subs->nurbs; i++)
+                        snd_iprintf(buffer, "%d ", subs->dataurb[i].packets);
+                snd_iprintf(buffer, "]\n");
+                snd_iprintf(buffer, "    Packet Size = %d\n", subs->curpacksize);
+                snd_iprintf(buffer, "    Momentary freq = %u Hz (%#x.%04x)\n",
+                            snd_usb_get_speed(subs->dev) == USB_SPEED_FULL
+                            ? get_full_speed_hz(subs->freqm)
+                            : get_high_speed_hz(subs->freqm),
+                            subs->freqm >> 16, subs->freqm & 0xffff);
+        } else {
+                snd_iprintf(buffer, "  Status: Stop\n");
+        }
+}
+
+static void proc_pcm_format_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
+{
+        struct snd_usb_stream *stream = entry->private_data;
+
+        snd_iprintf(buffer, "%s : %s\n", stream->chip->card->longname, stream->pcm->name);
+
+        if (stream->substream[SNDRV_PCM_STREAM_PLAYBACK].num_formats) {
+                snd_iprintf(buffer, "\nPlayback:\n");
+                proc_dump_substream_status(&stream->substream[SNDRV_PCM_STREAM_PLAYBACK], buffer);
+                proc_dump_substream_formats(&stream->substream[SNDRV_PCM_STREAM_PLAYBACK], buffer);
+        }
+        if (stream->substream[SNDRV_PCM_STREAM_CAPTURE].num_formats) {
+                snd_iprintf(buffer, "\nCapture:\n");
+                proc_dump_substream_status(&stream->substream[SNDRV_PCM_STREAM_CAPTURE], buffer);
+                proc_dump_substream_formats(&stream->substream[SNDRV_PCM_STREAM_CAPTURE], buffer);
+        }
+}
+
+void snd_usb_proc_pcm_format_add(struct snd_usb_stream *stream)
+{
+        struct snd_info_entry *entry;
+        char name[32];
+        struct snd_card *card = stream->chip->card;
+
+        sprintf(name, "stream%d", stream->pcm_index);
+        if (!snd_card_proc_new(card, name, &entry))
+                snd_info_set_text_ops(entry, stream, proc_pcm_format_read);
+}
+