forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: azt3328: use a helper variable to remove one indirection in hotpath

Browse source 
Signed-off-by: Andreas Mohr <andi@lisas.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Andreas Mohr 2010-12-27 21:17:11 +01:00 • committed by Takashi Iwai
parent 9fd8d36caa
commit 345855951a
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
sound/pci/azt3328.c
View file

@ -294,6 +294,7 @@ MODULE_PARM_DESC(seqtimer_scaling, "Set 1024000Hz sequencer timer scale factor (
struct snd_azf3328_codec_data { struct snd_azf3328_codec_data {
unsigned long io_base; unsigned long io_base;
unsigned int dma_base; /* helper to avoid an indirection in hotpath */
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
bool running; bool running;
const char *name; const char *name;
@ -1165,14 +1166,17 @@ snd_azf3328_codec_setdmaa(struct snd_azf3328 *chip,
static int static int
snd_azf3328_codec_prepare(struct snd_pcm_substream *substream) snd_azf3328_codec_prepare(struct snd_pcm_substream *substream)
{ {
#if 0
struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_azf3328_codec *codec = runtime->private_data;
#if 0
unsigned int size = snd_pcm_lib_buffer_bytes(substream); unsigned int size = snd_pcm_lib_buffer_bytes(substream);
unsigned int count = snd_pcm_lib_period_bytes(substream); unsigned int count = snd_pcm_lib_period_bytes(substream);
#endif #endif
snd_azf3328_dbgcallenter(); snd_azf3328_dbgcallenter();
codec->dma_base = runtime->dma_addr;
#if 0 #if 0
snd_azf3328_codec_setfmt(chip, AZF_CODEC_..., snd_azf3328_codec_setfmt(chip, AZF_CODEC_...,
runtime->rate, runtime->rate,
@ -1370,18 +1374,17 @@ snd_azf3328_codec_pointer(struct snd_pcm_substream *substream,
{ {
const struct snd_azf3328 *chip = snd_pcm_substream_chip(substream); const struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);
const struct snd_azf3328_codec_data *codec = &chip->codecs[codec_type]; const struct snd_azf3328_codec_data *codec = &chip->codecs[codec_type];
unsigned long bufptr, result; unsigned long result;
snd_pcm_uframes_t frmres; snd_pcm_uframes_t frmres;
#ifdef QUERY_HARDWARE
bufptr = snd_azf3328_codec_inl(codec, IDX_IO_CODEC_DMA_START_1);
#else
bufptr = substream->runtime->dma_addr;
#endif
result = snd_azf3328_codec_inl(codec, IDX_IO_CODEC_DMA_CURRPOS); result = snd_azf3328_codec_inl(codec, IDX_IO_CODEC_DMA_CURRPOS);
/* calculate offset */ /* calculate offset */
result -= bufptr; #ifdef QUERY_HARDWARE
result -= snd_azf3328_codec_inl(codec, IDX_IO_CODEC_DMA_START_1);
#else
result -= codec->dma_base;
#endif
frmres = bytes_to_frames( substream->runtime, result); frmres = bytes_to_frames( substream->runtime, result);
snd_azf3328_dbgcodec("%08li %s @ 0x%8lx, frames %8ld\n", snd_azf3328_dbgcodec("%08li %s @ 0x%8lx, frames %8ld\n",
jiffies, codec->name, result, frmres); jiffies, codec->name, result, frmres);