summaryrefslogtreecommitdiffstats
path: root/drivers/sgi
diff options
context:
space:
mode:
authorUlf Carlsson <md1ulfc@mdstud.chalmers.se>1999-02-08 18:29:31 +0000
committerUlf Carlsson <md1ulfc@mdstud.chalmers.se>1999-02-08 18:29:31 +0000
commit145dd02fc9968ebd65307baf0653dc9341dd6bb2 (patch)
tree54a95ffbd2b1d2ba1b34475cfd9a75c1fa6eb932 /drivers/sgi
parent91885fc94effad73511f11875254da8192042941 (diff)
o Added a VINO driver, well it tries to read the revision register at least. I use some special code when I write to those 64 bit registers.
Diffstat (limited to 'drivers/sgi')
-rw-r--r--drivers/sgi/audio/hal2.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/sgi/audio/hal2.c b/drivers/sgi/audio/hal2.c
index 11c905759..8a61dab50 100644
--- a/drivers/sgi/audio/hal2.c
+++ b/drivers/sgi/audio/hal2.c
@@ -1,4 +1,4 @@
-/* $Id: hal2.c,v 1.11 1999/02/03 23:25:31 tsbogend Exp $
+/* $Id: hal2.c,v 1.13 1999/02/07 22:18:37 ulfc Exp $
*
* drivers/sgi/audio/hal2.c
*
@@ -101,6 +101,7 @@ struct sgiaudio_chan_ops {
void (*start) (struct sgiaudio *);
void (*stop) (struct sgiaudio *);
void (*free) (struct sgiaudio *);
+ void *priv;
};
#if 0
@@ -198,7 +199,7 @@ static void hal2_reset(void)
}
/* enable/disable a specific PBUS dma channel */
-__inline__ void sgipbus_enable(unsigned int channel, unsigned long desc)
+static __inline__ void sgipbus_enable(unsigned int channel, unsigned long desc)
{
struct hpc3_pbus_dmacregs *pbus = &hpc3c0->pbdma0;
@@ -206,14 +207,14 @@ __inline__ void sgipbus_enable(unsigned int channel, unsigned long desc)
pbus[channel].pbdma_ctrl |= HPC3_PDMACTRL_ACT;
}
-__inline__ void sgipbus_disable(unsigned int channel)
+static __inline__ void sgipbus_disable(unsigned int channel)
{
struct hpc3_pbus_dmacregs *pbus = &hpc3c0->pbdma0;
pbus[channel].pbdma_ctrl &= ~HPC3_PDMACTRL_ACT;
}
-__inline__ int sgipbus_interrupted(unsigned int channel)
+static __inline__ int sgipbus_interrupted(unsigned int channel)
{
struct hpc3_pbus_dmacregs *pbus = &hpc3c0->pbdma0;