<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16834] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16834">16834</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-02-26 04:44:41 -0600 (Fri, 26 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: new snd-dummy.c don't care no more about HZ in kernel</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxalsadummyc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/alsa/dummy.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxalsadummyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/alsa/dummy.c (16833 => 16834)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/alsa/dummy.c 2010-02-26 08:27:31 UTC (rev 16833)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/alsa/dummy.c 2010-02-26 10:44:41 UTC (rev 16834)
</span><span class="lines">@@ -44,73 +44,7 @@
</span><span class="cx"> #define MAX_PCM_SUBSTREAMS 128
</span><span class="cx"> #define MAX_MIDI_DEVICES 2
</span><span class="cx">
</span><del>-#if 0 /* emu10k1 emulation */
-#define MAX_BUFFER_SIZE (128 * 1024)
-static int emu10k1_playback_constraints(struct snd_pcm_runtime *runtime)
-{
- int err;
- err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
- if (err < 0)
- return err;
- err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX);
- if (err < 0)
- return err;
- return 0;
-}
</del><span class="cx">
</span><del>-#define add_playback_constraints emu10k1_playback_constraints
-#endif
-
-#if 0 /* RME9652 emulation */
-#define MAX_BUFFER_SIZE (26 * 64 * 1024)
-#define USE_FORMATS SNDRV_PCM_FMTBIT_S32_LE
-#define USE_CHANNELS_MIN 26
-#define USE_CHANNELS_MAX 26
-#define USE_PERIODS_MIN 2
-#define USE_PERIODS_MAX 2
-#endif
-
-#if 0 /* ICE1712 emulation */
-#define MAX_BUFFER_SIZE (256 * 1024)
-#define USE_FORMATS SNDRV_PCM_FMTBIT_S32_LE
-#define USE_CHANNELS_MIN 10
-#define USE_CHANNELS_MAX 10
-#define USE_PERIODS_MIN 1
-#define USE_PERIODS_MAX 1024
-#endif
-
-#if 0 /* UDA1341 emulation */
-#define MAX_BUFFER_SIZE (16380)
-#define USE_FORMATS SNDRV_PCM_FMTBIT_S16_LE
-#define USE_CHANNELS_MIN 2
-#define USE_CHANNELS_MAX 2
-#define USE_PERIODS_MIN 2
-#define USE_PERIODS_MAX 255
-#endif
-
-#if 0 /* simple AC97 bridge (intel8x0) with 48kHz AC97 only codec */
-#define USE_FORMATS SNDRV_PCM_FMTBIT_S16_LE
-#define USE_CHANNELS_MIN 2
-#define USE_CHANNELS_MAX 2
-#define USE_RATE SNDRV_PCM_RATE_48000
-#define USE_RATE_MIN 48000
-#define USE_RATE_MAX 48000
-#endif
-
-#if 0 /* CA0106 */
-#define USE_FORMATS SNDRV_PCM_FMTBIT_S16_LE
-#define USE_CHANNELS_MIN 2
-#define USE_CHANNELS_MAX 2
-#define USE_RATE (SNDRV_PCM_RATE_48000|SNDRV_PCM_RATE_96000|SNDRV_PCM_RATE_192000)
-#define USE_RATE_MIN 48000
-#define USE_RATE_MAX 192000
-#define MAX_BUFFER_SIZE ((65536-64)*8)
-#define MAX_PERIOD_SIZE (65536-64)
-#define USE_PERIODS_MIN 2
-#define USE_PERIODS_MAX 8
-#endif
-
-
</del><span class="cx"> /* defaults */
</span><span class="cx"> #ifndef MAX_BUFFER_SIZE
</span><span class="cx"> #define MAX_BUFFER_SIZE (64*1024)
</span><span class="lines">@@ -151,7 +85,6 @@
</span><span class="cx"> static int pcm_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1 };
</span><span class="cx"> static int pcm_substreams[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 128 };
</span><span class="cx">
</span><del>-//static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
</del><span class="cx">
</span><span class="cx"> module_param_array(index, int, NULL, 0444);
</span><span class="cx"> MODULE_PARM_DESC(index, "Index value for dummy soundcard.");
</span><span class="lines">@@ -163,11 +96,9 @@
</span><span class="cx"> MODULE_PARM_DESC(pcm_devs, "PCM devices # (0-4) for dummy driver.");
</span><span class="cx"> module_param_array(pcm_substreams, int, NULL, 0444);
</span><span class="cx"> MODULE_PARM_DESC(pcm_substreams, "PCM substreams # (1-64) for dummy driver.");
</span><del>-//module_param_array(midi_devs, int, NULL, 0444);
-//MODULE_PARM_DESC(midi_devs, "MIDI devices # (0-2) for dummy driver.");
</del><span class="cx">
</span><span class="cx"> static struct platform_device *devices[SNDRV_CARDS];
</span><del>-static struct timer_list giovatimer; //giova
</del><ins>+static struct timer_list giovatimer;
</ins><span class="cx"> static int giovastarted = 0;
</span><span class="cx"> static int giovaindex = 0;
</span><span class="cx"> static spinlock_t giovalock;
</span><span class="lines">@@ -213,8 +144,6 @@
</span><span class="cx"> int i;
</span><span class="cx"> int found = 0;
</span><span class="cx">
</span><del>-
-//printk("giova: 1 timer_start %d %p\n", __LINE__, dpcm);
</del><span class="cx"> for (i = 0; i < giovaindex + 1; i++) {
</span><span class="cx"> if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
</span><span class="cx"> printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
</span><span class="lines">@@ -228,17 +157,13 @@
</span><span class="cx"> if (!found) {
</span><span class="cx"> printk("skypiax: start, NOT found?\n");
</span><span class="cx"> }
</span><del>-
-//printk("giova: 2 timer_start %d %p\n", __LINE__, dpcm);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline void snd_card_dummy_pcm_timer_stop(struct snd_dummy_pcm *dpcm)
</span><span class="cx"> {
</span><del>- //del_timer(&dpcm->timer);
</del><span class="cx"> int i;
</span><span class="cx"> int found = 0;
</span><span class="cx">
</span><del>-//printk("giova: 1 timer_stop %d %p\n", __LINE__, dpcm);
</del><span class="cx"> for (i = 0; i < giovaindex + 1; i++) {
</span><span class="cx">
</span><span class="cx"> if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
</span><span class="lines">@@ -250,14 +175,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (!found) {
</span><del>- //printk("skypiax: stop, NOT found?\n");
</del><span class="cx"> } else {
</span><del>- //printk("skypiax: stop, YES found!\n");
</del><span class="cx"> }
</span><del>-
-
-
-//printk("giova: 2 timer_stop %d %p\n", __LINE__, dpcm);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static int snd_card_dummy_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
</span><span class="lines">@@ -266,24 +185,20 @@
</span><span class="cx"> struct snd_dummy_pcm *dpcm = runtime->private_data;
</span><span class="cx"> int err = 0;
</span><span class="cx">
</span><del>- //spin_lock(&dpcm->lock, flags);
</del><span class="cx"> spin_lock_bh(&giovalock);
</span><span class="cx"> switch (cmd) {
</span><span class="cx"> case SNDRV_PCM_TRIGGER_START:
</span><span class="cx"> case SNDRV_PCM_TRIGGER_RESUME:
</span><del>-//printk("giova: trigger timer_start %d %p\n", __LINE__, dpcm);
</del><span class="cx"> snd_card_dummy_pcm_timer_start(dpcm);
</span><span class="cx"> break;
</span><span class="cx"> case SNDRV_PCM_TRIGGER_STOP:
</span><span class="cx"> case SNDRV_PCM_TRIGGER_SUSPEND:
</span><del>-//printk("giova: trigger timer_stop %d %p\n", __LINE__, dpcm);
</del><span class="cx"> snd_card_dummy_pcm_timer_stop(dpcm);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> err = -EINVAL;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- //spin_unlock(&dpcm->lock, flags);
</del><span class="cx"> spin_unlock_bh(&giovalock);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -307,19 +222,16 @@
</span><span class="cx"> dpcm->pcm_buf_pos = 0;
</span><span class="cx"> snd_pcm_format_set_silence(runtime->format, runtime->dma_area, bytes_to_samples(runtime, runtime->dma_bytes));
</span><span class="cx">
</span><del>-//printk("giova: prepare %d %p\n", __LINE__, dpcm);
</del><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void snd_card_dummy_pcm_timer_function(unsigned long data)
</span><span class="cx"> {
</span><del>- //struct snd_dummy_pcm *dpcm = (struct snd_dummy_pcm *)data;
</del><span class="cx"> struct snd_dummy_pcm *dpcm = NULL;
</span><del>- //unsigned long flags;
</del><span class="cx"> int i;
</span><span class="cx">
</span><span class="cx">
</span><del>- giovatimer.expires = (HZ / 100) + jiffies;
</del><ins>+ giovatimer.expires = 1 + jiffies;
</ins><span class="cx"> add_timer(&giovatimer);
</span><span class="cx">
</span><span class="cx"> for (i = 0; i < giovaindex + 1; i++) {
</span><span class="lines">@@ -327,8 +239,6 @@
</span><span class="cx"> if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
</span><span class="cx"> printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
</span><span class="cx"> }
</span><del>-//printk("giova: timer_func %d i=%d\n", __LINE__, i);
-
</del><span class="cx"> if (giovadpcms[i].started != 1)
</span><span class="cx"> continue;
</span><span class="cx"> dpcm = giovadpcms[i].dpcm;
</span><span class="lines">@@ -336,23 +246,15 @@
</span><span class="cx"> printk("giova: timer_func %d %d NULL: continue\n", __LINE__, i);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- //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);
</del><span class="cx"> spin_lock_bh(&dpcm->lock);
</span><del>- dpcm->pcm_irq_pos += dpcm->pcm_bps * (HZ / 100);
- dpcm->pcm_buf_pos += dpcm->pcm_bps * (HZ / 100);
</del><ins>+ dpcm->pcm_irq_pos += dpcm->pcm_bps;
+ dpcm->pcm_buf_pos += dpcm->pcm_bps;
</ins><span class="cx"> dpcm->pcm_buf_pos %= dpcm->pcm_buffer_size * dpcm->pcm_hz;
</span><span class="cx"> if (dpcm->pcm_irq_pos >= dpcm->pcm_period_size * dpcm->pcm_hz) {
</span><span class="cx"> dpcm->pcm_irq_pos %= dpcm->pcm_period_size * dpcm->pcm_hz;
</span><del>- //spin_unlock_irqrestore(&dpcm->lock, flags);
</del><span class="cx"> spin_unlock_bh(&dpcm->lock);
</span><span class="cx"> snd_pcm_period_elapsed(dpcm->substream);
</span><span class="cx"> } else {
</span><del>- //spin_unlock_irqrestore(&dpcm->lock, flags);
</del><span class="cx"> spin_unlock_bh(&dpcm->lock);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -363,9 +265,7 @@
</span><span class="cx"> struct snd_pcm_runtime *runtime = substream->runtime;
</span><span class="cx"> struct snd_dummy_pcm *dpcm = runtime->private_data;
</span><span class="cx">
</span><del>-//printk("giova: pointer %d %p\n", __LINE__, dpcm);
</del><span class="cx"> return bytes_to_frames(runtime, dpcm->pcm_buf_pos / dpcm->pcm_hz);
</span><del>- //return (dpcm->pcm_buf_pos / dpcm->pcm_hz) / 2;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static struct snd_pcm_hardware snd_card_dummy_playback = {
</span><span class="lines">@@ -403,9 +303,7 @@
</span><span class="cx"> static void snd_card_dummy_runtime_free(struct snd_pcm_runtime *runtime)
</span><span class="cx"> {
</span><span class="cx"> int i;
</span><del>-//int found=0;
</del><span class="cx">
</span><del>-//printk("snd_card_dummy_runtime_free giova 1 giovaindex=%d dpcm=%p runtime=%p\n", giovaindex, runtime->private_data, runtime);
</del><span class="cx"> spin_lock_bh(&giovalock);
</span><span class="cx">
</span><span class="cx"> for (i = 0; i < giovaindex; i++) {
</span><span class="lines">@@ -413,15 +311,9 @@
</span><span class="cx"> if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
</span><span class="cx"> printk("giova, %s:%d, i=%d, giovaindex=%d \n", __FILE__, __LINE__, i, giovaindex);
</span><span class="cx"> }
</span><del>- //if((giovadpcms[i].substream == substream) && (giovadpcms[i].dpcm == dpcm)){
</del><span class="cx"> if ((giovadpcms[i].dpcm == runtime->private_data)) {
</span><del>- //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;
</del><span class="cx"> giovadpcms[i].started = 0;
</span><del>- //break;
</del><span class="cx"> } else {
</span><del>- //printk("giova, %s:%d, i=%d, giovaindex=%d %p!=%p NOT ME\n", __FILE__, __LINE__, i, giovaindex, giovadpcms[i].dpcm , runtime->private_data);
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -445,30 +337,21 @@
</span><span class="cx"> int i;
</span><span class="cx"> int found = 0;
</span><span class="cx">
</span><del>- //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);
</del><span class="cx"> dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);
</span><del>- //printk("giova, %s:%d, giovaindex=%d\n", __FILE__, __LINE__, giovaindex);
</del><span class="cx"> if (!dpcm) {
</span><del>- //spin_unlock_bh(&giovalock);
</del><span class="cx"> printk("giova, %s:%d, giovaindex=%d NO MEMORY!!!!\n", __FILE__, __LINE__, giovaindex);
</span><span class="cx"> return dpcm;
</span><span class="cx"> }
</span><del>- //printk("giova, %s:%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, giovaindex, dpcm);
</del><span class="cx"> init_timer(&dpcm->timer);
</span><del>- //dpcm->timer.data = (unsigned long) dpcm;
- //dpcm->timer.function = snd_card_dummy_pcm_timer_function;
</del><span class="cx"> spin_lock_init(&dpcm->lock);
</span><span class="cx"> dpcm->substream = substream;
</span><span class="cx">
</span><span class="cx"> spin_lock_bh(&giovalock);
</span><del>- //printk("giova 1 giovaindex=%d dpcm=%p substream=%p sizeof=%lu\n", giovaindex, dpcm, substream, sizeof(*dpcm));
</del><span class="cx"> for (i = 0; i < giovaindex; i++) {
</span><span class="cx">
</span><span class="cx"> if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
</span><span class="cx"> printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
</span><span class="cx"> }
</span><del>- //if((giovadpcms[i].substream == substream) && (giovadpcms[i].dpcm == dpcm))
</del><span class="cx"> if ((giovadpcms[i].substream == substream)) {
</span><span class="cx"> found = 1;
</span><span class="cx"> break;
</span><span class="lines">@@ -480,7 +363,6 @@
</span><span class="cx">
</span><span class="cx"> giovadpcms[giovaindex].substream = substream;
</span><span class="cx"> giovaindex++;
</span><del>- //printk("giova 2 giovaindex=%d dpcm=%p substream=%p\n", giovaindex, dpcm, substream);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -495,7 +377,6 @@
</span><span class="cx"> giovadpcms[i].dpcm = dpcm;
</span><span class="cx"> giovadpcms[i].started = 0;
</span><span class="cx"> found = 1;
</span><del>- //printk("giova 3 giovaindex=%d dpcm=%p substream=%p\n", giovaindex, dpcm, substream);
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -505,7 +386,6 @@
</span><span class="cx"> if (!found) {
</span><span class="cx"> printk("skypiax giovaindex=%d NOT found????\n", giovaindex);
</span><span class="cx"> }
</span><del>- //printk("giova, %s:%d, giovaindex=%d\n", __FILE__, __LINE__, giovaindex);
</del><span class="cx"> return dpcm;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -517,7 +397,6 @@
</span><span class="cx">
</span><span class="cx"> if ((dpcm = new_pcm_stream(substream)) == NULL)
</span><span class="cx"> return -ENOMEM;
</span><del>- //printk("giova, %s:%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, giovaindex, dpcm);
</del><span class="cx"> runtime->private_data = dpcm;
</span><span class="cx"> /* makes the infrastructure responsible for freeing dpcm */
</span><span class="cx"> runtime->private_free = snd_card_dummy_runtime_free;
</span><span class="lines">@@ -543,7 +422,6 @@
</span><span class="cx">
</span><span class="cx"> if ((dpcm = new_pcm_stream(substream)) == NULL)
</span><span class="cx"> return -ENOMEM;
</span><del>- //printk("giova, %s:%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, giovaindex, dpcm);
</del><span class="cx"> runtime->private_data = dpcm;
</span><span class="cx"> /* makes the infrastructure responsible for freeing dpcm */
</span><span class="cx"> runtime->private_free = snd_card_dummy_runtime_free;
</span><span class="lines">@@ -563,14 +441,12 @@
</span><span class="cx">
</span><span class="cx"> static int snd_card_dummy_playback_close(struct snd_pcm_substream *substream)
</span><span class="cx"> {
</span><del>-//printk("play giova 1 giovaindex=%d dpcm=%p substream=%p\n", giovaindex, substream->private_data, substream);
</del><span class="cx"> snd_card_dummy_pcm_timer_stop(substream->private_data);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static int snd_card_dummy_capture_close(struct snd_pcm_substream *substream)
</span><span class="cx"> {
</span><del>-//printk("capt giova 2 giovaindex=%d dpcm=%p substream=%p\n", giovaindex, substream->private_data, substream);
</del><span class="cx"> snd_card_dummy_pcm_timer_stop(substream->private_data);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -638,17 +514,12 @@
</span><span class="cx"> {
</span><span class="cx"> struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);
</span><span class="cx"> int addr = kcontrol->private_value;
</span><del>- //unsigned long flags;
</del><span class="cx">
</span><span class="cx"> if (in_irq())
</span><span class="cx"> printk("giova: line %d we are in HARDWARE IRQ\n", __LINE__);
</span><del>-//printk("giova: volume get %d %d\n", __LINE__, addr);
- //spin_lock_irq(&dummy->mixer_lock);
- //spin_lock_irqsave(&dummy->mixer_lock, flags);
</del><span class="cx"> spin_lock_bh(&dummy->mixer_lock);
</span><span class="cx"> ucontrol->value.integer.value[0] = dummy->mixer_volume[addr][0];
</span><span class="cx"> ucontrol->value.integer.value[1] = dummy->mixer_volume[addr][1];
</span><del>- //spin_unlock_irqrestore(&dummy->mixer_lock, flags);
</del><span class="cx"> spin_unlock_bh(&dummy->mixer_lock);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -658,7 +529,6 @@
</span><span class="cx"> struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);
</span><span class="cx"> int change, addr = kcontrol->private_value;
</span><span class="cx"> int left, right;
</span><del>- //unsigned long flags;
</del><span class="cx">
</span><span class="cx"> if (in_irq())
</span><span class="cx"> printk("giova: line %d we are in HARDWARE IRQ\n", __LINE__);
</span><span class="lines">@@ -672,15 +542,10 @@
</span><span class="cx"> right = -50;
</span><span class="cx"> if (right > 100)
</span><span class="cx"> right = 100;
</span><del>-//printk("giova: volume put %d %d\n", __LINE__, addr);
- //spin_lock_irq(&dummy->mixer_lock);
- //spin_lock_irqsave(&dummy->mixer_lock, flags);
</del><span class="cx"> spin_lock_bh(&dummy->mixer_lock);
</span><span class="cx"> change = dummy->mixer_volume[addr][0] != left || dummy->mixer_volume[addr][1] != right;
</span><span class="cx"> dummy->mixer_volume[addr][0] = left;
</span><span class="cx"> dummy->mixer_volume[addr][1] = right;
</span><del>- //spin_unlock_irq(&dummy->mixer_lock);
- //spin_unlock_irqrestore(&dummy->mixer_lock, flags);
</del><span class="cx"> spin_unlock_bh(&dummy->mixer_lock);
</span><span class="cx"> return change;
</span><span class="cx"> }
</span><span class="lines">@@ -699,19 +564,13 @@
</span><span class="cx"> {
</span><span class="cx"> struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);
</span><span class="cx"> int addr = kcontrol->private_value;
</span><del>- //unsigned long flags;
</del><span class="cx">
</span><span class="cx"> if (in_irq())
</span><span class="cx"> printk("giova: line %d we are in HARDWARE IRQ\n", __LINE__);
</span><del>- //spin_lock_irq(&dummy->mixer_lock);
- //spin_lock_irqsave(&dummy->mixer_lock, flags);
</del><span class="cx"> spin_lock_bh(&dummy->mixer_lock);
</span><span class="cx"> ucontrol->value.integer.value[0] = dummy->capture_source[addr][0];
</span><span class="cx"> ucontrol->value.integer.value[1] = dummy->capture_source[addr][1];
</span><del>- //spin_unlock_irq(&dummy->mixer_lock);
- //spin_unlock_irqrestore(&dummy->mixer_lock, flags);
</del><span class="cx"> spin_unlock_bh(&dummy->mixer_lock);
</span><del>-//printk("giova: capsrc_get %d %d\n", __LINE__, addr);
</del><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -720,22 +579,16 @@
</span><span class="cx"> struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);
</span><span class="cx"> int change, addr = kcontrol->private_value;
</span><span class="cx"> int left, right;
</span><del>- //unsigned long flags;
</del><span class="cx">
</span><span class="cx"> if (in_irq())
</span><span class="cx"> printk("giova: line %d we are in HARDWARE IRQ\n", __LINE__);
</span><span class="cx"> left = ucontrol->value.integer.value[0] & 1;
</span><span class="cx"> right = ucontrol->value.integer.value[1] & 1;
</span><del>- //spin_lock_irq(&dummy->mixer_lock);
- //spin_lock_irqsave(&dummy->mixer_lock, flags);
</del><span class="cx"> spin_lock_bh(&dummy->mixer_lock);
</span><span class="cx"> change = dummy->capture_source[addr][0] != left && dummy->capture_source[addr][1] != right;
</span><span class="cx"> dummy->capture_source[addr][0] = left;
</span><span class="cx"> dummy->capture_source[addr][1] = right;
</span><del>- //spin_unlock_irq(&dummy->mixer_lock);
- //spin_unlock_irqrestore(&dummy->mixer_lock, flags);
</del><span class="cx"> spin_unlock_bh(&dummy->mixer_lock);
</span><del>-//printk("giova: capsrc_put %d %d\n", __LINE__, addr);
</del><span class="cx"> return change;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -758,11 +611,8 @@
</span><span class="cx"> unsigned int idx;
</span><span class="cx"> int err;
</span><span class="cx">
</span><del>- //giova if (snd_BUG_ON(!dummy))
- //giova return -EINVAL;
</del><span class="cx"> spin_lock_init(&dummy->mixer_lock);
</span><span class="cx"> strcpy(card->mixername, "Dummy Mixer");
</span><del>-//printk("giova: new_mixer %d\n", __LINE__);
</del><span class="cx"> return 0; //giova no mixer
</span><span class="cx">
</span><span class="cx"> for (idx = 0; idx < ARRAY_SIZE(snd_dummy_controls); idx++) {
</span><span class="lines">@@ -784,10 +634,6 @@
</span><span class="cx"> if (card == NULL)
</span><span class="cx"> return -ENOMEM;
</span><span class="cx">
</span><del>- //giova err = snd_card_create(index[dev], id[dev], THIS_MODULE,
- //giova sizeof(struct snd_dummy), &card);
- //giova if (err < 0)
- //giova return err;
</del><span class="cx"> dummy = card->private_data;
</span><span class="cx"> dummy->card = card;
</span><span class="cx"> for (idx = 0; idx < MAX_PCM_DEVICES && idx < pcm_devs[dev]; idx++) {
</span><span class="lines">@@ -892,12 +738,11 @@
</span><span class="cx"> giovadpcms[i].started = 0;
</span><span class="cx"> }
</span><span class="cx"> init_timer(&giovatimer);
</span><del>- //giovatimer.data = (unsigned long) dpcm;
</del><span class="cx"> giovatimer.data = (unsigned long) &giovadpcms;
</span><span class="cx"> giovatimer.function = snd_card_dummy_pcm_timer_function;
</span><del>- giovatimer.expires = (HZ / 100) + jiffies;
</del><ins>+ giovatimer.expires = 1 + jiffies;
</ins><span class="cx"> add_timer(&giovatimer);
</span><del>- printk("snd-dummy skypiax driver, %s:%d working on a machine with %dHZ kernel\n", __FILE__, __LINE__, HZ);
</del><ins>+ printk("snd-dummy skypiax driver version: 3, %s:%d working on a machine with %dHZ kernel\n", __FILE__, __LINE__, HZ);
</ins><span class="cx"> spin_unlock_bh(&giovalock);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>