Skip to content

F
freeswitch
提交 aebc2c75 authored 作者: Giovanni Maruzzelli's avatar Giovanni Maruzzelli
浏览文件
操作

skypiax: updated /usr/src/freeswitch.trunk/src/mod/endpoints/mod_skypiax/kernel dummy.c 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15538 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 b810170e
隐藏空白字符变更
内嵌 并排
正在显示 包含 407 行增加 和 408 行删除
src/mod/endpoints/mod_skypiax/kernel/dummy.c.skypiax
浏览文件 @ aebc2c75
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
* *
*/ */
#include <sound/driver.h> //giova
#include <linux/init.h> #include <linux/init.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
...@@ -26,6 +25,8 @@ ...@@ -26,6 +25,8 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/hrtimer.h>
#include <linux/math64.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/control.h> #include <sound/control.h>
...@@ -34,7 +35,6 @@ ...@@ -34,7 +35,6 @@
#include <sound/rawmidi.h> #include <sound/rawmidi.h>
#include <sound/initval.h> #include <sound/initval.h>
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
MODULE_DESCRIPTION("Dummy soundcard (/dev/null)"); MODULE_DESCRIPTION("Dummy soundcard (/dev/null)");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -112,10 +112,10 @@ static int emu10k1_playback_constraints(struct snd_pcm_runtime *runtime) ...@@ -112,10 +112,10 @@ static int emu10k1_playback_constraints(struct snd_pcm_runtime *runtime)
/* defaults */ /* defaults */
#ifndef MAX_BUFFER_SIZE #ifndef MAX_BUFFER_SIZE
#define MAX_BUFFER_SIZE (64*1024) #define MAX_BUFFER_SIZE 1024
#endif #endif
#ifndef MAX_PERIOD_SIZE #ifndef MAX_PERIOD_SIZE
#define MAX_PERIOD_SIZE MAX_BUFFER_SIZE #define MAX_PERIOD_SIZE 512
#endif #endif
#ifndef USE_FORMATS #ifndef USE_FORMATS
#define USE_FORMATS (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE) #define USE_FORMATS (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE)
...@@ -150,6 +150,10 @@ static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0}; ...@@ -150,6 +150,10 @@ static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
static int pcm_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1}; static int pcm_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
static int pcm_substreams[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 128}; static int pcm_substreams[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 128};
//static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2}; //static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
#ifdef CONFIG_HIGH_RES_TIMERS
static int hrtimer = 1;
#endif
static int fake_buffer = 1;
module_param_array(index, int, NULL, 0444); module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for dummy soundcard."); MODULE_PARM_DESC(index, "Index value for dummy soundcard.");
...@@ -160,21 +164,17 @@ MODULE_PARM_DESC(enable, "Enable this dummy soundcard."); ...@@ -160,21 +164,17 @@ MODULE_PARM_DESC(enable, "Enable this dummy soundcard.");
module_param_array(pcm_devs, int, NULL, 0444); module_param_array(pcm_devs, int, NULL, 0444);
MODULE_PARM_DESC(pcm_devs, "PCM devices # (0-4) for dummy driver."); MODULE_PARM_DESC(pcm_devs, "PCM devices # (0-4) for dummy driver.");
module_param_array(pcm_substreams, int, NULL, 0444); module_param_array(pcm_substreams, int, NULL, 0444);
MODULE_PARM_DESC(pcm_substreams, "PCM substreams # (1-64) for dummy driver."); MODULE_PARM_DESC(pcm_substreams, "PCM substreams # (1-16) for dummy driver.");
//module_param_array(midi_devs, int, NULL, 0444); //module_param_array(midi_devs, int, NULL, 0444);
//MODULE_PARM_DESC(midi_devs, "MIDI devices # (0-2) for dummy driver."); //MODULE_PARM_DESC(midi_devs, "MIDI devices # (0-2) for dummy driver.");
module_param(fake_buffer, bool, 0444);
MODULE_PARM_DESC(fake_buffer, "Fake buffer allocations.");
#ifdef CONFIG_HIGH_RES_TIMERS
module_param(hrtimer, bool, 0644);
MODULE_PARM_DESC(hrtimer, "Use hrtimer as the timer source.");
#endif
static struct platform_device *devices[SNDRV_CARDS]; static struct platform_device *devices[SNDRV_CARDS];
static struct timer_list giovatimer; //giova
static int giovastarted=0;
static int giovaindex=0;
static spinlock_t giovalock;
struct giovadpcm {
struct snd_pcm_substream *substream;
struct snd_dummy_pcm *dpcm;
int started;
};
static struct giovadpcm giovadpcms[MAX_PCM_SUBSTREAMS];
#define MIXER_ADDR_MASTER 0 #define MIXER_ADDR_MASTER 0
#define MIXER_ADDR_LINE 1 #define MIXER_ADDR_LINE 1
...@@ -183,215 +183,324 @@ static struct giovadpcm giovadpcms[MAX_PCM_SUBSTREAMS]; ...@@ -183,215 +183,324 @@ static struct giovadpcm giovadpcms[MAX_PCM_SUBSTREAMS];
#define MIXER_ADDR_CD 4 #define MIXER_ADDR_CD 4
#define MIXER_ADDR_LAST 4 #define MIXER_ADDR_LAST 4
static void snd_card_dummy_pcm_timer_function(unsigned long data); struct dummy_timer_ops {
int (*create)(struct snd_pcm_substream *);
void (*free)(struct snd_pcm_substream *);
int (*prepare)(struct snd_pcm_substream *);
int (*start)(struct snd_pcm_substream *);
int (*stop)(struct snd_pcm_substream *);
snd_pcm_uframes_t (*pointer)(struct snd_pcm_substream *);
};
struct snd_dummy { struct snd_dummy {
struct snd_card *card; struct snd_card *card;
struct snd_pcm *pcm; struct snd_pcm *pcm;
spinlock_t mixer_lock; spinlock_t mixer_lock;
int mixer_volume[MIXER_ADDR_LAST+1][2]; int mixer_volume[MIXER_ADDR_LAST+1][2];
int capture_source[MIXER_ADDR_LAST+1][2]; int capture_source[MIXER_ADDR_LAST+1][2];
const struct dummy_timer_ops *timer_ops;
}; };
struct snd_dummy_pcm { /*
struct snd_dummy *dummy; * system timer interface
*/
struct dummy_systimer_pcm {
spinlock_t lock; spinlock_t lock;
struct timer_list timer; struct timer_list timer;
unsigned int pcm_buffer_size; unsigned long base_time;
unsigned int pcm_period_size; unsigned int frac_pos; /* fractional sample position (based HZ) */
unsigned int pcm_bps; /* bytes per second */ unsigned int frac_period_rest;
unsigned int pcm_hz; /* HZ */ unsigned int frac_buffer_size; /* buffer_size * HZ */
unsigned int pcm_irq_pos; /* IRQ position */ unsigned int frac_period_size; /* period_size * HZ */
unsigned int pcm_buf_pos; /* position in buffer */ unsigned int rate;
int elapsed;
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
}; };
static void dummy_systimer_rearm(struct dummy_systimer_pcm *dpcm)
static inline void snd_card_dummy_pcm_timer_start(struct snd_dummy_pcm *dpcm)
{ {
int i; dpcm->timer.expires = jiffies +
int found=0; (dpcm->frac_period_rest + dpcm->rate - 1) / dpcm->rate;
add_timer(&dpcm->timer);
}
//printk("giova: 1 timer_start %d %p\n", __LINE__, dpcm); static void dummy_systimer_update(struct dummy_systimer_pcm *dpcm)
for(i=0; i<giovaindex+1; i++){ {
if(i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS){ unsigned long delta;
printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
delta = jiffies - dpcm->base_time;
if (!delta)
return;
dpcm->base_time += delta;
delta *= dpcm->rate;
dpcm->frac_pos += delta;
while (dpcm->frac_pos >= dpcm->frac_buffer_size)
dpcm->frac_pos -= dpcm->frac_buffer_size;
while (dpcm->frac_period_rest <= delta) {
dpcm->elapsed++;
dpcm->frac_period_rest += dpcm->frac_period_size;
} }
dpcm->frac_period_rest -= delta;
}
if(giovadpcms[i].dpcm == dpcm){ static int dummy_systimer_start(struct snd_pcm_substream *substream)
giovadpcms[i].started=1; {
found=1; struct dummy_systimer_pcm *dpcm = substream->runtime->private_data;
spin_lock(&dpcm->lock);
dpcm->base_time = jiffies;
dummy_systimer_rearm(dpcm);
spin_unlock(&dpcm->lock);
return 0;
} }
static int dummy_systimer_stop(struct snd_pcm_substream *substream)
{
struct dummy_systimer_pcm *dpcm = substream->runtime->private_data;
spin_lock(&dpcm->lock);
del_timer(&dpcm->timer);
spin_unlock(&dpcm->lock);
return 0;
} }
if(!found){
printk("skypiax: start, NOT found?\n"); static int dummy_systimer_prepare(struct snd_pcm_substream *substream)
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct dummy_systimer_pcm *dpcm = runtime->private_data;
dpcm->frac_pos = 0;
dpcm->rate = runtime->rate;
dpcm->frac_buffer_size = runtime->buffer_size * HZ;
dpcm->frac_period_size = runtime->period_size * HZ;
dpcm->frac_period_rest = dpcm->frac_period_size;
dpcm->elapsed = 0;
return 0;
} }
static void dummy_systimer_callback(unsigned long data)
{
struct dummy_systimer_pcm *dpcm = (struct dummy_systimer_pcm *)data;
unsigned long flags;
int elapsed = 0;
spin_lock_irqsave(&dpcm->lock, flags);
dummy_systimer_update(dpcm);
dummy_systimer_rearm(dpcm);
elapsed = dpcm->elapsed;
dpcm->elapsed = 0;
spin_unlock_irqrestore(&dpcm->lock, flags);
if (elapsed)
snd_pcm_period_elapsed(dpcm->substream);
}
static snd_pcm_uframes_t
dummy_systimer_pointer(struct snd_pcm_substream *substream)
{
struct dummy_systimer_pcm *dpcm = substream->runtime->private_data;
snd_pcm_uframes_t pos;
//printk("giova: 2 timer_start %d %p\n", __LINE__, dpcm); spin_lock(&dpcm->lock);
dummy_systimer_update(dpcm);
pos = dpcm->frac_pos / HZ;
spin_unlock(&dpcm->lock);
return pos;
} }
static inline void snd_card_dummy_pcm_timer_stop(struct snd_dummy_pcm *dpcm) static int dummy_systimer_create(struct snd_pcm_substream *substream)
{ {
//del_timer(&dpcm->timer); struct dummy_systimer_pcm *dpcm;
int i;
int found=0;
//printk("giova: 1 timer_stop %d %p\n", __LINE__, dpcm); dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);
for(i=0; i<giovaindex +1; i++){ if (!dpcm)
return -ENOMEM;
substream->runtime->private_data = dpcm;
init_timer(&dpcm->timer);
dpcm->timer.data = (unsigned long) dpcm;
dpcm->timer.function = dummy_systimer_callback;
spin_lock_init(&dpcm->lock);
dpcm->substream = substream;
return 0;
}
if(i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS){ static void dummy_systimer_free(struct snd_pcm_substream *substream)
printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm); {
} kfree(substream->runtime->private_data);
if(giovadpcms[i].dpcm == dpcm){
giovadpcms[i].started=0;
found=1;
} }
static struct dummy_timer_ops dummy_systimer_ops = {
.create = dummy_systimer_create,
.free = dummy_systimer_free,
.prepare = dummy_systimer_prepare,
.start = dummy_systimer_start,
.stop = dummy_systimer_stop,
.pointer = dummy_systimer_pointer,
};
#ifdef CONFIG_HIGH_RES_TIMERS
/*
* hrtimer interface
*/
struct dummy_hrtimer_pcm {
ktime_t base_time;
ktime_t period_time;
atomic_t running;
struct hrtimer timer;
struct tasklet_struct tasklet;
struct snd_pcm_substream *substream;
};
static void dummy_hrtimer_pcm_elapsed(unsigned long priv)
{
struct dummy_hrtimer_pcm *dpcm = (struct dummy_hrtimer_pcm *)priv;
if (atomic_read(&dpcm->running))
snd_pcm_period_elapsed(dpcm->substream);
} }
if(!found){
//printk("skypiax: stop, NOT found?\n");
} else {
//printk("skypiax: stop, YES found!\n");
}
static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer)
{
struct dummy_hrtimer_pcm *dpcm;
dpcm = container_of(timer, struct dummy_hrtimer_pcm, timer);
if (!atomic_read(&dpcm->running))
return HRTIMER_NORESTART;
tasklet_schedule(&dpcm->tasklet);
hrtimer_forward_now(timer, dpcm->period_time);
return HRTIMER_RESTART;
}
static int dummy_hrtimer_start(struct snd_pcm_substream *substream)
{
struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data;
//printk("giova: 2 timer_stop %d %p\n", __LINE__, dpcm); dpcm->base_time = hrtimer_cb_get_time(&dpcm->timer);
hrtimer_start(&dpcm->timer, dpcm->period_time, HRTIMER_MODE_REL);
atomic_set(&dpcm->running, 1);
return 0;
} }
static int snd_card_dummy_pcm_trigger(struct snd_pcm_substream *substream, int cmd) static int dummy_hrtimer_stop(struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data;
struct snd_dummy_pcm *dpcm = runtime->private_data;
int err = 0;
//spin_lock(&dpcm->lock, flags); atomic_set(&dpcm->running, 0);
spin_lock_bh(&giovalock); hrtimer_cancel(&dpcm->timer);
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_RESUME:
//printk("giova: trigger timer_start %d %p\n", __LINE__, dpcm);
snd_card_dummy_pcm_timer_start(dpcm);
break;
case SNDRV_PCM_TRIGGER_STOP:
case SNDRV_PCM_TRIGGER_SUSPEND:
//printk("giova: trigger timer_stop %d %p\n", __LINE__, dpcm);
snd_card_dummy_pcm_timer_stop(dpcm);
break;
default:
err = -EINVAL;
break;
}
//spin_unlock(&dpcm->lock, flags);
spin_unlock_bh(&giovalock);
return 0; return 0;
} }
static int snd_card_dummy_pcm_prepare(struct snd_pcm_substream *substream) static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm)
{
tasklet_kill(&dpcm->tasklet);
}
static snd_pcm_uframes_t
dummy_hrtimer_pointer(struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_dummy_pcm *dpcm = runtime->private_data; struct dummy_hrtimer_pcm *dpcm = runtime->private_data;
int bps; u64 delta;
u32 pos;
delta = ktime_us_delta(hrtimer_cb_get_time(&dpcm->timer),
dpcm->base_time);
delta = div_u64(delta * runtime->rate + 999999, 1000000);
div_u64_rem(delta, runtime->buffer_size, &pos);
return pos;
}
bps = snd_pcm_format_width(runtime->format) * runtime->rate * static int dummy_hrtimer_prepare(struct snd_pcm_substream *substream)
runtime->channels / 8; {
struct snd_pcm_runtime *runtime = substream->runtime;
struct dummy_hrtimer_pcm *dpcm = runtime->private_data;
unsigned int period, rate;
long sec;
unsigned long nsecs;
dummy_hrtimer_sync(dpcm);
period = runtime->period_size;
rate = runtime->rate;
sec = period / rate;
period %= rate;
nsecs = div_u64((u64)period * 1000000000UL + rate - 1, rate);
dpcm->period_time = ktime_set(sec, nsecs);
if (bps <= 0) return 0;
return -EINVAL; }
dpcm->pcm_bps = bps; static int dummy_hrtimer_create(struct snd_pcm_substream *substream)
dpcm->pcm_hz = HZ; {
dpcm->pcm_buffer_size = snd_pcm_lib_buffer_bytes(substream); struct dummy_hrtimer_pcm *dpcm;
dpcm->pcm_period_size = snd_pcm_lib_period_bytes(substream);
dpcm->pcm_irq_pos = 0;
dpcm->pcm_buf_pos = 0;
snd_pcm_format_set_silence(runtime->format, runtime->dma_area,
bytes_to_samples(runtime, runtime->dma_bytes));
//printk("giova: prepare %d %p\n", __LINE__, dpcm); dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);
if (!dpcm)
return -ENOMEM;
substream->runtime->private_data = dpcm;
hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
dpcm->timer.function = dummy_hrtimer_callback;
dpcm->substream = substream;
atomic_set(&dpcm->running, 0);
tasklet_init(&dpcm->tasklet, dummy_hrtimer_pcm_elapsed,
(unsigned long)dpcm);
return 0; return 0;
} }
static void snd_card_dummy_pcm_timer_function(unsigned long data) static void dummy_hrtimer_free(struct snd_pcm_substream *substream)
{ {
//struct snd_dummy_pcm *dpcm = (struct snd_dummy_pcm *)data; struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data;
struct snd_dummy_pcm *dpcm=NULL; dummy_hrtimer_sync(dpcm);
//unsigned long flags; kfree(dpcm);
int i; }
static struct dummy_timer_ops dummy_hrtimer_ops = {
.create = dummy_hrtimer_create,
.free = dummy_hrtimer_free,
.prepare = dummy_hrtimer_prepare,
.start = dummy_hrtimer_start,
.stop = dummy_hrtimer_stop,
.pointer = dummy_hrtimer_pointer,
};
giovatimer.expires = (HZ/100) + jiffies; #endif /* CONFIG_HIGH_RES_TIMERS */
add_timer(&giovatimer);
for(i=0; i< giovaindex +1; i++) { /*
* PCM interface
*/
if(i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS){ static int dummy_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm); {
} struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
//printk("giova: timer_func %d i=%d\n", __LINE__, i);
switch (cmd) {
if(giovadpcms[i].started != 1) case SNDRV_PCM_TRIGGER_START:
continue; case SNDRV_PCM_TRIGGER_RESUME:
dpcm = giovadpcms[i].dpcm; return dummy->timer_ops->start(substream);
if(dpcm==NULL){ case SNDRV_PCM_TRIGGER_STOP:
printk("giova: timer_func %d %d NULL: continue\n", __LINE__, i); case SNDRV_PCM_TRIGGER_SUSPEND:
continue; return dummy->timer_ops->stop(substream);
}
if(in_irq())
printk("giova: timer_func %d %d we are in HARDWARE IRQ\n", __LINE__, i);
//if(in_softirq())
//printk("giova: timer_func %d %d we are in SOFT IRQ\n", __LINE__, i);
//printk("giova: timer_func %d %d\n", __LINE__, i);
//spin_lock_irqsave(&dpcm->lock, flags);
spin_lock_bh(&dpcm->lock);
dpcm->pcm_irq_pos += dpcm->pcm_bps * (HZ/100);
dpcm->pcm_buf_pos += dpcm->pcm_bps * (HZ/100);
dpcm->pcm_buf_pos %= dpcm->pcm_buffer_size * dpcm->pcm_hz;
if (dpcm->pcm_irq_pos >= dpcm->pcm_period_size * dpcm->pcm_hz) {
dpcm->pcm_irq_pos %= dpcm->pcm_period_size * dpcm->pcm_hz;
//spin_unlock_irqrestore(&dpcm->lock, flags);
spin_unlock_bh(&dpcm->lock);
snd_pcm_period_elapsed(dpcm->substream);
} else {
//spin_unlock_irqrestore(&dpcm->lock, flags);
spin_unlock_bh(&dpcm->lock);
} }
} return -EINVAL;
} }
static snd_pcm_uframes_t snd_card_dummy_pcm_pointer(struct snd_pcm_substream *substream) static int dummy_pcm_prepare(struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
struct snd_dummy_pcm *dpcm = runtime->private_data;
//printk("giova: pointer %d %p\n", __LINE__, dpcm); return dummy->timer_ops->prepare(substream);
//return bytes_to_frames(runtime, dpcm->pcm_buf_pos / dpcm->pcm_hz);
return (dpcm->pcm_buf_pos / dpcm->pcm_hz)/2;
} }
static struct snd_pcm_hardware snd_card_dummy_playback = static snd_pcm_uframes_t dummy_pcm_pointer(struct snd_pcm_substream *substream)
{ {
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_MMAP_VALID),
.formats = USE_FORMATS,
.rates = USE_RATE,
.rate_min = USE_RATE_MIN,
.rate_max = USE_RATE_MAX,
.channels_min = USE_CHANNELS_MIN,
.channels_max = USE_CHANNELS_MAX,
.buffer_bytes_max = MAX_BUFFER_SIZE,
.period_bytes_min = 64,
.period_bytes_max = MAX_PERIOD_SIZE,
.periods_min = USE_PERIODS_MIN,
.periods_max = USE_PERIODS_MAX,
.fifo_size = 0,
};
static struct snd_pcm_hardware snd_card_dummy_capture = return dummy->timer_ops->pointer(substream);
{ }
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_MMAP_VALID), static struct snd_pcm_hardware dummy_pcm_hardware = {
.info = (SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_RESUME |
SNDRV_PCM_INFO_MMAP_VALID),
.formats = USE_FORMATS, .formats = USE_FORMATS,
.rates = USE_RATE, .rates = USE_RATE,
.rate_min = USE_RATE_MIN, .rate_min = USE_RATE_MIN,
...@@ -406,209 +515,152 @@ static struct snd_pcm_hardware snd_card_dummy_capture = ...@@ -406,209 +515,152 @@ static struct snd_pcm_hardware snd_card_dummy_capture =
.fifo_size = 0, .fifo_size = 0,
}; };
static void snd_card_dummy_runtime_free(struct snd_pcm_runtime *runtime) static int dummy_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{ {
int i; if (fake_buffer) {
//int found=0; /* runtime->dma_bytes has to be set manually to allow mmap */
substream->runtime->dma_bytes = params_buffer_bytes(hw_params);
//printk("snd_card_dummy_runtime_free giova 1 giovaindex=%d dpcm=%p runtime=%p\n", giovaindex, runtime->private_data, runtime); return 0;
spin_lock_bh(&giovalock);
for(i=0; i < giovaindex; i++) {
if(i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS){
printk("giova, %s:%d, i=%d, giovaindex=%d \n", __FILE__, __LINE__, i, giovaindex);
}
//if((giovadpcms[i].substream == substream) && (giovadpcms[i].dpcm == dpcm)){
if((giovadpcms[i].dpcm == runtime->private_data)){
//printk("giova, %s:%d, i=%d, giovaindex=%d %p==%p YES I AM!!!!\n", __FILE__, __LINE__, i, giovaindex, giovadpcms[i].dpcm , runtime->private_data);
//giovadpcms[i].dpcm = NULL;
//giovadpcms[i].substream = NULL;
giovadpcms[i].started = 0;
//break;
} else {
//printk("giova, %s:%d, i=%d, giovaindex=%d %p!=%p NOT ME\n", __FILE__, __LINE__, i, giovaindex, giovadpcms[i].dpcm , runtime->private_data);
} }
return snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(hw_params));
} }
spin_unlock_bh(&giovalock); static int dummy_pcm_hw_free(struct snd_pcm_substream *substream)
kfree(runtime->private_data);
}
static int snd_card_dummy_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{
return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
}
static int snd_card_dummy_hw_free(struct snd_pcm_substream *substream)
{ {
if (fake_buffer)
return 0;
return snd_pcm_lib_free_pages(substream); return snd_pcm_lib_free_pages(substream);
} }
static struct snd_dummy_pcm *new_pcm_stream(struct snd_pcm_substream *substream) static int dummy_pcm_open(struct snd_pcm_substream *substream)
{
struct snd_dummy_pcm *dpcm;
int i;
int found=0;
//printk("giova, %s:%d, i=%d, giovaindex=%d %p==%p YES I AM!!!!\n", __FILE__, __LINE__, i, giovaindex, giovadpcms[i].dpcm , runtime->private_data);
//printk("giova, %s:%d, giovaindex=%d\n", __FILE__, __LINE__, giovaindex);
dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);
//printk("giova, %s:%d, giovaindex=%d\n", __FILE__, __LINE__, giovaindex);
if (! dpcm){
//spin_unlock_bh(&giovalock);
printk("giova, %s:%d, giovaindex=%d NO MEMORY!!!!\n", __FILE__, __LINE__, giovaindex);
return dpcm;
}
//printk("giova, %s:%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, giovaindex, dpcm);
init_timer(&dpcm->timer);
//dpcm->timer.data = (unsigned long) dpcm;
//dpcm->timer.function = snd_card_dummy_pcm_timer_function;
spin_lock_init(&dpcm->lock);
dpcm->substream = substream;
spin_lock_bh(&giovalock);
//printk("giova 1 giovaindex=%d dpcm=%p substream=%p sizeof=%lu\n", giovaindex, dpcm, substream, sizeof(*dpcm));
for(i=0; i < giovaindex; i++) {
if(i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS){
printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
}
//if((giovadpcms[i].substream == substream) && (giovadpcms[i].dpcm == dpcm))
if((giovadpcms[i].substream == substream)){
found=1;
break;
}
}
if(!found){
giovadpcms[giovaindex].substream=substream;
giovaindex++;
//printk("giova 2 giovaindex=%d dpcm=%p substream=%p\n", giovaindex, dpcm, substream);
}
found =0;
for(i=0; i < giovaindex; i++) {
if(i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS){
printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
}
if(giovadpcms[i].substream == substream){
giovadpcms[i].dpcm=dpcm;
giovadpcms[i].started=0;
found = 1;
//printk("giova 3 giovaindex=%d dpcm=%p substream=%p\n", giovaindex, dpcm, substream);
break;
}
}
spin_unlock_bh(&giovalock);
if(!found) {
printk("skypiax giovaindex=%d NOT found????\n", giovaindex);
}
//printk("giova, %s:%d, giovaindex=%d\n", __FILE__, __LINE__, giovaindex);
return dpcm;
}
static int snd_card_dummy_playback_open(struct snd_pcm_substream *substream)
{ {
struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_dummy_pcm *dpcm;
int err; int err;
if ((dpcm = new_pcm_stream(substream)) == NULL) dummy->timer_ops = &dummy_systimer_ops;
return -ENOMEM; #ifdef CONFIG_HIGH_RES_TIMERS
//printk("giova, %s:%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, giovaindex, dpcm); if (hrtimer)
runtime->private_data = dpcm; dummy->timer_ops = &dummy_hrtimer_ops;
/* makes the infrastructure responsible for freeing dpcm */ #endif
runtime->private_free = snd_card_dummy_runtime_free;
runtime->hw = snd_card_dummy_playback; err = dummy->timer_ops->create(substream);
if (err < 0)
return err;
runtime->hw = dummy_pcm_hardware;
if (substream->pcm->device & 1) { if (substream->pcm->device & 1) {
runtime->hw.info &= ~SNDRV_PCM_INFO_INTERLEAVED; runtime->hw.info &= ~SNDRV_PCM_INFO_INTERLEAVED;
runtime->hw.info |= SNDRV_PCM_INFO_NONINTERLEAVED; runtime->hw.info |= SNDRV_PCM_INFO_NONINTERLEAVED;
} }
if (substream->pcm->device & 2) if (substream->pcm->device & 2)
runtime->hw.info &= ~(SNDRV_PCM_INFO_MMAP|SNDRV_PCM_INFO_MMAP_VALID); runtime->hw.info &= ~(SNDRV_PCM_INFO_MMAP |
err = add_playback_constraints(runtime); SNDRV_PCM_INFO_MMAP_VALID);
if (err < 0)
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
err = add_playback_constraints(substream->runtime);
else
err = add_capture_constraints(substream->runtime);
if (err < 0) {
dummy->timer_ops->free(substream);
return err; return err;
}
return 0; return 0;
} }
static int snd_card_dummy_capture_open(struct snd_pcm_substream *substream) static int dummy_pcm_close(struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
struct snd_dummy_pcm *dpcm; dummy->timer_ops->free(substream);
int err; return 0;
}
if ((dpcm = new_pcm_stream(substream)) == NULL) /*
return -ENOMEM; * dummy buffer handling
//printk("giova, %s:%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, giovaindex, dpcm); */
runtime->private_data = dpcm;
/* makes the infrastructure responsible for freeing dpcm */ static void *dummy_page[2];
runtime->private_free = snd_card_dummy_runtime_free;
runtime->hw = snd_card_dummy_capture; static void free_fake_buffer(void)
if (substream->pcm->device == 1) { {
runtime->hw.info &= ~SNDRV_PCM_INFO_INTERLEAVED; if (fake_buffer) {
runtime->hw.info |= SNDRV_PCM_INFO_NONINTERLEAVED; int i;
for (i = 0; i < 2; i++)
if (dummy_page[i]) {
free_page((unsigned long)dummy_page[i]);
dummy_page[i] = NULL;
}
} }
if (substream->pcm->device & 2) }
runtime->hw.info &= ~(SNDRV_PCM_INFO_MMAP|SNDRV_PCM_INFO_MMAP_VALID);
err = add_capture_constraints(runtime); static int alloc_fake_buffer(void)
if (err < 0) {
return err; int i;
if (!fake_buffer)
return 0;
for (i = 0; i < 2; i++) {
dummy_page[i] = (void *)get_zeroed_page(GFP_KERNEL);
if (!dummy_page[i]) {
free_fake_buffer();
return -ENOMEM;
}
}
return 0; return 0;
} }
static int snd_card_dummy_playback_close(struct snd_pcm_substream *substream) static int dummy_pcm_copy(struct snd_pcm_substream *substream,
int channel, snd_pcm_uframes_t pos,
void __user *dst, snd_pcm_uframes_t count)
{ {
//printk("play giova 1 giovaindex=%d dpcm=%p substream=%p\n", giovaindex, substream->private_data, substream); return 0; /* do nothing */
snd_card_dummy_pcm_timer_stop(substream->private_data);
return 0;
} }
static int snd_card_dummy_capture_close(struct snd_pcm_substream *substream) static int dummy_pcm_silence(struct snd_pcm_substream *substream,
int channel, snd_pcm_uframes_t pos,
snd_pcm_uframes_t count)
{ {
//printk("capt giova 2 giovaindex=%d dpcm=%p substream=%p\n", giovaindex, substream->private_data, substream); return 0; /* do nothing */
snd_card_dummy_pcm_timer_stop(substream->private_data);
return 0;
} }
static struct snd_pcm_ops snd_card_dummy_playback_ops = { static struct page *dummy_pcm_page(struct snd_pcm_substream *substream,
.open = snd_card_dummy_playback_open, unsigned long offset)
.close = snd_card_dummy_playback_close, {
.ioctl = snd_pcm_lib_ioctl, return virt_to_page(dummy_page[substream->stream]); /* the same page */
.hw_params = snd_card_dummy_hw_params, }
.hw_free = snd_card_dummy_hw_free,
.prepare = snd_card_dummy_pcm_prepare, static struct snd_pcm_ops dummy_pcm_ops = {
.trigger = snd_card_dummy_pcm_trigger, .open = dummy_pcm_open,
.pointer = snd_card_dummy_pcm_pointer, .close = dummy_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = dummy_pcm_hw_params,
.hw_free = dummy_pcm_hw_free,
.prepare = dummy_pcm_prepare,
.trigger = dummy_pcm_trigger,
.pointer = dummy_pcm_pointer,
}; };
static struct snd_pcm_ops snd_card_dummy_capture_ops = { static struct snd_pcm_ops dummy_pcm_ops_no_buf = {
.open = snd_card_dummy_capture_open, .open = dummy_pcm_open,
.close = snd_card_dummy_capture_close, .close = dummy_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_card_dummy_hw_params, .hw_params = dummy_pcm_hw_params,
.hw_free = snd_card_dummy_hw_free, .hw_free = dummy_pcm_hw_free,
.prepare = snd_card_dummy_pcm_prepare, .prepare = dummy_pcm_prepare,
.trigger = snd_card_dummy_pcm_trigger, .trigger = dummy_pcm_trigger,
.pointer = snd_card_dummy_pcm_pointer, .pointer = dummy_pcm_pointer,
.copy = dummy_pcm_copy,
.silence = dummy_pcm_silence,
.page = dummy_pcm_page,
}; };
static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device, static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device,
int substreams) int substreams)
{ {
struct snd_pcm *pcm; struct snd_pcm *pcm;
struct snd_pcm_ops *ops;
int err; int err;
err = snd_pcm_new(dummy->card, "Dummy PCM", device, err = snd_pcm_new(dummy->card, "Dummy PCM", device,
...@@ -616,15 +668,21 @@ static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device, ...@@ -616,15 +668,21 @@ static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device,
if (err < 0) if (err < 0)
return err; return err;
dummy->pcm = pcm; dummy->pcm = pcm;
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_card_dummy_playback_ops); if (fake_buffer)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_card_dummy_capture_ops); ops = &dummy_pcm_ops_no_buf;
else
ops = &dummy_pcm_ops;
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, ops);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, ops);
pcm->private_data = dummy; pcm->private_data = dummy;
pcm->info_flags = 0; pcm->info_flags = 0;
strcpy(pcm->name, "Dummy PCM"); strcpy(pcm->name, "Dummy PCM");
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, if (!fake_buffer) {
snd_dma_continuous_data(GFP_KERNEL), snd_pcm_lib_preallocate_pages_for_all(pcm,
128*1024, 1024*1024); SNDRV_DMA_TYPE_CONTINUOUS,
snd_dma_continuous_data(GFP_KERNEL),
0, 64*1024);
}
return 0; return 0;
} }
...@@ -652,18 +710,11 @@ static int snd_dummy_volume_get(struct snd_kcontrol *kcontrol, ...@@ -652,18 +710,11 @@ static int snd_dummy_volume_get(struct snd_kcontrol *kcontrol,
{ {
struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol); struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);
int addr = kcontrol->private_value; int addr = kcontrol->private_value;
//unsigned long flags;
spin_lock_irq(&dummy->mixer_lock);
if(in_irq())
printk("giova: line %d we are in HARDWARE IRQ\n", __LINE__);
//printk("giova: volume get %d %d\n", __LINE__, addr);
//spin_lock_irq(&dummy->mixer_lock);
//spin_lock_irqsave(&dummy->mixer_lock, flags);
spin_lock_bh(&dummy->mixer_lock);
ucontrol->value.integer.value[0] = dummy->mixer_volume[addr][0]; ucontrol->value.integer.value[0] = dummy->mixer_volume[addr][0];
ucontrol->value.integer.value[1] = dummy->mixer_volume[addr][1]; ucontrol->value.integer.value[1] = dummy->mixer_volume[addr][1];
//spin_unlock_irqrestore(&dummy->mixer_lock, flags); spin_unlock_irq(&dummy->mixer_lock);
spin_unlock_bh(&dummy->mixer_lock);
return 0; return 0;
} }
...@@ -673,10 +724,7 @@ static int snd_dummy_volume_put(struct snd_kcontrol *kcontrol, ...@@ -673,10 +724,7 @@ static int snd_dummy_volume_put(struct snd_kcontrol *kcontrol,
struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol); struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);
int change, addr = kcontrol->private_value; int change, addr = kcontrol->private_value;
int left, right; int left, right;
//unsigned long flags;
if(in_irq())
printk("giova: line %d we are in HARDWARE IRQ\n", __LINE__);
left = ucontrol->value.integer.value[0]; left = ucontrol->value.integer.value[0];
if (left < -50) if (left < -50)
left = -50; left = -50;
...@@ -687,17 +735,12 @@ static int snd_dummy_volume_put(struct snd_kcontrol *kcontrol, ...@@ -687,17 +735,12 @@ static int snd_dummy_volume_put(struct snd_kcontrol *kcontrol,
right = -50; right = -50;
if (right > 100) if (right > 100)
right = 100; right = 100;
//printk("giova: volume put %d %d\n", __LINE__, addr); spin_lock_irq(&dummy->mixer_lock);
//spin_lock_irq(&dummy->mixer_lock);
//spin_lock_irqsave(&dummy->mixer_lock, flags);
spin_lock_bh(&dummy->mixer_lock);
change = dummy->mixer_volume[addr][0] != left || change = dummy->mixer_volume[addr][0] != left ||
dummy->mixer_volume[addr][1] != right; dummy->mixer_volume[addr][1] != right;
dummy->mixer_volume[addr][0] = left; dummy->mixer_volume[addr][0] = left;
dummy->mixer_volume[addr][1] = right; dummy->mixer_volume[addr][1] = right;
//spin_unlock_irq(&dummy->mixer_lock); spin_unlock_irq(&dummy->mixer_lock);
//spin_unlock_irqrestore(&dummy->mixer_lock, flags);
spin_unlock_bh(&dummy->mixer_lock);
return change; return change;
} }
...@@ -716,19 +759,11 @@ static int snd_dummy_capsrc_get(struct snd_kcontrol *kcontrol, ...@@ -716,19 +759,11 @@ static int snd_dummy_capsrc_get(struct snd_kcontrol *kcontrol,
{ {
struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol); struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);
int addr = kcontrol->private_value; int addr = kcontrol->private_value;
//unsigned long flags;
if(in_irq()) spin_lock_irq(&dummy->mixer_lock);
printk("giova: line %d we are in HARDWARE IRQ\n", __LINE__);
//spin_lock_irq(&dummy->mixer_lock);
//spin_lock_irqsave(&dummy->mixer_lock, flags);
spin_lock_bh(&dummy->mixer_lock);
ucontrol->value.integer.value[0] = dummy->capture_source[addr][0]; ucontrol->value.integer.value[0] = dummy->capture_source[addr][0];
ucontrol->value.integer.value[1] = dummy->capture_source[addr][1]; ucontrol->value.integer.value[1] = dummy->capture_source[addr][1];
//spin_unlock_irq(&dummy->mixer_lock); spin_unlock_irq(&dummy->mixer_lock);
//spin_unlock_irqrestore(&dummy->mixer_lock, flags);
spin_unlock_bh(&dummy->mixer_lock);
//printk("giova: capsrc_get %d %d\n", __LINE__, addr);
return 0; return 0;
} }
...@@ -737,23 +772,15 @@ static int snd_dummy_capsrc_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el ...@@ -737,23 +772,15 @@ static int snd_dummy_capsrc_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el
struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol); struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);
int change, addr = kcontrol->private_value; int change, addr = kcontrol->private_value;
int left, right; int left, right;
//unsigned long flags;
if(in_irq())
printk("giova: line %d we are in HARDWARE IRQ\n", __LINE__);
left = ucontrol->value.integer.value[0] & 1; left = ucontrol->value.integer.value[0] & 1;
right = ucontrol->value.integer.value[1] & 1; right = ucontrol->value.integer.value[1] & 1;
//spin_lock_irq(&dummy->mixer_lock); spin_lock_irq(&dummy->mixer_lock);
//spin_lock_irqsave(&dummy->mixer_lock, flags);
spin_lock_bh(&dummy->mixer_lock);
change = dummy->capture_source[addr][0] != left && change = dummy->capture_source[addr][0] != left &&
dummy->capture_source[addr][1] != right; dummy->capture_source[addr][1] != right;
dummy->capture_source[addr][0] = left; dummy->capture_source[addr][0] = left;
dummy->capture_source[addr][1] = right; dummy->capture_source[addr][1] = right;
//spin_unlock_irq(&dummy->mixer_lock); spin_unlock_irq(&dummy->mixer_lock);
//spin_unlock_irqrestore(&dummy->mixer_lock, flags);
spin_unlock_bh(&dummy->mixer_lock);
//printk("giova: capsrc_put %d %d\n", __LINE__, addr);
return change; return change;
} }
...@@ -776,12 +803,10 @@ static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy) ...@@ -776,12 +803,10 @@ static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy)
unsigned int idx; unsigned int idx;
int err; int err;
//giova if (snd_BUG_ON(!dummy)) if (snd_BUG_ON(!dummy))
//giova return -EINVAL; return -EINVAL;
spin_lock_init(&dummy->mixer_lock); spin_lock_init(&dummy->mixer_lock);
strcpy(card->mixername, "Dummy Mixer"); strcpy(card->mixername, "Dummy Mixer");
//printk("giova: new_mixer %d\n", __LINE__);
return 0; //giova no mixer
for (idx = 0; idx < ARRAY_SIZE(snd_dummy_controls); idx++) { for (idx = 0; idx < ARRAY_SIZE(snd_dummy_controls); idx++) {
err = snd_ctl_add(card, snd_ctl_new1(&snd_dummy_controls[idx], dummy)); err = snd_ctl_add(card, snd_ctl_new1(&snd_dummy_controls[idx], dummy));
...@@ -798,15 +823,10 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr) ...@@ -798,15 +823,10 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)
int idx, err; int idx, err;
int dev = devptr->id; int dev = devptr->id;
card = snd_card_new(index[dev], id[dev], THIS_MODULE, err = snd_card_create(index[dev], id[dev], THIS_MODULE,
sizeof(struct snd_dummy)); sizeof(struct snd_dummy), &card);
if (card == NULL) if (err < 0)
return -ENOMEM; return err;
//giova err = snd_card_create(index[dev], id[dev], THIS_MODULE,
//giova sizeof(struct snd_dummy), &card);
//giova if (err < 0)
//giova return err;
dummy = card->private_data; dummy = card->private_data;
dummy->card = card; dummy->card = card;
for (idx = 0; idx < MAX_PCM_DEVICES && idx < pcm_devs[dev]; idx++) { for (idx = 0; idx < MAX_PCM_DEVICES && idx < pcm_devs[dev]; idx++) {
...@@ -839,8 +859,6 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr) ...@@ -839,8 +859,6 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)
static int __devexit snd_dummy_remove(struct platform_device *devptr) static int __devexit snd_dummy_remove(struct platform_device *devptr)
{ {
del_timer(&giovatimer);
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL); platform_set_drvdata(devptr, NULL);
return 0; return 0;
...@@ -887,6 +905,7 @@ static void snd_dummy_unregister_all(void) ...@@ -887,6 +905,7 @@ static void snd_dummy_unregister_all(void)
for (i = 0; i < ARRAY_SIZE(devices); ++i) for (i = 0; i < ARRAY_SIZE(devices); ++i)
platform_device_unregister(devices[i]); platform_device_unregister(devices[i]);
platform_driver_unregister(&snd_dummy_driver); platform_driver_unregister(&snd_dummy_driver);
free_fake_buffer();
} }
static int __init alsa_card_dummy_init(void) static int __init alsa_card_dummy_init(void)
...@@ -897,30 +916,11 @@ static int __init alsa_card_dummy_init(void) ...@@ -897,30 +916,11 @@ static int __init alsa_card_dummy_init(void)
if (err < 0) if (err < 0)
return err; return err;
if(!giovastarted){ err = alloc_fake_buffer();
giovastarted=1; if (err < 0) {
spin_lock_init(&giovalock); platform_driver_unregister(&snd_dummy_driver);
return err;
spin_lock_bh(&giovalock);
for(i=0; i<MAX_PCM_SUBSTREAMS;i++){
if(i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS){
printk("giova, %s:%d, i=%d, giovaindex=%d \n", __FILE__, __LINE__, i, giovaindex);
} }
giovadpcms[i].substream=NULL;
giovadpcms[i].dpcm=NULL;
giovadpcms[i].started=0;
}
init_timer(&giovatimer);
//giovatimer.data = (unsigned long) dpcm;
giovatimer.data = (unsigned long) &giovadpcms;
giovatimer.function = snd_card_dummy_pcm_timer_function;
giovatimer.expires = (HZ/100) + jiffies;
add_timer(&giovatimer);
printk("snd-dummy skypiax driver, %s:%d working on a machine with %dHZ kernel\n", __FILE__, __LINE__, HZ);
spin_unlock_bh(&giovalock);
}
cards = 0; cards = 0;
for (i = 0; i < SNDRV_CARDS; i++) { for (i = 0; i < SNDRV_CARDS; i++) {
...@@ -950,7 +950,6 @@ printk("snd-dummy skypiax driver, %s:%d working on a machine with %dHZ kernel\n" ...@@ -950,7 +950,6 @@ printk("snd-dummy skypiax driver, %s:%d working on a machine with %dHZ kernel\n"
static void __exit alsa_card_dummy_exit(void) static void __exit alsa_card_dummy_exit(void)
{ {
del_timer(&giovatimer);
snd_dummy_unregister_all(); snd_dummy_unregister_all();
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论