You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'topic/misc' into for-linus
This commit is contained in:
Takashi Iwai
@@ -4264,6 +4264,13 @@ M: Tim Hockin <thockin@hockin.org>
|
||||
S: Maintained
|
||||
F: drivers/net/natsemi.c
|
||||
|
||||
NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
|
||||
M: Daniel Mack <zonque@gmail.com>
|
||||
S: Maintained
|
||||
L: alsa-devel@alsa-project.org
|
||||
W: http://www.native-instruments.com
|
||||
F: sound/usb/caiaq/
|
||||
|
||||
NCP FILESYSTEM
|
||||
M: Petr Vandrovec <petr@vandrovec.name>
|
||||
S: Odd Fixes
|
||||
|
||||
@@ -166,21 +166,6 @@ config RADIO_MAXIRADIO
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called radio-maxiradio.
|
||||
|
||||
config RADIO_MAESTRO
|
||||
tristate "Maestro on board radio"
|
||||
depends on VIDEO_V4L2 && PCI
|
||||
---help---
|
||||
Say Y here to directly support the on-board radio tuner on the
|
||||
Maestro 2 or 2E sound card.
|
||||
|
||||
In order to control your radio card, you will need to use programs
|
||||
that are compatible with the Video For Linux API. Information on
|
||||
this API and pointers to "v4l" programs may be found at
|
||||
<file:Documentation/video4linux/API.html>.
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called radio-maestro.
|
||||
|
||||
config RADIO_MIROPCM20
|
||||
tristate "miroSOUND PCM20 radio"
|
||||
depends on ISA && VIDEO_V4L2 && SND
|
||||
|
||||
@@ -16,7 +16,6 @@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o
|
||||
obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
|
||||
obj-$(CONFIG_I2C_SI4713) += si4713-i2c.o
|
||||
obj-$(CONFIG_RADIO_SI4713) += radio-si4713.o
|
||||
obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o
|
||||
obj-$(CONFIG_RADIO_MIROPCM20) += radio-miropcm20.o
|
||||
obj-$(CONFIG_USB_DSBR) += dsbr100.o
|
||||
obj-$(CONFIG_RADIO_SI470X) += si470x/
|
||||
|
||||
@@ -1,452 +0,0 @@
|
||||
/* Maestro PCI sound card radio driver for Linux support
|
||||
* (c) 2000 A. Tlalka, atlka@pg.gda.pl
|
||||
* Notes on the hardware
|
||||
*
|
||||
* + Frequency control is done digitally
|
||||
* + No volume control - only mute/unmute - you have to use Aux line volume
|
||||
* control on Maestro card to set the volume
|
||||
* + Radio status (tuned/not_tuned and stereo/mono) is valid some time after
|
||||
* frequency setting (>100ms) and only when the radio is unmuted.
|
||||
* version 0.02
|
||||
* + io port is automatically detected - only the first radio is used
|
||||
* version 0.03
|
||||
* + thread access locking additions
|
||||
* version 0.04
|
||||
* + code improvements
|
||||
* + VIDEO_TUNER_LOW is permanent
|
||||
*
|
||||
* Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/version.h> /* for KERNEL_VERSION MACRO */
|
||||
#include <linux/pci.h>
|
||||
#include <linux/videodev2.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/slab.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
|
||||
MODULE_AUTHOR("Adam Tlalka, atlka@pg.gda.pl");
|
||||
MODULE_DESCRIPTION("Radio driver for the Maestro PCI sound card radio.");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static int radio_nr = -1;
|
||||
module_param(radio_nr, int, 0);
|
||||
|
||||
#define RADIO_VERSION KERNEL_VERSION(0, 0, 6)
|
||||
#define DRIVER_VERSION "0.06"
|
||||
|
||||
#define GPIO_DATA 0x60 /* port offset from ESS_IO_BASE */
|
||||
|
||||
#define IO_MASK 4 /* mask register offset from GPIO_DATA
|
||||
bits 1=unmask write to given bit */
|
||||
#define IO_DIR 8 /* direction register offset from GPIO_DATA
|
||||
bits 0/1=read/write direction */
|
||||
|
||||
#define GPIO6 0x0040 /* mask bits for GPIO lines */
|
||||
#define GPIO7 0x0080
|
||||
#define GPIO8 0x0100
|
||||
#define GPIO9 0x0200
|
||||
|
||||
#define STR_DATA GPIO6 /* radio TEA5757 pins and GPIO bits */
|
||||
#define STR_CLK GPIO7
|
||||
#define STR_WREN GPIO8
|
||||
#define STR_MOST GPIO9
|
||||
|
||||
#define FREQ_LO 50*16000
|
||||
#define FREQ_HI 150*16000
|
||||
|
||||
#define FREQ_IF 171200 /* 10.7*16000 */
|
||||
#define FREQ_STEP 200 /* 12.5*16 */
|
||||
|
||||
#define FREQ2BITS(x) ((((unsigned int)(x)+FREQ_IF+(FREQ_STEP<<1))\
|
||||
/(FREQ_STEP<<2))<<2) /* (x==fmhz*16*1000) -> bits */
|
||||
|
||||
#define BITS2FREQ(x) ((x) * FREQ_STEP - FREQ_IF)
|
||||
|
||||
struct maestro {
|
||||
struct v4l2_device v4l2_dev;
|
||||
struct video_device vdev;
|
||||
struct pci_dev *pdev;
|
||||
struct mutex lock;
|
||||
|
||||
u16 io; /* base of Maestro card radio io (GPIO_DATA)*/
|
||||
u16 muted; /* VIDEO_AUDIO_MUTE */
|
||||
u16 stereo; /* VIDEO_TUNER_STEREO_ON */
|
||||
u16 tuned; /* signal strength (0 or 0xffff) */
|
||||
};
|
||||
|
||||
static inline struct maestro *to_maestro(struct v4l2_device *v4l2_dev)
|
||||
{
|
||||
return container_of(v4l2_dev, struct maestro, v4l2_dev);
|
||||
}
|
||||
|
||||
static u32 radio_bits_get(struct maestro *dev)
|
||||
{
|
||||
u16 io = dev->io, l, rdata;
|
||||
u32 data = 0;
|
||||
u16 omask;
|
||||
|
||||
omask = inw(io + IO_MASK);
|
||||
outw(~(STR_CLK | STR_WREN), io + IO_MASK);
|
||||
outw(0, io);
|
||||
udelay(16);
|
||||
|
||||
for (l = 24; l--;) {
|
||||
outw(STR_CLK, io); /* HI state */
|
||||
udelay(2);
|
||||
if (!l)
|
||||
dev->tuned = inw(io) & STR_MOST ? 0 : 0xffff;
|
||||
outw(0, io); /* LO state */
|
||||
udelay(2);
|
||||
data <<= 1; /* shift data */
|
||||
rdata = inw(io);
|
||||
if (!l)
|
||||
dev->stereo = (rdata & STR_MOST) ? 0 : 1;
|
||||
else if (rdata & STR_DATA)
|
||||
data++;
|
||||
udelay(2);
|
||||
}
|
||||
|
||||
if (dev->muted)
|
||||
outw(STR_WREN, io);
|
||||
|
||||
udelay(4);
|
||||
outw(omask, io + IO_MASK);
|
||||
|
||||
return data & 0x3ffe;
|
||||
}
|
||||
|
||||
static void radio_bits_set(struct maestro *dev, u32 data)
|
||||
{
|
||||
u16 io = dev->io, l, bits;
|
||||
u16 omask, odir;
|
||||
|
||||
omask = inw(io + IO_MASK);
|
||||
odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);
|
||||
outw(odir | STR_DATA, io + IO_DIR);
|
||||
outw(~(STR_DATA | STR_CLK | STR_WREN), io + IO_MASK);
|
||||
udelay(16);
|
||||
for (l = 25; l; l--) {
|
||||
bits = ((data >> 18) & STR_DATA) | STR_WREN;
|
||||
data <<= 1; /* shift data */
|
||||
outw(bits, io); /* start strobe */
|
||||
udelay(2);
|
||||
outw(bits | STR_CLK, io); /* HI level */
|
||||
udelay(2);
|
||||
outw(bits, io); /* LO level */
|
||||
udelay(4);
|
||||
}
|
||||
|
||||
if (!dev->muted)
|
||||
outw(0, io);
|
||||
|
||||
udelay(4);
|
||||
outw(omask, io + IO_MASK);
|
||||
outw(odir, io + IO_DIR);
|
||||
msleep(125);
|
||||
}
|
||||
|
||||
static int vidioc_querycap(struct file *file, void *priv,
|
||||
struct v4l2_capability *v)
|
||||
{
|
||||
struct maestro *dev = video_drvdata(file);
|
||||
|
||||
strlcpy(v->driver, "radio-maestro", sizeof(v->driver));
|
||||
strlcpy(v->card, "Maestro Radio", sizeof(v->card));
|
||||
snprintf(v->bus_info, sizeof(v->bus_info), "PCI:%s", pci_name(dev->pdev));
|
||||
v->version = RADIO_VERSION;
|
||||
v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_tuner(struct file *file, void *priv,
|
||||
struct v4l2_tuner *v)
|
||||
{
|
||||
struct maestro *dev = video_drvdata(file);
|
||||
|
||||
if (v->index > 0)
|
||||
return -EINVAL;
|
||||
|
||||
mutex_lock(&dev->lock);
|
||||
radio_bits_get(dev);
|
||||
|
||||
strlcpy(v->name, "FM", sizeof(v->name));
|
||||
v->type = V4L2_TUNER_RADIO;
|
||||
v->rangelow = FREQ_LO;
|
||||
v->rangehigh = FREQ_HI;
|
||||
v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
|
||||
v->capability = V4L2_TUNER_CAP_LOW;
|
||||
if (dev->stereo)
|
||||
v->audmode = V4L2_TUNER_MODE_STEREO;
|
||||
else
|
||||
v->audmode = V4L2_TUNER_MODE_MONO;
|
||||
v->signal = dev->tuned;
|
||||
mutex_unlock(&dev->lock);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_s_tuner(struct file *file, void *priv,
|
||||
struct v4l2_tuner *v)
|
||||
{
|
||||
return v->index ? -EINVAL : 0;
|
||||
}
|
||||
|
||||
static int vidioc_s_frequency(struct file *file, void *priv,
|
||||
struct v4l2_frequency *f)
|
||||
{
|
||||
struct maestro *dev = video_drvdata(file);
|
||||
|
||||
if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
|
||||
return -EINVAL;
|
||||
if (f->frequency < FREQ_LO || f->frequency > FREQ_HI)
|
||||
return -EINVAL;
|
||||
mutex_lock(&dev->lock);
|
||||
radio_bits_set(dev, FREQ2BITS(f->frequency));
|
||||
mutex_unlock(&dev->lock);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_frequency(struct file *file, void *priv,
|
||||
struct v4l2_frequency *f)
|
||||
{
|
||||
struct maestro *dev = video_drvdata(file);
|
||||
|
||||
if (f->tuner != 0)
|
||||
return -EINVAL;
|
||||
f->type = V4L2_TUNER_RADIO;
|
||||
mutex_lock(&dev->lock);
|
||||
f->frequency = BITS2FREQ(radio_bits_get(dev));
|
||||
mutex_unlock(&dev->lock);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_queryctrl(struct file *file, void *priv,
|
||||
struct v4l2_queryctrl *qc)
|
||||
{
|
||||
switch (qc->id) {
|
||||
case V4L2_CID_AUDIO_MUTE:
|
||||
return v4l2_ctrl_query_fill(qc, 0, 1, 1, 1);
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int vidioc_g_ctrl(struct file *file, void *priv,
|
||||
struct v4l2_control *ctrl)
|
||||
{
|
||||
struct maestro *dev = video_drvdata(file);
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_AUDIO_MUTE:
|
||||
ctrl->value = dev->muted;
|
||||
return 0;
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int vidioc_s_ctrl(struct file *file, void *priv,
|
||||
struct v4l2_control *ctrl)
|
||||
{
|
||||
struct maestro *dev = video_drvdata(file);
|
||||
u16 io = dev->io;
|
||||
u16 omask;
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_AUDIO_MUTE:
|
||||
mutex_lock(&dev->lock);
|
||||
omask = inw(io + IO_MASK);
|
||||
outw(~STR_WREN, io + IO_MASK);
|
||||
dev->muted = ctrl->value;
|
||||
outw(dev->muted ? STR_WREN : 0, io);
|
||||
udelay(4);
|
||||
outw(omask, io + IO_MASK);
|
||||
msleep(125);
|
||||
mutex_unlock(&dev->lock);
|
||||
return 0;
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
|
||||
{
|
||||
*i = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
|
||||
{
|
||||
return i ? -EINVAL : 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_audio(struct file *file, void *priv,
|
||||
struct v4l2_audio *a)
|
||||
{
|
||||
a->index = 0;
|
||||
strlcpy(a->name, "Radio", sizeof(a->name));
|
||||
a->capability = V4L2_AUDCAP_STEREO;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_s_audio(struct file *file, void *priv,
|
||||
struct v4l2_audio *a)
|
||||
{
|
||||
return a->index ? -EINVAL : 0;
|
||||
}
|
||||
|
||||
static const struct v4l2_file_operations maestro_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.unlocked_ioctl = video_ioctl2,
|
||||
};
|
||||
|
||||
static const struct v4l2_ioctl_ops maestro_ioctl_ops = {
|
||||
.vidioc_querycap = vidioc_querycap,
|
||||
.vidioc_g_tuner = vidioc_g_tuner,
|
||||
.vidioc_s_tuner = vidioc_s_tuner,
|
||||
.vidioc_g_audio = vidioc_g_audio,
|
||||
.vidioc_s_audio = vidioc_s_audio,
|
||||
.vidioc_g_input = vidioc_g_input,
|
||||
.vidioc_s_input = vidioc_s_input,
|
||||
.vidioc_g_frequency = vidioc_g_frequency,
|
||||
.vidioc_s_frequency = vidioc_s_frequency,
|
||||
.vidioc_queryctrl = vidioc_queryctrl,
|
||||
.vidioc_g_ctrl = vidioc_g_ctrl,
|
||||
.vidioc_s_ctrl = vidioc_s_ctrl,
|
||||
};
|
||||
|
||||
static u16 __devinit radio_power_on(struct maestro *dev)
|
||||
{
|
||||
register u16 io = dev->io;
|
||||
register u32 ofreq;
|
||||
u16 omask, odir;
|
||||
|
||||
omask = inw(io + IO_MASK);
|
||||
odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);
|
||||
outw(odir & ~STR_WREN, io + IO_DIR);
|
||||
dev->muted = inw(io) & STR_WREN ? 0 : 1;
|
||||
outw(odir, io + IO_DIR);
|
||||
outw(~(STR_WREN | STR_CLK), io + IO_MASK);
|
||||
outw(dev->muted ? 0 : STR_WREN, io);
|
||||
udelay(16);
|
||||
outw(omask, io + IO_MASK);
|
||||
ofreq = radio_bits_get(dev);
|
||||
|
||||
if ((ofreq < FREQ2BITS(FREQ_LO)) || (ofreq > FREQ2BITS(FREQ_HI)))
|
||||
ofreq = FREQ2BITS(FREQ_LO);
|
||||
radio_bits_set(dev, ofreq);
|
||||
|
||||
return (ofreq == radio_bits_get(dev));
|
||||
}
|
||||
|
||||
static int __devinit maestro_probe(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
struct maestro *dev;
|
||||
struct v4l2_device *v4l2_dev;
|
||||
int retval;
|
||||
|
||||
retval = pci_enable_device(pdev);
|
||||
if (retval) {
|
||||
dev_err(&pdev->dev, "enabling pci device failed!\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
retval = -ENOMEM;
|
||||
|
||||
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
|
||||
if (dev == NULL) {
|
||||
dev_err(&pdev->dev, "not enough memory\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
v4l2_dev = &dev->v4l2_dev;
|
||||
mutex_init(&dev->lock);
|
||||
dev->pdev = pdev;
|
||||
|
||||
strlcpy(v4l2_dev->name, "maestro", sizeof(v4l2_dev->name));
|
||||
|
||||
retval = v4l2_device_register(&pdev->dev, v4l2_dev);
|
||||
if (retval < 0) {
|
||||
v4l2_err(v4l2_dev, "Could not register v4l2_device\n");
|
||||
goto errfr;
|
||||
}
|
||||
|
||||
dev->io = pci_resource_start(pdev, 0) + GPIO_DATA;
|
||||
|
||||
strlcpy(dev->vdev.name, v4l2_dev->name, sizeof(dev->vdev.name));
|
||||
dev->vdev.v4l2_dev = v4l2_dev;
|
||||
dev->vdev.fops = &maestro_fops;
|
||||
dev->vdev.ioctl_ops = &maestro_ioctl_ops;
|
||||
dev->vdev.release = video_device_release_empty;
|
||||
video_set_drvdata(&dev->vdev, dev);
|
||||
|
||||
if (!radio_power_on(dev)) {
|
||||
retval = -EIO;
|
||||
goto errfr1;
|
||||
}
|
||||
|
||||
retval = video_register_device(&dev->vdev, VFL_TYPE_RADIO, radio_nr);
|
||||
if (retval) {
|
||||
v4l2_err(v4l2_dev, "can't register video device!\n");
|
||||
goto errfr1;
|
||||
}
|
||||
|
||||
v4l2_info(v4l2_dev, "version " DRIVER_VERSION "\n");
|
||||
|
||||
return 0;
|
||||
errfr1:
|
||||
v4l2_device_unregister(v4l2_dev);
|
||||
errfr:
|
||||
kfree(dev);
|
||||
err:
|
||||
return retval;
|
||||
|
||||
}
|
||||
|
||||
static void __devexit maestro_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct v4l2_device *v4l2_dev = dev_get_drvdata(&pdev->dev);
|
||||
struct maestro *dev = to_maestro(v4l2_dev);
|
||||
|
||||
video_unregister_device(&dev->vdev);
|
||||
v4l2_device_unregister(&dev->v4l2_dev);
|
||||
}
|
||||
|
||||
static struct pci_device_id maestro_r_pci_tbl[] = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ESS1968),
|
||||
.class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
|
||||
.class_mask = 0xffff00 },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ESS1978),
|
||||
.class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
|
||||
.class_mask = 0xffff00 },
|
||||
{ 0 }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, maestro_r_pci_tbl);
|
||||
|
||||
static struct pci_driver maestro_r_driver = {
|
||||
.name = "maestro_radio",
|
||||
.id_table = maestro_r_pci_tbl,
|
||||
.probe = maestro_probe,
|
||||
.remove = __devexit_p(maestro_remove),
|
||||
};
|
||||
|
||||
static int __init maestro_radio_init(void)
|
||||
{
|
||||
int retval = pci_register_driver(&maestro_r_driver);
|
||||
|
||||
if (retval)
|
||||
printk(KERN_ERR "error during registration pci driver\n");
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
static void __exit maestro_radio_exit(void)
|
||||
{
|
||||
pci_unregister_driver(&maestro_r_driver);
|
||||
}
|
||||
|
||||
module_init(maestro_radio_init);
|
||||
module_exit(maestro_radio_exit);
|
||||
@@ -113,6 +113,7 @@ struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new * kcontrolnew, v
|
||||
void snd_ctl_free_one(struct snd_kcontrol * kcontrol);
|
||||
int snd_ctl_add(struct snd_card * card, struct snd_kcontrol * kcontrol);
|
||||
int snd_ctl_remove(struct snd_card * card, struct snd_kcontrol * kcontrol);
|
||||
int snd_ctl_replace(struct snd_card *card, struct snd_kcontrol *kcontrol, bool add_on_replace);
|
||||
int snd_ctl_remove_id(struct snd_card * card, struct snd_ctl_elem_id *id);
|
||||
int snd_ctl_rename_id(struct snd_card * card, struct snd_ctl_elem_id *src_id, struct snd_ctl_elem_id *dst_id);
|
||||
int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id,
|
||||
|
||||
@@ -26,29 +26,37 @@
|
||||
#include <media/v4l2-dev.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
|
||||
#define TEA575X_FMIF 10700
|
||||
|
||||
#define TEA575X_DATA (1 << 0)
|
||||
#define TEA575X_CLK (1 << 1)
|
||||
#define TEA575X_WREN (1 << 2)
|
||||
#define TEA575X_MOST (1 << 3)
|
||||
|
||||
struct snd_tea575x;
|
||||
|
||||
struct snd_tea575x_ops {
|
||||
void (*write)(struct snd_tea575x *tea, unsigned int val);
|
||||
unsigned int (*read)(struct snd_tea575x *tea);
|
||||
void (*mute)(struct snd_tea575x *tea, unsigned int mute);
|
||||
void (*set_pins)(struct snd_tea575x *tea, u8 pins);
|
||||
u8 (*get_pins)(struct snd_tea575x *tea);
|
||||
void (*set_direction)(struct snd_tea575x *tea, bool output);
|
||||
};
|
||||
|
||||
struct snd_tea575x {
|
||||
struct snd_card *card;
|
||||
struct video_device *vd; /* video device */
|
||||
int dev_nr; /* requested device number + 1 */
|
||||
int tea5759; /* 5759 chip is present */
|
||||
int mute; /* Device is muted? */
|
||||
unsigned int freq_fixup; /* crystal onboard */
|
||||
bool tea5759; /* 5759 chip is present */
|
||||
bool mute; /* Device is muted? */
|
||||
bool stereo; /* receiving stereo */
|
||||
bool tuned; /* tuned to a station */
|
||||
unsigned int val; /* hw value */
|
||||
unsigned long freq; /* frequency */
|
||||
unsigned long in_use; /* set if the device is in use */
|
||||
struct snd_tea575x_ops *ops;
|
||||
void *private_data;
|
||||
u8 card[32];
|
||||
u8 bus_info[32];
|
||||
};
|
||||
|
||||
void snd_tea575x_init(struct snd_tea575x *tea);
|
||||
int snd_tea575x_init(struct snd_tea575x *tea);
|
||||
void snd_tea575x_exit(struct snd_tea575x *tea);
|
||||
|
||||
#endif /* __SOUND_TEA575X_TUNER_H */
|
||||
|
||||
@@ -365,6 +365,70 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)
|
||||
|
||||
EXPORT_SYMBOL(snd_ctl_add);
|
||||
|
||||
/**
|
||||
* snd_ctl_replace - replace the control instance of the card
|
||||
* @card: the card instance
|
||||
* @kcontrol: the control instance to replace
|
||||
* @add_on_replace: add the control if not already added
|
||||
*
|
||||
* Replaces the given control. If the given control does not exist
|
||||
* and the add_on_replace flag is set, the control is added. If the
|
||||
* control exists, it is destroyed first.
|
||||
*
|
||||
* Returns zero if successful, or a negative error code on failure.
|
||||
*
|
||||
* It frees automatically the control which cannot be added or replaced.
|
||||
*/
|
||||
int snd_ctl_replace(struct snd_card *card, struct snd_kcontrol *kcontrol,
|
||||
bool add_on_replace)
|
||||
{
|
||||
struct snd_ctl_elem_id id;
|
||||
unsigned int idx;
|
||||
struct snd_kcontrol *old;
|
||||
int ret;
|
||||
|
||||
if (!kcontrol)
|
||||
return -EINVAL;
|
||||
if (snd_BUG_ON(!card || !kcontrol->info)) {
|
||||
ret = -EINVAL;
|
||||
goto error;
|
||||
}
|
||||
id = kcontrol->id;
|
||||
down_write(&card->controls_rwsem);
|
||||
old = snd_ctl_find_id(card, &id);
|
||||
if (!old) {
|
||||
if (add_on_replace)
|
||||
goto add;
|
||||
up_write(&card->controls_rwsem);
|
||||
ret = -EINVAL;
|
||||
goto error;
|
||||
}
|
||||
ret = snd_ctl_remove(card, old);
|
||||
if (ret < 0) {
|
||||
up_write(&card->controls_rwsem);
|
||||
goto error;
|
||||
}
|
||||
add:
|
||||
if (snd_ctl_find_hole(card, kcontrol->count) < 0) {
|
||||
up_write(&card->controls_rwsem);
|
||||
ret = -ENOMEM;
|
||||
goto error;
|
||||
}
|
||||
list_add_tail(&kcontrol->list, &card->controls);
|
||||
card->controls_count += kcontrol->count;
|
||||
kcontrol->id.numid = card->last_numid + 1;
|
||||
card->last_numid += kcontrol->count;
|
||||
up_write(&card->controls_rwsem);
|
||||
for (idx = 0; idx < kcontrol->count; idx++, id.index++, id.numid++)
|
||||
snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);
|
||||
return 0;
|
||||
|
||||
error:
|
||||
snd_ctl_free_one(kcontrol);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(snd_ctl_replace);
|
||||
|
||||
/**
|
||||
* snd_ctl_remove - remove the control from the card and release it
|
||||
* @card: the card instance
|
||||
|
||||
+1
-1
@@ -514,7 +514,7 @@ static void snd_card_set_id_no_lock(struct snd_card *card, const char *nid)
|
||||
id = card->id;
|
||||
|
||||
if (*id == '\0')
|
||||
strcpy(id, "default");
|
||||
strcpy(id, "Default");
|
||||
|
||||
while (1) {
|
||||
if (loops-- == 0) {
|
||||
|
||||
@@ -189,6 +189,7 @@ static void xrun(struct snd_pcm_substream *substream)
|
||||
#define XRUN_LOG_CNT 10
|
||||
|
||||
struct hwptr_log_entry {
|
||||
unsigned int in_interrupt;
|
||||
unsigned long jiffies;
|
||||
snd_pcm_uframes_t pos;
|
||||
snd_pcm_uframes_t period_size;
|
||||
@@ -204,7 +205,7 @@ struct snd_pcm_hwptr_log {
|
||||
};
|
||||
|
||||
static void xrun_log(struct snd_pcm_substream *substream,
|
||||
snd_pcm_uframes_t pos)
|
||||
snd_pcm_uframes_t pos, int in_interrupt)
|
||||
{
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
struct snd_pcm_hwptr_log *log = runtime->hwptr_log;
|
||||
@@ -220,6 +221,7 @@ static void xrun_log(struct snd_pcm_substream *substream,
|
||||
return;
|
||||
}
|
||||
entry = &log->entries[log->idx];
|
||||
entry->in_interrupt = in_interrupt;
|
||||
entry->jiffies = jiffies;
|
||||
entry->pos = pos;
|
||||
entry->period_size = runtime->period_size;
|
||||
@@ -246,9 +248,11 @@ static void xrun_log_show(struct snd_pcm_substream *substream)
|
||||
entry = &log->entries[idx];
|
||||
if (entry->period_size == 0)
|
||||
break;
|
||||
snd_printd("hwptr log: %s: j=%lu, pos=%ld/%ld/%ld, "
|
||||
snd_printd("hwptr log: %s: %sj=%lu, pos=%ld/%ld/%ld, "
|
||||
"hwptr=%ld/%ld\n",
|
||||
name, entry->jiffies, (unsigned long)entry->pos,
|
||||
name, entry->in_interrupt ? "[Q] " : "",
|
||||
entry->jiffies,
|
||||
(unsigned long)entry->pos,
|
||||
(unsigned long)entry->period_size,
|
||||
(unsigned long)entry->buffer_size,
|
||||
(unsigned long)entry->old_hw_ptr,
|
||||
@@ -262,7 +266,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream)
|
||||
#else /* ! CONFIG_SND_PCM_XRUN_DEBUG */
|
||||
|
||||
#define hw_ptr_error(substream, fmt, args...) do { } while (0)
|
||||
#define xrun_log(substream, pos) do { } while (0)
|
||||
#define xrun_log(substream, pos, in_interrupt) do { } while (0)
|
||||
#define xrun_log_show(substream) do { } while (0)
|
||||
|
||||
#endif
|
||||
@@ -326,7 +330,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
|
||||
}
|
||||
pos -= pos % runtime->min_align;
|
||||
if (xrun_debug(substream, XRUN_DEBUG_LOG))
|
||||
xrun_log(substream, pos);
|
||||
xrun_log(substream, pos, in_interrupt);
|
||||
hw_base = runtime->hw_ptr_base;
|
||||
new_hw_ptr = hw_base + pos;
|
||||
if (in_interrupt) {
|
||||
|
||||
@@ -22,4 +22,15 @@ config SND_FIREWIRE_SPEAKERS
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called snd-firewire-speakers.
|
||||
|
||||
config SND_ISIGHT
|
||||
tristate "Apple iSight microphone"
|
||||
select SND_PCM
|
||||
select SND_FIREWIRE_LIB
|
||||
help
|
||||
Say Y here to include support for the front and rear microphones
|
||||
of the Apple iSight web camera.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called snd-isight.
|
||||
|
||||
endif # SND_FIREWIRE
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
snd-firewire-lib-objs := lib.o iso-resources.o packets-buffer.o \
|
||||
fcp.o cmp.o amdtp.o
|
||||
snd-firewire-speakers-objs := speakers.o
|
||||
snd-isight-objs := isight.o
|
||||
|
||||
obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o
|
||||
obj-$(CONFIG_SND_FIREWIRE_SPEAKERS) += snd-firewire-speakers.o
|
||||
obj-$(CONFIG_SND_ISIGHT) += snd-isight.o
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -36,6 +36,7 @@ int fw_iso_resources_init(struct fw_iso_resources *r, struct fw_unit *unit)
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(fw_iso_resources_init);
|
||||
|
||||
/**
|
||||
* fw_iso_resources_destroy - destroy a resource manager
|
||||
@@ -48,6 +49,7 @@ void fw_iso_resources_destroy(struct fw_iso_resources *r)
|
||||
mutex_destroy(&r->mutex);
|
||||
fw_unit_put(r->unit);
|
||||
}
|
||||
EXPORT_SYMBOL(fw_iso_resources_destroy);
|
||||
|
||||
static unsigned int packet_bandwidth(unsigned int max_payload_bytes, int speed)
|
||||
{
|
||||
@@ -152,6 +154,7 @@ retry_after_bus_reset:
|
||||
|
||||
return channel;
|
||||
}
|
||||
EXPORT_SYMBOL(fw_iso_resources_allocate);
|
||||
|
||||
/**
|
||||
* fw_iso_resources_update - update resource allocations after a bus reset
|
||||
@@ -203,6 +206,7 @@ int fw_iso_resources_update(struct fw_iso_resources *r)
|
||||
|
||||
return channel;
|
||||
}
|
||||
EXPORT_SYMBOL(fw_iso_resources_update);
|
||||
|
||||
/**
|
||||
* fw_iso_resources_free - frees allocated resources
|
||||
@@ -230,3 +234,4 @@ void fw_iso_resources_free(struct fw_iso_resources *r)
|
||||
|
||||
mutex_unlock(&r->mutex);
|
||||
}
|
||||
EXPORT_SYMBOL(fw_iso_resources_free);
|
||||
|
||||
@@ -60,6 +60,7 @@ err_packets:
|
||||
error:
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL(iso_packets_buffer_init);
|
||||
|
||||
/**
|
||||
* iso_packets_buffer_destroy - frees packet buffer resources
|
||||
@@ -72,3 +73,4 @@ void iso_packets_buffer_destroy(struct iso_packets_buffer *b,
|
||||
fw_iso_buffer_destroy(&b->iso_buffer, fw_parent_device(unit)->card);
|
||||
kfree(b->packets);
|
||||
}
|
||||
EXPORT_SYMBOL(iso_packets_buffer_destroy);
|
||||
|
||||
@@ -14,4 +14,4 @@ snd-tea575x-tuner-objs := tea575x-tuner.o
|
||||
obj-$(CONFIG_SND_PDAUDIOCF) += snd-ak4117.o
|
||||
obj-$(CONFIG_SND_ICE1712) += snd-ak4xxx-adda.o
|
||||
obj-$(CONFIG_SND_ICE1724) += snd-ak4114.o snd-ak4113.o snd-ak4xxx-adda.o snd-pt2258.o
|
||||
obj-$(CONFIG_SND_FM801_TEA575X) += snd-tea575x-tuner.o
|
||||
obj-$(CONFIG_SND_TEA575X) += snd-tea575x-tuner.o
|
||||
|
||||
+112
-41
@@ -37,8 +37,8 @@ static int radio_nr = -1;
|
||||
module_param(radio_nr, int, 0);
|
||||
|
||||
#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
|
||||
#define FREQ_LO (87 * 16000)
|
||||
#define FREQ_HI (108 * 16000)
|
||||
#define FREQ_LO (50UL * 16000)
|
||||
#define FREQ_HI (150UL * 16000)
|
||||
|
||||
/*
|
||||
* definitions
|
||||
@@ -77,27 +77,95 @@ static struct v4l2_queryctrl radio_qctrl[] = {
|
||||
* lowlevel part
|
||||
*/
|
||||
|
||||
static void snd_tea575x_write(struct snd_tea575x *tea, unsigned int val)
|
||||
{
|
||||
u16 l;
|
||||
u8 data;
|
||||
|
||||
tea->ops->set_direction(tea, 1);
|
||||
udelay(16);
|
||||
|
||||
for (l = 25; l > 0; l--) {
|
||||
data = (val >> 24) & TEA575X_DATA;
|
||||
val <<= 1; /* shift data */
|
||||
tea->ops->set_pins(tea, data | TEA575X_WREN);
|
||||
udelay(2);
|
||||
tea->ops->set_pins(tea, data | TEA575X_WREN | TEA575X_CLK);
|
||||
udelay(2);
|
||||
tea->ops->set_pins(tea, data | TEA575X_WREN);
|
||||
udelay(2);
|
||||
}
|
||||
|
||||
if (!tea->mute)
|
||||
tea->ops->set_pins(tea, 0);
|
||||
}
|
||||
|
||||
static unsigned int snd_tea575x_read(struct snd_tea575x *tea)
|
||||
{
|
||||
u16 l, rdata;
|
||||
u32 data = 0;
|
||||
|
||||
tea->ops->set_direction(tea, 0);
|
||||
tea->ops->set_pins(tea, 0);
|
||||
udelay(16);
|
||||
|
||||
for (l = 24; l--;) {
|
||||
tea->ops->set_pins(tea, TEA575X_CLK);
|
||||
udelay(2);
|
||||
if (!l)
|
||||
tea->tuned = tea->ops->get_pins(tea) & TEA575X_MOST ? 0 : 1;
|
||||
tea->ops->set_pins(tea, 0);
|
||||
udelay(2);
|
||||
data <<= 1; /* shift data */
|
||||
rdata = tea->ops->get_pins(tea);
|
||||
if (!l)
|
||||
tea->stereo = (rdata & TEA575X_MOST) ? 0 : 1;
|
||||
if (rdata & TEA575X_DATA)
|
||||
data++;
|
||||
udelay(2);
|
||||
}
|
||||
|
||||
if (tea->mute)
|
||||
tea->ops->set_pins(tea, TEA575X_WREN);
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
static void snd_tea575x_get_freq(struct snd_tea575x *tea)
|
||||
{
|
||||
unsigned long freq;
|
||||
|
||||
freq = snd_tea575x_read(tea) & TEA575X_BIT_FREQ_MASK;
|
||||
/* freq *= 12.5 */
|
||||
freq *= 125;
|
||||
freq /= 10;
|
||||
/* crystal fixup */
|
||||
if (tea->tea5759)
|
||||
freq += TEA575X_FMIF;
|
||||
else
|
||||
freq -= TEA575X_FMIF;
|
||||
|
||||
tea->freq = freq * 16; /* from kHz */
|
||||
}
|
||||
|
||||
static void snd_tea575x_set_freq(struct snd_tea575x *tea)
|
||||
{
|
||||
unsigned long freq;
|
||||
|
||||
freq = tea->freq / 16; /* to kHz */
|
||||
if (freq > 108000)
|
||||
freq = 108000;
|
||||
if (freq < 87000)
|
||||
freq = 87000;
|
||||
freq = clamp(tea->freq, FREQ_LO, FREQ_HI);
|
||||
freq /= 16; /* to kHz */
|
||||
/* crystal fixup */
|
||||
if (tea->tea5759)
|
||||
freq -= tea->freq_fixup;
|
||||
freq -= TEA575X_FMIF;
|
||||
else
|
||||
freq += tea->freq_fixup;
|
||||
freq += TEA575X_FMIF;
|
||||
/* freq /= 12.5 */
|
||||
freq *= 10;
|
||||
freq /= 125;
|
||||
|
||||
tea->val &= ~TEA575X_BIT_FREQ_MASK;
|
||||
tea->val |= freq & TEA575X_BIT_FREQ_MASK;
|
||||
tea->ops->write(tea, tea->val);
|
||||
snd_tea575x_write(tea, tea->val);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -109,29 +177,34 @@ static int vidioc_querycap(struct file *file, void *priv,
|
||||
{
|
||||
struct snd_tea575x *tea = video_drvdata(file);
|
||||
|
||||
strcpy(v->card, tea->tea5759 ? "TEA5759" : "TEA5757");
|
||||
strlcpy(v->driver, "tea575x-tuner", sizeof(v->driver));
|
||||
strlcpy(v->card, "Maestro Radio", sizeof(v->card));
|
||||
sprintf(v->bus_info, "PCI");
|
||||
strlcpy(v->card, tea->card, sizeof(v->card));
|
||||
strlcat(v->card, tea->tea5759 ? " TEA5759" : " TEA5757", sizeof(v->card));
|
||||
strlcpy(v->bus_info, tea->bus_info, sizeof(v->bus_info));
|
||||
v->version = RADIO_VERSION;
|
||||
v->capabilities = V4L2_CAP_TUNER;
|
||||
v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_tuner(struct file *file, void *priv,
|
||||
struct v4l2_tuner *v)
|
||||
{
|
||||
struct snd_tea575x *tea = video_drvdata(file);
|
||||
|
||||
if (v->index > 0)
|
||||
return -EINVAL;
|
||||
|
||||
snd_tea575x_read(tea);
|
||||
|
||||
strcpy(v->name, "FM");
|
||||
v->type = V4L2_TUNER_RADIO;
|
||||
v->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;
|
||||
v->rangelow = FREQ_LO;
|
||||
v->rangehigh = FREQ_HI;
|
||||
v->rxsubchans = V4L2_TUNER_SUB_MONO|V4L2_TUNER_SUB_STEREO;
|
||||
v->capability = V4L2_TUNER_CAP_LOW;
|
||||
v->audmode = V4L2_TUNER_MODE_MONO;
|
||||
v->signal = 0xffff;
|
||||
v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
|
||||
v->audmode = tea->stereo ? V4L2_TUNER_MODE_STEREO : V4L2_TUNER_MODE_MONO;
|
||||
v->signal = tea->tuned ? 0xffff : 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -148,7 +221,10 @@ static int vidioc_g_frequency(struct file *file, void *priv,
|
||||
{
|
||||
struct snd_tea575x *tea = video_drvdata(file);
|
||||
|
||||
if (f->tuner != 0)
|
||||
return -EINVAL;
|
||||
f->type = V4L2_TUNER_RADIO;
|
||||
snd_tea575x_get_freq(tea);
|
||||
f->frequency = tea->freq;
|
||||
return 0;
|
||||
}
|
||||
@@ -158,6 +234,9 @@ static int vidioc_s_frequency(struct file *file, void *priv,
|
||||
{
|
||||
struct snd_tea575x *tea = video_drvdata(file);
|
||||
|
||||
if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
|
||||
return -EINVAL;
|
||||
|
||||
if (f->frequency < FREQ_LO || f->frequency > FREQ_HI)
|
||||
return -EINVAL;
|
||||
|
||||
@@ -209,10 +288,8 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_AUDIO_MUTE:
|
||||
if (tea->ops->mute) {
|
||||
ctrl->value = tea->mute;
|
||||
return 0;
|
||||
}
|
||||
ctrl->value = tea->mute;
|
||||
return 0;
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -224,11 +301,11 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_AUDIO_MUTE:
|
||||
if (tea->ops->mute) {
|
||||
tea->ops->mute(tea, ctrl->value);
|
||||
if (tea->mute != ctrl->value) {
|
||||
tea->mute = ctrl->value;
|
||||
return 0;
|
||||
snd_tea575x_set_freq(tea);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -293,18 +370,16 @@ static struct video_device tea575x_radio = {
|
||||
/*
|
||||
* initialize all the tea575x chips
|
||||
*/
|
||||
void snd_tea575x_init(struct snd_tea575x *tea)
|
||||
int snd_tea575x_init(struct snd_tea575x *tea)
|
||||
{
|
||||
int retval;
|
||||
unsigned int val;
|
||||
struct video_device *tea575x_radio_inst;
|
||||
|
||||
val = tea->ops->read(tea);
|
||||
if (val == 0x1ffffff || val == 0) {
|
||||
snd_printk(KERN_ERR
|
||||
"tea575x-tuner: Cannot find TEA575x chip\n");
|
||||
return;
|
||||
}
|
||||
tea->mute = 1;
|
||||
|
||||
snd_tea575x_write(tea, 0x55AA);
|
||||
if (snd_tea575x_read(tea) != 0x55AA)
|
||||
return -ENODEV;
|
||||
|
||||
tea->in_use = 0;
|
||||
tea->val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_10_40;
|
||||
@@ -313,7 +388,7 @@ void snd_tea575x_init(struct snd_tea575x *tea)
|
||||
tea575x_radio_inst = video_device_alloc();
|
||||
if (tea575x_radio_inst == NULL) {
|
||||
printk(KERN_ERR "tea575x-tuner: not enough memory\n");
|
||||
return;
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
memcpy(tea575x_radio_inst, &tea575x_radio, sizeof(tea575x_radio));
|
||||
@@ -328,17 +403,13 @@ void snd_tea575x_init(struct snd_tea575x *tea)
|
||||
if (retval) {
|
||||
printk(KERN_ERR "tea575x-tuner: can't register video device!\n");
|
||||
kfree(tea575x_radio_inst);
|
||||
return;
|
||||
return retval;
|
||||
}
|
||||
|
||||
snd_tea575x_set_freq(tea);
|
||||
|
||||
/* mute on init */
|
||||
if (tea->ops->mute) {
|
||||
tea->ops->mute(tea, 1);
|
||||
tea->mute = 1;
|
||||
}
|
||||
tea->vd = tea575x_radio_inst;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void snd_tea575x_exit(struct snd_tea575x *tea)
|
||||
|
||||
+13
-5
@@ -534,6 +534,14 @@ config SND_ES1968_INPUT
|
||||
If you say N the buttons will directly control the master volume.
|
||||
It is recommended to say Y.
|
||||
|
||||
config SND_ES1968_RADIO
|
||||
bool "Enable TEA5757 radio tuner support for es1968"
|
||||
depends on SND_ES1968
|
||||
depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968
|
||||
help
|
||||
Say Y here to include support for TEA5757 radio tuner integrated on
|
||||
some MediaForte cards (e.g. SF64-PCE2).
|
||||
|
||||
config SND_FM801
|
||||
tristate "ForteMedia FM801"
|
||||
select SND_OPL3_LIB
|
||||
@@ -552,13 +560,13 @@ config SND_FM801_TEA575X_BOOL
|
||||
depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801
|
||||
help
|
||||
Say Y here to include support for soundcards based on the ForteMedia
|
||||
FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media
|
||||
Forte SF256-PCS-02) into the snd-fm801 driver.
|
||||
FM801 chip with a TEA5757 tuner (MediaForte SF256-PCS, SF256-PCP and
|
||||
SF64-PCR) into the snd-fm801 driver.
|
||||
|
||||
config SND_FM801_TEA575X
|
||||
config SND_TEA575X
|
||||
tristate
|
||||
depends on SND_FM801_TEA575X_BOOL
|
||||
default SND_FM801
|
||||
depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO
|
||||
default SND_FM801 || SND_ES1968
|
||||
|
||||
source "sound/pci/hda/Kconfig"
|
||||
|
||||
|
||||
+142
-186
File diff suppressed because it is too large
Load Diff
+15
-24
@@ -200,8 +200,8 @@ static void hpi_read_block(struct dsp_obj *pdo, u32 address, u32 *pdata,
|
||||
static void subsys_create_adapter(struct hpi_message *phm,
|
||||
struct hpi_response *phr);
|
||||
|
||||
static void subsys_delete_adapter(struct hpi_message *phm,
|
||||
struct hpi_response *phr);
|
||||
static void adapter_delete(struct hpi_adapter_obj *pao,
|
||||
struct hpi_message *phm, struct hpi_response *phr);
|
||||
|
||||
static void adapter_get_asserts(struct hpi_adapter_obj *pao,
|
||||
struct hpi_message *phm, struct hpi_response *phr);
|
||||
@@ -222,9 +222,6 @@ static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)
|
||||
case HPI_SUBSYS_CREATE_ADAPTER:
|
||||
subsys_create_adapter(phm, phr);
|
||||
break;
|
||||
case HPI_SUBSYS_DELETE_ADAPTER:
|
||||
subsys_delete_adapter(phm, phr);
|
||||
break;
|
||||
default:
|
||||
phr->error = HPI_ERROR_INVALID_FUNC;
|
||||
break;
|
||||
@@ -279,6 +276,10 @@ static void adapter_message(struct hpi_adapter_obj *pao,
|
||||
adapter_get_asserts(pao, phm, phr);
|
||||
break;
|
||||
|
||||
case HPI_ADAPTER_DELETE:
|
||||
adapter_delete(pao, phm, phr);
|
||||
break;
|
||||
|
||||
default:
|
||||
hw_message(pao, phm, phr);
|
||||
break;
|
||||
@@ -333,26 +334,22 @@ void HPI_6000(struct hpi_message *phm, struct hpi_response *phr)
|
||||
{
|
||||
struct hpi_adapter_obj *pao = NULL;
|
||||
|
||||
/* subsytem messages get executed by every HPI. */
|
||||
/* All other messages are ignored unless the adapter index matches */
|
||||
/* an adapter in the HPI */
|
||||
/*HPI_DEBUG_LOG(DEBUG, "O %d,F %x\n", phm->wObject, phm->wFunction); */
|
||||
|
||||
/* if Dsp has crashed then do not communicate with it any more */
|
||||
if (phm->object != HPI_OBJ_SUBSYSTEM) {
|
||||
pao = hpi_find_adapter(phm->adapter_index);
|
||||
if (!pao) {
|
||||
HPI_DEBUG_LOG(DEBUG,
|
||||
" %d,%d refused, for another HPI?\n",
|
||||
phm->object, phm->function);
|
||||
hpi_init_response(phr, phm->object, phm->function,
|
||||
HPI_ERROR_BAD_ADAPTER_NUMBER);
|
||||
HPI_DEBUG_LOG(DEBUG, "invalid adapter index: %d \n",
|
||||
phm->adapter_index);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Don't even try to communicate with crashed DSP */
|
||||
if (pao->dsp_crashed >= 10) {
|
||||
hpi_init_response(phr, phm->object, phm->function,
|
||||
HPI_ERROR_DSP_HARDWARE);
|
||||
HPI_DEBUG_LOG(DEBUG, " %d,%d dsp crashed.\n",
|
||||
phm->object, phm->function);
|
||||
HPI_DEBUG_LOG(DEBUG, "adapter %d dsp crashed\n",
|
||||
phm->adapter_index);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -463,15 +460,9 @@ static void subsys_create_adapter(struct hpi_message *phm,
|
||||
phr->error = 0;
|
||||
}
|
||||
|
||||
static void subsys_delete_adapter(struct hpi_message *phm,
|
||||
struct hpi_response *phr)
|
||||
static void adapter_delete(struct hpi_adapter_obj *pao,
|
||||
struct hpi_message *phm, struct hpi_response *phr)
|
||||
{
|
||||
struct hpi_adapter_obj *pao = NULL;
|
||||
|
||||
pao = hpi_find_adapter(phm->obj_index);
|
||||
if (!pao)
|
||||
return;
|
||||
|
||||
delete_adapter_obj(pao);
|
||||
hpi_delete_adapter(pao);
|
||||
phr->error = 0;
|
||||
|
||||
+48
-47
@@ -152,8 +152,8 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
|
||||
|
||||
static void subsys_create_adapter(struct hpi_message *phm,
|
||||
struct hpi_response *phr);
|
||||
static void subsys_delete_adapter(struct hpi_message *phm,
|
||||
struct hpi_response *phr);
|
||||
static void adapter_delete(struct hpi_adapter_obj *pao,
|
||||
struct hpi_message *phm, struct hpi_response *phr);
|
||||
|
||||
static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
|
||||
u32 *pos_error_code);
|
||||
@@ -223,15 +223,13 @@ static u16 boot_loader_test_pld(struct hpi_adapter_obj *pao, int dsp_index);
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)
|
||||
static void subsys_message(struct hpi_adapter_obj *pao,
|
||||
struct hpi_message *phm, struct hpi_response *phr)
|
||||
{
|
||||
switch (phm->function) {
|
||||
case HPI_SUBSYS_CREATE_ADAPTER:
|
||||
subsys_create_adapter(phm, phr);
|
||||
break;
|
||||
case HPI_SUBSYS_DELETE_ADAPTER:
|
||||
subsys_delete_adapter(phm, phr);
|
||||
break;
|
||||
default:
|
||||
phr->error = HPI_ERROR_INVALID_FUNC;
|
||||
break;
|
||||
@@ -279,6 +277,10 @@ static void adapter_message(struct hpi_adapter_obj *pao,
|
||||
struct hpi_message *phm, struct hpi_response *phr)
|
||||
{
|
||||
switch (phm->function) {
|
||||
case HPI_ADAPTER_DELETE:
|
||||
adapter_delete(pao, phm, phr);
|
||||
break;
|
||||
|
||||
default:
|
||||
hw_message(pao, phm, phr);
|
||||
break;
|
||||
@@ -371,36 +373,17 @@ static void instream_message(struct hpi_adapter_obj *pao,
|
||||
/** Entry point to this HPI backend
|
||||
* All calls to the HPI start here
|
||||
*/
|
||||
void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)
|
||||
void _HPI_6205(struct hpi_adapter_obj *pao, struct hpi_message *phm,
|
||||
struct hpi_response *phr)
|
||||
{
|
||||
struct hpi_adapter_obj *pao = NULL;
|
||||
|
||||
/* subsytem messages are processed by every HPI.
|
||||
* All other messages are ignored unless the adapter index matches
|
||||
* an adapter in the HPI
|
||||
*/
|
||||
/* HPI_DEBUG_LOG(DEBUG, "HPI Obj=%d, Func=%d\n", phm->wObject,
|
||||
phm->wFunction); */
|
||||
|
||||
/* if Dsp has crashed then do not communicate with it any more */
|
||||
if (phm->object != HPI_OBJ_SUBSYSTEM) {
|
||||
pao = hpi_find_adapter(phm->adapter_index);
|
||||
if (!pao) {
|
||||
HPI_DEBUG_LOG(DEBUG,
|
||||
" %d,%d refused, for another HPI?\n",
|
||||
phm->object, phm->function);
|
||||
return;
|
||||
}
|
||||
|
||||
if ((pao->dsp_crashed >= 10)
|
||||
&& (phm->function != HPI_ADAPTER_DEBUG_READ)) {
|
||||
/* allow last resort debug read even after crash */
|
||||
hpi_init_response(phr, phm->object, phm->function,
|
||||
HPI_ERROR_DSP_HARDWARE);
|
||||
HPI_DEBUG_LOG(WARNING, " %d,%d dsp crashed.\n",
|
||||
phm->object, phm->function);
|
||||
return;
|
||||
}
|
||||
if (pao && (pao->dsp_crashed >= 10)
|
||||
&& (phm->function != HPI_ADAPTER_DEBUG_READ)) {
|
||||
/* allow last resort debug read even after crash */
|
||||
hpi_init_response(phr, phm->object, phm->function,
|
||||
HPI_ERROR_DSP_HARDWARE);
|
||||
HPI_DEBUG_LOG(WARNING, " %d,%d dsp crashed.\n", phm->object,
|
||||
phm->function);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Init default response */
|
||||
@@ -412,7 +395,7 @@ void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)
|
||||
case HPI_TYPE_MESSAGE:
|
||||
switch (phm->object) {
|
||||
case HPI_OBJ_SUBSYSTEM:
|
||||
subsys_message(phm, phr);
|
||||
subsys_message(pao, phm, phr);
|
||||
break;
|
||||
|
||||
case HPI_OBJ_ADAPTER:
|
||||
@@ -444,6 +427,26 @@ void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)
|
||||
}
|
||||
}
|
||||
|
||||
void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)
|
||||
{
|
||||
struct hpi_adapter_obj *pao = NULL;
|
||||
|
||||
if (phm->object != HPI_OBJ_SUBSYSTEM) {
|
||||
/* normal messages must have valid adapter index */
|
||||
pao = hpi_find_adapter(phm->adapter_index);
|
||||
} else {
|
||||
/* subsys messages don't address an adapter */
|
||||
_HPI_6205(NULL, phm, phr);
|
||||
return;
|
||||
}
|
||||
|
||||
if (pao)
|
||||
_HPI_6205(pao, phm, phr);
|
||||
else
|
||||
hpi_init_response(phr, phm->object, phm->function,
|
||||
HPI_ERROR_BAD_ADAPTER_NUMBER);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/* SUBSYSTEM */
|
||||
|
||||
@@ -491,13 +494,11 @@ static void subsys_create_adapter(struct hpi_message *phm,
|
||||
}
|
||||
|
||||
/** delete an adapter - required by WDM driver */
|
||||
static void subsys_delete_adapter(struct hpi_message *phm,
|
||||
struct hpi_response *phr)
|
||||
static void adapter_delete(struct hpi_adapter_obj *pao,
|
||||
struct hpi_message *phm, struct hpi_response *phr)
|
||||
{
|
||||
struct hpi_adapter_obj *pao;
|
||||
struct hpi_hw_obj *phw;
|
||||
|
||||
pao = hpi_find_adapter(phm->obj_index);
|
||||
if (!pao) {
|
||||
phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
|
||||
return;
|
||||
@@ -563,11 +564,12 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
|
||||
}
|
||||
|
||||
err = adapter_boot_load_dsp(pao, pos_error_code);
|
||||
if (err)
|
||||
if (err) {
|
||||
HPI_DEBUG_LOG(ERROR, "DSP code load failed\n");
|
||||
/* no need to clean up as SubSysCreateAdapter */
|
||||
/* calls DeleteAdapter on error. */
|
||||
return err;
|
||||
|
||||
}
|
||||
HPI_DEBUG_LOG(INFO, "load DSP code OK\n");
|
||||
|
||||
/* allow boot load even if mem alloc wont work */
|
||||
@@ -604,6 +606,7 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
|
||||
control_cache.number_of_controls,
|
||||
interface->control_cache.size_in_bytes,
|
||||
p_control_cache_virtual);
|
||||
|
||||
if (!phw->p_cache)
|
||||
err = HPI_ERROR_MEMORY_ALLOC;
|
||||
}
|
||||
@@ -675,16 +678,14 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
|
||||
}
|
||||
|
||||
/** Free memory areas allocated by adapter
|
||||
* this routine is called from SubSysDeleteAdapter,
|
||||
* this routine is called from AdapterDelete,
|
||||
* and SubSysCreateAdapter if duplicate index
|
||||
*/
|
||||
static void delete_adapter_obj(struct hpi_adapter_obj *pao)
|
||||
{
|
||||
struct hpi_hw_obj *phw;
|
||||
struct hpi_hw_obj *phw = pao->priv;
|
||||
int i;
|
||||
|
||||
phw = pao->priv;
|
||||
|
||||
if (hpios_locked_mem_valid(&phw->h_control_cache)) {
|
||||
hpios_locked_mem_free(&phw->h_control_cache);
|
||||
hpi_free_control_cache(phw->p_cache);
|
||||
@@ -1275,6 +1276,7 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
|
||||
case HPI_ADAPTER_FAMILY_ASI(0x6300):
|
||||
boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(0x6400);
|
||||
break;
|
||||
case HPI_ADAPTER_FAMILY_ASI(0x5500):
|
||||
case HPI_ADAPTER_FAMILY_ASI(0x5600):
|
||||
case HPI_ADAPTER_FAMILY_ASI(0x6500):
|
||||
boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(0x6600);
|
||||
@@ -2059,7 +2061,6 @@ static int wait_dsp_ack(struct hpi_hw_obj *phw, int state, int timeout_us)
|
||||
static void send_dsp_command(struct hpi_hw_obj *phw, int cmd)
|
||||
{
|
||||
struct bus_master_interface *interface = phw->p_interface_buffer;
|
||||
|
||||
u32 r;
|
||||
|
||||
interface->host_cmd = cmd;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user