git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
pcmcia
/
pdaudiocf
/
pdaudiocf_pcm.c
diff --git
a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
index
0a954dc
..
7f2a4de
100644
(file)
--- a/
sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
+++ b/
sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
@@
-34,7
+34,7
@@
*/
/* get the physical page pointer on the given offset */
*/
/* get the physical page pointer on the given offset */
-static struct page *snd_pcm_get_vmalloc_page(s
nd_pcm_substream_t
*subs, unsigned long offset)
+static struct page *snd_pcm_get_vmalloc_page(s
truct snd_pcm_substream
*subs, unsigned long offset)
{
void *pageptr = subs->runtime->dma_area + offset;
return vmalloc_to_page(pageptr);
{
void *pageptr = subs->runtime->dma_area + offset;
return vmalloc_to_page(pageptr);
@@
-44,15
+44,15
@@
static struct page *snd_pcm_get_vmalloc_page(snd_pcm_substream_t *subs, unsigned
* hw_params callback
* NOTE: this may be called not only once per pcm open!
*/
* hw_params callback
* NOTE: this may be called not only once per pcm open!
*/
-static int snd_pcm_alloc_vmalloc_buffer(s
nd_pcm_substream_t
*subs, size_t size)
+static int snd_pcm_alloc_vmalloc_buffer(s
truct snd_pcm_substream
*subs, size_t size)
{
{
- s
nd_pcm_runtime_t
*runtime = subs->runtime;
+ s
truct snd_pcm_runtime
*runtime = subs->runtime;
if (runtime->dma_area) {
if (runtime->dma_bytes >= size)
return 0; /* already enough large */
if (runtime->dma_area) {
if (runtime->dma_bytes >= size)
return 0; /* already enough large */
- vfree
_nocheck
(runtime->dma_area);
+ vfree(runtime->dma_area);
}
}
- runtime->dma_area = vmalloc_
nocheck
(size);
+ runtime->dma_area = vmalloc_
32
(size);
if (! runtime->dma_area)
return -ENOMEM;
runtime->dma_bytes = size;
if (! runtime->dma_area)
return -ENOMEM;
runtime->dma_bytes = size;
@@
-63,20
+63,19
@@
static int snd_pcm_alloc_vmalloc_buffer(snd_pcm_substream_t *subs, size_t size)
* hw_free callback
* NOTE: this may be called not only once per pcm open!
*/
* hw_free callback
* NOTE: this may be called not only once per pcm open!
*/
-static int snd_pcm_free_vmalloc_buffer(s
nd_pcm_substream_t
*subs)
+static int snd_pcm_free_vmalloc_buffer(s
truct snd_pcm_substream
*subs)
{
{
- snd_pcm_runtime_t *runtime = subs->runtime;
- if (runtime->dma_area) {
- vfree_nocheck(runtime->dma_area);
- runtime->dma_area = NULL;
- }
+ struct snd_pcm_runtime *runtime = subs->runtime;
+
+ vfree(runtime->dma_area);
+ runtime->dma_area = NULL;
return 0;
}
/*
* clear the SRAM contents
*/
return 0;
}
/*
* clear the SRAM contents
*/
-static int pdacf_pcm_clear_sram(
pdacf_t
*chip)
+static int pdacf_pcm_clear_sram(
struct snd_pdacf
*chip)
{
int max_loop = 64 * 1024;
{
int max_loop = 64 * 1024;
@@
-91,10
+90,10
@@
static int pdacf_pcm_clear_sram(pdacf_t *chip)
/*
* pdacf_pcm_trigger - trigger callback for capture
*/
/*
* pdacf_pcm_trigger - trigger callback for capture
*/
-static int pdacf_pcm_trigger(s
nd_pcm_substream_t
*subs, int cmd)
+static int pdacf_pcm_trigger(s
truct snd_pcm_substream
*subs, int cmd)
{
{
-
pdacf_t
*chip = snd_pcm_substream_chip(subs);
- s
nd_pcm_runtime_t
*runtime = subs->runtime;
+
struct snd_pdacf
*chip = snd_pcm_substream_chip(subs);
+ s
truct snd_pcm_runtime
*runtime = subs->runtime;
int inc, ret = 0, rate;
unsigned short mask, val, tmp;
int inc, ret = 0, rate;
unsigned short mask, val, tmp;
@@
-146,8
+145,8
@@
static int pdacf_pcm_trigger(snd_pcm_substream_t *subs, int cmd)
/*
* pdacf_pcm_hw_params - hw_params callback for playback and capture
*/
/*
* pdacf_pcm_hw_params - hw_params callback for playback and capture
*/
-static int pdacf_pcm_hw_params(s
nd_pcm_substream_t
*subs,
- s
nd_pcm_hw_params_t
*hw_params)
+static int pdacf_pcm_hw_params(s
truct snd_pcm_substream
*subs,
+ s
truct snd_pcm_hw_params
*hw_params)
{
return snd_pcm_alloc_vmalloc_buffer(subs, params_buffer_bytes(hw_params));
}
{
return snd_pcm_alloc_vmalloc_buffer(subs, params_buffer_bytes(hw_params));
}
@@
-155,7
+154,7
@@
static int pdacf_pcm_hw_params(snd_pcm_substream_t *subs,
/*
* pdacf_pcm_hw_free - hw_free callback for playback and capture
*/
/*
* pdacf_pcm_hw_free - hw_free callback for playback and capture
*/
-static int pdacf_pcm_hw_free(s
nd_pcm_substream_t
*subs)
+static int pdacf_pcm_hw_free(s
truct snd_pcm_substream
*subs)
{
return snd_pcm_free_vmalloc_buffer(subs);
}
{
return snd_pcm_free_vmalloc_buffer(subs);
}
@@
-163,10
+162,10
@@
static int pdacf_pcm_hw_free(snd_pcm_substream_t *subs)
/*
* pdacf_pcm_prepare - prepare callback for playback and capture
*/
/*
* pdacf_pcm_prepare - prepare callback for playback and capture
*/
-static int pdacf_pcm_prepare(s
nd_pcm_substream_t
*subs)
+static int pdacf_pcm_prepare(s
truct snd_pcm_substream
*subs)
{
{
-
pdacf_t
*chip = snd_pcm_substream_chip(subs);
- s
nd_pcm_runtime_t
*runtime = subs->runtime;
+
struct snd_pdacf
*chip = snd_pcm_substream_chip(subs);
+ s
truct snd_pcm_runtime
*runtime = subs->runtime;
u16 val, nval, aval;
if (chip->chip_status & PDAUDIOCF_STAT_IS_STALE)
u16 val, nval, aval;
if (chip->chip_status & PDAUDIOCF_STAT_IS_STALE)
@@
-209,7
+208,7
@@
static int pdacf_pcm_prepare(snd_pcm_substream_t *subs)
case SNDRV_PCM_FORMAT_S24_3LE:
case SNDRV_PCM_FORMAT_S24_3BE:
chip->pcm_sample = 3;
case SNDRV_PCM_FORMAT_S24_3LE:
case SNDRV_PCM_FORMAT_S24_3BE:
chip->pcm_sample = 3;
- /* fall trough */
+ /* fall t
h
rough */
default: /* 24-bit */
aval = AK4117_DIF_24R;
chip->pcm_frame = 3;
default: /* 24-bit */
aval = AK4117_DIF_24R;
chip->pcm_frame = 3;
@@
-239,7
+238,7
@@
static int pdacf_pcm_prepare(snd_pcm_substream_t *subs)
* capture hw information
*/
* capture hw information
*/
-static s
nd_pcm_hardware_t
pdacf_pcm_capture_hw = {
+static s
truct snd_pcm_hardware
pdacf_pcm_capture_hw = {
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME |
SNDRV_PCM_INFO_MMAP_VALID),
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME |
SNDRV_PCM_INFO_MMAP_VALID),
@@
-269,10
+268,10
@@
static snd_pcm_hardware_t pdacf_pcm_capture_hw = {
/*
* pdacf_pcm_capture_open - open callback for capture
*/
/*
* pdacf_pcm_capture_open - open callback for capture
*/
-static int pdacf_pcm_capture_open(s
nd_pcm_substream_t
*subs)
+static int pdacf_pcm_capture_open(s
truct snd_pcm_substream
*subs)
{
{
- s
nd_pcm_runtime_t
*runtime = subs->runtime;
-
pdacf_t
*chip = snd_pcm_substream_chip(subs);
+ s
truct snd_pcm_runtime
*runtime = subs->runtime;
+
struct snd_pdacf
*chip = snd_pcm_substream_chip(subs);
if (chip->chip_status & PDAUDIOCF_STAT_IS_STALE)
return -EBUSY;
if (chip->chip_status & PDAUDIOCF_STAT_IS_STALE)
return -EBUSY;
@@
-287,9
+286,9
@@
static int pdacf_pcm_capture_open(snd_pcm_substream_t *subs)
/*
* pdacf_pcm_capture_close - close callback for capture
*/
/*
* pdacf_pcm_capture_close - close callback for capture
*/
-static int pdacf_pcm_capture_close(s
nd_pcm_substream_t
*subs)
+static int pdacf_pcm_capture_close(s
truct snd_pcm_substream
*subs)
{
{
-
pdacf_t
*chip = snd_pcm_substream_chip(subs);
+
struct snd_pdacf
*chip = snd_pcm_substream_chip(subs);
if (!chip)
return -EINVAL;
if (!chip)
return -EINVAL;
@@
-302,16
+301,16
@@
static int pdacf_pcm_capture_close(snd_pcm_substream_t *subs)
/*
* pdacf_pcm_capture_pointer - pointer callback for capture
*/
/*
* pdacf_pcm_capture_pointer - pointer callback for capture
*/
-static snd_pcm_uframes_t pdacf_pcm_capture_pointer(s
nd_pcm_substream_t
*subs)
+static snd_pcm_uframes_t pdacf_pcm_capture_pointer(s
truct snd_pcm_substream
*subs)
{
{
-
pdacf_t
*chip = snd_pcm_substream_chip(subs);
+
struct snd_pdacf
*chip = snd_pcm_substream_chip(subs);
return chip->pcm_hwptr;
}
/*
* operators for PCM capture
*/
return chip->pcm_hwptr;
}
/*
* operators for PCM capture
*/
-static s
nd_pcm_ops_t
pdacf_pcm_capture_ops = {
+static s
truct snd_pcm_ops
pdacf_pcm_capture_ops = {
.open = pdacf_pcm_capture_open,
.close = pdacf_pcm_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.open = pdacf_pcm_capture_open,
.close = pdacf_pcm_capture_close,
.ioctl = snd_pcm_lib_ioctl,
@@
-324,21
+323,12
@@
static snd_pcm_ops_t pdacf_pcm_capture_ops = {
};
};
-/*
- * free callback for pcm
- */
-static void snd_pdacf_pcm_free(snd_pcm_t *pcm)
-{
- pdacf_t *chip = pcm->private_data;
- chip->pcm = NULL;
-}
-
/*
* snd_pdacf_pcm_new - create and initialize a pcm
*/
/*
* snd_pdacf_pcm_new - create and initialize a pcm
*/
-int snd_pdacf_pcm_new(
pdacf_t
*chip)
+int snd_pdacf_pcm_new(
struct snd_pdacf
*chip)
{
{
- s
nd_pcm_t
*pcm;
+ s
truct snd_pcm
*pcm;
int err;
err = snd_pcm_new(chip->card, "PDAudioCF", 0, 0, 1, &pcm);
int err;
err = snd_pcm_new(chip->card, "PDAudioCF", 0, 0, 1, &pcm);
@@
-348,7
+338,6
@@
int snd_pdacf_pcm_new(pdacf_t *chip)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &pdacf_pcm_capture_ops);
pcm->private_data = chip;
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &pdacf_pcm_capture_ops);
pcm->private_data = chip;
- pcm->private_free = snd_pdacf_pcm_free;
pcm->info_flags = 0;
strcpy(pcm->name, chip->card->shortname);
chip->pcm = pcm;
pcm->info_flags = 0;
strcpy(pcm->name, chip->card->shortname);
chip->pcm = pcm;