diff options
-rw-r--r-- | sound/pci/emu10k1/p16v.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c index 93dff4c6b233..98f980189892 100644 --- a/sound/pci/emu10k1/p16v.c +++ b/sound/pci/emu10k1/p16v.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk> | 2 | * Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk> |
3 | * Driver p16v chips | 3 | * Driver p16v chips |
4 | * Version: 0.22 | 4 | * Version: 0.25 |
5 | * | 5 | * |
6 | * FEATURES currently supported: | 6 | * FEATURES currently supported: |
7 | * Output fixed at S32_LE, 2 channel to hw:0,0 | 7 | * Output fixed at S32_LE, 2 channel to hw:0,0 |
@@ -48,6 +48,8 @@ | |||
48 | * e.g. When HD Capture source is set to SPDIF, | 48 | * e.g. When HD Capture source is set to SPDIF, |
49 | * setting HD Capture channel to 0 captures from CDROM digital input. | 49 | * setting HD Capture channel to 0 captures from CDROM digital input. |
50 | * setting HD Capture channel to 1 captures from SPDIF in. | 50 | * setting HD Capture channel to 1 captures from SPDIF in. |
51 | * 0.25 | ||
52 | * Include capture buffer sizes. | ||
51 | * | 53 | * |
52 | * BUGS: | 54 | * BUGS: |
53 | * Some stability problems when unloading the snd-p16v kernel module. | 55 | * Some stability problems when unloading the snd-p16v kernel module. |
@@ -149,9 +151,9 @@ static snd_pcm_hardware_t snd_p16v_capture_hw = { | |||
149 | .rate_max = 192000, | 151 | .rate_max = 192000, |
150 | .channels_min = 2, | 152 | .channels_min = 2, |
151 | .channels_max = 2, | 153 | .channels_max = 2, |
152 | .buffer_bytes_max = (32*1024), | 154 | .buffer_bytes_max = (65536 - 64), |
153 | .period_bytes_min = 64, | 155 | .period_bytes_min = 64, |
154 | .period_bytes_max = (16*1024), | 156 | .period_bytes_max = (65536 - 128) >> 1, /* size has to be N*64 bytes */ |
155 | .periods_min = 2, | 157 | .periods_min = 2, |
156 | .periods_max = 2, | 158 | .periods_max = 2, |
157 | .fifo_size = 0, | 159 | .fifo_size = 0, |
@@ -637,7 +639,7 @@ int snd_p16v_pcm(emu10k1_t *emu, int device, snd_pcm_t **rpcm) | |||
637 | if ((err = snd_pcm_lib_preallocate_pages(substream, | 639 | if ((err = snd_pcm_lib_preallocate_pages(substream, |
638 | SNDRV_DMA_TYPE_DEV, | 640 | SNDRV_DMA_TYPE_DEV, |
639 | snd_dma_pci_data(emu->pci), | 641 | snd_dma_pci_data(emu->pci), |
640 | 64*1024, 64*1024)) < 0) | 642 | 65536 - 64, 65536 - 64)) < 0) |
641 | return err; | 643 | return err; |
642 | //snd_printk("preallocate capture substream: err=%d\n", err); | 644 | //snd_printk("preallocate capture substream: err=%d\n", err); |
643 | } | 645 | } |