diff options
| -rw-r--r-- | configfs.c | 2 | ||||
| -rw-r--r-- | core.c | 4 | ||||
| -rw-r--r-- | dummy/dummy.c | 10 | ||||
| -rw-r--r-- | loopback/loopback.c | 1 |
4 files changed, 9 insertions, 8 deletions
@@ -76,8 +76,6 @@ static ssize_t cfg_avirt_stream_channels_store(struct config_item *item, stream->channels = tmp; - D_INFOK("channels: %d", stream->channels); - return count; } CONFIGFS_ATTR(cfg_avirt_stream_, channels); @@ -19,7 +19,6 @@ MODULE_AUTHOR("James O'Shannessy <james.oshannessy@fiberdyne.com.au>"); MODULE_AUTHOR("Mark Farrugia <mark.farrugia@fiberdyne.com.au>"); MODULE_DESCRIPTION("ALSA virtual, dynamic soundcard"); MODULE_LICENSE("GPL v2"); -MODULE_SUPPORTED_DEVICE("{{ALSA,AVIRT soundcard}}"); #define D_LOGNAME "core" @@ -196,6 +195,7 @@ static struct snd_pcm *pcm_create(struct avirt_stream *stream) struct snd_pcm *pcm; int err; + /** Special case: loopback */ if (!strcmp(stream->map, "ap_loopback")) { playback = true; capture = true; @@ -212,8 +212,6 @@ static struct snd_pcm *pcm_create(struct avirt_stream *stream) if (err < 0) return ERR_PTR(err); - // TD MF: IMPORTANT: NEED TO TEST >8 PCM DEVICES ON A - // CARD! /** Register driver callbacks */ if (playback) snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &pcm_ops); diff --git a/dummy/dummy.c b/dummy/dummy.c index 2841585..596838d 100644 --- a/dummy/dummy.c +++ b/dummy/dummy.c @@ -20,6 +20,12 @@ MODULE_AUTHOR("Mark Farrugia <mark.farrugia@fiberdyne.com.au>"); MODULE_DESCRIPTION("Dummy Audio Path for AVIRT"); MODULE_LICENSE("GPL v2"); +#define AP_UID "ap_dummy" + +#define AP_INFOK(fmt, args...) DINFO(AP_UID, fmt, ##args) +#define AP_PRINTK(fmt, args...) DDEBUG(AP_UID, fmt, ##args) +#define AP_ERRORK(fmt, args...) DERROR(AP_UID, fmt, ##args) + #define DUMMY_SAMPLE_RATE 48000 #define DUMMY_BLOCKSIZE 512 #define DUMMY_PERIODS_MIN 1 @@ -247,8 +253,8 @@ int dummy_configure(struct snd_card *card, container_of(entry, struct config_item, ci_entry); struct avirt_stream *stream = avirt_stream_from_config_item(item); - pr_info("%s: stream name:%s device:%d channels:%d\n", __func__, - stream->name, stream->device, stream->channels); + AP_INFOK("stream name:%s device:%d channels:%d", stream->name, + stream->device, stream->channels); } return 0; diff --git a/loopback/loopback.c b/loopback/loopback.c index d465cc6..acddf99 100644 --- a/loopback/loopback.c +++ b/loopback/loopback.c @@ -38,7 +38,6 @@ MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); MODULE_DESCRIPTION("Loopback Audio Path for AVIRT"); MODULE_LICENSE("GPL"); -MODULE_SUPPORTED_DEVICE("{{ALSA,Loopback soundcard}}"); #define AP_UID "ap_loopback" |