Commit 753bcd6f authored by Gerd Knorr's avatar Gerd Knorr Committed by Linus Torvalds

[PATCH] btaudio driver update

This patch updates the btaudio driver.  btaudio can automatically
configures the sampling rate for autodetected cards (by PCI Subsystem
ID) now.
parent 5eb0a60b
...@@ -144,18 +144,17 @@ struct btaudio { ...@@ -144,18 +144,17 @@ struct btaudio {
int sampleshift; int sampleshift;
int channels; int channels;
int analog; int analog;
int rate;
};
struct cardinfo {
char *name;
int rate;
}; };
static struct btaudio *btaudios = NULL; static struct btaudio *btaudios = NULL;
static unsigned int dsp1 = -1;
static unsigned int dsp2 = -1;
static unsigned int mixer = -1;
static unsigned int debug = 0; static unsigned int debug = 0;
static unsigned int irq_debug = 0; static unsigned int irq_debug = 0;
static int latency = -1;
static int digital = 1;
static int analog = 1;
static int rate = 32000;
/* -------------------------------------------------------------- */ /* -------------------------------------------------------------- */
...@@ -658,7 +657,7 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file, ...@@ -658,7 +657,7 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file,
if (bta->analog) { if (bta->analog) {
return put_user(HWBASE_AD*4/bta->decimation>>bta->sampleshift, (int*)arg); return put_user(HWBASE_AD*4/bta->decimation>>bta->sampleshift, (int*)arg);
} else { } else {
return put_user(rate, (int*)arg); return put_user(bta->rate, (int*)arg);
} }
case SNDCTL_DSP_STEREO: case SNDCTL_DSP_STEREO:
...@@ -871,10 +870,32 @@ static void btaudio_irq(int irq, void *dev_id, struct pt_regs * regs) ...@@ -871,10 +870,32 @@ static void btaudio_irq(int irq, void *dev_id, struct pt_regs * regs)
/* -------------------------------------------------------------- */ /* -------------------------------------------------------------- */
static unsigned int dsp1 = -1;
static unsigned int dsp2 = -1;
static unsigned int mixer = -1;
static int latency = -1;
static int digital = 1;
static int analog = 1;
static int rate = 0;
#define BTA_OSPREY200 1
static struct cardinfo cards[] = {
[0] = {
name: "default",
rate: 32000,
},
[BTA_OSPREY200] = {
name: "Osprey 200",
rate: 44100,
},
};
static int __devinit btaudio_probe(struct pci_dev *pci_dev, static int __devinit btaudio_probe(struct pci_dev *pci_dev,
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)
{ {
struct btaudio *bta; struct btaudio *bta;
struct cardinfo *card = &cards[pci_id->driver_data];
unsigned char revision,lat; unsigned char revision,lat;
int rc = -EBUSY; int rc = -EBUSY;
...@@ -909,6 +930,11 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev, ...@@ -909,6 +930,11 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev,
bta->sampleshift = 1; bta->sampleshift = 1;
} }
/* sample rate */
bta->rate = card->rate;
if (rate)
bta->rate = rate;
init_MUTEX(&bta->lock); init_MUTEX(&bta->lock);
init_waitqueue_head(&bta->readq); init_waitqueue_head(&bta->readq);
...@@ -924,6 +950,7 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev, ...@@ -924,6 +950,7 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev,
PCI_SLOT(pci_dev->devfn),PCI_FUNC(pci_dev->devfn)); PCI_SLOT(pci_dev->devfn),PCI_FUNC(pci_dev->devfn));
printk("irq: %d, latency: %d, mmio: 0x%lx\n", printk("irq: %d, latency: %d, mmio: 0x%lx\n",
bta->irq, lat, bta->mem); bta->irq, lat, bta->mem);
printk("btaudio: using card config \"%s\"\n", card->name);
/* init hw */ /* init hw */
btwrite(0, REG_GPIO_DMA_CTL); btwrite(0, REG_GPIO_DMA_CTL);
...@@ -1034,11 +1061,25 @@ static void __devexit btaudio_remove(struct pci_dev *pci_dev) ...@@ -1034,11 +1061,25 @@ static void __devexit btaudio_remove(struct pci_dev *pci_dev)
/* -------------------------------------------------------------- */ /* -------------------------------------------------------------- */
static struct pci_device_id btaudio_pci_tbl[] __devinitdata = { static struct pci_device_id btaudio_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_BROOKTREE, 0x0878, {
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, vendor: PCI_VENDOR_ID_BROOKTREE,
{ PCI_VENDOR_ID_BROOKTREE, 0x0879, device: 0x0878,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, subvendor: 0x0070,
{0,} subdevice: 0xff01,
driver_data: BTA_OSPREY200,
},{
vendor: PCI_VENDOR_ID_BROOKTREE,
device: 0x0878,
subvendor: PCI_ANY_ID,
subdevice: PCI_ANY_ID,
},{
vendor: PCI_VENDOR_ID_BROOKTREE,
device: 0x0878,
subvendor: PCI_ANY_ID,
subdevice: PCI_ANY_ID,
},{
/* --- end of list --- */
}
}; };
static struct pci_driver btaudio_pci_driver = { static struct pci_driver btaudio_pci_driver = {
...@@ -1050,7 +1091,7 @@ static struct pci_driver btaudio_pci_driver = { ...@@ -1050,7 +1091,7 @@ static struct pci_driver btaudio_pci_driver = {
static int btaudio_init_module(void) static int btaudio_init_module(void)
{ {
printk(KERN_INFO "btaudio: driver version 0.6 loaded [%s%s%s]\n", printk(KERN_INFO "btaudio: driver version 0.7 loaded [%s%s%s]\n",
digital ? "digital" : "", digital ? "digital" : "",
analog && digital ? "+" : "", analog && digital ? "+" : "",
analog ? "analog" : ""); analog ? "analog" : "");
......
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