redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[ALSA] oxygen: optimize snd_pcm_hardware structures

Browse source 
Add one more indirection to the lookup of the snd_pcm_hardware
structures so that we can save the space of the duplicate ones.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Clemens Ladisch 2008-01-21 08:54:06 +01:00 committed by Jaroslav Kysela
parent 7f0b89465b
commit c57cccc038
1 changed files with 79 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

229
sound/pci/oxygen/oxygen_pcm.c
View file

@ -24,155 +24,84 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include "oxygen.h" #include "oxygen.h"
static struct snd_pcm_hardware oxygen_hardware[PCM_COUNT] = { static const struct snd_pcm_hardware oxygen_stereo_hardware = {
[PCM_A] = { .info = SNDRV_PCM_INFO_MMAP |
.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_SYNC_START,
SNDRV_PCM_INFO_SYNC_START, .formats = SNDRV_PCM_FMTBIT_S16_LE |
.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,
SNDRV_PCM_FMTBIT_S32_LE, .rates = SNDRV_PCM_RATE_32000 |
.rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_64000 |
SNDRV_PCM_RATE_64000 | SNDRV_PCM_RATE_88200 |
SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |
SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000,
SNDRV_PCM_RATE_192000, .rate_min = 32000,
.rate_min = 32000, .rate_max = 192000,
.rate_max = 192000, .channels_min = 2,
.channels_min = 2, .channels_max = 2,
.channels_max = 2, .buffer_bytes_max = 256 * 1024,
.buffer_bytes_max = 256 * 1024, .period_bytes_min = 128,
.period_bytes_min = 128, .period_bytes_max = 128 * 1024,
.period_bytes_max = 128 * 1024, .periods_min = 2,
.periods_min = 2, .periods_max = 2048,
.periods_max = 2048, };
}, static const struct snd_pcm_hardware oxygen_multichannel_hardware = {
[PCM_B] = { .info = SNDRV_PCM_INFO_MMAP |
.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_SYNC_START,
SNDRV_PCM_INFO_SYNC_START, .formats = SNDRV_PCM_FMTBIT_S16_LE |
.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,
SNDRV_PCM_FMTBIT_S32_LE, .rates = SNDRV_PCM_RATE_32000 |
.rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_64000 |
SNDRV_PCM_RATE_64000 | SNDRV_PCM_RATE_88200 |
SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |
SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000,
SNDRV_PCM_RATE_192000, .rate_min = 32000,
.rate_min = 32000, .rate_max = 192000,
.rate_max = 192000, .channels_min = 2,
.channels_min = 2, .channels_max = 8,
.channels_max = 2, .buffer_bytes_max = 2048 * 1024,
.buffer_bytes_max = 256 * 1024, .period_bytes_min = 128,
.period_bytes_min = 128, .period_bytes_max = 256 * 1024,
.period_bytes_max = 128 * 1024, .periods_min = 2,
.periods_min = 2, .periods_max = 16384,
.periods_max = 2048, };
}, static const struct snd_pcm_hardware oxygen_ac97_hardware = {
[PCM_C] = { .info = SNDRV_PCM_INFO_MMAP |
.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_SYNC_START,
SNDRV_PCM_INFO_SYNC_START, .formats = SNDRV_PCM_FMTBIT_S16_LE,
.formats = SNDRV_PCM_FMTBIT_S16_LE | .rates = SNDRV_PCM_RATE_48000,
SNDRV_PCM_FMTBIT_S32_LE, .rate_min = 48000,
.rates = SNDRV_PCM_RATE_32000 | .rate_max = 48000,
SNDRV_PCM_RATE_44100 | .channels_min = 2,
SNDRV_PCM_RATE_48000 | .channels_max = 2,
SNDRV_PCM_RATE_64000 | .buffer_bytes_max = 256 * 1024,
SNDRV_PCM_RATE_88200 | .period_bytes_min = 128,
SNDRV_PCM_RATE_96000 | .period_bytes_max = 128 * 1024,
SNDRV_PCM_RATE_176400 | .periods_min = 2,
SNDRV_PCM_RATE_192000, .periods_max = 2048,
.rate_min = 32000, };
.rate_max = 192000,
.channels_min = 2, static const struct snd_pcm_hardware *const oxygen_hardware[PCM_COUNT] = {
.channels_max = 2, [PCM_A] = &oxygen_stereo_hardware,
.buffer_bytes_max = 256 * 1024, [PCM_B] = &oxygen_stereo_hardware,
.period_bytes_min = 128, [PCM_C] = &oxygen_stereo_hardware,
.period_bytes_max = 128 * 1024, [PCM_SPDIF] = &oxygen_stereo_hardware,
.periods_min = 2, [PCM_MULTICH] = &oxygen_multichannel_hardware,
.periods_max = 2048, [PCM_AC97] = &oxygen_ac97_hardware,
},
[PCM_SPDIF] = {
.info = SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_SYNC_START,
.formats = SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S32_LE,
.rates = SNDRV_PCM_RATE_32000 |
SNDRV_PCM_RATE_44100 |
SNDRV_PCM_RATE_48000 |
SNDRV_PCM_RATE_64000 |
SNDRV_PCM_RATE_88200 |
SNDRV_PCM_RATE_96000 |
SNDRV_PCM_RATE_176400 |
SNDRV_PCM_RATE_192000,
.rate_min = 32000,
.rate_max = 192000,
.channels_min = 2,
.channels_max = 2,
.buffer_bytes_max = 256 * 1024,
.period_bytes_min = 128,
.period_bytes_max = 128 * 1024,
.periods_min = 2,
.periods_max = 2048,
},
[PCM_MULTICH] = {
.info = SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_SYNC_START,
.formats = SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S32_LE,
.rates = SNDRV_PCM_RATE_32000 |
SNDRV_PCM_RATE_44100 |
SNDRV_PCM_RATE_48000 |
SNDRV_PCM_RATE_64000 |
SNDRV_PCM_RATE_88200 |
SNDRV_PCM_RATE_96000 |
SNDRV_PCM_RATE_176400 |
SNDRV_PCM_RATE_192000,
.rate_min = 32000,
.rate_max = 192000,
.channels_min = 2,
.channels_max = 8,
.buffer_bytes_max = 2048 * 1024,
.period_bytes_min = 128,
.period_bytes_max = 256 * 1024,
.periods_min = 2,
.periods_max = 16384,
},
[PCM_AC97] = {
.info = SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_SYNC_START,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.rates = SNDRV_PCM_RATE_48000,
.rate_min = 48000,
.rate_max = 48000,
.channels_min = 2,
.channels_max = 2,
.buffer_bytes_max = 256 * 1024,
.period_bytes_min = 128,
.period_bytes_max = 128 * 1024,
.periods_min = 2,
.periods_max = 2048,
},
}; };
static inline unsigned int static inline unsigned int
@ -189,7 +118,7 @@ static int oxygen_open(struct snd_pcm_substream *substream,
int err; int err;
runtime->private_data = (void *)(uintptr_t)channel; runtime->private_data = (void *)(uintptr_t)channel;
runtime->hw = oxygen_hardware[channel]; runtime->hw = *oxygen_hardware[channel];
if (chip->model->pcm_hardware_filter) if (chip->model->pcm_hardware_filter)
chip->model->pcm_hardware_filter(channel, &runtime->hw); chip->model->pcm_hardware_filter(channel, &runtime->hw);
err = snd_pcm_hw_constraint_step(runtime, 0, err = snd_pcm_hw_constraint_step(runtime, 0,