git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
pci
/
au88x0
/
au88x0_core.c
diff --git
a/sound/pci/au88x0/au88x0_core.c
b/sound/pci/au88x0/au88x0_core.c
index
e3394fe
..
4a336ea
100644
(file)
--- a/
sound/pci/au88x0/au88x0_core.c
+++ b/
sound/pci/au88x0/au88x0_core.c
@@
-376,7
+376,7
@@
vortex_mixer_delWTD(vortex_t * vortex, unsigned char mix, unsigned char ch)
static void vortex_mixer_init(vortex_t * vortex)
{
static void vortex_mixer_init(vortex_t * vortex)
{
- u
nsigned long
addr;
+ u
32
addr;
int x;
// FIXME: get rid of this crap.
int x;
// FIXME: get rid of this crap.
@@
-639,7
+639,7
@@
static void vortex_src_setupchannel(vortex_t * card, unsigned char src,
static void vortex_srcblock_init(vortex_t * vortex)
{
static void vortex_srcblock_init(vortex_t * vortex)
{
- u
nsigned long
addr;
+ u
32
addr;
int x;
hwwrite(vortex->mmio, VORTEX_SRC_SOURCESIZE, 0x1ff);
/*
int x;
hwwrite(vortex->mmio, VORTEX_SRC_SOURCESIZE, 0x1ff);
/*
@@
-1035,7
+1035,7
@@
vortex_fifo_setwtctrl(vortex_t * vortex, int fifo, int ctrl, int priority,
static void vortex_fifo_init(vortex_t * vortex)
{
int x;
static void vortex_fifo_init(vortex_t * vortex)
{
int x;
- u
nsigned long
addr;
+ u
32
addr;
/* ADB DMA channels fifos. */
addr = VORTEX_FIFO_ADBCTRL + ((NR_ADB - 1) * 4);
/* ADB DMA channels fifos. */
addr = VORTEX_FIFO_ADBCTRL + ((NR_ADB - 1) * 4);
@@
-1054,7
+1054,7
@@
static void vortex_fifo_init(vortex_t * vortex)
hwwrite(vortex->mmio, addr, FIFO_U0);
if (hwread(vortex->mmio, addr) != FIFO_U0)
printk(KERN_ERR
hwwrite(vortex->mmio, addr, FIFO_U0);
if (hwread(vortex->mmio, addr) != FIFO_U0)
printk(KERN_ERR
- "bad wt fifo reset (0x%08
l
x, 0x%08x)!\n",
+ "bad wt fifo reset (0x%08x, 0x%08x)!\n",
addr, hwread(vortex->mmio, addr));
vortex_fifo_clearwtdata(vortex, x, FIFO_SIZE);
addr -= 4;
addr, hwread(vortex->mmio, addr));
vortex_fifo_clearwtdata(vortex, x, FIFO_SIZE);
addr -= 4;
@@
-1152,7
+1152,7
@@
vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,
static void
vortex_adbdma_setmode(vortex_t * vortex, int adbdma, int ie, int dir,
static void
vortex_adbdma_setmode(vortex_t * vortex, int adbdma, int ie, int dir,
- int fmt, int d, u
nsigned long
offset)
+ int fmt, int d, u
32
offset)
{
stream_t *dma = &vortex->dma_adb[adbdma];
{
stream_t *dma = &vortex->dma_adb[adbdma];
@@
-1411,7
+1411,7
@@
vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma,
static void
vortex_wtdma_setmode(vortex_t * vortex, int wtdma, int ie, int fmt, int d,
static void
vortex_wtdma_setmode(vortex_t * vortex, int wtdma, int ie, int fmt, int d,
- /*int e, */ u
nsigned long
offset)
+ /*int e, */ u
32
offset)
{
stream_t *dma = &vortex->dma_wt[wtdma];
{
stream_t *dma = &vortex->dma_wt[wtdma];
@@
-2385,7
+2385,7
@@
static void vortex_disable_int(vortex_t * card)
hwread(card->mmio, VORTEX_CTRL) & ~CTRL_IRQ_ENABLE);
}
hwread(card->mmio, VORTEX_CTRL) & ~CTRL_IRQ_ENABLE);
}
-static irqreturn_t vortex_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t vortex_interrupt(int irq, void *dev_id)
{
vortex_t *vortex = dev_id;
int i, handled;
{
vortex_t *vortex = dev_id;
int i, handled;
@@
-2462,7
+2462,7
@@
static irqreturn_t vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs)
}
if (source & IRQ_MIDI) {
snd_mpu401_uart_interrupt(vortex->irq,
}
if (source & IRQ_MIDI) {
snd_mpu401_uart_interrupt(vortex->irq,
- vortex->rmidi->private_data
, regs
);
+ vortex->rmidi->private_data);
handled = 1;
}
handled = 1;
}
@@
-2658,7
+2658,7
@@
static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode)
/* Initialization */
/* Initialization */
-static int vortex_core_init(vortex_t * vortex)
+static int
__devinit
vortex_core_init(vortex_t * vortex)
{
printk(KERN_INFO "Vortex: init.... ");
{
printk(KERN_INFO "Vortex: init.... ");
@@
-2690,7
+2690,7
@@
static int vortex_core_init(vortex_t * vortex)
#ifndef CHIP_AU8820
vortex_eq_init(vortex);
vortex_spdif_init(vortex, 48000, 1);
#ifndef CHIP_AU8820
vortex_eq_init(vortex);
vortex_spdif_init(vortex, 48000, 1);
- vortex_Vort3D
(vortex, 1
);
+ vortex_Vort3D
_enable(vortex
);
#endif
#ifndef CHIP_AU8810
vortex_wt_init(vortex);
#endif
#ifndef CHIP_AU8810
vortex_wt_init(vortex);
@@
-2718,7
+2718,7
@@
static int vortex_core_shutdown(vortex_t * vortex)
printk(KERN_INFO "Vortex: shutdown...");
#ifndef CHIP_AU8820
vortex_eq_free(vortex);
printk(KERN_INFO "Vortex: shutdown...");
#ifndef CHIP_AU8820
vortex_eq_free(vortex);
- vortex_Vort3D
(vortex, 0
);
+ vortex_Vort3D
_disable(vortex
);
#endif
//vortex_disable_timer_int(vortex);
vortex_disable_int(vortex);
#endif
//vortex_disable_timer_int(vortex);
vortex_disable_int(vortex);