Hello all: I'm trying to use asoc for an at91 custom board and I had some problem compiling the kernel with the v1.0.14rc1 alsa patch. The problem were in the debug sections in two files. I attach a patch to correct this problems. I'm new sending patches to alsa, so if you think I did something wrong just let me know and I'll do my best. Note: please put me in CC since i'm not subscribed to the list. Thanks, -- Raúl Sánchez Siles Barracuda Systems S.L. C/ Luxemburgo, 4 - Local Pozuelo de Alarcón 28224 Madrid Tlf.: +34 91 351 11 20 Fax: +34 91 352 54 44
# HG changeset patch
# User Raúl Sánchez Siles <rss@xxxxxxxxxxxx>
# Date 1167325268 -3600
# Node ID 80537c953b2dc530cc7bfb6bad13f2abe956fcc4
# Parent 1c7129898e61d6dc47634cab28dd83d750e06176
Solve typos/compilation problems for debug functions in soc-dapm and at91-i2s.
soc-dapm
·Fixed typo in soc-dapm.
at91-i2s
·Fixed typo in dai modes definition.
·Fixed struct member name in at91_ssc_info->ssc_state.
·Fixed compilation problem, ssc_state is bundled in at91_ssc_info.
diff -r 1c7129898e61 -r 80537c953b2d soc/at91/at91-i2s.c
--- a/soc/at91/at91-i2s.c Thu Dec 28 15:40:47 2006 +0100
+++ b/soc/at91/at91-i2s.c Thu Dec 28 18:01:08 2006 +0100
@@ -101,7 +101,7 @@ static struct snd_soc_dai_mode at91_i2s[
.pcmdir = AT91_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV,
.fs = 250,
- .bfs SND_SOC_FSBD(5),
+ .bfs = SND_SOC_FSBD(5),
.priv = (13 << 16 | 23),
},
};
@@ -352,19 +352,19 @@ static int at91_i2s_suspend(struct platf
ssc_p = &ssc_info[dai->id];
/* Save the status register before disabling transmit and receive. */
- ssc_p->state->ssc_sr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_SR);
+ ssc_p->ssc_state.ssc_sr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_SR);
at91_ssc_write(ssc_p->ssc.base +
AT91_SSC_CR, AT91_SSC_TXDIS | AT91_SSC_RXDIS);
/* Save the current interrupt mask, then disable unmasked interrupts. */
- ssc_p->state->ssc_imr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_IMR);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IDR, ssc_p->state->ssc_imr);
-
- ssc_p->state->ssc_cmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_CMR);
- ssc_p->state->ssc_rcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
- ssc_p->state->ssc_rfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
- ssc_p->state->ssc_tcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
- ssc_p->state->ssc_tfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+ ssc_p->ssc_state.ssc_imr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_IMR);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IDR, ssc_p->ssc_state.ssc_imr);
+
+ ssc_p->ssc_state.ssc_cmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_CMR);
+ ssc_p->ssc_state.ssc_rcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+ ssc_p->ssc_state.ssc_rfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+ ssc_p->ssc_state.ssc_tcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+ ssc_p->ssc_state.ssc_tfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
return 0;
}
@@ -380,17 +380,17 @@ static int at91_i2s_resume(struct platfo
ssc_p = &ssc_info[dai->id];
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_tfmr);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_tcmr);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_rfmr);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_rcmr);
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CMR, ssc_p->state->ssc_cmr);
-
- at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IER, ssc_p->state->ssc_imr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_tfmr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_tcmr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_rfmr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_rcmr);
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CMR, ssc_p->ssc_state.ssc_cmr);
+
+ at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IER, ssc_p->ssc_state.ssc_imr);
at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CR,
- ((ssc_p->state->ssc_sr & AT91_SSC_RXENA) ? AT91_SSC_RXEN : 0) |
- ((ssc_p->state->ssc_sr & AT91_SSC_TXENA) ? AT91_SSC_TXEN : 0));
+ ((ssc_p->ssc_state.ssc_sr & AT91_SSC_RXENA) ? AT91_SSC_RXEN : 0) |
+ ((ssc_p->ssc_state.ssc_sr & AT91_SSC_TXENA) ? AT91_SSC_TXEN : 0));
return 0;
}
diff -r 1c7129898e61 -r 80537c953b2d soc/soc-dapm.c
--- a/soc/soc-dapm.c Thu Dec 28 15:40:47 2006 +0100
+++ b/soc/soc-dapm.c Thu Dec 28 18:01:08 2006 +0100
@@ -651,7 +651,7 @@ static void dbg_dump_dapm(struct snd_soc
p->source->name);
}
list_for_each_entry(p, &w->sinks, list_source) {
- p = list_entry(lp, struct snd_soc_dapm_path, list_source);
+ p = list_entry(p, struct snd_soc_dapm_path, list_source);
if (p->connect)
printk(" out %s %s\n", p->name ? p->name : "static",
p->sink->name);
Attachment:
pgpAnL9AG5mBc.pgp
Description: PGP signature
------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.sourceforge.net/lists/listinfo/alsa-devel
