projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[powerpc.git]
/
sound
/
pci
/
au88x0
/
au88x0_core.c
diff --git
a/sound/pci/au88x0/au88x0_core.c
b/sound/pci/au88x0/au88x0_core.c
index
5905188
..
9cac02e
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;
@@
-1097,7
+1097,7
@@
static void vortex_adbdma_setstartbuffer(vortex_t * vortex, int adbdma, int sb)
static void
vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,
static void
vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,
- s
nd_pcm_sgbuf_t
* sgbuf, int psize, int count)
+ s
truct snd_sg_buf
* sgbuf, int psize, int count)
{
stream_t *dma = &vortex->dma_adb[adbdma];
{
stream_t *dma = &vortex->dma_adb[adbdma];
@@
-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];
@@
-1367,7
+1367,7
@@
static void vortex_wtdma_setstartbuffer(vortex_t * vortex, int wtdma, int sb)
static void
vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma,
static void
vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma,
- s
nd_pcm_sgbuf_t
* sgbuf, int psize, int count)
+ s
truct snd_sg_buf
* sgbuf, int psize, int count)
{
stream_t *dma = &vortex->dma_wt[wtdma];
{
stream_t *dma = &vortex->dma_wt[wtdma];
@@
-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];
@@
-2514,7
+2514,7
@@
static void vortex_codec_init(vortex_t * vortex)
}
static void
}
static void
-vortex_codec_write(
ac97_t
* codec, unsigned short addr, unsigned short data)
+vortex_codec_write(
struct snd_ac97
* codec, unsigned short addr, unsigned short data)
{
vortex_t *card = (vortex_t *) codec->private_data;
{
vortex_t *card = (vortex_t *) codec->private_data;
@@
-2539,7
+2539,7
@@
vortex_codec_write(ac97_t * codec, unsigned short addr, unsigned short data)
hwread(card->mmio, VORTEX_CODEC_IO);
}
hwread(card->mmio, VORTEX_CODEC_IO);
}
-static unsigned short vortex_codec_read(
ac97_t
* codec, unsigned short addr)
+static unsigned short vortex_codec_read(
struct snd_ac97
* codec, unsigned short addr)
{
vortex_t *card = (vortex_t *) codec->private_data;
{
vortex_t *card = (vortex_t *) codec->private_data;