diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /drivers/sound/msnd.h | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'drivers/sound/msnd.h')
| -rw-r--r-- | drivers/sound/msnd.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/sound/msnd.h b/drivers/sound/msnd.h index 1379563f2..54bf5fd01 100644 --- a/drivers/sound/msnd.h +++ b/drivers/sound/msnd.h @@ -189,7 +189,7 @@ typedef u8 BYTE; typedef u16 USHORT; typedef u16 WORD; typedef u32 DWORD; -typedef volatile BYTE * LPDAQD; +typedef unsigned long LPDAQD; /* Generic FIFO */ typedef struct { @@ -208,12 +208,12 @@ typedef struct multisound_dev { int memid, irqid; int irq, irq_ref; unsigned char info; - volatile BYTE *base; + unsigned long base; /* Motorola 56k DSP SMA */ - volatile BYTE *SMA; - volatile BYTE *DAPQ, *DARQ, *MODQ, *MIDQ, *DSPQ; - volatile WORD *pwDSPQData, *pwMIDQData, *pwMODQData; + unsigned long SMA; + unsigned long DAPQ, DARQ, MODQ, MIDQ, DSPQ; + unsigned long pwDSPQData, pwMIDQData, pwMODQData; /* State variables */ enum { msndClassic, msndPinnacle } type; |