Skip to content

L
linux
Commit 446ab5f5 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files
Options

[ALSA] Remove xxx_t typedefs: Documentation 

Modules: Documentation

Remove xxx_t typedefs from documentation.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a0d6f880
Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 219 deletions
Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
View file @ 446ab5f5
...@@ -403,9 +403,8 @@ ...@@ -403,9 +403,8 @@
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
/* definition of the chip-specific record */ /* definition of the chip-specific record */
typedef struct snd_mychip mychip_t; struct mychip {
struct snd_mychip { struct snd_card *card;
snd_card_t *card;
// rest of implementation will be in the section // rest of implementation will be in the section
// "PCI Resource Managements" // "PCI Resource Managements"
}; };
...@@ -413,7 +412,7 @@ ...@@ -413,7 +412,7 @@
/* chip-specific destructor /* chip-specific destructor
* (see "PCI Resource Managements") * (see "PCI Resource Managements")
*/ */
static int snd_mychip_free(mychip_t *chip) static int snd_mychip_free(struct mychip *chip)
{ {
.... // will be implemented later... .... // will be implemented later...
} }
...@@ -421,22 +420,21 @@ ...@@ -421,22 +420,21 @@
/* component-destructor /* component-destructor
* (see "Management of Cards and Components") * (see "Management of Cards and Components")
*/ */
static int snd_mychip_dev_free(snd_device_t *device) static int snd_mychip_dev_free(struct snd_device *device)
{ {
mychip_t *chip = device->device_data; return snd_mychip_free(device->device_data);
return snd_mychip_free(chip);
} }
/* chip-specific constructor /* chip-specific constructor
* (see "Management of Cards and Components") * (see "Management of Cards and Components")
*/ */
static int __devinit snd_mychip_create(snd_card_t *card, static int __devinit snd_mychip_create(struct snd_card *card,
struct pci_dev *pci, struct pci_dev *pci,
mychip_t **rchip) struct mychip **rchip)
{ {
mychip_t *chip; struct mychip *chip;
int err; int err;
static snd_device_ops_t ops = { static struct snd_device_ops ops = {
.dev_free = snd_mychip_dev_free, .dev_free = snd_mychip_dev_free,
}; };
...@@ -474,8 +472,8 @@ ...@@ -474,8 +472,8 @@
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)
{ {
static int dev; static int dev;
snd_card_t *card; struct snd_card *card;
mychip_t *chip; struct mychip *chip;
int err; int err;
/* (1) */ /* (1) */
...@@ -582,7 +580,7 @@ ...@@ -582,7 +580,7 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
snd_card_t *card; struct snd_card *card;
.... ....
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
]]> ]]>
...@@ -605,7 +603,7 @@ ...@@ -605,7 +603,7 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
mychip_t *chip; struct mychip *chip;
.... ....
if ((err = snd_mychip_create(card, pci, &chip)) < 0) { if ((err = snd_mychip_create(card, pci, &chip)) < 0) {
snd_card_free(card); snd_card_free(card);
...@@ -806,7 +804,7 @@ ...@@ -806,7 +804,7 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
snd_card_t *card; struct snd_card *card;
card = snd_card_new(index, id, module, extra_size); card = snd_card_new(index, id, module, extra_size);
]]> ]]>
</programlisting> </programlisting>
...@@ -830,7 +828,7 @@ ...@@ -830,7 +828,7 @@
<para> <para>
After the card is created, you can attach the components After the card is created, you can attach the components
(devices) to the card instance. On ALSA driver, a component is (devices) to the card instance. On ALSA driver, a component is
represented as a <type>snd_device_t</type> object. represented as a struct <structname>snd_device</structname> object.
A component can be a PCM instance, a control interface, a raw A component can be a PCM instance, a control interface, a raw
MIDI interface, etc. Each of such instances has one component MIDI interface, etc. Each of such instances has one component
entry. entry.
...@@ -891,14 +889,11 @@ ...@@ -891,14 +889,11 @@
The chip-specific information, e.g. the i/o port address, its The chip-specific information, e.g. the i/o port address, its
resource pointer, or the irq number, is stored in the resource pointer, or the irq number, is stored in the
chip-specific record. chip-specific record.
Usually, the chip-specific record is typedef'ed as
<type>xxx_t</type> like the following:
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
typedef struct snd_mychip mychip_t; struct mychip {
struct snd_mychip {
.... ....
}; };
]]> ]]>
...@@ -918,12 +913,12 @@ ...@@ -918,12 +913,12 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(mychip_t)); card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(struct mychip));
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
whether <type>mychip_t</type> is the type of the chip record. whether struct <structname>mychip</structname> is the type of the chip record.
</para> </para>
<para> <para>
...@@ -932,7 +927,7 @@ ...@@ -932,7 +927,7 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
mychip_t *chip = (mychip_t *)card->private_data; struct mychip *chip = (struct mychip *)card->private_data;
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -954,8 +949,8 @@ ...@@ -954,8 +949,8 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
snd_card_t *card; struct snd_card *card;
mychip_t *chip; struct mychip *chip;
card = snd_card_new(index[dev], id[dev], THIS_MODULE, NULL); card = snd_card_new(index[dev], id[dev], THIS_MODULE, NULL);
..... .....
chip = kzalloc(sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
...@@ -971,8 +966,8 @@ ...@@ -971,8 +966,8 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
struct snd_mychip { struct mychip {
snd_card_t *card; struct snd_card *card;
.... ....
}; };
]]> ]]>
...@@ -1000,7 +995,7 @@ ...@@ -1000,7 +995,7 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static snd_device_ops_t ops = { static struct snd_device_ops ops = {
.dev_free = snd_mychip_dev_free, .dev_free = snd_mychip_dev_free,
}; };
.... ....
...@@ -1018,10 +1013,9 @@ ...@@ -1018,10 +1013,9 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_mychip_dev_free(snd_device_t *device) static int snd_mychip_dev_free(struct snd_device *device)
{ {
mychip_t *chip = device->device_data; return snd_mychip_free(device->device_data);
return snd_mychip_free(chip);
} }
]]> ]]>
</programlisting> </programlisting>
...@@ -1087,15 +1081,15 @@ ...@@ -1087,15 +1081,15 @@
<title>PCI Resource Managements Example</title> <title>PCI Resource Managements Example</title>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
struct snd_mychip { struct mychip {
snd_card_t *card; struct snd_card *card;
struct pci_dev *pci; struct pci_dev *pci;
unsigned long port; unsigned long port;
int irq; int irq;
}; };
static int snd_mychip_free(mychip_t *chip) static int snd_mychip_free(struct mychip *chip)
{ {
/* disable hardware here if any */ /* disable hardware here if any */
.... // (not implemented in this document) .... // (not implemented in this document)
...@@ -1113,13 +1107,13 @@ ...@@ -1113,13 +1107,13 @@
} }
/* chip-specific constructor */ /* chip-specific constructor */
static int __devinit snd_mychip_create(snd_card_t *card, static int __devinit snd_mychip_create(struct snd_card *card,
struct pci_dev *pci, struct pci_dev *pci,
mychip_t **rchip) struct mychip **rchip)
{ {
mychip_t *chip; struct mychip *chip;
int err; int err;
static snd_device_ops_t ops = { static struct snd_device_ops ops = {
.dev_free = snd_mychip_dev_free, .dev_free = snd_mychip_dev_free,
}; };
...@@ -1155,8 +1149,7 @@ ...@@ -1155,8 +1149,7 @@
} }
chip->port = pci_resource_start(pci, 0); chip->port = pci_resource_start(pci, 0);
if (request_irq(pci->irq, snd_mychip_interrupt, if (request_irq(pci->irq, snd_mychip_interrupt,
SA_INTERRUPT|SA_SHIRQ, "My Chip", SA_INTERRUPT|SA_SHIRQ, "My Chip", chip)) {
(void *)chip)) {
printk(KERN_ERR "cannot grab irq %d\n", pci->irq); printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
snd_mychip_free(chip); snd_mychip_free(chip);
return -EBUSY; return -EBUSY;
...@@ -1268,14 +1261,14 @@ ...@@ -1268,14 +1261,14 @@
<para> <para>
Now assume that this PCI device has an I/O port with 8 bytes Now assume that this PCI device has an I/O port with 8 bytes
and an interrupt. Then <type>mychip_t</type> will have the and an interrupt. Then struct <structname>mychip</structname> will have the
following fields: following fields:
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
struct snd_mychip { struct mychip {
snd_card_t *card; struct snd_card *card;
unsigned long port; unsigned long port;
int irq; int irq;
...@@ -1330,8 +1323,7 @@ ...@@ -1330,8 +1323,7 @@
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
if (request_irq(pci->irq, snd_mychip_interrupt, if (request_irq(pci->irq, snd_mychip_interrupt,
SA_INTERRUPT|SA_SHIRQ, "My Chip", SA_INTERRUPT|SA_SHIRQ, "My Chip", chip)) {
(void *)chip)) {
printk(KERN_ERR "cannot grab irq %d\n", pci->irq); printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
snd_mychip_free(chip); snd_mychip_free(chip);
return -EBUSY; return -EBUSY;
...@@ -1372,7 +1364,7 @@ ...@@ -1372,7 +1364,7 @@
static irqreturn_t snd_mychip_interrupt(int irq, void *dev_id, static irqreturn_t snd_mychip_interrupt(int irq, void *dev_id,
struct pt_regs *regs) struct pt_regs *regs)
{ {
mychip_t *chip = dev_id; struct mychip *chip = dev_id;
.... ....
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -1487,7 +1479,7 @@ ...@@ -1487,7 +1479,7 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
struct snd_mychip { struct mychip {
.... ....
unsigned long iobase_phys; unsigned long iobase_phys;
void __iomem *iobase_virt; void __iomem *iobase_virt;
...@@ -1517,7 +1509,7 @@ ...@@ -1517,7 +1509,7 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_mychip_free(mychip_t *chip) static int snd_mychip_free(struct mychip *chip)
{ {
.... ....
if (chip->iobase_virt) if (chip->iobase_virt)
...@@ -1537,7 +1529,7 @@ ...@@ -1537,7 +1529,7 @@
<title>Registration of Device Struct</title> <title>Registration of Device Struct</title>
<para> <para>
At some point, typically after calling <function>snd_device_new()</function>, At some point, typically after calling <function>snd_device_new()</function>,
you need to register the <structname>struct device</structname> of the chip you need to register the struct <structname>device</structname> of the chip
you're handling for udev and co. ALSA provides a macro for compatibility with you're handling for udev and co. ALSA provides a macro for compatibility with
older kernels. Simply call like the following: older kernels. Simply call like the following:
<informalexample> <informalexample>
...@@ -1739,7 +1731,7 @@ ...@@ -1739,7 +1731,7 @@
.... ....
/* hardware definition */ /* hardware definition */
static snd_pcm_hardware_t snd_mychip_playback_hw = { static struct snd_pcm_hardware snd_mychip_playback_hw = {
.info = (SNDRV_PCM_INFO_MMAP | .info = (SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_BLOCK_TRANSFER |
...@@ -1758,7 +1750,7 @@ ...@@ -1758,7 +1750,7 @@
}; };
/* hardware definition */ /* hardware definition */
static snd_pcm_hardware_t snd_mychip_capture_hw = { static struct snd_pcm_hardware snd_mychip_capture_hw = {
.info = (SNDRV_PCM_INFO_MMAP | .info = (SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_BLOCK_TRANSFER |
...@@ -1777,10 +1769,10 @@ ...@@ -1777,10 +1769,10 @@
}; };
/* open callback */ /* open callback */
static int snd_mychip_playback_open(snd_pcm_substream_t *substream) static int snd_mychip_playback_open(struct snd_pcm_substream *substream)
{ {
mychip_t *chip = snd_pcm_substream_chip(substream); struct mychip *chip = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
runtime->hw = snd_mychip_playback_hw; runtime->hw = snd_mychip_playback_hw;
// more hardware-initialization will be done here // more hardware-initialization will be done here
...@@ -1788,19 +1780,19 @@ ...@@ -1788,19 +1780,19 @@
} }
/* close callback */ /* close callback */
static int snd_mychip_playback_close(snd_pcm_substream_t *substream) static int snd_mychip_playback_close(struct snd_pcm_substream *substream)
{ {
mychip_t *chip = snd_pcm_substream_chip(substream); struct mychip *chip = snd_pcm_substream_chip(substream);
// the hardware-specific codes will be here // the hardware-specific codes will be here
return 0; return 0;
} }
/* open callback */ /* open callback */
static int snd_mychip_capture_open(snd_pcm_substream_t *substream) static int snd_mychip_capture_open(struct snd_pcm_substream *substream)
{ {
mychip_t *chip = snd_pcm_substream_chip(substream); struct mychip *chip = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
runtime->hw = snd_mychip_capture_hw; runtime->hw = snd_mychip_capture_hw;
// more hardware-initialization will be done here // more hardware-initialization will be done here
...@@ -1808,33 +1800,33 @@ ...@@ -1808,33 +1800,33 @@
} }
/* close callback */ /* close callback */
static int snd_mychip_capture_close(snd_pcm_substream_t *substream) static int snd_mychip_capture_close(struct snd_pcm_substream *substream)
{ {
mychip_t *chip = snd_pcm_substream_chip(substream); struct mychip *chip = snd_pcm_substream_chip(substream);
// the hardware-specific codes will be here // the hardware-specific codes will be here
return 0; return 0;
} }
/* hw_params callback */ /* hw_params callback */
static int snd_mychip_pcm_hw_params(snd_pcm_substream_t *substream, static int snd_mychip_pcm_hw_params(struct snd_pcm_substream *substream,
snd_pcm_hw_params_t * hw_params) struct snd_pcm_hw_params *hw_params)
{ {
return snd_pcm_lib_malloc_pages(substream, return snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(hw_params)); params_buffer_bytes(hw_params));
} }
/* hw_free callback */ /* hw_free callback */
static int snd_mychip_pcm_hw_free(snd_pcm_substream_t *substream) static int snd_mychip_pcm_hw_free(struct snd_pcm_substream *substream)
{ {
return snd_pcm_lib_free_pages(substream); return snd_pcm_lib_free_pages(substream);
} }
/* prepare callback */ /* prepare callback */
static int snd_mychip_pcm_prepare(snd_pcm_substream_t *substream) static int snd_mychip_pcm_prepare(struct snd_pcm_substream *substream)
{ {
mychip_t *chip = snd_pcm_substream_chip(substream); struct mychip *chip = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
/* set up the hardware with the current configuration /* set up the hardware with the current configuration
* for example... * for example...
...@@ -1849,7 +1841,7 @@ ...@@ -1849,7 +1841,7 @@
} }
/* trigger callback */ /* trigger callback */
static int snd_mychip_pcm_trigger(snd_pcm_substream_t *substream, static int snd_mychip_pcm_trigger(struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
switch (cmd) { switch (cmd) {
...@@ -1866,9 +1858,9 @@ ...@@ -1866,9 +1858,9 @@
/* pointer callback */ /* pointer callback */
static snd_pcm_uframes_t static snd_pcm_uframes_t
snd_mychip_pcm_pointer(snd_pcm_substream_t *substream) snd_mychip_pcm_pointer(struct snd_pcm_substream *substream)
{ {
mychip_t *chip = snd_pcm_substream_chip(substream); struct mychip *chip = snd_pcm_substream_chip(substream);
unsigned int current_ptr; unsigned int current_ptr;
/* get the current hardware pointer */ /* get the current hardware pointer */
...@@ -1877,7 +1869,7 @@ ...@@ -1877,7 +1869,7 @@
} }
/* operators */ /* operators */
static snd_pcm_ops_t snd_mychip_playback_ops = { static struct snd_pcm_ops snd_mychip_playback_ops = {
.open = snd_mychip_playback_open, .open = snd_mychip_playback_open,
.close = snd_mychip_playback_close, .close = snd_mychip_playback_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
...@@ -1889,7 +1881,7 @@ ...@@ -1889,7 +1881,7 @@
}; };
/* operators */ /* operators */
static snd_pcm_ops_t snd_mychip_capture_ops = { static struct snd_pcm_ops snd_mychip_capture_ops = {
.open = snd_mychip_capture_open, .open = snd_mychip_capture_open,
.close = snd_mychip_capture_close, .close = snd_mychip_capture_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
...@@ -1905,9 +1897,9 @@ ...@@ -1905,9 +1897,9 @@
*/ */
/* create a pcm device */ /* create a pcm device */
static int __devinit snd_mychip_new_pcm(mychip_t *chip) static int __devinit snd_mychip_new_pcm(struct mychip *chip)
{ {
snd_pcm_t *pcm; struct snd_pcm *pcm;
int err; int err;
if ((err = snd_pcm_new(chip->card, "My Chip", 0, 1, 1, if ((err = snd_pcm_new(chip->card, "My Chip", 0, 1, 1,
...@@ -1944,9 +1936,9 @@ ...@@ -1944,9 +1936,9 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int __devinit snd_mychip_new_pcm(mychip_t *chip) static int __devinit snd_mychip_new_pcm(struct mychip *chip)
{ {
snd_pcm_t *pcm; struct snd_pcm *pcm;
int err; int err;
if ((err = snd_pcm_new(chip->card, "My Chip", 0, 1, 1, if ((err = snd_pcm_new(chip->card, "My Chip", 0, 1, 1,
...@@ -1989,13 +1981,13 @@ ...@@ -1989,13 +1981,13 @@
specify more numbers, but they must be handled properly in specify more numbers, but they must be handled properly in
open/close, etc. callbacks. When you need to know which open/close, etc. callbacks. When you need to know which
substream you are referring to, then it can be obtained from substream you are referring to, then it can be obtained from
<type>snd_pcm_substream_t</type> data passed to each callback struct <structname>snd_pcm_substream</structname> data passed to each callback
as follows: as follows:
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
snd_pcm_substream_t *substream; struct snd_pcm_substream *substream;
int index = substream->number; int index = substream->number;
]]> ]]>
</programlisting> </programlisting>
...@@ -2024,7 +2016,7 @@ ...@@ -2024,7 +2016,7 @@
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static snd_pcm_ops_t snd_mychip_playback_ops = { static struct snd_pcm_ops snd_mychip_playback_ops = {
.open = snd_mychip_pcm_open, .open = snd_mychip_pcm_open,
.close = snd_mychip_pcm_close, .close = snd_mychip_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
...@@ -2102,18 +2094,18 @@ ...@@ -2102,18 +2094,18 @@
<title>PCM Instance with a Destructor</title> <title>PCM Instance with a Destructor</title>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static void mychip_pcm_free(snd_pcm_t *pcm) static void mychip_pcm_free(struct snd_pcm *pcm)
{ {
mychip_t *chip = snd_pcm_chip(pcm); struct mychip *chip = snd_pcm_chip(pcm);
/* free your own data */ /* free your own data */
kfree(chip->my_private_pcm_data); kfree(chip->my_private_pcm_data);
// do what you like else // do what you like else
.... ....
} }
static int __devinit snd_mychip_new_pcm(mychip_t *chip) static int __devinit snd_mychip_new_pcm(struct mychip *chip)
{ {
snd_pcm_t *pcm; struct snd_pcm *pcm;
.... ....
/* allocate your own data */ /* allocate your own data */
chip->my_private_pcm_data = kmalloc(...); chip->my_private_pcm_data = kmalloc(...);
...@@ -2149,7 +2141,7 @@ ...@@ -2149,7 +2141,7 @@
<![CDATA[ <![CDATA[
struct _snd_pcm_runtime { struct _snd_pcm_runtime {
/* -- Status -- */ /* -- Status -- */
snd_pcm_substream_t *trigger_master; struct snd_pcm_substream *trigger_master;
snd_timestamp_t trigger_tstamp; /* trigger timestamp */ snd_timestamp_t trigger_tstamp; /* trigger timestamp */
int overrange; int overrange;
snd_pcm_uframes_t avail_max; snd_pcm_uframes_t avail_max;
...@@ -2192,8 +2184,8 @@ struct _snd_pcm_runtime { ...@@ -2192,8 +2184,8 @@ struct _snd_pcm_runtime {
snd_pcm_sync_id_t sync; /* hardware synchronization ID */ snd_pcm_sync_id_t sync; /* hardware synchronization ID */
/* -- mmap -- */ /* -- mmap -- */
volatile snd_pcm_mmap_status_t *status; volatile struct snd_pcm_mmap_status *status;
volatile snd_pcm_mmap_control_t *control; volatile struct snd_pcm_mmap_control *control;
atomic_t mmap_count; atomic_t mmap_count;
/* -- locking / scheduling -- */ /* -- locking / scheduling -- */
...@@ -2204,15 +2196,15 @@ struct _snd_pcm_runtime { ...@@ -2204,15 +2196,15 @@ struct _snd_pcm_runtime {
/* -- private section -- */ /* -- private section -- */
void *private_data; void *private_data;
void (*private_free)(snd_pcm_runtime_t *runtime); void (*private_free)(struct snd_pcm_runtime *runtime);
/* -- hardware description -- */ /* -- hardware description -- */
snd_pcm_hardware_t hw; struct snd_pcm_hardware hw;
snd_pcm_hw_constraints_t hw_constraints; struct snd_pcm_hw_constraints hw_constraints;
/* -- interrupt callbacks -- */ /* -- interrupt callbacks -- */
void (*transfer_ack_begin)(snd_pcm_substream_t *substream); void (*transfer_ack_begin)(struct snd_pcm_substream *substream);
void (*transfer_ack_end)(snd_pcm_substream_t *substream); void (*transfer_ack_end)(struct snd_pcm_substream *substream);
/* -- timer -- */ /* -- timer -- */
unsigned int timer_resolution; /* timer resolution */ unsigned int timer_resolution; /* timer resolution */
...@@ -2226,7 +2218,7 @@ struct _snd_pcm_runtime { ...@@ -2226,7 +2218,7 @@ struct _snd_pcm_runtime {
#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
/* -- OSS things -- */ /* -- OSS things -- */
snd_pcm_oss_runtime_t oss; struct snd_pcm_oss_runtime oss;
#endif #endif
}; };
]]> ]]>
...@@ -2252,7 +2244,7 @@ struct _snd_pcm_runtime { ...@@ -2252,7 +2244,7 @@ struct _snd_pcm_runtime {
<section id="pcm-interface-runtime-hw"> <section id="pcm-interface-runtime-hw">
<title>Hardware Description</title> <title>Hardware Description</title>
<para> <para>
The hardware descriptor (<type>snd_pcm_hardware_t</type>) The hardware descriptor (struct <structname>snd_pcm_hardware</structname>)
contains the definitions of the fundamental hardware contains the definitions of the fundamental hardware
configuration. Above all, you'll need to define this in configuration. Above all, you'll need to define this in
<link linkend="pcm-interface-operators-open-callback"><citetitle> <link linkend="pcm-interface-operators-open-callback"><citetitle>
...@@ -2267,7 +2259,7 @@ struct _snd_pcm_runtime { ...@@ -2267,7 +2259,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
... ...
runtime->hw = snd_mychip_playback_hw; /* common definition */ runtime->hw = snd_mychip_playback_hw; /* common definition */
if (chip->model == VERY_OLD_ONE) if (chip->model == VERY_OLD_ONE)
...@@ -2282,7 +2274,7 @@ struct _snd_pcm_runtime { ...@@ -2282,7 +2274,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static snd_pcm_hardware_t snd_mychip_playback_hw = { static struct snd_pcm_hardware snd_mychip_playback_hw = {
.info = (SNDRV_PCM_INFO_MMAP | .info = (SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_BLOCK_TRANSFER |
...@@ -2512,7 +2504,7 @@ struct _snd_pcm_runtime { ...@@ -2512,7 +2504,7 @@ struct _snd_pcm_runtime {
<title>Running Status</title> <title>Running Status</title>
<para> <para>
The running status can be referred via <constant>runtime-&gt;status</constant>. The running status can be referred via <constant>runtime-&gt;status</constant>.
This is the pointer to <type>snd_pcm_mmap_status_t</type> This is the pointer to struct <structname>snd_pcm_mmap_status</structname>
record. For example, you can get the current DMA hardware record. For example, you can get the current DMA hardware
pointer via <constant>runtime-&gt;status-&gt;hw_ptr</constant>. pointer via <constant>runtime-&gt;status-&gt;hw_ptr</constant>.
</para> </para>
...@@ -2520,7 +2512,7 @@ struct _snd_pcm_runtime { ...@@ -2520,7 +2512,7 @@ struct _snd_pcm_runtime {
<para> <para>
The DMA application pointer can be referred via The DMA application pointer can be referred via
<constant>runtime-&gt;control</constant>, which points <constant>runtime-&gt;control</constant>, which points
<type>snd_pcm_mmap_control_t</type> record. struct <structname>snd_pcm_mmap_control</structname> record.
However, accessing directly to this value is not recommended. However, accessing directly to this value is not recommended.
</para> </para>
</section> </section>
...@@ -2542,9 +2534,9 @@ struct _snd_pcm_runtime { ...@@ -2542,9 +2534,9 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_xxx_open(snd_pcm_substream_t *substream) static int snd_xxx_open(struct snd_pcm_substream *substream)
{ {
my_pcm_data_t *data; struct my_pcm_data *data;
.... ....
data = kmalloc(sizeof(*data), GFP_KERNEL); data = kmalloc(sizeof(*data), GFP_KERNEL);
substream->runtime->private_data = data; substream->runtime->private_data = data;
...@@ -2586,7 +2578,7 @@ struct _snd_pcm_runtime { ...@@ -2586,7 +2578,7 @@ struct _snd_pcm_runtime {
<para> <para>
The callback function takes at least the argument with The callback function takes at least the argument with
<type>snd_pcm_substream_t</type> pointer. For retrieving the <structname>snd_pcm_substream</structname> pointer. For retrieving the
chip record from the given substream instance, you can use the chip record from the given substream instance, you can use the
following macro. following macro.
...@@ -2594,7 +2586,7 @@ struct _snd_pcm_runtime { ...@@ -2594,7 +2586,7 @@ struct _snd_pcm_runtime {
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
int xxx() { int xxx() {
mychip_t *chip = snd_pcm_substream_chip(substream); struct mychip *chip = snd_pcm_substream_chip(substream);
.... ....
} }
]]> ]]>
...@@ -2616,7 +2608,7 @@ struct _snd_pcm_runtime { ...@@ -2616,7 +2608,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_xxx_open(snd_pcm_substream_t *substream); static int snd_xxx_open(struct snd_pcm_substream *substream);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -2631,10 +2623,10 @@ struct _snd_pcm_runtime { ...@@ -2631,10 +2623,10 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_xxx_open(snd_pcm_substream_t *substream) static int snd_xxx_open(struct snd_pcm_substream *substream)
{ {
mychip_t *chip = snd_pcm_substream_chip(substream); struct mychip *chip = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
runtime->hw = snd_mychip_playback_hw; runtime->hw = snd_mychip_playback_hw;
return 0; return 0;
...@@ -2667,7 +2659,7 @@ struct _snd_pcm_runtime { ...@@ -2667,7 +2659,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_xxx_close(snd_pcm_substream_t *substream); static int snd_xxx_close(struct snd_pcm_substream *substream);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -2682,7 +2674,7 @@ struct _snd_pcm_runtime { ...@@ -2682,7 +2674,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_xxx_close(snd_pcm_substream_t *substream) static int snd_xxx_close(struct snd_pcm_substream *substream)
{ {
.... ....
kfree(substream->runtime->private_data); kfree(substream->runtime->private_data);
...@@ -2709,8 +2701,8 @@ struct _snd_pcm_runtime { ...@@ -2709,8 +2701,8 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_xxx_hw_params(snd_pcm_substream_t * substream, static int snd_xxx_hw_params(struct snd_pcm_substream *substream,
snd_pcm_hw_params_t * hw_params); struct snd_pcm_hw_params *hw_params);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -2785,7 +2777,7 @@ struct _snd_pcm_runtime { ...@@ -2785,7 +2777,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_xxx_hw_free(snd_pcm_substream_t * substream); static int snd_xxx_hw_free(struct snd_pcm_substream *substream);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -2820,7 +2812,7 @@ struct _snd_pcm_runtime { ...@@ -2820,7 +2812,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_xxx_prepare(snd_pcm_substream_t * substream); static int snd_xxx_prepare(struct snd_pcm_substream *substream);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -2869,7 +2861,7 @@ struct _snd_pcm_runtime { ...@@ -2869,7 +2861,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_xxx_trigger(snd_pcm_substream_t * substream, int cmd); static int snd_xxx_trigger(struct snd_pcm_substream *substream, int cmd);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -2939,7 +2931,7 @@ struct _snd_pcm_runtime { ...@@ -2939,7 +2931,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static snd_pcm_uframes_t snd_xxx_pointer(snd_pcm_substream_t * substream) static snd_pcm_uframes_t snd_xxx_pointer(struct snd_pcm_substream *substream)
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -3067,7 +3059,7 @@ struct _snd_pcm_runtime { ...@@ -3067,7 +3059,7 @@ struct _snd_pcm_runtime {
static irqreturn_t snd_mychip_interrupt(int irq, void *dev_id, static irqreturn_t snd_mychip_interrupt(int irq, void *dev_id,
struct pt_regs *regs) struct pt_regs *regs)
{ {
mychip_t *chip = dev_id; struct mychip *chip = dev_id;
spin_lock(&chip->lock); spin_lock(&chip->lock);
.... ....
if (pcm_irq_invoked(chip)) { if (pcm_irq_invoked(chip)) {
...@@ -3111,7 +3103,7 @@ struct _snd_pcm_runtime { ...@@ -3111,7 +3103,7 @@ struct _snd_pcm_runtime {
static irqreturn_t snd_mychip_interrupt(int irq, void *dev_id, static irqreturn_t snd_mychip_interrupt(int irq, void *dev_id,
struct pt_regs *regs) struct pt_regs *regs)
{ {
mychip_t *chip = dev_id; struct mychip *chip = dev_id;
spin_lock(&chip->lock); spin_lock(&chip->lock);
.... ....
if (pcm_irq_invoked(chip)) { if (pcm_irq_invoked(chip)) {
...@@ -3221,13 +3213,13 @@ struct _snd_pcm_runtime { ...@@ -3221,13 +3213,13 @@ struct _snd_pcm_runtime {
<![CDATA[ <![CDATA[
static unsigned int rates[] = static unsigned int rates[] =
{4000, 10000, 22050, 44100}; {4000, 10000, 22050, 44100};
static snd_pcm_hw_constraint_list_t constraints_rates = { static struct snd_pcm_hw_constraint_list constraints_rates = {
.count = ARRAY_SIZE(rates), .count = ARRAY_SIZE(rates),
.list = rates, .list = rates,
.mask = 0, .mask = 0,
}; };
static int snd_mychip_pcm_open(snd_pcm_substream_t *substream) static int snd_mychip_pcm_open(struct snd_pcm_substream *substream)
{ {
int err; int err;
.... ....
...@@ -3249,19 +3241,20 @@ struct _snd_pcm_runtime { ...@@ -3249,19 +3241,20 @@ struct _snd_pcm_runtime {
You can even define your own constraint rules. You can even define your own constraint rules.
For example, let's suppose my_chip can manage a substream of 1 channel For example, let's suppose my_chip can manage a substream of 1 channel
if and only if the format is S16_LE, otherwise it supports any format if and only if the format is S16_LE, otherwise it supports any format
specified in the <type>snd_pcm_hardware_t</type> stucture (or in any specified in the <structname>snd_pcm_hardware</structname> stucture (or in any
other constraint_list). You can build a rule like this: other constraint_list). You can build a rule like this:
<example> <example>
<title>Example of Hardware Constraints for Channels</title> <title>Example of Hardware Constraints for Channels</title>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int hw_rule_format_by_channels(snd_pcm_hw_params_t *params, static int hw_rule_format_by_channels(struct snd_pcm_hw_params *params,
snd_pcm_hw_rule_t *rule) struct snd_pcm_hw_rule *rule)
{ {
snd_interval_t *c = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); struct snd_interval *c = hw_param_interval(params,
snd_mask_t *f = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); SNDRV_PCM_HW_PARAM_CHANNELS);
snd_mask_t fmt; struct snd_mask *f = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
struct snd_mask fmt;
snd_mask_any(&fmt); /* Init the struct */ snd_mask_any(&fmt); /* Init the struct */
if (c->min < 2) { if (c->min < 2) {
...@@ -3298,12 +3291,13 @@ struct _snd_pcm_runtime { ...@@ -3298,12 +3291,13 @@ struct _snd_pcm_runtime {
<title>Example of Hardware Constraints for Channels</title> <title>Example of Hardware Constraints for Channels</title>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int hw_rule_channels_by_format(snd_pcm_hw_params_t *params, static int hw_rule_channels_by_format(struct snd_pcm_hw_params *params,
snd_pcm_hw_rule_t *rule) struct snd_pcm_hw_rule *rule)
{ {
snd_interval_t *c = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); struct snd_interval *c = hw_param_interval(params,
snd_mask_t *f = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); SNDRV_PCM_HW_PARAM_CHANNELS);
snd_interval_t ch; struct snd_mask *f = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
struct snd_interval ch;
snd_interval_any(&ch); snd_interval_any(&ch);
if (f->bits[0] == SNDRV_PCM_FMTBIT_S16_LE) { if (f->bits[0] == SNDRV_PCM_FMTBIT_S16_LE) {
...@@ -3376,13 +3370,13 @@ struct _snd_pcm_runtime { ...@@ -3376,13 +3370,13 @@ struct _snd_pcm_runtime {
callbacks: <structfield>info</structfield>, callbacks: <structfield>info</structfield>,
<structfield>get</structfield> and <structfield>get</structfield> and
<structfield>put</structfield>. Then, define a <structfield>put</structfield>. Then, define a
<type>snd_kcontrol_new_t</type> record, such as: struct <structname>snd_kcontrol_new</structname> record, such as:
<example> <example>
<title>Definition of a Control</title> <title>Definition of a Control</title>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static snd_kcontrol_new_t my_control __devinitdata = { static struct snd_kcontrol_new my_control __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "PCM Playback Switch", .name = "PCM Playback Switch",
.index = 0, .index = 0,
...@@ -3599,7 +3593,7 @@ struct _snd_pcm_runtime { ...@@ -3599,7 +3593,7 @@ struct _snd_pcm_runtime {
<para> <para>
The <structfield>info</structfield> callback is used to get The <structfield>info</structfield> callback is used to get
the detailed information of this control. This must store the the detailed information of this control. This must store the
values of the given <type>snd_ctl_elem_info_t</type> values of the given struct <structname>snd_ctl_elem_info</structname>
object. For example, for a boolean control with a single object. For example, for a boolean control with a single
element will be: element will be:
...@@ -3607,8 +3601,8 @@ struct _snd_pcm_runtime { ...@@ -3607,8 +3601,8 @@ struct _snd_pcm_runtime {
<title>Example of info callback</title> <title>Example of info callback</title>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_myctl_info(snd_kcontrol_t *kcontrol, static int snd_myctl_info(struct snd_kcontrol *kcontrol,
snd_ctl_elem_info_t *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->count = 1; uinfo->count = 1;
...@@ -3642,8 +3636,8 @@ struct _snd_pcm_runtime { ...@@ -3642,8 +3636,8 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_myctl_info(snd_kcontrol_t *kcontrol, static int snd_myctl_info(struct snd_kcontrol *kcontrol,
snd_ctl_elem_info_t *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[4] = { static char *texts[4] = {
"First", "Second", "Third", "Fourth" "First", "Second", "Third", "Fourth"
...@@ -3678,10 +3672,10 @@ struct _snd_pcm_runtime { ...@@ -3678,10 +3672,10 @@ struct _snd_pcm_runtime {
<title>Example of get callback</title> <title>Example of get callback</title>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_myctl_get(snd_kcontrol_t *kcontrol, static int snd_myctl_get(struct snd_kcontrol *kcontrol,
snd_ctl_elem_value_t *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
mychip_t *chip = snd_kcontrol_chip(kcontrol); struct mychip *chip = snd_kcontrol_chip(kcontrol);
ucontrol->value.integer.value[0] = get_some_value(chip); ucontrol->value.integer.value[0] = get_some_value(chip);
return 0; return 0;
} }
...@@ -3717,8 +3711,8 @@ struct _snd_pcm_runtime { ...@@ -3717,8 +3711,8 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_sbmixer_get_single(snd_kcontrol_t *kcontrol, static int snd_sbmixer_get_single(struct snd_kcontrol *kcontrol,
snd_ctl_elem_value_t *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
int reg = kcontrol->private_value & 0xff; int reg = kcontrol->private_value & 0xff;
int shift = (kcontrol->private_value >> 16) & 0xff; int shift = (kcontrol->private_value >> 16) & 0xff;
...@@ -3754,10 +3748,10 @@ struct _snd_pcm_runtime { ...@@ -3754,10 +3748,10 @@ struct _snd_pcm_runtime {
<title>Example of put callback</title> <title>Example of put callback</title>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_myctl_put(snd_kcontrol_t *kcontrol, static int snd_myctl_put(struct snd_kcontrol *kcontrol,
snd_ctl_elem_value_t *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
mychip_t *chip = snd_kcontrol_chip(kcontrol); struct mychip *chip = snd_kcontrol_chip(kcontrol);
int changed = 0; int changed = 0;
if (chip->current_value != if (chip->current_value !=
ucontrol->value.integer.value[0]) { ucontrol->value.integer.value[0]) {
...@@ -3814,7 +3808,7 @@ struct _snd_pcm_runtime { ...@@ -3814,7 +3808,7 @@ struct _snd_pcm_runtime {
</informalexample> </informalexample>
where <parameter>my_control</parameter> is the where <parameter>my_control</parameter> is the
<type>snd_kcontrol_new_t</type> object defined above, and chip struct <structname>snd_kcontrol_new</structname> object defined above, and chip
is the object pointer to be passed to is the object pointer to be passed to
kcontrol-&gt;private_data kcontrol-&gt;private_data
which can be referred in callbacks. which can be referred in callbacks.
...@@ -3822,7 +3816,7 @@ struct _snd_pcm_runtime { ...@@ -3822,7 +3816,7 @@ struct _snd_pcm_runtime {
<para> <para>
<function>snd_ctl_new1()</function> allocates a new <function>snd_ctl_new1()</function> allocates a new
<type>snd_kcontrol_t</type> instance (that's why the definition <structname>snd_kcontrol</structname> instance (that's why the definition
of <parameter>my_control</parameter> can be with of <parameter>my_control</parameter> can be with
<parameter>__devinitdata</parameter> <parameter>__devinitdata</parameter>
prefix), and <function>snd_ctl_add</function> assigns the given prefix), and <function>snd_ctl_add</function> assigns the given
...@@ -3849,7 +3843,7 @@ struct _snd_pcm_runtime { ...@@ -3849,7 +3843,7 @@ struct _snd_pcm_runtime {
control id pointer for the notification. The event-mask control id pointer for the notification. The event-mask
specifies the types of notification, for example, in the above specifies the types of notification, for example, in the above
example, the change of control values is notified. example, the change of control values is notified.
The id pointer is the pointer of <type>snd_ctl_elem_id_t</type> The id pointer is the pointer of struct <structname>snd_ctl_elem_id</structname>
to be notified. to be notified.
You can find some examples in <filename>es1938.c</filename> or You can find some examples in <filename>es1938.c</filename> or
<filename>es1968.c</filename> for hardware volume interrupts. <filename>es1968.c</filename> for hardware volume interrupts.
...@@ -3882,35 +3876,35 @@ struct _snd_pcm_runtime { ...@@ -3882,35 +3876,35 @@ struct _snd_pcm_runtime {
<title>Example of AC97 Interface</title> <title>Example of AC97 Interface</title>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
struct snd_mychip { struct mychip {
.... ....
ac97_t *ac97; struct snd_ac97 *ac97;
.... ....
}; };
static unsigned short snd_mychip_ac97_read(ac97_t *ac97, static unsigned short snd_mychip_ac97_read(struct snd_ac97 *ac97,
unsigned short reg) unsigned short reg)
{ {
mychip_t *chip = ac97->private_data; struct mychip *chip = ac97->private_data;
.... ....
// read a register value here from the codec // read a register value here from the codec
return the_register_value; return the_register_value;
} }
static void snd_mychip_ac97_write(ac97_t *ac97, static void snd_mychip_ac97_write(struct snd_ac97 *ac97,
unsigned short reg, unsigned short val) unsigned short reg, unsigned short val)
{ {
mychip_t *chip = ac97->private_data; struct mychip *chip = ac97->private_data;
.... ....
// write the given register value to the codec // write the given register value to the codec
} }
static int snd_mychip_ac97(mychip_t *chip) static int snd_mychip_ac97(struct mychip *chip)
{ {
ac97_bus_t *bus; struct snd_ac97_bus *bus;
ac97_template_t ac97; struct snd_ac97_template ac97;
int err; int err;
static ac97_bus_ops_t ops = { static struct snd_ac97_bus_ops ops = {
.write = snd_mychip_ac97_write, .write = snd_mychip_ac97_write,
.read = snd_mychip_ac97_read, .read = snd_mychip_ac97_read,
}; };
...@@ -3937,8 +3931,8 @@ struct _snd_pcm_runtime { ...@@ -3937,8 +3931,8 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
ac97_bus_t *bus; struct snd_ac97_bus *bus;
static ac97_bus_ops_t ops = { static struct snd_ac97_bus_ops ops = {
.write = snd_mychip_ac97_write, .write = snd_mychip_ac97_write,
.read = snd_mychip_ac97_read, .read = snd_mychip_ac97_read,
}; };
...@@ -3952,13 +3946,14 @@ struct _snd_pcm_runtime { ...@@ -3952,13 +3946,14 @@ struct _snd_pcm_runtime {
</para> </para>
<para> <para>
And then call <function>snd_ac97_mixer()</function> with an <type>ac97_template_t</type> And then call <function>snd_ac97_mixer()</function> with an
struct <structname>snd_ac97_template</structname>
record together with the bus pointer created above. record together with the bus pointer created above.
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
ac97_template_t ac97; struct snd_ac97_template ac97;
int err; int err;
memset(&ac97, 0, sizeof(ac97)); memset(&ac97, 0, sizeof(ac97));
...@@ -3995,10 +3990,10 @@ struct _snd_pcm_runtime { ...@@ -3995,10 +3990,10 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static unsigned short snd_mychip_ac97_read(ac97_t *ac97, static unsigned short snd_mychip_ac97_read(struct snd_ac97 *ac97,
unsigned short reg) unsigned short reg)
{ {
mychip_t *chip = ac97->private_data; struct mychip *chip = ac97->private_data;
.... ....
return the_register_value; return the_register_value;
} }
...@@ -4016,7 +4011,7 @@ struct _snd_pcm_runtime { ...@@ -4016,7 +4011,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static void snd_mychip_ac97_write(ac97_t *ac97, static void snd_mychip_ac97_write(struct snd_ac97 *ac97,
unsigned short reg, unsigned short val) unsigned short reg, unsigned short val)
]]> ]]>
</programlisting> </programlisting>
...@@ -4163,7 +4158,7 @@ struct _snd_pcm_runtime { ...@@ -4163,7 +4158,7 @@ struct _snd_pcm_runtime {
<title>Multiple Codecs</title> <title>Multiple Codecs</title>
<para> <para>
When there are several codecs on the same card, you need to When there are several codecs on the same card, you need to
call <function>snd_ac97_new()</function> multiple times with call <function>snd_ac97_mixer()</function> multiple times with
ac97.num=1 or greater. The <structfield>num</structfield> field ac97.num=1 or greater. The <structfield>num</structfield> field
specifies the codec specifies the codec
number. number.
...@@ -4212,7 +4207,7 @@ struct _snd_pcm_runtime { ...@@ -4212,7 +4207,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
snd_rawmidi_t *rmidi; struct snd_rawmidi *rmidi;
snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port, integrated, snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port, integrated,
irq, irq_flags, &rmidi); irq, irq_flags, &rmidi);
]]> ]]>
...@@ -4253,17 +4248,17 @@ struct _snd_pcm_runtime { ...@@ -4253,17 +4248,17 @@ struct _snd_pcm_runtime {
Usually, the port address corresponds to the command port and Usually, the port address corresponds to the command port and
port + 1 corresponds to the data port. If not, you may change port + 1 corresponds to the data port. If not, you may change
the <structfield>cport</structfield> field of the <structfield>cport</structfield> field of
<type>mpu401_t</type> manually struct <structname>snd_mpu401</structname> manually
afterward. However, <type>mpu401_t</type> pointer is not afterward. However, <structname>snd_mpu401</structname> pointer is not
returned explicitly by returned explicitly by
<function>snd_mpu401_uart_new()</function>. You need to cast <function>snd_mpu401_uart_new()</function>. You need to cast
rmidi-&gt;private_data to rmidi-&gt;private_data to
<type>mpu401_t</type> explicitly, <structname>snd_mpu401</structname> explicitly,
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
mpu401_t *mpu; struct snd_mpu401 *mpu;
mpu = rmidi->private_data; mpu = rmidi->private_data;
]]> ]]>
</programlisting> </programlisting>
...@@ -4359,7 +4354,7 @@ struct _snd_pcm_runtime { ...@@ -4359,7 +4354,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
snd_rawmidi_t *rmidi; struct snd_rawmidi *rmidi;
err = snd_rawmidi_new(chip->card, "MyMIDI", 0, outs, ins, &rmidi); err = snd_rawmidi_new(chip->card, "MyMIDI", 0, outs, ins, &rmidi);
if (err < 0) if (err < 0)
return err; return err;
...@@ -4419,7 +4414,7 @@ struct _snd_pcm_runtime { ...@@ -4419,7 +4414,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static snd_rawmidi_ops_t snd_mymidi_output_ops = { static struct snd_rawmidi_ops snd_mymidi_output_ops = {
.open = snd_mymidi_output_open, .open = snd_mymidi_output_open,
.close = snd_mymidi_output_close, .close = snd_mymidi_output_close,
.trigger = snd_mymidi_output_trigger, .trigger = snd_mymidi_output_trigger,
...@@ -4439,9 +4434,9 @@ struct _snd_pcm_runtime { ...@@ -4439,9 +4434,9 @@ struct _snd_pcm_runtime {
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
struct list_head *list; struct list_head *list;
snd_rawmidi_substream_t *substream; struct snd_rawmidi_substream *substream;
list_for_each(list, &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams) { list_for_each(list, &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams) {
substream = list_entry(list, snd_rawmidi_substream_t, list); substream = list_entry(list, struct snd_rawmidi_substream, list);
sprintf(substream->name, "My MIDI Port %d", substream->number + 1); sprintf(substream->name, "My MIDI Port %d", substream->number + 1);
} }
/* same for SNDRV_RAWMIDI_STREAM_INPUT */ /* same for SNDRV_RAWMIDI_STREAM_INPUT */
...@@ -4463,12 +4458,12 @@ struct _snd_pcm_runtime { ...@@ -4463,12 +4458,12 @@ struct _snd_pcm_runtime {
<para> <para>
If there is more than one port, your callbacks can determine the If there is more than one port, your callbacks can determine the
port index from the snd_rawmidi_substream_t data passed to each port index from the struct snd_rawmidi_substream data passed to each
callback: callback:
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
snd_rawmidi_substream_t *substream; struct snd_rawmidi_substream *substream;
int index = substream->number; int index = substream->number;
]]> ]]>
</programlisting> </programlisting>
...@@ -4481,7 +4476,7 @@ struct _snd_pcm_runtime { ...@@ -4481,7 +4476,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_xxx_open(snd_rawmidi_substream_t *substream); static int snd_xxx_open(struct snd_rawmidi_substream *substream);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -4499,7 +4494,7 @@ struct _snd_pcm_runtime { ...@@ -4499,7 +4494,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int snd_xxx_close(snd_rawmidi_substream_t *substream); static int snd_xxx_close(struct snd_rawmidi_substream *substream);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -4522,7 +4517,7 @@ struct _snd_pcm_runtime { ...@@ -4522,7 +4517,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static void snd_xxx_output_trigger(snd_rawmidi_substream_t *substream, int up); static void snd_xxx_output_trigger(struct snd_rawmidi_substream *substream, int up);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -4547,7 +4542,7 @@ struct _snd_pcm_runtime { ...@@ -4547,7 +4542,7 @@ struct _snd_pcm_runtime {
<![CDATA[ <![CDATA[
unsigned char data; unsigned char data;
while (snd_rawmidi_transmit_peek(substream, &data, 1) == 1) { while (snd_rawmidi_transmit_peek(substream, &data, 1) == 1) {
if (mychip_try_to_transmit(data)) if (snd_mychip_try_to_transmit(data))
snd_rawmidi_transmit_ack(substream, 1); snd_rawmidi_transmit_ack(substream, 1);
else else
break; /* hardware FIFO full */ break; /* hardware FIFO full */
...@@ -4564,11 +4559,11 @@ struct _snd_pcm_runtime { ...@@ -4564,11 +4559,11 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
while (mychip_transmit_possible()) { while (snd_mychip_transmit_possible()) {
unsigned char data; unsigned char data;
if (snd_rawmidi_transmit(substream, &data, 1) != 1) if (snd_rawmidi_transmit(substream, &data, 1) != 1)
break; /* no more data */ break; /* no more data */
mychip_transmit(data); snd_mychip_transmit(data);
} }
]]> ]]>
</programlisting> </programlisting>
...@@ -4603,7 +4598,7 @@ struct _snd_pcm_runtime { ...@@ -4603,7 +4598,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static void snd_xxx_input_trigger(snd_rawmidi_substream_t *substream, int up); static void snd_xxx_input_trigger(struct snd_rawmidi_substream *substream, int up);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -4647,7 +4642,7 @@ struct _snd_pcm_runtime { ...@@ -4647,7 +4642,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static void snd_xxx_drain(snd_rawmidi_substream_t *substream); static void snd_xxx_drain(struct snd_rawmidi_substream *substream);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -4661,7 +4656,7 @@ struct _snd_pcm_runtime { ...@@ -4661,7 +4656,7 @@ struct _snd_pcm_runtime {
<para> <para>
This callback is optional. If you do not set This callback is optional. If you do not set
<structfield>drain</structfield> in the snd_rawmidi_ops_t <structfield>drain</structfield> in the struct snd_rawmidi_ops
structure, ALSA will simply wait for 50&nbsp;milliseconds structure, ALSA will simply wait for 50&nbsp;milliseconds
instead. instead.
</para> </para>
...@@ -4703,7 +4698,7 @@ struct _snd_pcm_runtime { ...@@ -4703,7 +4698,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
opl3_t *opl3; struct snd_opl3 *opl3;
snd_opl3_create(card, lport, rport, OPL3_HW_OPL3_XXX, snd_opl3_create(card, lport, rport, OPL3_HW_OPL3_XXX,
integrated, &opl3); integrated, &opl3);
]]> ]]>
...@@ -4736,7 +4731,7 @@ struct _snd_pcm_runtime { ...@@ -4736,7 +4731,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
opl3_t *opl3; struct snd_opl3 *opl3;
snd_opl3_new(card, OPL3_HW_OPL3_XXX, &opl3); snd_opl3_new(card, OPL3_HW_OPL3_XXX, &opl3);
]]> ]]>
</programlisting> </programlisting>
...@@ -4767,7 +4762,7 @@ struct _snd_pcm_runtime { ...@@ -4767,7 +4762,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
snd_hwdep_t *opl3hwdep; struct snd_hwdep *opl3hwdep;
snd_opl3_hwdep_new(opl3, 0, 1, &opl3hwdep); snd_opl3_hwdep_new(opl3, 0, 1, &opl3hwdep);
]]> ]]>
</programlisting> </programlisting>
...@@ -4804,7 +4799,7 @@ struct _snd_pcm_runtime { ...@@ -4804,7 +4799,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
snd_hwdep_t *hw; struct snd_hwdep *hw;
snd_hwdep_new(card, "My HWDEP", 0, &hw); snd_hwdep_new(card, "My HWDEP", 0, &hw);
]]> ]]>
</programlisting> </programlisting>
...@@ -4823,7 +4818,7 @@ struct _snd_pcm_runtime { ...@@ -4823,7 +4818,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
mydata_t *p = kmalloc(sizeof(*p), GFP_KERNEL); struct mydata *p = kmalloc(sizeof(*p), GFP_KERNEL);
hw->private_data = p; hw->private_data = p;
hw->private_free = mydata_free; hw->private_free = mydata_free;
]]> ]]>
...@@ -4835,9 +4830,9 @@ struct _snd_pcm_runtime { ...@@ -4835,9 +4830,9 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static void mydata_free(snd_hwdep_t *hw) static void mydata_free(struct snd_hwdep *hw)
{ {
mydata_t *p = hw->private_data; struct mydata *p = hw->private_data;
kfree(p); kfree(p);
} }
]]> ]]>
...@@ -5061,9 +5056,9 @@ struct _snd_pcm_runtime { ...@@ -5061,9 +5056,9 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int playback_copy(snd_pcm_substream_t *substream, int channel, static int playback_copy(struct snd_pcm_substream *substream, int channel,
snd_pcm_uframes_t pos, void *src, snd_pcm_uframes_t count); snd_pcm_uframes_t pos, void *src, snd_pcm_uframes_t count);
static int capture_copy(snd_pcm_substream_t *substream, int channel, static int capture_copy(struct snd_pcm_substream *substream, int channel,
snd_pcm_uframes_t pos, void *dst, snd_pcm_uframes_t count); snd_pcm_uframes_t pos, void *dst, snd_pcm_uframes_t count);
]]> ]]>
</programlisting> </programlisting>
...@@ -5144,7 +5139,7 @@ struct _snd_pcm_runtime { ...@@ -5144,7 +5139,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int silence(snd_pcm_substream_t *substream, int channel, static int silence(struct snd_pcm_substream *substream, int channel,
snd_pcm_uframes_t pos, snd_pcm_uframes_t count); snd_pcm_uframes_t pos, snd_pcm_uframes_t count);
]]> ]]>
</programlisting> </programlisting>
...@@ -5211,7 +5206,7 @@ struct _snd_pcm_runtime { ...@@ -5211,7 +5206,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
snd_pcm_sgbuf_t *sgbuf = (snd_pcm_sgbuf_t*)substream->dma_private; struct snd_sg_buf *sgbuf = (struct snd_sg_buf_t*)substream->dma_private;
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -5266,7 +5261,7 @@ struct _snd_pcm_runtime { ...@@ -5266,7 +5261,7 @@ struct _snd_pcm_runtime {
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
/* get the physical page pointer on the given offset */ /* get the physical page pointer on the given offset */
static struct page *mychip_page(snd_pcm_substream_t *substream, static struct page *mychip_page(struct snd_pcm_substream *substream,
unsigned long offset) unsigned long offset)
{ {
void *pageptr = substream->runtime->dma_area + offset; void *pageptr = substream->runtime->dma_area + offset;
...@@ -5301,7 +5296,7 @@ struct _snd_pcm_runtime { ...@@ -5301,7 +5296,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
snd_info_entry_t *entry; struct snd_info_entry *entry;
int err = snd_card_proc_new(card, "my-file", &entry); int err = snd_card_proc_new(card, "my-file", &entry);
]]> ]]>
</programlisting> </programlisting>
...@@ -5345,8 +5340,8 @@ struct _snd_pcm_runtime { ...@@ -5345,8 +5340,8 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static void my_proc_read(snd_info_entry_t *entry, static void my_proc_read(struct snd_info_entry *entry,
snd_info_buffer_t *buffer); struct snd_info_buffer *buffer);
]]> ]]>
</programlisting> </programlisting>
</informalexample> </informalexample>
...@@ -5361,10 +5356,10 @@ struct _snd_pcm_runtime { ...@@ -5361,10 +5356,10 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static void my_proc_read(snd_info_entry_t *entry, static void my_proc_read(struct snd_info_entry *entry,
snd_info_buffer_t *buffer) struct snd_info_buffer *buffer)
{ {
chip_t *chip = entry->private_data; struct my_chip *chip = entry->private_data;
snd_iprintf(buffer, "This is my chip!\n"); snd_iprintf(buffer, "This is my chip!\n");
snd_iprintf(buffer, "Port = %ld\n", chip->port); snd_iprintf(buffer, "Port = %ld\n", chip->port);
...@@ -5453,7 +5448,7 @@ struct _snd_pcm_runtime { ...@@ -5453,7 +5448,7 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static long my_file_io_read(snd_info_entry_t *entry, static long my_file_io_read(struct snd_info_entry *entry,
void *file_private_data, void *file_private_data,
struct file *file, struct file *file,
char *buf, char *buf,
...@@ -5496,12 +5491,12 @@ struct _snd_pcm_runtime { ...@@ -5496,12 +5491,12 @@ struct _snd_pcm_runtime {
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int snd_my_suspend(snd_card_t *card, pm_message_t state) static int snd_my_suspend(struct snd_card *card, pm_message_t state)
{ {
.... // do things for suspsend .... // do things for suspsend
return 0; return 0;
} }
static int snd_my_resume(snd_card_t *card) static int snd_my_resume(struct snd_card *card)
{ {
.... // do things for suspsend .... // do things for suspsend
return 0; return 0;
...@@ -5530,10 +5525,10 @@ struct _snd_pcm_runtime { ...@@ -5530,10 +5525,10 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static int mychip_suspend(snd_card_t *card, pm_message_t state) static int mychip_suspend(struct snd_card *card, pm_message_t state)
{ {
/* (1) */ /* (1) */
mychip_t *chip = card->pm_private_data; struct mychip *chip = card->pm_private_data;
/* (2) */ /* (2) */
snd_pcm_suspend_all(chip->pcm); snd_pcm_suspend_all(chip->pcm);
/* (3) */ /* (3) */
...@@ -5570,10 +5565,10 @@ struct _snd_pcm_runtime { ...@@ -5570,10 +5565,10 @@ struct _snd_pcm_runtime {
<informalexample> <informalexample>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
static void mychip_resume(mychip_t *chip) static void mychip_resume(struct mychip *chip)
{ {
/* (1) */ /* (1) */
mychip_t *chip = card->pm_private_data; struct mychip *chip = card->pm_private_data;
/* (2) */ /* (2) */
pci_enable_device(chip->pci); pci_enable_device(chip->pci);
/* (3) */ /* (3) */
...@@ -5602,8 +5597,8 @@ struct _snd_pcm_runtime { ...@@ -5602,8 +5597,8 @@ struct _snd_pcm_runtime {
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)
{ {
.... ....
snd_card_t *card; struct snd_card *card;
mychip_t *chip; struct mychip *chip;
.... ....
snd_card_set_pm_callback(card, snd_my_suspend, snd_my_resume, chip); snd_card_set_pm_callback(card, snd_my_suspend, snd_my_resume, chip);
.... ....
......
Documentation/sound/alsa/hda_codec.txt
View file @ 446ab5f5
...@@ -63,7 +63,7 @@ The bus instance is created via snd_hda_bus_new(). You need to pass ...@@ -63,7 +63,7 @@ The bus instance is created via snd_hda_bus_new(). You need to pass
the card instance, the template, and the pointer to store the the card instance, the template, and the pointer to store the
resultant bus instance. resultant bus instance.
int snd_hda_bus_new(snd_card_t *card, const struct hda_bus_template *temp, int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,
struct hda_bus **busp); struct hda_bus **busp);
It returns zero if successful. A negative return value means any It returns zero if successful. A negative return value means any
...@@ -166,14 +166,14 @@ The ops field contains the following callback functions: ...@@ -166,14 +166,14 @@ The ops field contains the following callback functions:
struct hda_pcm_ops { struct hda_pcm_ops {
int (*open)(struct hda_pcm_stream *info, struct hda_codec *codec, int (*open)(struct hda_pcm_stream *info, struct hda_codec *codec,
snd_pcm_substream_t *substream); struct snd_pcm_substream *substream);
int (*close)(struct hda_pcm_stream *info, struct hda_codec *codec, int (*close)(struct hda_pcm_stream *info, struct hda_codec *codec,
snd_pcm_substream_t *substream); struct snd_pcm_substream *substream);
int (*prepare)(struct hda_pcm_stream *info, struct hda_codec *codec, int (*prepare)(struct hda_pcm_stream *info, struct hda_codec *codec,
unsigned int stream_tag, unsigned int format, unsigned int stream_tag, unsigned int format,
snd_pcm_substream_t *substream); struct snd_pcm_substream *substream);
int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec, int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,
snd_pcm_substream_t *substream); struct snd_pcm_substream *substream);
}; };
All are non-NULL, so you can call them safely without NULL check. All are non-NULL, so you can call them safely without NULL check.
...@@ -284,7 +284,7 @@ parameter, and PCI subsystem IDs. If the matching entry is found, it ...@@ -284,7 +284,7 @@ parameter, and PCI subsystem IDs. If the matching entry is found, it
returns the config field value. returns the config field value.
snd_hda_add_new_ctls() can be used to create and add control entries. snd_hda_add_new_ctls() can be used to create and add control entries.
Pass the zero-terminated array of snd_kcontrol_new_t. The same array Pass the zero-terminated array of struct snd_kcontrol_new. The same array
can be passed to snd_hda_resume_ctls() for resume. can be passed to snd_hda_resume_ctls() for resume.
Note that this will call control->put callback of these entries. So, Note that this will call control->put callback of these entries. So,
put callback should check codec->in_resume and force to restore the put callback should check codec->in_resume and force to restore the
...@@ -292,7 +292,7 @@ given value if it's non-zero even if the value is identical with the ...@@ -292,7 +292,7 @@ given value if it's non-zero even if the value is identical with the
cached value. cached value.
Macros HDA_CODEC_VOLUME(), HDA_CODEC_MUTE() and their variables can be Macros HDA_CODEC_VOLUME(), HDA_CODEC_MUTE() and their variables can be
used for the entry of snd_kcontrol_new_t. used for the entry of struct snd_kcontrol_new.
The input MUX helper callbacks for such a control are provided, too: The input MUX helper callbacks for such a control are provided, too:
snd_hda_input_mux_info() and snd_hda_input_mux_put(). See snd_hda_input_mux_info() and snd_hda_input_mux_put(). See
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7