From 75166a0fc92220b496eb67451ec1b11cb8b72091 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 29 Oct 2011 18:54:10 -0700 Subject: Use unsigned long rather than deprecated IOADDRESS Signed-off-by: Jeremy Huddleston --- src/atiprint.c | 4 ++-- src/atiprobe.c | 2 +- src/atistruct.h | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/atiprint.c b/src/atiprint.c index 3a1debb..f050d52 100644 --- a/src/atiprint.c +++ b/src/atiprint.c @@ -92,11 +92,11 @@ ATIPrintBIOS static void ATIPrintIndexedRegisters ( - const IOADDRESS Port, + const unsigned long Port, const CARD8 StartIndex, const CARD8 EndIndex, const char *Name, - const IOADDRESS GenS1 + const unsigned long GenS1 ) { int Index; diff --git a/src/atiprobe.c b/src/atiprobe.c index 5092073..b065915 100644 --- a/src/atiprobe.c +++ b/src/atiprobe.c @@ -373,7 +373,7 @@ ATIMach64ProbeIO #ifndef AVOID_CPIO - static const IOADDRESS Mach64SparseIOBases[] = { + static const unsigned long Mach64SparseIOBases[] = { 0x02ECU, 0x01CCU, 0x01C8U diff --git a/src/atistruct.h b/src/atistruct.h index 5225256..87f2a5d 100644 --- a/src/atistruct.h +++ b/src/atistruct.h @@ -234,19 +234,19 @@ typedef struct _ATIRec * Processor I/O decoding definitions. */ CARD8 CPIODecoding; - IOADDRESS CPIOBase; + unsigned long CPIOBase; #ifndef AVOID_CPIO /* * Processor I/O port definition for VGA. */ - IOADDRESS CPIO_VGABase; + unsigned long CPIO_VGABase; /* * Processor I/O port definitions for VGA Wonder. */ - IOADDRESS CPIO_VGAWonder; + unsigned long CPIO_VGAWonder; #endif /* AVOID_CPIO */ @@ -256,7 +256,7 @@ typedef struct _ATIRec #ifndef AVOID_CPIO - IOADDRESS CPIO_DAC_MASK, CPIO_DAC_DATA, CPIO_DAC_READ, CPIO_DAC_WRITE, + unsigned long CPIO_DAC_MASK, CPIO_DAC_DATA, CPIO_DAC_READ, CPIO_DAC_WRITE, CPIO_DAC_WAIT; #endif /* AVOID_CPIO */ -- cgit v1.2.3