Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 16033
b: refs/heads/master
c: ceb9e47
h: refs/heads/master
i:
  16031: e5a4ace
v: v3
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Jan 3, 2006
1 parent eef90c1 commit a460c32
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 65b29f5039b38a5854b5e12238b0688a33e235cc
refs/heads/master: ceb9e476c89f50e9ba7de914bbec2c05e9647915
72 changes: 36 additions & 36 deletions trunk/sound/arm/aaci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
*/
#undef CONFIG_PM

static void aaci_ac97_select_codec(struct aaci *aaci, ac97_t *ac97)
static void aaci_ac97_select_codec(struct aaci *aaci, struct snd_ac97 *ac97)
{
u32 v, maincr = aaci->maincr | MAINCR_SCRA(ac97->num);

Expand All @@ -65,7 +65,7 @@ static void aaci_ac97_select_codec(struct aaci *aaci, ac97_t *ac97)
* SI1TxEn, SI2TxEn and SI12TxEn bits are set in the AACI_MAINCR
* register.
*/
static void aaci_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short val)
static void aaci_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val)
{
struct aaci *aaci = ac97->private_data;
u32 v;
Expand Down Expand Up @@ -97,7 +97,7 @@ static void aaci_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short val
/*
* Read an AC'97 register.
*/
static unsigned short aaci_ac97_read(ac97_t *ac97, unsigned short reg)
static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
{
struct aaci *aaci = ac97->private_data;
u32 v;
Expand Down Expand Up @@ -284,11 +284,11 @@ static unsigned int rate_list[] = {
* (unimplemented)
*/
static int
aaci_rule_rate_by_channels(snd_pcm_hw_params_t *p, snd_pcm_hw_rule_t *rule)
aaci_rule_rate_by_channels(struct snd_pcm_hw_params *p, struct snd_pcm_hw_rule *rule)
{
struct aaci *aaci = rule->private;
unsigned int rate_mask = SNDRV_PCM_RATE_8000_48000|SNDRV_PCM_RATE_5512;
snd_interval_t *c = hw_param_interval(p, SNDRV_PCM_HW_PARAM_CHANNELS);
struct snd_interval *c = hw_param_interval(p, SNDRV_PCM_HW_PARAM_CHANNELS);

switch (c->max) {
case 6:
Expand All @@ -304,7 +304,7 @@ aaci_rule_rate_by_channels(snd_pcm_hw_params_t *p, snd_pcm_hw_rule_t *rule)
rate_mask);
}

static snd_pcm_hardware_t aaci_hw_info = {
static struct snd_pcm_hardware aaci_hw_info = {
.info = SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_INTERLEAVED |
Expand All @@ -330,10 +330,10 @@ static snd_pcm_hardware_t aaci_hw_info = {
.periods_max = PAGE_SIZE / 16,
};

static int aaci_pcm_open(struct aaci *aaci, snd_pcm_substream_t *substream,
static int aaci_pcm_open(struct aaci *aaci, struct snd_pcm_substream *substream,
struct aaci_runtime *aacirun)
{
snd_pcm_runtime_t *runtime = substream->runtime;
struct snd_pcm_runtime *runtime = substream->runtime;
int ret;

aacirun->substream = substream;
Expand Down Expand Up @@ -375,7 +375,7 @@ static int aaci_pcm_open(struct aaci *aaci, snd_pcm_substream_t *substream,
/*
* Common ALSA stuff
*/
static int aaci_pcm_close(snd_pcm_substream_t *substream)
static int aaci_pcm_close(struct snd_pcm_substream *substream)
{
struct aaci *aaci = substream->private_data;
struct aaci_runtime *aacirun = substream->runtime->private_data;
Expand All @@ -388,7 +388,7 @@ static int aaci_pcm_close(snd_pcm_substream_t *substream)
return 0;
}

static int aaci_pcm_hw_free(snd_pcm_substream_t *substream)
static int aaci_pcm_hw_free(struct snd_pcm_substream *substream)
{
struct aaci_runtime *aacirun = substream->runtime->private_data;

Expand All @@ -409,9 +409,9 @@ static int aaci_pcm_hw_free(snd_pcm_substream_t *substream)
return 0;
}

static int aaci_pcm_hw_params(snd_pcm_substream_t *substream,
static int aaci_pcm_hw_params(struct snd_pcm_substream *substream,
struct aaci_runtime *aacirun,
snd_pcm_hw_params_t *params)
struct snd_pcm_hw_params *params)
{
int err;

Expand All @@ -434,9 +434,9 @@ static int aaci_pcm_hw_params(snd_pcm_substream_t *substream,
return err;
}

static int aaci_pcm_prepare(snd_pcm_substream_t *substream)
static int aaci_pcm_prepare(struct snd_pcm_substream *substream)
{
snd_pcm_runtime_t *runtime = substream->runtime;
struct snd_pcm_runtime *runtime = substream->runtime;
struct aaci_runtime *aacirun = runtime->private_data;

aacirun->start = (void *)runtime->dma_area;
Expand All @@ -448,16 +448,16 @@ static int aaci_pcm_prepare(snd_pcm_substream_t *substream)
return 0;
}

static snd_pcm_uframes_t aaci_pcm_pointer(snd_pcm_substream_t *substream)
static snd_pcm_uframes_t aaci_pcm_pointer(struct snd_pcm_substream *substream)
{
snd_pcm_runtime_t *runtime = substream->runtime;
struct snd_pcm_runtime *runtime = substream->runtime;
struct aaci_runtime *aacirun = runtime->private_data;
ssize_t bytes = aacirun->ptr - aacirun->start;

return bytes_to_frames(runtime, bytes);
}

static int aaci_pcm_mmap(snd_pcm_substream_t *substream, struct vm_area_struct *vma)
static int aaci_pcm_mmap(struct snd_pcm_substream *substream, struct vm_area_struct *vma)
{
return devdma_mmap(NULL, substream, vma);
}
Expand All @@ -484,7 +484,7 @@ static const u32 channels_to_txmask[] = {
static unsigned int channel_list[] = { 2, 4, 6 };

static int
aaci_rule_channels(snd_pcm_hw_params_t *p, snd_pcm_hw_rule_t *rule)
aaci_rule_channels(struct snd_pcm_hw_params *p, struct snd_pcm_hw_rule *rule)
{
struct aaci *aaci = rule->private;
unsigned int chan_mask = 1 << 0, slots;
Expand All @@ -504,7 +504,7 @@ aaci_rule_channels(snd_pcm_hw_params_t *p, snd_pcm_hw_rule_t *rule)
chan_mask);
}

static int aaci_pcm_playback_open(snd_pcm_substream_t *substream)
static int aaci_pcm_playback_open(struct snd_pcm_substream *substream)
{
struct aaci *aaci = substream->private_data;
int ret;
Expand All @@ -522,8 +522,8 @@ static int aaci_pcm_playback_open(snd_pcm_substream_t *substream)
return aaci_pcm_open(aaci, substream, &aaci->playback);
}

static int aaci_pcm_playback_hw_params(snd_pcm_substream_t *substream,
snd_pcm_hw_params_t *params)
static int aaci_pcm_playback_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
struct aaci *aaci = substream->private_data;
struct aaci_runtime *aacirun = substream->runtime->private_data;
Expand Down Expand Up @@ -575,7 +575,7 @@ static void aaci_pcm_playback_start(struct aaci_runtime *aacirun)
writel(aacirun->cr, aacirun->base + AACI_TXCR);
}

static int aaci_pcm_playback_trigger(snd_pcm_substream_t *substream, int cmd)
static int aaci_pcm_playback_trigger(struct snd_pcm_substream *substream, int cmd)
{
struct aaci *aaci = substream->private_data;
struct aaci_runtime *aacirun = substream->runtime->private_data;
Expand Down Expand Up @@ -614,7 +614,7 @@ static int aaci_pcm_playback_trigger(snd_pcm_substream_t *substream, int cmd)
return ret;
}

static snd_pcm_ops_t aaci_playback_ops = {
static struct snd_pcm_ops aaci_playback_ops = {
.open = aaci_pcm_playback_open,
.close = aaci_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
Expand All @@ -632,7 +632,7 @@ static snd_pcm_ops_t aaci_playback_ops = {
* Power Management.
*/
#ifdef CONFIG_PM
static int aaci_do_suspend(snd_card_t *card, unsigned int state)
static int aaci_do_suspend(struct snd_card *card, unsigned int state)
{
struct aaci *aaci = card->private_data;
if (aaci->card->power_state != SNDRV_CTL_POWER_D3cold) {
Expand All @@ -642,7 +642,7 @@ static int aaci_do_suspend(snd_card_t *card, unsigned int state)
return 0;
}

static int aaci_do_resume(snd_card_t *card, unsigned int state)
static int aaci_do_resume(struct snd_card *card, unsigned int state)
{
struct aaci *aaci = card->private_data;
if (aaci->card->power_state != SNDRV_CTL_POWER_D0) {
Expand All @@ -653,13 +653,13 @@ static int aaci_do_resume(snd_card_t *card, unsigned int state)

static int aaci_suspend(struct amba_device *dev, pm_message_t state)
{
snd_card_t *card = amba_get_drvdata(dev);
struct snd_card *card = amba_get_drvdata(dev);
return card ? aaci_do_suspend(card) : 0;
}

static int aaci_resume(struct amba_device *dev)
{
snd_card_t *card = amba_get_drvdata(dev);
struct snd_card *card = amba_get_drvdata(dev);
return card ? aaci_do_resume(card) : 0;
}
#else
Expand Down Expand Up @@ -705,16 +705,16 @@ static struct ac97_pcm ac97_defs[] __devinitdata = {
}
};

static ac97_bus_ops_t aaci_bus_ops = {
static struct snd_ac97_bus_ops aaci_bus_ops = {
.write = aaci_ac97_write,
.read = aaci_ac97_read,
};

static int __devinit aaci_probe_ac97(struct aaci *aaci)
{
ac97_template_t ac97_template;
ac97_bus_t *ac97_bus;
ac97_t *ac97;
struct snd_ac97_template ac97_template;
struct snd_ac97_bus *ac97_bus;
struct snd_ac97 *ac97;
int ret;

/*
Expand All @@ -737,7 +737,7 @@ static int __devinit aaci_probe_ac97(struct aaci *aaci)
ac97_bus->clock = 48000;
aaci->ac97_bus = ac97_bus;

memset(&ac97_template, 0, sizeof(ac97_template_t));
memset(&ac97_template, 0, sizeof(struct snd_ac97_template));
ac97_template.private_data = aaci;
ac97_template.num = 0;
ac97_template.scaps = AC97_SCAP_SKIP_MODEM;
Expand All @@ -762,7 +762,7 @@ static int __devinit aaci_probe_ac97(struct aaci *aaci)
return ret;
}

static void aaci_free_card(snd_card_t *card)
static void aaci_free_card(struct snd_card *card)
{
struct aaci *aaci = card->private_data;
if (aaci->base)
Expand All @@ -772,7 +772,7 @@ static void aaci_free_card(snd_card_t *card)
static struct aaci * __devinit aaci_init_card(struct amba_device *dev)
{
struct aaci *aaci;
snd_card_t *card;
struct snd_card *card;

card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
THIS_MODULE, sizeof(struct aaci));
Expand Down Expand Up @@ -803,7 +803,7 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev)

static int __devinit aaci_init_pcm(struct aaci *aaci)
{
snd_pcm_t *pcm;
struct snd_pcm *pcm;
int ret;

ret = snd_pcm_new(aaci->card, "AACI AC'97", 0, 1, 0, &pcm);
Expand Down Expand Up @@ -920,7 +920,7 @@ static int __devinit aaci_probe(struct amba_device *dev, void *id)

static int __devexit aaci_remove(struct amba_device *dev)
{
snd_card_t *card = amba_get_drvdata(dev);
struct snd_card *card = amba_get_drvdata(dev);

amba_set_drvdata(dev, NULL);

Expand Down
6 changes: 3 additions & 3 deletions trunk/sound/arm/aaci.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ struct aaci_runtime {
int pcm_open;

u32 cr;
snd_pcm_substream_t *substream;
struct snd_pcm_substream *substream;

/*
* PIO support
Expand All @@ -222,7 +222,7 @@ struct aaci_runtime {

struct aaci {
struct amba_device *dev;
snd_card_t *card;
struct snd_card *card;
void __iomem *base;
unsigned int fifosize;

Expand All @@ -236,7 +236,7 @@ struct aaci {
struct aaci_runtime playback;
struct aaci_runtime capture;

snd_pcm_t *pcm;
struct snd_pcm *pcm;
};

#define ACSTREAM_FRONT 0
Expand Down
12 changes: 6 additions & 6 deletions trunk/sound/arm/devdma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

#include "devdma.h"

void devdma_hw_free(struct device *dev, snd_pcm_substream_t *substream)
void devdma_hw_free(struct device *dev, struct snd_pcm_substream *substream)
{
snd_pcm_runtime_t *runtime = substream->runtime;
struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_dma_buffer *buf = runtime->dma_buffer_p;

if (runtime->dma_area == NULL)
Expand All @@ -34,9 +34,9 @@ void devdma_hw_free(struct device *dev, snd_pcm_substream_t *substream)
snd_pcm_set_runtime_buffer(substream, NULL);
}

int devdma_hw_alloc(struct device *dev, snd_pcm_substream_t *substream, size_t size)
int devdma_hw_alloc(struct device *dev, struct snd_pcm_substream *substream, size_t size)
{
snd_pcm_runtime_t *runtime = substream->runtime;
struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_dma_buffer *buf = runtime->dma_buffer_p;
int ret = 0;

Expand Down Expand Up @@ -74,8 +74,8 @@ int devdma_hw_alloc(struct device *dev, snd_pcm_substream_t *substream, size_t s
return -ENOMEM;
}

int devdma_mmap(struct device *dev, snd_pcm_substream_t *substream, struct vm_area_struct *vma)
int devdma_mmap(struct device *dev, struct snd_pcm_substream *substream, struct vm_area_struct *vma)
{
snd_pcm_runtime_t *runtime = substream->runtime;
struct snd_pcm_runtime *runtime = substream->runtime;
return dma_mmap_coherent(dev, vma, runtime->dma_area, runtime->dma_addr, runtime->dma_bytes);
}
6 changes: 3 additions & 3 deletions trunk/sound/arm/devdma.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
void devdma_hw_free(struct device *dev, snd_pcm_substream_t *substream);
int devdma_hw_alloc(struct device *dev, snd_pcm_substream_t *substream, size_t size);
int devdma_mmap(struct device *dev, snd_pcm_substream_t *substream, struct vm_area_struct *vma);
void devdma_hw_free(struct device *dev, struct snd_pcm_substream *substream);
int devdma_hw_alloc(struct device *dev, struct snd_pcm_substream *substream, size_t size);
int devdma_mmap(struct device *dev, struct snd_pcm_substream *substream, struct vm_area_struct *vma);

0 comments on commit a460c32

Please sign in to comment.