diff options
| author | daryll <daryll> | 1999-12-08 19:08:49 +0000 |
|---|---|---|
| committer | daryll <daryll> | 1999-12-08 19:08:49 +0000 |
| commit | 7d1444fb80d20552460be384be8bf1fd9167b6f8 (patch) | |
| tree | f24055898b338ce6d040dddf861983dba3c87fc3 | |
| parent | 6db1b3d541ddc8ec3100f022f17f6c1f6eeb550f (diff) | |
Remove MMIO_ functions as they occur in versions later than 3.9.16.
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c index fb0efcbf2..1e8513f86 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c @@ -40,10 +40,21 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "tdfx.h" -#define minb(p) MMIO_IN8(pTDFX->MMIOBase, (p)) -#define moutb(p,v) MMIO_OUT8(pTDFX->MMIOBase, (p),(v)) -#define minl(p) MMIO_IN32(pTDFX->MMIOBase, (p)) -#define moutl(p,v) MMIO_OUT32(pTDFX->MMIOBase, (p),(v)) +#ifndef __alpha__ +#define minb(p) *(volatile CARD8 *)(pTDFX->MMIOBase + (p)) +#define moutb(p,v) \ + *(volatile CARD8 *)(pTDFX->MMIOBase + (p)) = (v) +#define minl(p) *(volatile CARD32 *)(pTDFX->MMIOBase + (p)) +#define moutl(p,v) \ + *(volatile CARD32 *)(pTDFX->MMIOBase + (p)) = (v) +#else +#define minb(p) xf86ReadSparse8(pTDFX->MMIOBase, (p)) +#define moutb(p,v) \ + xf86WriteSparse8((v), pTDFX->MMIOBase, (p)) +#define minl(p) xf86ReadSparse32(pTDFX->MMIOBase, (p)) +#define moutl(p,v) \ + xf86WriteSparse32((v), pTDFX->MMIOBase, (p)) +#endif static void TDFXWriteControlPIO(TDFXPtr pTDFX, int addr, char index, char val) { outb(pTDFX->PIOBase+addr, index); |