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
vserver 1.9.3
[linux-2.6.git]
/
sound
/
oss
/
msnd_pinnacle.c
diff --git
a/sound/oss/msnd_pinnacle.c
b/sound/oss/msnd_pinnacle.c
index
eb345b6
..
7ebc5d3
100644
(file)
--- a/
sound/oss/msnd_pinnacle.c
+++ b/
sound/oss/msnd_pinnacle.c
@@
-136,9
+136,9
@@
static void reset_record_queue(void)
/* Critical section: bank 1 access */
spin_lock_irqsave(&dev.lock, flags);
/* Critical section: bank 1 access */
spin_lock_irqsave(&dev.lock, flags);
- outb(HPBLKSEL_1, dev.io + HP_BLKS);
+
msnd_
outb(HPBLKSEL_1, dev.io + HP_BLKS);
isa_memset_io(dev.base, 0, DAR_BUFF_SIZE * 3);
isa_memset_io(dev.base, 0, DAR_BUFF_SIZE * 3);
- outb(HPBLKSEL_0, dev.io + HP_BLKS);
+
msnd_
outb(HPBLKSEL_0, dev.io + HP_BLKS);
spin_unlock_irqrestore(&dev.lock, flags);
for (n = 0, lpDAQ = dev.base + DARQ_DATA_BUFF; n < 3; ++n, lpDAQ += DAQDS__size) {
spin_unlock_irqrestore(&dev.lock, flags);
for (n = 0, lpDAQ = dev.base + DARQ_DATA_BUFF; n < 3; ++n, lpDAQ += DAQDS__size) {
@@
-830,12
+830,12
@@
static __inline__ int pack_DARQ_to_DARF(register int bank)
/* Read data from the head (unprotected bank 1 access okay
since this is only called inside an interrupt) */
/* Read data from the head (unprotected bank 1 access okay
since this is only called inside an interrupt) */
- outb(HPBLKSEL_1, dev.io + HP_BLKS);
+
msnd_
outb(HPBLKSEL_1, dev.io + HP_BLKS);
msnd_fifo_write(
&dev.DARF,
(char *)(dev.base + bank * DAR_BUFF_SIZE),
size);
msnd_fifo_write(
&dev.DARF,
(char *)(dev.base + bank * DAR_BUFF_SIZE),
size);
- outb(HPBLKSEL_0, dev.io + HP_BLKS);
+
msnd_
outb(HPBLKSEL_0, dev.io + HP_BLKS);
return 1;
}
return 1;
}
@@
-1091,7
+1091,7
@@
static __inline__ void eval_dsp_msg(register WORD wMessage)
static irqreturn_t intr(int irq, void *dev_id, struct pt_regs *regs)
{
/* Send ack to DSP */
static irqreturn_t intr(int irq, void *dev_id, struct pt_regs *regs)
{
/* Send ack to DSP */
- inb(dev.io + HP_RXL);
+
msnd_
inb(dev.io + HP_RXL);
/* Evaluate queued DSP messages */
while (isa_readw(dev.DSPQ + JQS_wTail) != isa_readw(dev.DSPQ + JQS_wHead)) {
/* Evaluate queued DSP messages */
while (isa_readw(dev.DSPQ + JQS_wTail) != isa_readw(dev.DSPQ + JQS_wHead)) {
@@
-1120,15
+1120,15
@@
static int reset_dsp(void)
{
int timeout = 100;
{
int timeout = 100;
- outb(HPDSPRESET_ON, dev.io + HP_DSPR);
+
msnd_
outb(HPDSPRESET_ON, dev.io + HP_DSPR);
mdelay(1);
#ifndef MSND_CLASSIC
mdelay(1);
#ifndef MSND_CLASSIC
- dev.info = inb(dev.io + HP_INFO);
+ dev.info =
msnd_
inb(dev.io + HP_INFO);
#endif
#endif
- outb(HPDSPRESET_OFF, dev.io + HP_DSPR);
+
msnd_
outb(HPDSPRESET_OFF, dev.io + HP_DSPR);
mdelay(1);
while (timeout-- > 0) {
mdelay(1);
while (timeout-- > 0) {
- if (inb(dev.io + HP_CVR) == HP_CVR_DEF)
+ if (
msnd_
inb(dev.io + HP_CVR) == HP_CVR_DEF)
return 0;
mdelay(1);
}
return 0;
mdelay(1);
}
@@
-1202,9
+1202,9
@@
static int init_sma(void)
unsigned long flags;
#ifdef MSND_CLASSIC
unsigned long flags;
#ifdef MSND_CLASSIC
- outb(dev.memid, dev.io + HP_MEMM);
+
msnd_
outb(dev.memid, dev.io + HP_MEMM);
#endif
#endif
- outb(HPBLKSEL_0, dev.io + HP_BLKS);
+
msnd_
outb(HPBLKSEL_0, dev.io + HP_BLKS);
if (initted) {
mastVolLeft = isa_readw(dev.SMA + SMA_wCurrMastVolLeft);
mastVolRight = isa_readw(dev.SMA + SMA_wCurrMastVolRight);
if (initted) {
mastVolLeft = isa_readw(dev.SMA + SMA_wCurrMastVolLeft);
mastVolRight = isa_readw(dev.SMA + SMA_wCurrMastVolRight);
@@
-1214,9
+1214,9
@@
static int init_sma(void)
/* Critical section: bank 1 access */
spin_lock_irqsave(&dev.lock, flags);
/* Critical section: bank 1 access */
spin_lock_irqsave(&dev.lock, flags);
- outb(HPBLKSEL_1, dev.io + HP_BLKS);
+
msnd_
outb(HPBLKSEL_1, dev.io + HP_BLKS);
isa_memset_io(dev.base, 0, 0x8000);
isa_memset_io(dev.base, 0, 0x8000);
- outb(HPBLKSEL_0, dev.io + HP_BLKS);
+
msnd_
outb(HPBLKSEL_0, dev.io + HP_BLKS);
spin_unlock_irqrestore(&dev.lock, flags);
dev.pwDSPQData = (dev.base + DSPQ_DATA_BUFF);
spin_unlock_irqrestore(&dev.lock, flags);
dev.pwDSPQData = (dev.base + DSPQ_DATA_BUFF);
@@
-1289,7
+1289,7
@@
static int __init calibrate_adc(WORD srate)
static int upload_dsp_code(void)
{
static int upload_dsp_code(void)
{
- outb(HPBLKSEL_0, dev.io + HP_BLKS);
+
msnd_
outb(HPBLKSEL_0, dev.io + HP_BLKS);
#ifndef HAVE_DSPCODEH
INITCODESIZE = mod_firmware_load(INITCODEFILE, &INITCODE);
if (!INITCODE) {
#ifndef HAVE_DSPCODEH
INITCODESIZE = mod_firmware_load(INITCODEFILE, &INITCODE);
if (!INITCODE) {
@@
-1326,9
+1326,9
@@
static int upload_dsp_code(void)
#ifdef MSND_CLASSIC
static void reset_proteus(void)
{
#ifdef MSND_CLASSIC
static void reset_proteus(void)
{
- outb(HPPRORESET_ON, dev.io + HP_PROR);
+
msnd_
outb(HPPRORESET_ON, dev.io + HP_PROR);
mdelay(TIME_PRO_RESET);
mdelay(TIME_PRO_RESET);
- outb(HPPRORESET_OFF, dev.io + HP_PROR);
+
msnd_
outb(HPPRORESET_OFF, dev.io + HP_PROR);
mdelay(TIME_PRO_RESET_DONE);
}
#endif
mdelay(TIME_PRO_RESET_DONE);
}
#endif
@@
-1338,8
+1338,8
@@
static int initialize(void)
int err, timeout;
#ifdef MSND_CLASSIC
int err, timeout;
#ifdef MSND_CLASSIC
- outb(HPWAITSTATE_0, dev.io + HP_WAIT);
- outb(HPBITMODE_16, dev.io + HP_BITM);
+
msnd_
outb(HPWAITSTATE_0, dev.io + HP_WAIT);
+
msnd_
outb(HPBITMODE_16, dev.io + HP_BITM);
reset_proteus();
#endif
reset_proteus();
#endif
@@
-1455,9
+1455,9
@@
static void __exit unload_multisound(void)
static int __init msnd_write_cfg(int cfg, int reg, int value)
{
static int __init msnd_write_cfg(int cfg, int reg, int value)
{
- outb(reg, cfg);
- outb(value, cfg + 1);
- if (value != inb(cfg + 1)) {
+
msnd_
outb(reg, cfg);
+
msnd_
outb(value, cfg + 1);
+ if (value !=
msnd_
inb(cfg + 1)) {
printk(KERN_ERR LOGNAME ": msnd_write_cfg: I/O error\n");
return -EIO;
}
printk(KERN_ERR LOGNAME ": msnd_write_cfg: I/O error\n");
return -EIO;
}