patch-2.4.22 linux-2.4.22/drivers/sound/hal2.c
Next file: linux-2.4.22/drivers/sound/hal2.h
Previous file: linux-2.4.22/drivers/sound/forte.c
Back to the patch index
Back to the overall index
- Lines: 1481
- Date:
2003-08-25 04:44:42.000000000 -0700
- Orig file:
linux-2.4.21/drivers/sound/hal2.c
- Orig date:
2002-08-02 17:39:44.000000000 -0700
diff -urN linux-2.4.21/drivers/sound/hal2.c linux-2.4.22/drivers/sound/hal2.c
@@ -1,6 +1,6 @@
/*
- * Driver for HAL2 sound processors
- * Copyright (c) 2001, 2002 Ladislav Michl <ladis@psi.cz>
+ * Driver for A2 audio system used in SGI machines
+ * Copyright (c) 2001, 2002, 2003 Ladislav Michl <ladis@linux-mips.org>
*
* Based on Ulf Carlsson's code.
*
@@ -21,12 +21,10 @@
* /dev/dsp standard dsp device, (mostly) OSS compatible
* /dev/mixer standard mixer device, (mostly) OSS compatible
*
- * BUGS:
- * + Driver currently supports indigo mode only.
- * + Recording doesn't work. I guess that it is caused by PBUS channel
- * misconfiguration, but until I get relevant info I'm unable to fix it.
+ * TODO: 4 channel mode?
*/
+#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/init.h>
@@ -36,7 +34,8 @@
#include <linux/soundcard.h>
#include <asm/io.h>
#include <asm/uaccess.h>
-#include <asm/sgi/sgint23.h>
+#include <asm/sgi/hpc3.h>
+#include <asm/sgi/ip22.h>
#include "hal2.h"
@@ -57,69 +56,71 @@
#define H2_READ_ADDR(addr) (addr | (1<<7))
#define H2_WRITE_ADDR(addr) (addr)
-static char *hal2str = "HAL2 audio";
-static int ibuffers = 32;
-static int obuffers = 32;
+static char *hal2str = "HAL2";
+static int msmix = 0;
+static int ibufs = 4;
+static int obufs = 8;
-/* I doubt anyone has a machine with two HAL2 cards. It's possible to
+/*
+ * I doubt anyone has a machine with two HAL2 cards. It's possible to
* have two HPC's, so it is probably possible to have two HAL2 cards.
* Try to deal with it, but note that it is not tested.
*/
#define MAXCARDS 2
-static hal2_card_t* hal2_card[MAXCARDS];
+static struct hal2_card* hal2_card[MAXCARDS];
static const struct {
unsigned char idx:4, avail:1;
} mixtable[SOUND_MIXER_NRDEVICES] = {
- [SOUND_MIXER_PCM] = { H2_MIX_OUTPUT_ATT, 1 }, /* voice */
- [SOUND_MIXER_MIC] = { H2_MIX_INPUT_GAIN, 1 }, /* mic */
+ [SOUND_MIXER_PCM] = { H2_MIX_OUTPUT_ATT, 1 }, /* voice */
+ [SOUND_MIXER_MIC] = { H2_MIX_INPUT_GAIN, 1 }, /* mic */
};
#define H2_SUPPORTED_FORMATS (AFMT_S16_LE | AFMT_S16_BE)
-static inline void hal2_isr_write(hal2_card_t *hal2, u32 val)
+static inline void hal2_isr_write(struct hal2_card *hal2, u16 val)
{
hal2->ctl_regs->isr = val;
}
-static inline u32 hal2_isr_look(hal2_card_t *hal2)
+static inline u16 hal2_isr_look(struct hal2_card *hal2)
{
return hal2->ctl_regs->isr;
}
-static inline u32 hal2_rev_look(hal2_card_t *hal2)
+static inline u16 hal2_rev_look(struct hal2_card *hal2)
{
return hal2->ctl_regs->rev;
}
-#if 0
-static u16 hal2_i_look16(hal2_card_t *hal2, u32 addr)
+#ifdef HAL2_DUMP_REGS
+static u16 hal2_i_look16(struct hal2_card *hal2, u16 addr)
{
- hal2_ctl_regs_t *regs = hal2->ctl_regs;
+ struct hal2_ctl_regs *regs = hal2->ctl_regs;
regs->iar = H2_READ_ADDR(addr);
H2_INDIRECT_WAIT(regs);
- return (regs->idr0 & 0xffff);
+ return regs->idr0;
}
#endif
-static u32 hal2_i_look32(hal2_card_t *hal2, u32 addr)
+static u32 hal2_i_look32(struct hal2_card *hal2, u16 addr)
{
u32 ret;
- hal2_ctl_regs_t *regs = hal2->ctl_regs;
+ struct hal2_ctl_regs *regs = hal2->ctl_regs;
regs->iar = H2_READ_ADDR(addr);
H2_INDIRECT_WAIT(regs);
- ret = regs->idr0 & 0xffff;
+ ret = regs->idr0;
regs->iar = H2_READ_ADDR(addr | 0x1);
H2_INDIRECT_WAIT(regs);
- ret |= (regs->idr0 & 0xffff) << 16;
+ ret |= regs->idr0 << 16;
return ret;
}
-static void hal2_i_write16(hal2_card_t *hal2, u32 addr, u16 val)
+static void hal2_i_write16(struct hal2_card *hal2, u16 addr, u16 val)
{
- hal2_ctl_regs_t *regs = hal2->ctl_regs;
+ struct hal2_ctl_regs *regs = hal2->ctl_regs;
regs->idr0 = val;
regs->idr1 = 0;
@@ -129,9 +130,9 @@
H2_INDIRECT_WAIT(regs);
}
-static void hal2_i_write32(hal2_card_t *hal2, u32 addr, u32 val)
+static void hal2_i_write32(struct hal2_card *hal2, u16 addr, u32 val)
{
- hal2_ctl_regs_t *regs = hal2->ctl_regs;
+ struct hal2_ctl_regs *regs = hal2->ctl_regs;
regs->idr0 = val & 0xffff;
regs->idr1 = val >> 16;
@@ -141,9 +142,9 @@
H2_INDIRECT_WAIT(regs);
}
-static void hal2_i_setbit16(hal2_card_t *hal2, u32 addr, u16 bit)
+static void hal2_i_setbit16(struct hal2_card *hal2, u16 addr, u16 bit)
{
- hal2_ctl_regs_t *regs = hal2->ctl_regs;
+ struct hal2_ctl_regs *regs = hal2->ctl_regs;
regs->iar = H2_READ_ADDR(addr);
H2_INDIRECT_WAIT(regs);
@@ -155,10 +156,10 @@
H2_INDIRECT_WAIT(regs);
}
-static void hal2_i_setbit32(hal2_card_t *hal2, u32 addr, u32 bit)
+static void hal2_i_setbit32(struct hal2_card *hal2, u16 addr, u32 bit)
{
u32 tmp;
- hal2_ctl_regs_t *regs = hal2->ctl_regs;
+ struct hal2_ctl_regs *regs = hal2->ctl_regs;
regs->iar = H2_READ_ADDR(addr);
H2_INDIRECT_WAIT(regs);
@@ -171,9 +172,9 @@
H2_INDIRECT_WAIT(regs);
}
-static void hal2_i_clearbit16(hal2_card_t *hal2, u32 addr, u16 bit)
+static void hal2_i_clearbit16(struct hal2_card *hal2, u16 addr, u16 bit)
{
- hal2_ctl_regs_t *regs = hal2->ctl_regs;
+ struct hal2_ctl_regs *regs = hal2->ctl_regs;
regs->iar = H2_READ_ADDR(addr);
H2_INDIRECT_WAIT(regs);
@@ -186,7 +187,7 @@
}
#if 0
-static void hal2_i_clearbit32(hal2_card_t *hal2, u32 addr, u32 bit)
+static void hal2_i_clearbit32(struct hal2_card *hal2, u16 addr, u32 bit)
{
u32 tmp;
hal2_ctl_regs_t *regs = hal2->ctl_regs;
@@ -203,33 +204,33 @@
}
#endif
-#ifdef HAL2_DEBUG
-static void hal2_dump_regs(hal2_card_t *hal2)
+#ifdef HAL2_DUMP_REGS
+static void hal2_dump_regs(struct hal2_card *hal2)
{
- printk("isr: %08hx ", hal2_isr_look(hal2));
- printk("rev: %08hx\n", hal2_rev_look(hal2));
- printk("relay: %04hx\n", hal2_i_look16(hal2, H2I_RELAY_C));
- printk("port en: %04hx ", hal2_i_look16(hal2, H2I_DMA_PORT_EN));
- printk("dma end: %04hx ", hal2_i_look16(hal2, H2I_DMA_END));
- printk("dma drv: %04hx\n", hal2_i_look16(hal2, H2I_DMA_DRV));
- printk("syn ctl: %04hx ", hal2_i_look16(hal2, H2I_SYNTH_C));
- printk("aesrx ctl: %04hx ", hal2_i_look16(hal2, H2I_AESRX_C));
- printk("aestx ctl: %04hx ", hal2_i_look16(hal2, H2I_AESTX_C));
- printk("dac ctl1: %04hx ", hal2_i_look16(hal2, H2I_ADC_C1));
- printk("dac ctl2: %08lx ", hal2_i_look32(hal2, H2I_ADC_C2));
- printk("adc ctl1: %04hx ", hal2_i_look16(hal2, H2I_DAC_C1));
- printk("adc ctl2: %08lx ", hal2_i_look32(hal2, H2I_DAC_C2));
- printk("syn map: %04hx\n", hal2_i_look16(hal2, H2I_SYNTH_MAP_C));
- printk("bres1 ctl1: %04hx ", hal2_i_look16(hal2, H2I_BRES1_C1));
- printk("bres1 ctl2: %04lx ", hal2_i_look32(hal2, H2I_BRES1_C2));
- printk("bres2 ctl1: %04hx ", hal2_i_look16(hal2, H2I_BRES2_C1));
- printk("bres2 ctl2: %04lx ", hal2_i_look32(hal2, H2I_BRES2_C2));
- printk("bres3 ctl1: %04hx ", hal2_i_look16(hal2, H2I_BRES3_C1));
- printk("bres3 ctl2: %04lx\n", hal2_i_look32(hal2, H2I_BRES3_C2));
+ DEBUG("isr: %08hx ", hal2_isr_look(hal2));
+ DEBUG("rev: %08hx\n", hal2_rev_look(hal2));
+ DEBUG("relay: %04hx\n", hal2_i_look16(hal2, H2I_RELAY_C));
+ DEBUG("port en: %04hx ", hal2_i_look16(hal2, H2I_DMA_PORT_EN));
+ DEBUG("dma end: %04hx ", hal2_i_look16(hal2, H2I_DMA_END));
+ DEBUG("dma drv: %04hx\n", hal2_i_look16(hal2, H2I_DMA_DRV));
+ DEBUG("syn ctl: %04hx ", hal2_i_look16(hal2, H2I_SYNTH_C));
+ DEBUG("aesrx ctl: %04hx ", hal2_i_look16(hal2, H2I_AESRX_C));
+ DEBUG("aestx ctl: %04hx ", hal2_i_look16(hal2, H2I_AESTX_C));
+ DEBUG("dac ctl1: %04hx ", hal2_i_look16(hal2, H2I_ADC_C1));
+ DEBUG("dac ctl2: %08x ", hal2_i_look32(hal2, H2I_ADC_C2));
+ DEBUG("adc ctl1: %04hx ", hal2_i_look16(hal2, H2I_DAC_C1));
+ DEBUG("adc ctl2: %08x ", hal2_i_look32(hal2, H2I_DAC_C2));
+ DEBUG("syn map: %04hx\n", hal2_i_look16(hal2, H2I_SYNTH_MAP_C));
+ DEBUG("bres1 ctl1: %04hx ", hal2_i_look16(hal2, H2I_BRES1_C1));
+ DEBUG("bres1 ctl2: %04x ", hal2_i_look32(hal2, H2I_BRES1_C2));
+ DEBUG("bres2 ctl1: %04hx ", hal2_i_look16(hal2, H2I_BRES2_C1));
+ DEBUG("bres2 ctl2: %04x ", hal2_i_look32(hal2, H2I_BRES2_C2));
+ DEBUG("bres3 ctl1: %04hx ", hal2_i_look16(hal2, H2I_BRES3_C1));
+ DEBUG("bres3 ctl2: %04x\n", hal2_i_look32(hal2, H2I_BRES3_C2));
}
#endif
-static hal2_card_t* hal2_dsp_find_card(int minor)
+static struct hal2_card* hal2_dsp_find_card(int minor)
{
int i;
@@ -239,7 +240,7 @@
return NULL;
}
-static hal2_card_t* hal2_mixer_find_card(int minor)
+static struct hal2_card* hal2_mixer_find_card(int minor)
{
int i;
@@ -250,12 +251,12 @@
}
-static void hal2_dac_interrupt(hal2_codec_t *dac)
+static void hal2_dac_interrupt(struct hal2_codec *dac)
{
int running;
spin_lock(&dac->lock);
-
+
/* if tail buffer contains zero samples DMA stream was already
* stopped */
running = dac->tail->info.cnt;
@@ -272,10 +273,10 @@
wake_up(&dac->dma_wait);
}
-static void hal2_adc_interrupt(hal2_codec_t *adc)
+static void hal2_adc_interrupt(struct hal2_codec *adc)
{
int running;
-
+
spin_lock(&adc->lock);
/* if head buffer contains nonzero samples DMA stream was already
@@ -298,7 +299,7 @@
static void hal2_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
- hal2_card_t *hal2 = (hal2_card_t*)dev_id;
+ struct hal2_card *hal2 = (struct hal2_card*)dev_id;
/* decide what caused this interrupt */
if (hal2->dac.pbus.pbus->pbdma_ctrl & HPC3_PDMACTRL_INT)
@@ -307,50 +308,33 @@
hal2_adc_interrupt(&hal2->adc);
}
-static int hal2_compute_rate(hal2_codec_t *codec, unsigned int rate)
+static int hal2_compute_rate(struct hal2_codec *codec, unsigned int rate)
{
- unsigned short inc;
+ unsigned short mod;
- /* We default to 44.1 kHz and if it isn't possible to fall back to
- * 48.0 kHz with the needed adjustments of real_rate.
- */
-
DEBUG("rate: %d\n", rate);
- /* Refer to CS4216 data sheet */
- if (rate < 4000)
- rate = 4000;
- if (rate > 50000)
- rate = 50000;
-
- /* Note: This is NOT the way they set up the bresenham clock generators
- * in the specification. I've tried to implement that method but it
- * doesn't work. It's probably another silly bug in the spec.
- *
- * I accidently discovered this method while I was testing and it seems
- * to work very well with all frequencies, and thee shall follow rule #1
- * of programming :-)
- */
-
- if (44100 % rate == 0) {
- inc = 44100 / rate;
- if (inc < 1) inc = 1;
+ if (rate < 4000) rate = 4000;
+ else if (rate > 48000) rate = 48000;
+
+ if (44100 % rate < 48000 % rate) {
+ mod = 4 * 44100 / rate;
codec->master = 44100;
} else {
- inc = 48000 / rate;
- if (inc < 1) inc = 1;
- rate = 48000 / inc;
+ mod = 4 * 48000 / rate;
codec->master = 48000;
}
- codec->inc = inc;
- codec->mod = 1;
-
+
+ codec->inc = 4;
+ codec->mod = mod;
+ rate = 4 * codec->master / mod;
+
DEBUG("real_rate: %d\n", rate);
return rate;
}
-static void hal2_set_dac_rate(hal2_card_t *hal2)
+static void hal2_set_dac_rate(struct hal2_card *hal2)
{
unsigned int master = hal2->dac.master;
int inc = hal2->dac.inc;
@@ -359,10 +343,10 @@
DEBUG("master: %d inc: %d mod: %d\n", master, inc, mod);
hal2_i_write16(hal2, H2I_BRES1_C1, (master == 44100) ? 1 : 0);
- hal2_i_write32(hal2, H2I_BRES1_C2, ((0xffff & (mod - inc - 1)) << 16) | 1);
+ hal2_i_write32(hal2, H2I_BRES1_C2, ((0xffff & (inc - mod - 1)) << 16) | inc);
}
-static void hal2_set_adc_rate(hal2_card_t *hal2)
+static void hal2_set_adc_rate(struct hal2_card *hal2)
{
unsigned int master = hal2->adc.master;
int inc = hal2->adc.inc;
@@ -371,13 +355,13 @@
DEBUG("master: %d inc: %d mod: %d\n", master, inc, mod);
hal2_i_write16(hal2, H2I_BRES2_C1, (master == 44100) ? 1 : 0);
- hal2_i_write32(hal2, H2I_BRES2_C2, ((0xffff & (mod - inc - 1)) << 16) | 1);
+ hal2_i_write32(hal2, H2I_BRES2_C2, ((0xffff & (inc - mod - 1)) << 16) | inc);
}
-static void hal2_setup_dac(hal2_card_t *hal2)
+static void hal2_setup_dac(struct hal2_card *hal2)
{
unsigned int fifobeg, fifoend, highwater, sample_size;
- hal2_pbus_t *pbus = &hal2->dac.pbus;
+ struct hal2_pbus *pbus = &hal2->dac.pbus;
DEBUG("hal2_setup_dac\n");
@@ -393,86 +377,88 @@
highwater = (sample_size * 2) >> 1; /* halfwords */
fifobeg = 0; /* playback is first */
fifoend = (sample_size * 4) >> 3; /* doublewords */
+
pbus->ctrl = HPC3_PDMACTRL_RT | HPC3_PDMACTRL_LD |
- (highwater << 8) | (fifobeg << 16) | (fifoend << 24);
+ (highwater << 8) | (fifobeg << 16) | (fifoend << 24) |
+ (hal2->dac.format & AFMT_S16_LE ? HPC3_PDMACTRL_SEL : 0);
/* We disable everything before we do anything at all */
pbus->pbus->pbdma_ctrl = HPC3_PDMACTRL_LD;
hal2_i_clearbit16(hal2, H2I_DMA_PORT_EN, H2I_DMA_PORT_EN_CODECTX);
- hal2_i_clearbit16(hal2, H2I_DMA_DRV, (1 << pbus->pbusnr));
/* Setup the HAL2 for playback */
hal2_set_dac_rate(hal2);
+ /* Set endianess */
+ if (hal2->dac.format & AFMT_S16_LE)
+ hal2_i_setbit16(hal2, H2I_DMA_END, H2I_DMA_END_CODECTX);
+ else
+ hal2_i_clearbit16(hal2, H2I_DMA_END, H2I_DMA_END_CODECTX);
+ /* Set DMA bus */
+ hal2_i_setbit16(hal2, H2I_DMA_DRV, (1 << pbus->pbusnr));
/* We are using 1st Bresenham clock generator for playback */
hal2_i_write16(hal2, H2I_DAC_C1, (pbus->pbusnr << H2I_C1_DMA_SHIFT)
| (1 << H2I_C1_CLKID_SHIFT)
| (hal2->dac.voices << H2I_C1_DATAT_SHIFT));
}
-static void hal2_setup_adc(hal2_card_t *hal2)
+static void hal2_setup_adc(struct hal2_card *hal2)
{
unsigned int fifobeg, fifoend, highwater, sample_size;
- hal2_pbus_t *pbus = &hal2->adc.pbus;
+ struct hal2_pbus *pbus = &hal2->adc.pbus;
DEBUG("hal2_setup_adc\n");
-
+
sample_size = 2 * hal2->adc.voices;
highwater = (sample_size * 2) >> 1; /* halfwords */
fifobeg = (4 * 4) >> 3; /* record is second */
fifoend = (4 * 4 + sample_size * 4) >> 3; /* doublewords */
+
pbus->ctrl = HPC3_PDMACTRL_RT | HPC3_PDMACTRL_RCV | HPC3_PDMACTRL_LD |
- (highwater << 8) | (fifobeg << 16) | (fifoend << 24);
+ (highwater << 8) | (fifobeg << 16) | (fifoend << 24) |
+ (hal2->adc.format & AFMT_S16_LE ? HPC3_PDMACTRL_SEL : 0);
pbus->pbus->pbdma_ctrl = HPC3_PDMACTRL_LD;
hal2_i_clearbit16(hal2, H2I_DMA_PORT_EN, H2I_DMA_PORT_EN_CODECR);
- hal2_i_clearbit16(hal2, H2I_DMA_DRV, (1 << pbus->pbusnr));
/* Setup the HAL2 for record */
hal2_set_adc_rate(hal2);
+ /* Set endianess */
+ if (hal2->adc.format & AFMT_S16_LE)
+ hal2_i_setbit16(hal2, H2I_DMA_END, H2I_DMA_END_CODECR);
+ else
+ hal2_i_clearbit16(hal2, H2I_DMA_END, H2I_DMA_END_CODECR);
+ /* Set DMA bus */
+ hal2_i_setbit16(hal2, H2I_DMA_DRV, (1 << pbus->pbusnr));
/* We are using 2nd Bresenham clock generator for record */
hal2_i_write16(hal2, H2I_ADC_C1, (pbus->pbusnr << H2I_C1_DMA_SHIFT)
| (2 << H2I_C1_CLKID_SHIFT)
| (hal2->adc.voices << H2I_C1_DATAT_SHIFT));
}
-static void hal2_start_dac(hal2_card_t *hal2)
+static void hal2_start_dac(struct hal2_card *hal2)
{
- hal2_pbus_t *pbus = &hal2->dac.pbus;
+ struct hal2_pbus *pbus = &hal2->dac.pbus;
DEBUG("hal2_start_dac\n");
pbus->pbus->pbdma_dptr = PHYSADDR(hal2->dac.tail);
pbus->pbus->pbdma_ctrl = pbus->ctrl | HPC3_PDMACTRL_ACT;
- /* set endianess */
- if (hal2->dac.format & AFMT_S16_LE)
- hal2_i_setbit16(hal2, H2I_DMA_END, H2I_DMA_END_CODECTX);
- else
- hal2_i_clearbit16(hal2, H2I_DMA_END, H2I_DMA_END_CODECTX);
- /* set DMA bus */
- hal2_i_setbit16(hal2, H2I_DMA_DRV, (1 << pbus->pbusnr));
/* enable DAC */
hal2_i_setbit16(hal2, H2I_DMA_PORT_EN, H2I_DMA_PORT_EN_CODECTX);
}
-static void hal2_start_adc(hal2_card_t *hal2)
+static void hal2_start_adc(struct hal2_card *hal2)
{
- hal2_pbus_t *pbus = &hal2->adc.pbus;
+ struct hal2_pbus *pbus = &hal2->adc.pbus;
DEBUG("hal2_start_adc\n");
pbus->pbus->pbdma_dptr = PHYSADDR(hal2->adc.head);
pbus->pbus->pbdma_ctrl = pbus->ctrl | HPC3_PDMACTRL_ACT;
- /* set endianess */
- if (hal2->adc.format & AFMT_S16_LE)
- hal2_i_setbit16(hal2, H2I_DMA_END, H2I_DMA_END_CODECR);
- else
- hal2_i_clearbit16(hal2, H2I_DMA_END, H2I_DMA_END_CODECR);
- /* set DMA bus */
- hal2_i_setbit16(hal2, H2I_DMA_DRV, (1 << pbus->pbusnr));
/* enable ADC */
hal2_i_setbit16(hal2, H2I_DMA_PORT_EN, H2I_DMA_PORT_EN_CODECR);
}
-static inline void hal2_stop_dac(hal2_card_t *hal2)
+static inline void hal2_stop_dac(struct hal2_card *hal2)
{
DEBUG("hal2_stop_dac\n");
@@ -480,7 +466,7 @@
/* The HAL2 itself may remain enabled safely */
}
-static inline void hal2_stop_adc(hal2_card_t *hal2)
+static inline void hal2_stop_adc(struct hal2_card *hal2)
{
DEBUG("hal2_stop_adc\n");
@@ -489,25 +475,25 @@
#define hal2_alloc_dac_dmabuf(hal2) hal2_alloc_dmabuf(hal2, 1)
#define hal2_alloc_adc_dmabuf(hal2) hal2_alloc_dmabuf(hal2, 0)
-static int hal2_alloc_dmabuf(hal2_card_t *hal2, int is_dac)
+static int hal2_alloc_dmabuf(struct hal2_card *hal2, int is_dac)
{
int buffers, cntinfo;
- hal2_buf_t *buf, *prev;
- hal2_codec_t *codec;
+ struct hal2_buf *buf, *prev;
+ struct hal2_codec *codec;
if (is_dac) {
codec = &hal2->dac;
- buffers = obuffers;
+ buffers = obufs;
cntinfo = HPCDMA_XIE | HPCDMA_EOX;
} else {
codec = &hal2->adc;
- buffers = ibuffers;
+ buffers = ibufs;
cntinfo = HPCDMA_XIE | H2_BUFFER_SIZE;
}
DEBUG("allocating %d DMA buffers.\n", buffers);
- buf = (hal2_buf_t*) get_zeroed_page(GFP_KERNEL);
+ buf = (struct hal2_buf *)get_zeroed_page(GFP_KERNEL);
if (!buf)
return -ENOMEM;
codec->head = buf;
@@ -518,9 +504,10 @@
buf->info.desc.cntinfo = cntinfo;
buf->info.cnt = 0;
prev = buf;
- buf = (hal2_buf_t*) get_zeroed_page(GFP_KERNEL);
+ buf = (struct hal2_buf *)get_zeroed_page(GFP_KERNEL);
if (!buf) {
- printk("HAL2: Not enough memory for DMA buffer.\n");
+ printk(KERN_ERR
+ "HAL2: Not enough memory for DMA buffer.\n");
buf = codec->head;
while (buf) {
prev = buf;
@@ -532,8 +519,7 @@
prev->info.next = buf;
prev->info.desc.pnext = PHYSADDR(buf);
/* The PBUS can prolly not read this stuff when it's in
- * the cache so we have to flush it back to main memory
- */
+ * the cache so we have to flush it back to main memory */
dma_cache_wback_inv((unsigned long) prev, PAGE_SIZE);
}
buf->info.desc.pbuf = PHYSADDR(&buf->data);
@@ -548,10 +534,10 @@
#define hal2_free_dac_dmabuf(hal2) hal2_free_dmabuf(hal2, 1)
#define hal2_free_adc_dmabuf(hal2) hal2_free_dmabuf(hal2, 0)
-static void hal2_free_dmabuf(hal2_card_t *hal2, int is_dac)
+static void hal2_free_dmabuf(struct hal2_card *hal2, int is_dac)
{
- hal2_buf_t *buf, *next;
- hal2_codec_t *codec = (is_dac) ? &hal2->dac : &hal2->adc;
+ struct hal2_buf *buf, *next;
+ struct hal2_codec *codec = (is_dac) ? &hal2->dac : &hal2->adc;
if (!codec->head)
return;
@@ -570,14 +556,14 @@
* Add 'count' bytes to 'buffer' from DMA ring buffers. Return number of
* bytes added or -EFAULT if copy_from_user failed.
*/
-static int hal2_get_buffer(hal2_card_t *hal2, char *buffer, int count)
+static int hal2_get_buffer(struct hal2_card *hal2, char *buffer, int count)
{
unsigned long flags;
int size, ret = 0;
- hal2_codec_t *adc = &hal2->adc;
-
+ struct hal2_codec *adc = &hal2->adc;
+
spin_lock_irqsave(&adc->lock, flags);
-
+
DEBUG("getting %d bytes ", count);
/* enable DMA stream if there are no data */
@@ -585,20 +571,20 @@
adc->tail->info.cnt == 0)
hal2_start_adc(hal2);
- DEBUG("... ");
-
while (adc->tail->info.cnt > 0 && count > 0) {
size = min(adc->tail->info.cnt, count);
spin_unlock_irqrestore(&adc->lock, flags);
- if (copy_to_user(buffer, &adc->tail->data[H2_BUFFER_SIZE-size],
+ if (copy_to_user(buffer,
+ &adc->tail->data[H2_BUFFER_SIZE -
+ adc->tail->info.cnt],
size)) {
ret = -EFAULT;
goto out;
}
spin_lock_irqsave(&adc->lock, flags);
-
+
adc->tail->info.cnt -= size;
/* buffer is empty, update tail pointer */
if (adc->tail->info.cnt == 0) {
@@ -619,9 +605,9 @@
DEBUG("(%d) ", size);
}
spin_unlock_irqrestore(&adc->lock, flags);
-out:
+out:
DEBUG("\n");
-
+
return ret;
}
@@ -629,20 +615,20 @@
* Add 'count' bytes from 'buffer' to DMA ring buffers. Return number of
* bytes added or -EFAULT if copy_from_user failed.
*/
-static int hal2_add_buffer(hal2_card_t *hal2, char *buffer, int count)
+static int hal2_add_buffer(struct hal2_card *hal2, char *buffer, int count)
{
unsigned long flags;
int size, ret = 0;
- hal2_codec_t *dac = &hal2->dac;
-
+ struct hal2_codec *dac = &hal2->dac;
+
spin_lock_irqsave(&dac->lock, flags);
-
+
DEBUG("adding %d bytes ", count);
while (dac->head->info.cnt == 0 && count > 0) {
size = min((int)H2_BUFFER_SIZE, count);
spin_unlock_irqrestore(&dac->lock, flags);
-
+
if (copy_from_user(dac->head->data, buffer, size)) {
ret = -EFAULT;
goto out;
@@ -662,20 +648,20 @@
}
if (!(dac->pbus.pbus->pbdma_ctrl & HPC3_PDMACTRL_ISACT) && ret > 0)
hal2_start_dac(hal2);
-
+
spin_unlock_irqrestore(&dac->lock, flags);
-out:
+out:
DEBUG("\n");
-
+
return ret;
}
#define hal2_reset_dac_pointer(hal2) hal2_reset_pointer(hal2, 1)
#define hal2_reset_adc_pointer(hal2) hal2_reset_pointer(hal2, 0)
-static void hal2_reset_pointer(hal2_card_t *hal2, int is_dac)
+static void hal2_reset_pointer(struct hal2_card *hal2, int is_dac)
{
- hal2_codec_t *codec = (is_dac) ? &hal2->dac : &hal2->adc;
-
+ struct hal2_codec *codec = (is_dac) ? &hal2->dac : &hal2->adc;
+
DEBUG("hal2_reset_pointer\n");
codec->tail = codec->head;
@@ -689,16 +675,16 @@
} while (codec->tail != codec->head);
}
-static int hal2_sync_dac(hal2_card_t *hal2)
+static int hal2_sync_dac(struct hal2_card *hal2)
{
DECLARE_WAITQUEUE(wait, current);
- hal2_codec_t *dac = &hal2->dac;
+ struct hal2_codec *dac = &hal2->dac;
int ret = 0;
signed long timeout = 1000 * H2_BUFFER_SIZE * 2 * dac->voices *
HZ / dac->sample_rate / 900;
down(&dac->sem);
-
+
while (dac->pbus.pbus->pbdma_ctrl & HPC3_PDMACTRL_ISACT) {
add_wait_queue(&dac->dma_wait, &wait);
set_current_state(TASK_INTERRUPTIBLE);
@@ -706,7 +692,7 @@
/* We may get bogus timeout when system is
* heavily loaded */
if (dac->tail->info.cnt) {
- printk("HAL2: timeout...\n");
+ printk(KERN_NOTICE "HAL2: timeout...\n");
ret = -ETIME;
}
if (signal_pending(current))
@@ -719,16 +705,16 @@
}
up(&dac->sem);
-
+
return ret;
}
-static int hal2_write_mixer(hal2_card_t *hal2, int index, int vol)
+static int hal2_write_mixer(struct hal2_card *hal2, int index, int vol)
{
- unsigned int l, r;
+ unsigned int l, r, tmp;
DEBUG_MIX("mixer %d write\n", index);
-
+
if (index >= SOUND_MIXER_NRDEVICES || !mixtable[index].avail)
return -EINVAL;
@@ -738,23 +724,22 @@
l = vol & 0xff;
if (l > 100)
l = 100;
-
+
hal2->mixer.volume[mixtable[index].idx] = l | (r << 8);
switch (mixtable[index].idx) {
- case H2_MIX_OUTPUT_ATT: {
+ case H2_MIX_OUTPUT_ATT:
DEBUG_MIX("output attenuator %d,%d\n", l, r);
if (r | l) {
- unsigned int tmp = hal2_i_look32(hal2, H2I_DAC_C2);
-
+ tmp = hal2_i_look32(hal2, H2I_DAC_C2);
tmp &= ~(H2I_C2_L_ATT_M | H2I_C2_R_ATT_M | H2I_C2_MUTE);
/* Attenuator has five bits */
- l = (31 * (100 - l) / 99);
- r = (31 * (100 - r) / 99);
-
+ l = 31 * (100 - l) / 99;
+ r = 31 * (100 - r) / 99;
+
DEBUG_MIX("left: %d, right %d\n", l, r);
tmp |= (l << H2I_C2_L_ATT_SHIFT) & H2I_C2_L_ATT_M;
@@ -762,31 +747,80 @@
hal2_i_write32(hal2, H2I_DAC_C2, tmp);
} else
hal2_i_setbit32(hal2, H2I_DAC_C2, H2I_C2_MUTE);
+ break;
+ case H2_MIX_INPUT_GAIN:
+
+ DEBUG_MIX("input gain %d,%d\n", l, r);
+
+ tmp = hal2_i_look32(hal2, H2I_ADC_C2);
+ tmp &= ~(H2I_C2_L_GAIN_M | H2I_C2_R_GAIN_M);
+
+ /* Gain control has four bits */
+ l = 16 * l / 100;
+ r = 16 * r / 100;
+
+ DEBUG_MIX("left: %d, right %d\n", l, r);
+
+ tmp |= (l << H2I_C2_L_GAIN_SHIFT) & H2I_C2_L_GAIN_M;
+ tmp |= (r << H2I_C2_R_GAIN_SHIFT) & H2I_C2_R_GAIN_M;
+ hal2_i_write32(hal2, H2I_ADC_C2, tmp);
+
+ break;
}
- case H2_MIX_INPUT_GAIN: {
- /* TODO */
- }
- }
+
return 0;
}
-static void hal2_init_mixer(hal2_card_t *hal2)
+static void hal2_init_mixer(struct hal2_card *hal2)
{
int i;
for (i = 0; i < SOUND_MIXER_NRDEVICES; i++)
- hal2_write_mixer(hal2, i, 100 | (100 << 8));
-
+ if (mixtable[i].avail)
+ hal2->mixer.volume[mixtable[i].idx] = 100 | (100 << 8);
+
+ /* disable attenuator */
+ hal2_i_write32(hal2, H2I_DAC_C2, 0);
+ /* set max input gain */
+ hal2_i_write32(hal2, H2I_ADC_C2, H2I_C2_MUTE |
+ (H2I_C2_L_GAIN_M << H2I_C2_L_GAIN_SHIFT) |
+ (H2I_C2_R_GAIN_M << H2I_C2_R_GAIN_SHIFT));
+ /* set max volume */
+ hal2->mixer.master = 0xff;
+ hal2->vol_regs->left = 0xff;
+ hal2->vol_regs->right = 0xff;
+}
+
+/*
+ * XXX: later i'll implement mixer for main volume which will be disabled
+ * by default. enabling it users will be allowed to have master volume level
+ * control on panel in their favourite X desktop
+ */
+static void hal2_volume_control(int direction)
+{
+ unsigned int master = hal2_card[0]->mixer.master;
+ struct hal2_vol_regs *vol = hal2_card[0]->vol_regs;
+
+ /* volume up */
+ if (direction > 0 && master < 0xff)
+ master++;
+ /* volume down */
+ else if (direction < 0 && master > 0)
+ master--;
+ /* TODO: mute/unmute */
+ vol->left = master;
+ vol->right = master;
+ hal2_card[0]->mixer.master = master;
}
-static int hal2_mixer_ioctl(hal2_card_t *hal2, unsigned int cmd,
+static int hal2_mixer_ioctl(struct hal2_card *hal2, unsigned int cmd,
unsigned long arg)
{
int val;
if (cmd == SOUND_MIXER_INFO) {
mixer_info info;
-
+
strncpy(info.id, hal2str, sizeof(info.id));
strncpy(info.name, hal2str, sizeof(info.name));
info.modify_counter = hal2->mixer.modcnt;
@@ -796,7 +830,7 @@
}
if (cmd == SOUND_OLD_MIXER_INFO) {
_old_mixer_info info;
-
+
strncpy(info.id, hal2str, sizeof(info.id));
strncpy(info.name, hal2str, sizeof(info.name));
if (copy_to_user((void *)arg, &info, sizeof(info)))
@@ -819,7 +853,7 @@
case SOUND_MIXER_DEVMASK:
case SOUND_MIXER_STEREODEVS: {
int i;
-
+
for (val = i = 0; i < SOUND_MIXER_NRDEVICES; i++)
if (mixtable[i].avail)
val |= 1 << i;
@@ -835,7 +869,7 @@
/* Read a specific mixer */
default: {
int i = _IOC_NR(cmd);
-
+
if (i >= SOUND_MIXER_NRDEVICES || !mixtable[i].avail)
return -EINVAL;
val = hal2->mixer.volume[mixtable[i].idx];
@@ -844,10 +878,10 @@
}
return put_user(val, (int *)arg);
}
-
+
if (_IOC_DIR(cmd) != (_IOC_WRITE|_IOC_READ))
return -EINVAL;
-
+
hal2->mixer.modcnt++;
if (get_user(val, (int *)arg))
@@ -866,7 +900,7 @@
static int hal2_open_mixdev(struct inode *inode, struct file *file)
{
- hal2_card_t *hal2 = hal2_mixer_find_card(MINOR(inode->i_rdev));
+ struct hal2_card *hal2 = hal2_mixer_find_card(MINOR(inode->i_rdev));
if (hal2) {
file->private_data = hal2;
@@ -883,31 +917,30 @@
static int hal2_ioctl_mixdev(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- return hal2_mixer_ioctl((hal2_card_t *)file->private_data, cmd, arg);
+ return hal2_mixer_ioctl((struct hal2_card *)file->private_data, cmd, arg);
}
-
static int hal2_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
int val;
- hal2_card_t *hal2 = (hal2_card_t *) file->private_data;
+ struct hal2_card *hal2 = (struct hal2_card *) file->private_data;
switch (cmd) {
case OSS_GETVERSION:
return put_user(SOUND_VERSION, (int *)arg);
-
+
case SNDCTL_DSP_SYNC:
if (file->f_mode & FMODE_WRITE)
return hal2_sync_dac(hal2);
return 0;
-
+
case SNDCTL_DSP_SETDUPLEX:
return 0;
case SNDCTL_DSP_GETCAPS:
return put_user(DSP_CAP_DUPLEX | DSP_CAP_MULTI, (int *)arg);
-
+
case SNDCTL_DSP_RESET:
if (file->f_mode & FMODE_READ) {
hal2_stop_adc(hal2);
@@ -935,7 +968,7 @@
hal2_set_dac_rate(hal2);
}
return put_user(val, (int *)arg);
-
+
case SNDCTL_DSP_STEREO:
if (get_user(val, (int *)arg))
return -EFAULT;
@@ -972,10 +1005,10 @@
if (file->f_mode & FMODE_WRITE)
val = hal2->dac.voices;
return put_user(val, (int *)arg);
-
+
case SNDCTL_DSP_GETFMTS: /* Returns a mask */
return put_user(H2_SUPPORTED_FORMATS, (int *)arg);
-
+
case SNDCTL_DSP_SETFMT: /* Selects ONE fmt*/
if (get_user(val, (int *)arg))
return -EFAULT;
@@ -1000,19 +1033,19 @@
val = hal2->dac.format;
}
return put_user(val, (int *)arg);
-
+
case SNDCTL_DSP_POST:
return 0;
case SNDCTL_DSP_GETOSPACE: {
unsigned long flags;
audio_buf_info info;
- hal2_buf_t *buf;
- hal2_codec_t *dac = &hal2->dac;
-
+ struct hal2_buf *buf;
+ struct hal2_codec *dac = &hal2->dac;
+
if (!(file->f_mode & FMODE_WRITE))
return -EINVAL;
-
+
spin_lock_irqsave(&dac->lock, flags);
info.fragments = 0;
buf = dac->head;
@@ -1021,23 +1054,23 @@
buf = buf->info.next;
}
spin_unlock_irqrestore(&dac->lock, flags);
-
- info.fragstotal = obuffers;
+
+ info.fragstotal = obufs;
info.fragsize = H2_BUFFER_SIZE;
info.bytes = info.fragsize * info.fragments;
return copy_to_user((void *)arg, &info, sizeof(info)) ? -EFAULT : 0;
}
-
+
case SNDCTL_DSP_GETISPACE: {
unsigned long flags;
audio_buf_info info;
- hal2_buf_t *buf;
- hal2_codec_t *adc = &hal2->adc;
-
+ struct hal2_buf *buf;
+ struct hal2_codec *adc = &hal2->adc;
+
if (!(file->f_mode & FMODE_READ))
return -EINVAL;
-
+
spin_lock_irqsave(&adc->lock, flags);
info.fragments = 0;
info.bytes = 0;
@@ -1049,19 +1082,19 @@
}
spin_unlock_irqrestore(&adc->lock, flags);
- info.fragstotal = ibuffers;
+ info.fragstotal = ibufs;
info.fragsize = H2_BUFFER_SIZE;
-
+
return copy_to_user((void *)arg, &info, sizeof(info)) ? -EFAULT : 0;
}
case SNDCTL_DSP_NONBLOCK:
file->f_flags |= O_NONBLOCK;
return 0;
-
+
case SNDCTL_DSP_GETBLKSIZE:
return put_user(H2_BUFFER_SIZE, (int *)arg);
-
+
case SNDCTL_DSP_SETFRAGMENT:
return 0;
@@ -1085,7 +1118,7 @@
val = 16;
return put_user(val, (int *)arg);
}
-
+
return hal2_mixer_ioctl(hal2, cmd, arg);
}
@@ -1093,16 +1126,16 @@
size_t count, loff_t *ppos)
{
ssize_t err;
- hal2_card_t *hal2 = (hal2_card_t *) file->private_data;
- hal2_codec_t *adc = &hal2->adc;
+ struct hal2_card *hal2 = (struct hal2_card *) file->private_data;
+ struct hal2_codec *adc = &hal2->adc;
if (count == 0)
return 0;
if (ppos != &file->f_pos)
return -ESPIPE;
-
+
down(&adc->sem);
-
+
if (file->f_flags & O_NONBLOCK) {
err = hal2_get_buffer(hal2, buffer, count);
err = err == 0 ? -EAGAIN : err;
@@ -1113,7 +1146,7 @@
2 * adc->voices * HZ / adc->sample_rate / 900;
DECLARE_WAITQUEUE(wait, current);
ssize_t cnt = 0;
-
+
err = hal2_get_buffer(hal2, buffer, count);
if (err > 0) {
count -= err;
@@ -1131,7 +1164,8 @@
/* We may get bogus timeout when system
* is heavily loaded */
if (!adc->tail->info.cnt) {
- printk("HAL2: timeout...\n");
+ printk(KERN_NOTICE
+ "HAL2: timeout...\n");
hal2_stop_adc(hal2);
hal2_reset_adc_pointer(hal2);
err = -EAGAIN;
@@ -1141,11 +1175,10 @@
remove_wait_queue(&adc->dma_wait, &wait);
}
} while (count > 0 && err >= 0);
-
}
-
+
up(&adc->sem);
-
+
return err;
}
@@ -1154,8 +1187,8 @@
{
ssize_t err;
char *buf = (char*) buffer;
- hal2_card_t *hal2 = (hal2_card_t *) file->private_data;
- hal2_codec_t *dac = &hal2->dac;
+ struct hal2_card *hal2 = (struct hal2_card *) file->private_data;
+ struct hal2_codec *dac = &hal2->dac;
if (count == 0)
return 0;
@@ -1174,7 +1207,7 @@
2 * dac->voices * HZ / dac->sample_rate / 900;
DECLARE_WAITQUEUE(wait, current);
ssize_t cnt = 0;
-
+
err = hal2_add_buffer(hal2, buf, count);
if (err > 0) {
count -= err;
@@ -1192,7 +1225,8 @@
/* We may get bogus timeout when system
* is heavily loaded */
if (dac->head->info.cnt) {
- printk("HAL2: timeout...\n");
+ printk(KERN_NOTICE
+ "HAL2: timeout...\n");
hal2_stop_dac(hal2);
hal2_reset_dac_pointer(hal2);
err = -EAGAIN;
@@ -1203,7 +1237,7 @@
}
} while (count > 0 && err >= 0);
}
-
+
up(&dac->sem);
return err;
@@ -1213,48 +1247,47 @@
{
unsigned long flags;
unsigned int mask = 0;
- hal2_card_t *hal2 = (hal2_card_t *) file->private_data;
+ struct hal2_card *hal2 = (struct hal2_card *) file->private_data;
if (file->f_mode & FMODE_READ) {
- hal2_codec_t *adc = &hal2->adc;
-
+ struct hal2_codec *adc = &hal2->adc;
+
poll_wait(file, &hal2->adc.dma_wait, wait);
spin_lock_irqsave(&adc->lock, flags);
if (adc->tail->info.cnt > 0)
mask |= POLLIN;
spin_unlock_irqrestore(&adc->lock, flags);
}
-
+
if (file->f_mode & FMODE_WRITE) {
- hal2_codec_t *dac = &hal2->dac;
-
+ struct hal2_codec *dac = &hal2->dac;
+
poll_wait(file, &dac->dma_wait, wait);
spin_lock_irqsave(&dac->lock, flags);
if (dac->head->info.cnt == 0)
mask |= POLLOUT;
spin_unlock_irqrestore(&dac->lock, flags);
}
-
+
return mask;
}
static int hal2_open(struct inode *inode, struct file *file)
{
int err;
- hal2_card_t *hal2 = hal2_dsp_find_card(MINOR(inode->i_rdev));
+ struct hal2_card *hal2 = hal2_dsp_find_card(MINOR(inode->i_rdev));
DEBUG("opening audio device.\n");
- if (!hal2) {
- printk("HAL2: Whee?! Open door and go away!\n");
+ if (!hal2)
return -ENODEV;
- }
+
file->private_data = hal2;
if (file->f_mode & FMODE_READ) {
if (hal2->adc.usecount)
return -EBUSY;
-
+
/* OSS spec wanted us to use 8 bit, 8 kHz mono by default,
* but HAL2 can't do 8bit audio */
hal2->adc.format = AFMT_S16_BE;
@@ -1288,13 +1321,13 @@
hal2->dac.usecount++;
}
-
+
return 0;
}
static int hal2_release(struct inode *inode, struct file *file)
{
- hal2_card_t *hal2 = (hal2_card_t *) file->private_data;
+ struct hal2_card *hal2 = (struct hal2_card *) file->private_data;
if (file->f_mode & FMODE_READ) {
hal2_stop_adc(hal2);
@@ -1312,25 +1345,25 @@
}
static struct file_operations hal2_audio_fops = {
- owner: THIS_MODULE,
- llseek: no_llseek,
- read: hal2_read,
- write: hal2_write,
- poll: hal2_poll,
- ioctl: hal2_ioctl,
- open: hal2_open,
- release: hal2_release,
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .read = hal2_read,
+ .write = hal2_write,
+ .poll = hal2_poll,
+ .ioctl = hal2_ioctl,
+ .open = hal2_open,
+ .release = hal2_release,
};
static struct file_operations hal2_mixer_fops = {
- owner: THIS_MODULE,
- llseek: no_llseek,
- ioctl: hal2_ioctl_mixdev,
- open: hal2_open_mixdev,
- release: hal2_release_mixdev,
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .ioctl = hal2_ioctl_mixdev,
+ .open = hal2_open_mixdev,
+ .release = hal2_release_mixdev,
};
-static int hal2_request_irq(hal2_card_t *hal2, int irq)
+static int hal2_request_irq(struct hal2_card *hal2, int irq)
{
unsigned long flags;
int ret = 0;
@@ -1344,38 +1377,34 @@
return ret;
}
-static int hal2_alloc_resources(hal2_card_t *hal2, struct hpc3_regs *hpc3)
+static int hal2_alloc_resources(struct hal2_card *hal2, struct hpc3_regs *hpc3)
{
- hal2_pbus_t *pbus;
+ struct hal2_pbus *pbus;
pbus = &hal2->dac.pbus;
pbus->pbusnr = 0;
pbus->pbus = &hpc3->pbdma[pbus->pbusnr];
- /* The spec says that we should write 0x08248844 but that's WRONG. HAL2
- * does 8 bit DMA, not 16 bit even if it generates 16 bit audio. */
- hpc3->pbus_dmacfgs[pbus->pbusnr][0] = 0x08208844; /* Magic :-) */
pbus = &hal2->adc.pbus;
pbus->pbusnr = 1;
pbus->pbus = &hpc3->pbdma[pbus->pbusnr];
- hpc3->pbus_dmacfgs[pbus->pbusnr][0] = 0x08208844; /* Magic :-) */
return hal2_request_irq(hal2, SGI_HPCDMA_IRQ);
}
-static void hal2_init_codec(hal2_codec_t *codec)
+static void hal2_init_codec(struct hal2_codec *codec)
{
init_waitqueue_head(&codec->dma_wait);
init_MUTEX(&codec->sem);
spin_lock_init(&codec->lock);
}
-static void hal2_free_resources(hal2_card_t *hal2)
+static void hal2_free_resources(struct hal2_card *hal2)
{
free_irq(SGI_HPCDMA_IRQ, hal2);
}
-static int hal2_detect(hal2_card_t *hal2)
+static int hal2_detect(struct hal2_card *hal2)
{
unsigned short board, major, minor;
unsigned short rev;
@@ -1397,34 +1426,28 @@
major = (rev & H2_REV_MAJOR_CHIP_M) >> 4;
minor = (rev & H2_REV_MINOR_CHIP_M);
- printk("SGI HAL2 Processor revision %i.%i.%i detected\n",
+ printk(KERN_INFO "SGI HAL2 revision %i.%i.%i\n",
board, major, minor);
- if (board != 4 || major != 1 || minor != 0)
- printk( "Other revision than 4.1.0 detected. "
- "Your card is probably unsupported\n");
-
return 0;
}
-static int hal2_init_card(hal2_card_t **phal2, struct hpc3_regs *hpc3,
- unsigned long hpc3_base)
+static int hal2_init_card(struct hal2_card **phal2, struct hpc3_regs *hpc3)
{
int ret = 0;
- hal2_card_t *hal2;
-
- hal2 = (hal2_card_t *) kmalloc(sizeof(hal2_card_t), GFP_KERNEL);
+ struct hal2_card *hal2;
+
+ hal2 = (struct hal2_card *) kmalloc(sizeof(struct hal2_card), GFP_KERNEL);
if (!hal2)
return -ENOMEM;
- memset(hal2, 0, sizeof(hal2_card_t));
+ memset(hal2, 0, sizeof(struct hal2_card));
- hal2->ctl_regs = (hal2_ctl_regs_t *) KSEG1ADDR(hpc3_base + H2_CTL_PIO);
- hal2->aes_regs = (hal2_aes_regs_t *) KSEG1ADDR(hpc3_base + H2_AES_PIO);
- hal2->vol_regs = (hal2_vol_regs_t *) KSEG1ADDR(hpc3_base + H2_VOL_PIO);
- hal2->syn_regs = (hal2_syn_regs_t *) KSEG1ADDR(hpc3_base + H2_SYN_PIO);
+ hal2->ctl_regs = (struct hal2_ctl_regs *)hpc3->pbus_extregs[0];
+ hal2->aes_regs = (struct hal2_aes_regs *)hpc3->pbus_extregs[1];
+ hal2->vol_regs = (struct hal2_vol_regs *)hpc3->pbus_extregs[2];
+ hal2->syn_regs = (struct hal2_syn_regs *)hpc3->pbus_extregs[3];
if (hal2_detect(hal2) < 0) {
- printk("HAL2 audio processor not found\n");
ret = -ENODEV;
goto fail1;
}
@@ -1435,8 +1458,6 @@
ret = hal2_alloc_resources(hal2, hpc3);
if (ret)
goto fail1;
-
- hal2_init_mixer(hal2);
hal2->dev_dsp = register_sound_dsp(&hal2_audio_fops, -1);
if (hal2->dev_dsp < 0) {
@@ -1449,7 +1470,35 @@
ret = hal2->dev_mixer;
goto fail3;
}
-
+
+ /*
+ * All DMA channel interfaces in HAL2 are designed to operate with
+ * PBUS programmed for 2 cycles in D3, 2 cycles in D4 and 2 cycles
+ * in D5. HAL2 is a 16-bit device which can accept both big and little
+ * endian format. It assumes that even address bytes are on high
+ * portion of PBUS (15:8) and assumes that HPC3 is programmed to
+ * accept a live (unsynchronized) version of P_DREQ_N from HAL2.
+ */
+#define HAL2_PBUS_DMACFG ((0 << HPC3_DMACFG_D3R_SHIFT) | \
+ (2 << HPC3_DMACFG_D4R_SHIFT) | \
+ (2 << HPC3_DMACFG_D5R_SHIFT) | \
+ (0 << HPC3_DMACFG_D3W_SHIFT) | \
+ (2 << HPC3_DMACFG_D4W_SHIFT) | \
+ (2 << HPC3_DMACFG_D5W_SHIFT) | \
+ HPC3_DMACFG_DS16 | \
+ HPC3_DMACFG_EVENHI | \
+ HPC3_DMACFG_RTIME | \
+ (8 << HPC3_DMACFG_BURST_SHIFT) | \
+ HPC3_DMACFG_DRQLIVE)
+ /*
+ * Ignore what's mentioned in the specification and write value which
+ * works in The Real World (TM)
+ */
+ hpc3->pbus_dmacfg[hal2->dac.pbus.pbusnr][0] = 0x8208844;
+ hpc3->pbus_dmacfg[hal2->adc.pbus.pbusnr][0] = 0x8208844;
+
+ hal2_init_mixer(hal2);
+
*phal2 = hal2;
return 0;
fail3:
@@ -1458,27 +1507,50 @@
hal2_free_resources(hal2);
fail1:
kfree(hal2);
-
+
return ret;
}
+extern void (*indy_volume_button)(int);
+
/*
* We are assuming only one HAL2 card. If you ever meet machine with more than
* one, tell immediately about it to someone. Preferably to me. --ladis
*/
static int __init init_hal2(void)
{
- int i;
+ int i, error;
for (i = 0; i < MAXCARDS; i++)
hal2_card[i] = NULL;
- return hal2_init_card(&hal2_card[0], hpc3c0, HPC3_CHIP0_PBASE);
+ /* adjust input and output buffer count to some reasonable value */
+ if (ibufs < 2)
+ ibufs = 2;
+ else if (ibufs > 16)
+ ibufs = 16;
+
+ if (obufs < 2)
+ obufs = 2;
+ else if (obufs > 64)
+ obufs = 64;
+
+ error = hal2_init_card(&hal2_card[0], hpc3c0);
+
+ /* let Indy's volume buttons work */
+ if (!error && !ip22_is_fullhouse())
+ indy_volume_button = hal2_volume_control;
+
+ return error;
+
}
static void __exit exit_hal2(void)
{
int i;
+
+ /* unregister volume butons callback function */
+ indy_volume_button = NULL;
for (i = 0; i < MAXCARDS; i++)
if (hal2_card[i]) {
@@ -1492,6 +1564,31 @@
module_init(init_hal2);
module_exit(exit_hal2);
+#ifndef MODULE
+static int __init setup_hal2(char *str)
+{
+ /* enable main mixer control, input buffers, output buffers */
+ int ints[3];
+
+ str = get_options(str, ARRAY_SIZE(ints), ints);
+
+ msmix = ints[1];
+ ibufs = ints[2];
+ obufs = ints[3];
+
+ return 1;
+}
+
+__setup("hal2=", setup_hal2);
+#endif
+
+MODULE_PARM(msmix, "i");
+MODULE_PARM(ibufs, "i");
+MODULE_PARM(obufs, "i");
+MODULE_PARM_DESC(msmix, "Enables master volume mixer");
+MODULE_PARM_DESC(ibufs, "Number of (page sized) input buffers");
+MODULE_PARM_DESC(obufs, "Number of (page sized) output buffers");
+
MODULE_DESCRIPTION("OSS compatible driver for SGI HAL2 audio");
MODULE_AUTHOR("Ladislav Michl");
MODULE_LICENSE("GPL");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)